- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 v3 00/31] block: Make blkdev_get_by_*() return
by Li Lingfeng 30 Nov '23

30 Nov '23

Create struct bdev_handle that contains all parameters that need to be passed to blkdev_put() and provide bdev_open_* functions that return this structure instead of plain bdev pointer. v1->v2: Add new bugfix 8bd90b6ae785 ("erofs: fix NULL dereference of dif->bdev_handle in fscache mode"). Fix the comment of cd34758c5238 ("block: Remove blkdev_get_by_() functions"). v2->v3: Fix the comment of acb083b55597 ("block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset()"). Jan Kara (30): block: Provide bdev_open_* functions block: Use bdev_open_by_dev() in blkdev_open() block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset() drdb: Convert to use bdev_open_by_path() pktcdvd: Convert to bdev_open_by_dev() rnbd-srv: Convert to use bdev_open_by_path() xen/blkback: Convert to bdev_open_by_dev() zram: Convert to use bdev_open_by_dev() bcache: Convert to bdev_open_by_path() dm: Convert to bdev_open_by_dev() md: Convert to bdev_open_by_dev() mtd: block2mtd: Convert to bdev_open_by_dev/path() nvmet: Convert to bdev_open_by_path() s390/dasd: Convert to bdev_open_by_path() scsi: target: Convert to bdev_open_by_path() PM: hibernate: Convert to bdev_open_by_dev() PM: hibernate: Drop unused snapshot_test argument mm/swap: Convert to use bdev_open_by_dev() fs: Convert to bdev_open_by_dev() btrfs: Convert to bdev_open_by_path() erofs: Convert to use bdev_open_by_path() ext4: Convert to bdev_open_by_dev() f2fs: Convert to bdev_open_by_dev/path() jfs: Convert to bdev_open_by_dev() nfs/blocklayout: Convert to use bdev_open_by_dev/path() ocfs2: Convert to use bdev_open_by_dev() reiserfs: Convert to bdev_open_by_dev/path() xfs: Convert to bdev_open_by_path() bcache: Fixup error handling in register_cache() block: Remove blkdev_get_by_*() functions Jingbo Xu (1): erofs: fix NULL dereference of dif->bdev_handle in fscache mode block/bdev.c | 65 ++++++++++------- block/fops.c | 44 +++++++----- block/genhd.c | 12 ++-- block/ioctl.c | 6 +- drivers/block/drbd/drbd_int.h | 2 + drivers/block/drbd/drbd_nl.c | 65 +++++++++-------- drivers/block/pktcdvd.c | 76 +++++++++++--------- drivers/block/rnbd/rnbd-srv.c | 27 +++---- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/block/xen-blkback/blkback.c | 4 +- drivers/block/xen-blkback/common.h | 4 +- drivers/block/xen-blkback/xenbus.c | 40 ++++++----- drivers/block/zram/zram_drv.c | 31 ++++---- drivers/block/zram/zram_drv.h | 2 +- drivers/md/bcache/bcache.h | 2 + drivers/md/bcache/super.c | 95 ++++++++++++------------ drivers/md/dm.c | 20 +++--- drivers/md/md.c | 23 +++--- drivers/md/md.h | 4 +- drivers/mtd/devices/block2mtd.c | 51 +++++++------ drivers/nvme/target/io-cmd-bdev.c | 20 +++--- drivers/nvme/target/nvmet.h | 1 + drivers/s390/block/dasd.c | 12 ++-- drivers/s390/block/dasd_genhd.c | 45 ++++++------ drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/target/target_core_iblock.c | 19 ++--- drivers/target/target_core_iblock.h | 1 + drivers/target/target_core_pscsi.c | 26 +++---- drivers/target/target_core_pscsi.h | 2 +- fs/btrfs/dev-replace.c | 14 ++-- fs/btrfs/ioctl.c | 18 +++-- fs/btrfs/volumes.c | 107 ++++++++++++++-------------- fs/btrfs/volumes.h | 6 +- fs/cramfs/inode.c | 2 +- fs/erofs/data.c | 5 +- fs/erofs/internal.h | 2 +- fs/erofs/super.c | 20 +++--- fs/ext4/ext4.h | 2 +- fs/ext4/fsmap.c | 9 +-- fs/ext4/super.c | 52 +++++++------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 13 ++-- fs/jfs/jfs_logmgr.c | 29 ++++---- fs/jfs/jfs_logmgr.h | 2 +- fs/jfs/jfs_mount.c | 3 +- fs/nfs/blocklayout/blocklayout.h | 2 +- fs/nfs/blocklayout/dev.c | 76 ++++++++++---------- fs/ocfs2/cluster/heartbeat.c | 81 +++++++++++---------- fs/reiserfs/journal.c | 56 +++++++-------- fs/reiserfs/procfs.c | 2 +- fs/reiserfs/reiserfs.h | 11 +-- fs/romfs/super.c | 2 +- fs/super.c | 15 ++-- fs/xfs/xfs_buf.c | 22 +++--- fs/xfs/xfs_buf.h | 3 +- fs/xfs/xfs_super.c | 42 ++++++----- include/linux/blkdev.h | 12 +++- include/linux/device-mapper.h | 1 + include/linux/fs.h | 1 + include/linux/pktcdvd.h | 4 +- include/linux/swap.h | 1 + kernel/power/hibernate.c | 14 ++-- kernel/power/power.h | 2 +- kernel/power/swap.c | 37 +++++----- mm/swapfile.c | 23 +++--- 66 files changed, 740 insertions(+), 657 deletions(-) -- 2.31.1

2 32

[PATCH OLK-6.6 v2 00/31] block: Make blkdev_get_by_*() return
by Li Lingfeng 30 Nov '23

30 Nov '23

Create struct bdev_handle that contains all parameters that need to be passed to blkdev_put() and provide bdev_open_* functions that return this structure instead of plain bdev pointer. v1->v2: Add new bugfix 8bd90b6ae785 ("erofs: fix NULL dereference of dif->bdev_handle in fscache mode"). Fix the comment of fd70b3b44 ("block: Remove blkdev_get_by_() functions"). Jan Kara (30): block: Provide bdev_open_* functions block: Use bdev_open_by_dev() in blkdev_open() block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset() drdb: Convert to use bdev_open_by_path() pktcdvd: Convert to bdev_open_by_dev() rnbd-srv: Convert to use bdev_open_by_path() xen/blkback: Convert to bdev_open_by_dev() zram: Convert to use bdev_open_by_dev() bcache: Convert to bdev_open_by_path() dm: Convert to bdev_open_by_dev() md: Convert to bdev_open_by_dev() mtd: block2mtd: Convert to bdev_open_by_dev/path() nvmet: Convert to bdev_open_by_path() s390/dasd: Convert to bdev_open_by_path() scsi: target: Convert to bdev_open_by_path() PM: hibernate: Convert to bdev_open_by_dev() PM: hibernate: Drop unused snapshot_test argument mm/swap: Convert to use bdev_open_by_dev() fs: Convert to bdev_open_by_dev() btrfs: Convert to bdev_open_by_path() erofs: Convert to use bdev_open_by_path() ext4: Convert to bdev_open_by_dev() f2fs: Convert to bdev_open_by_dev/path() jfs: Convert to bdev_open_by_dev() nfs/blocklayout: Convert to use bdev_open_by_dev/path() ocfs2: Convert to use bdev_open_by_dev() reiserfs: Convert to bdev_open_by_dev/path() xfs: Convert to bdev_open_by_path() bcache: Fixup error handling in register_cache() block: Remove blkdev_get_by_*() functions Jingbo Xu (1): erofs: fix NULL dereference of dif->bdev_handle in fscache mode block/bdev.c | 65 ++++++++++------- block/fops.c | 44 +++++++----- block/genhd.c | 12 ++-- block/ioctl.c | 6 +- drivers/block/drbd/drbd_int.h | 2 + drivers/block/drbd/drbd_nl.c | 65 +++++++++-------- drivers/block/pktcdvd.c | 76 +++++++++++--------- drivers/block/rnbd/rnbd-srv.c | 27 +++---- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/block/xen-blkback/blkback.c | 4 +- drivers/block/xen-blkback/common.h | 4 +- drivers/block/xen-blkback/xenbus.c | 40 ++++++----- drivers/block/zram/zram_drv.c | 31 ++++---- drivers/block/zram/zram_drv.h | 2 +- drivers/md/bcache/bcache.h | 2 + drivers/md/bcache/super.c | 95 ++++++++++++------------ drivers/md/dm.c | 20 +++--- drivers/md/md.c | 23 +++--- drivers/md/md.h | 4 +- drivers/mtd/devices/block2mtd.c | 51 +++++++------ drivers/nvme/target/io-cmd-bdev.c | 20 +++--- drivers/nvme/target/nvmet.h | 1 + drivers/s390/block/dasd.c | 12 ++-- drivers/s390/block/dasd_genhd.c | 45 ++++++------ drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/target/target_core_iblock.c | 19 ++--- drivers/target/target_core_iblock.h | 1 + drivers/target/target_core_pscsi.c | 26 +++---- drivers/target/target_core_pscsi.h | 2 +- fs/btrfs/dev-replace.c | 14 ++-- fs/btrfs/ioctl.c | 18 +++-- fs/btrfs/volumes.c | 107 ++++++++++++++-------------- fs/btrfs/volumes.h | 6 +- fs/cramfs/inode.c | 2 +- fs/erofs/data.c | 5 +- fs/erofs/internal.h | 2 +- fs/erofs/super.c | 20 +++--- fs/ext4/ext4.h | 2 +- fs/ext4/fsmap.c | 9 +-- fs/ext4/super.c | 52 +++++++------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 13 ++-- fs/jfs/jfs_logmgr.c | 29 ++++---- fs/jfs/jfs_logmgr.h | 2 +- fs/jfs/jfs_mount.c | 3 +- fs/nfs/blocklayout/blocklayout.h | 2 +- fs/nfs/blocklayout/dev.c | 76 ++++++++++---------- fs/ocfs2/cluster/heartbeat.c | 81 +++++++++++---------- fs/reiserfs/journal.c | 56 +++++++-------- fs/reiserfs/procfs.c | 2 +- fs/reiserfs/reiserfs.h | 11 +-- fs/romfs/super.c | 2 +- fs/super.c | 15 ++-- fs/xfs/xfs_buf.c | 22 +++--- fs/xfs/xfs_buf.h | 3 +- fs/xfs/xfs_super.c | 42 ++++++----- include/linux/blkdev.h | 12 +++- include/linux/device-mapper.h | 1 + include/linux/fs.h | 1 + include/linux/pktcdvd.h | 4 +- include/linux/swap.h | 1 + kernel/power/hibernate.c | 14 ++-- kernel/power/power.h | 2 +- kernel/power/swap.c | 37 +++++----- mm/swapfile.c | 23 +++--- 66 files changed, 740 insertions(+), 657 deletions(-) -- 2.31.1

2 32

[PATCH OLK-6.6 00/30] block: Make blkdev_get_by_*() return
by Li Lingfeng 30 Nov '23

30 Nov '23

Create struct bdev_handle that contains all parameters that need to be passed to blkdev_put() and provide bdev_open_* functions that return this structure instead of plain bdev pointer. Jan Kara (30): block: Provide bdev_open_* functions block: Use bdev_open_by_dev() in blkdev_open() block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset() drdb: Convert to use bdev_open_by_path() pktcdvd: Convert to bdev_open_by_dev() rnbd-srv: Convert to use bdev_open_by_path() xen/blkback: Convert to bdev_open_by_dev() zram: Convert to use bdev_open_by_dev() bcache: Convert to bdev_open_by_path() dm: Convert to bdev_open_by_dev() md: Convert to bdev_open_by_dev() mtd: block2mtd: Convert to bdev_open_by_dev/path() nvmet: Convert to bdev_open_by_path() s390/dasd: Convert to bdev_open_by_path() scsi: target: Convert to bdev_open_by_path() PM: hibernate: Convert to bdev_open_by_dev() PM: hibernate: Drop unused snapshot_test argument mm/swap: Convert to use bdev_open_by_dev() fs: Convert to bdev_open_by_dev() btrfs: Convert to bdev_open_by_path() erofs: Convert to use bdev_open_by_path() ext4: Convert to bdev_open_by_dev() f2fs: Convert to bdev_open_by_dev/path() jfs: Convert to bdev_open_by_dev() nfs/blocklayout: Convert to use bdev_open_by_dev/path() ocfs2: Convert to use bdev_open_by_dev() reiserfs: Convert to bdev_open_by_dev/path() xfs: Convert to bdev_open_by_path() bcache: Fixup error handling in register_cache() block: Remove blkdev_get_by_*() functions block/bdev.c | 65 ++++++++++------- block/fops.c | 44 +++++++----- block/genhd.c | 12 ++-- block/ioctl.c | 6 +- drivers/block/drbd/drbd_int.h | 2 + drivers/block/drbd/drbd_nl.c | 65 +++++++++-------- drivers/block/pktcdvd.c | 76 +++++++++++--------- drivers/block/rnbd/rnbd-srv.c | 27 +++---- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/block/xen-blkback/blkback.c | 4 +- drivers/block/xen-blkback/common.h | 4 +- drivers/block/xen-blkback/xenbus.c | 40 ++++++----- drivers/block/zram/zram_drv.c | 31 ++++---- drivers/block/zram/zram_drv.h | 2 +- drivers/md/bcache/bcache.h | 2 + drivers/md/bcache/super.c | 95 ++++++++++++------------ drivers/md/dm.c | 20 +++--- drivers/md/md.c | 23 +++--- drivers/md/md.h | 4 +- drivers/mtd/devices/block2mtd.c | 51 +++++++------ drivers/nvme/target/io-cmd-bdev.c | 20 +++--- drivers/nvme/target/nvmet.h | 1 + drivers/s390/block/dasd.c | 12 ++-- drivers/s390/block/dasd_genhd.c | 45 ++++++------ drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/target/target_core_iblock.c | 19 ++--- drivers/target/target_core_iblock.h | 1 + drivers/target/target_core_pscsi.c | 26 +++---- drivers/target/target_core_pscsi.h | 2 +- fs/btrfs/dev-replace.c | 14 ++-- fs/btrfs/ioctl.c | 18 +++-- fs/btrfs/volumes.c | 107 ++++++++++++++-------------- fs/btrfs/volumes.h | 6 +- fs/cramfs/inode.c | 2 +- fs/erofs/data.c | 4 +- fs/erofs/internal.h | 2 +- fs/erofs/super.c | 20 +++--- fs/ext4/ext4.h | 2 +- fs/ext4/fsmap.c | 9 +-- fs/ext4/super.c | 52 +++++++------- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 13 ++-- fs/jfs/jfs_logmgr.c | 29 ++++---- fs/jfs/jfs_logmgr.h | 2 +- fs/jfs/jfs_mount.c | 3 +- fs/nfs/blocklayout/blocklayout.h | 2 +- fs/nfs/blocklayout/dev.c | 76 ++++++++++---------- fs/ocfs2/cluster/heartbeat.c | 81 +++++++++++---------- fs/reiserfs/journal.c | 56 +++++++-------- fs/reiserfs/procfs.c | 2 +- fs/reiserfs/reiserfs.h | 11 +-- fs/romfs/super.c | 2 +- fs/super.c | 15 ++-- fs/xfs/xfs_buf.c | 22 +++--- fs/xfs/xfs_buf.h | 3 +- fs/xfs/xfs_super.c | 42 ++++++----- include/linux/blkdev.h | 12 +++- include/linux/device-mapper.h | 1 + include/linux/fs.h | 1 + include/linux/pktcdvd.h | 4 +- include/linux/swap.h | 1 + kernel/power/hibernate.c | 14 ++-- kernel/power/power.h | 2 +- kernel/power/swap.c | 37 +++++----- mm/swapfile.c | 23 +++--- 66 files changed, 739 insertions(+), 657 deletions(-) -- 2.31.1

2 31

[PATCH OLK-6.6 0/6] ipvlan: Introduce l2e mode
by Zhengchao Shao 30 Nov '23

30 Nov '23

Inherited features of olk5.10 version. Keefe LIU (4): ipvlan: Introduce l2e mode ipvlan: check the value of module parameter ipvlan_default_mode ipvlan: Introduce local xmit queue for l2e mode ipvlan: limit loop_qlen ranges Keefe Liu (1): ipvlan: limit loop_delay ranges Lu Wei (1): ipvlan: Modify the value of ipvlan modes drivers/net/ipvlan/ipvlan.h | 7 + drivers/net/ipvlan/ipvlan_core.c | 222 +++++++++++++++++++++++++++++++ drivers/net/ipvlan/ipvlan_main.c | 85 +++++++++++- include/uapi/linux/if_link.h | 1 + 4 files changed, 314 insertions(+), 1 deletion(-) -- 2.34.1

2 7

[PATCH OLK-5.10 00/20] KVM: arm64: Add vtimer interrupt bypass
by Dongxu Sun 30 Nov '23

30 Nov '23

Haibin Wang (2): KVM: arm64: arch_timer: Probe vtimer irqbypass capability KVM: arm64: arch_timer: Rework vcpu init/reset logic Kunkun Jiang (6): mbigen: vtimer mbigen driver support irqchip/gic-v4.1: Detect ITS vtimer interrupt bypass capability irqchip/gic-v4.1: Extend VSGI command to support the new vPPI mbigen: vtimer: add support for MBIX1_CPPI_NEGEDGE_CLR_EN_SETR(CLRR) KVM: arm64: vgic-v3: Clearing pending status of vtimer on guest reset mbigen: Sets the regs related to vtimer irqbypass Zenghui Yu (5): KVM: arm64: GICv4.1: Add direct injection capability to PPI registers KVM: arm64: arch_timer: Extract vtimer hyp_init logic KVM: arm64: GICv4.1: Allow non-trapping WFI when using direct vtimer interrupt KVM: arm64: vtimer: Expose HW-based vtimer interrupt in debugfs KVM: arm64: arch_timer: Make vtimer_irqbypass a Distributor attr wanghaibin (7): irqchip/gic-v4.1: Rework get/set_irqchip_state callbacks of GICv4.1-sgi chip irqchip/gic-v4.1: Rework its_alloc_vcpu_sgis() to support vPPI allocation irqchip/gic-v4.1: Probe vtimer irqbypass capability at RD level KVM: arm64: GICv4.1: Inform the HiSilicon vtimer irqbypass capability KVM: arm64: vgic: Add helper for vtimer vppi info register KVM: arm64: GICv4.1: Enable vtimer vPPI irqbypass config KVM: arm64: GICv4.1: Add support for MBIGEN save/restore arch/arm64/include/asm/kvm_emulate.h | 1 + arch/arm64/kvm/arch_timer.c | 273 ++++++++++-- arch/arm64/kvm/arm.c | 4 + arch/arm64/kvm/vgic/vgic-debug.c | 2 +- arch/arm64/kvm/vgic/vgic-init.c | 3 + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 +- arch/arm64/kvm/vgic/vgic-mmio.c | 24 +- arch/arm64/kvm/vgic/vgic-v3.c | 8 + arch/arm64/kvm/vgic/vgic-v4.c | 57 +++ arch/arm64/kvm/vgic/vgic.c | 24 + arch/arm64/kvm/vgic/vgic.h | 11 + drivers/irqchip/irq-gic-phytium-2500-its.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 94 +++- drivers/irqchip/irq-gic-v3.c | 37 +- drivers/irqchip/irq-gic-v4.c | 23 +- drivers/irqchip/irq-mbigen.c | 487 ++++++++++++++++++++- include/clocksource/arm_arch_timer.h | 18 + include/kvm/arm_arch_timer.h | 13 + include/kvm/arm_vgic.h | 34 ++ include/linux/irqchip/arm-gic-common.h | 3 + include/linux/irqchip/arm-gic-v3.h | 49 ++- include/linux/irqchip/arm-gic-v4.h | 6 +- 22 files changed, 1099 insertions(+), 89 deletions(-) -- 2.33.0

2 21

[PATCH openEuler-1.0-LTS] net: ipv6: unexport __init-annotated seg6_hmac_net_init()
by Liu Jian 30 Nov '23

30 Nov '23

From: YueHaibing <yuehaibing(a)huawei.com> stable inclusion from stable-v4.19.251 commit f6d9b011d8019bb59be4b71dd3d7de7c5e769d3e category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8KNM7 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… --------------------------- commit 53ad46169fe2996fe1b623ba6c9c4fa33847876f upstream. As of commit 5801f064e351 ("net: ipv6: unexport __init-annotated seg6_hmac_init()"), EXPORT_SYMBOL and __init is a bad combination because the .init.text section is freed up after the initialization. Hence, modules cannot use symbols annotated __init. The access to a freed symbol may end up with kernel panic. This remove the EXPORT_SYMBOL to fix modpost warning: WARNING: modpost: vmlinux.o(___ksymtab+seg6_hmac_net_init+0x0): Section mismatch in reference from the variable __ksymtab_seg6_hmac_net_init to the function .init.text:seg6_hmac_net_init() The symbol seg6_hmac_net_init is exported and annotated __init Fix this by removing the __init annotation of seg6_hmac_net_init or drop the export. Fixes: bf355b8d2c30 ("ipv6: sr: add core files for SR HMAC support") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Link: https://lore.kernel.org/r/20220628033134.21088-1-yuehaibing@huawei.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> (cherry picked from commit f6d9b011d8019bb59be4b71dd3d7de7c5e769d3e) Signed-off-by: Liu Jian <liujian56(a)huawei.com> --- net/ipv6/seg6_hmac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c index 8546f94f30d47..013573f61f045 100644 --- a/net/ipv6/seg6_hmac.c +++ b/net/ipv6/seg6_hmac.c @@ -416,7 +416,6 @@ int __net_init seg6_hmac_net_init(struct net *net) return 0; } -EXPORT_SYMBOL(seg6_hmac_net_init); void seg6_hmac_exit(void) { -- 2.34.1

1 0

[PATCH OLK-6.6] hugetlbfs: avoid overflow in hugetlbfs_fallocate
by Zizhi Wo 30 Nov '23

30 Nov '23

From: yangerkun <yangerkun(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JDQ7?from=project-issue --------------------------- luojiajun report a problem[1] two years ago which seems still exists in mainline. vfs_fallocate can avoid 'offset + len' trigger overflow, but 'offset + len + hpage_size - 1' may overflow too and will lead to a wrong 'end'. luojiajun give a solution which can fix the wrong 'end' but leave the overflow still happened. Fix it with DIV_ROUND_UP_ULL. [1] https://patchwork.kernel.org/project/linux-mm/patch/1554775226-67213-1-git-… Signed-off-by: yangerkun <yangerkun(a)huawei.com> Signed-off-by: Zizhi Wo <wozizhi(a)huawei.com> --- fs/hugetlbfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 316c4cebd3f3..cb6a5ea74cda 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -836,7 +836,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, * as well as being converted to page offsets. */ start = offset >> hpage_shift; - end = (offset + len + hpage_size - 1) >> hpage_shift; + end = DIV_ROUND_UP_ULL(offset + len, hpage_size); inode_lock(inode); -- 2.39.2

2 1

[PATCH OLK-6.6] fs/dcache.c: avoid softlock since too many negative dentry
by Zizhi Wo 30 Nov '23

30 Nov '23

From: yangerkun <yangerkun(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JH5M?from=project-issue --------------------------- Parallel thread to add negative dentry under root dir. Sometimes later, 'systemctl daemon-reload' will report softlockup since __fsnotify_update_child_dentry_flags need update all child under root dentry without distinguish does it active or not. It will waste so long time with catching d_lock of root dentry. And other thread try to spin_lock d_lock will run overtime. Limit negative dentry under dir can avoid this. Signed-off-by: yangerkun <yangerkun(a)huawei.com> Signed-off-by: Zizhi Wo <wozizhi(a)huawei.com> --- fs/dcache.c | 43 ++++++++++++++++++++++++++++++++++++++++-- include/linux/dcache.h | 4 ++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 7cdd8bbedd1c..c27aa8ff78f4 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -341,10 +341,18 @@ static inline void __d_set_inode_and_type(struct dentry *dentry, unsigned type_flags) { unsigned flags; + struct dentry *parent; + + parent = dentry->d_parent; + if ((dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT) && parent) { + WARN_ON(!inode); + atomic_dec(&parent->d_neg_dnum); + } dentry->d_inode = inode; flags = READ_ONCE(dentry->d_flags); - flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU); + flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU | + DCACHE_NEGATIVE_ACCOUNT); flags |= type_flags; smp_store_release(&dentry->d_flags, flags); } @@ -363,6 +371,7 @@ static inline void __d_clear_type_and_inode(struct dentry *dentry) static void dentry_free(struct dentry *dentry) { WARN_ON(!hlist_unhashed(&dentry->d_u.d_alias)); + WARN_ON(dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT); if (unlikely(dname_external(dentry))) { struct external_name *p = external_name(dentry); if (likely(atomic_dec_and_test(&p->u.count))) { @@ -601,8 +610,14 @@ static void __dentry_kill(struct dentry *dentry) /* if it was on the hash then remove it */ __d_drop(dentry); dentry_unlist(dentry, parent); - if (parent) + if (parent) { + if (dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT) { + atomic_dec(&parent->d_neg_dnum); + dentry->d_flags &= ~DCACHE_NEGATIVE_ACCOUNT; + } + spin_unlock(&parent->d_lock); + } if (dentry->d_inode) dentry_unlink_inode(dentry); else @@ -662,6 +677,8 @@ static inline struct dentry *lock_parent(struct dentry *dentry) static inline bool retain_dentry(struct dentry *dentry) { + struct dentry *parent; + WARN_ON(d_in_lookup(dentry)); /* Unreachable? Get rid of it */ @@ -679,6 +696,27 @@ static inline bool retain_dentry(struct dentry *dentry) if (unlikely(dentry->d_flags & DCACHE_DONTCACHE)) return false; + if (unlikely(!dentry->d_parent)) + goto noparent; + + parent = dentry->d_parent; + /* Return false if it's negative */ + WARN_ON((atomic_read(&parent->d_neg_dnum) < 0)); + if (!dentry->d_inode) { + if (!(dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT)) { + unsigned int flags = READ_ONCE(dentry->d_flags); + + flags |= DCACHE_NEGATIVE_ACCOUNT; + WRITE_ONCE(dentry->d_flags, flags); + atomic_inc(&parent->d_neg_dnum); + } + } + + if (!dentry->d_inode && + atomic_read(&parent->d_neg_dnum) >= NEG_DENTRY_LIMIT) + return false; + +noparent: /* retain; LRU fodder */ dentry->d_lockref.count--; if (unlikely(!(dentry->d_flags & DCACHE_LRU_LIST))) @@ -1809,6 +1847,7 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) seqcount_spinlock_init(&dentry->d_seq, &dentry->d_lock); dentry->d_inode = NULL; dentry->d_parent = dentry; + atomic_set(&dentry->d_neg_dnum, 0); dentry->d_sb = sb; dentry->d_op = NULL; dentry->d_fsdata = NULL; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 6b351e009f59..1c5b08d804ce 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -77,6 +77,7 @@ extern const struct qstr dotdot_name; # endif #endif +#define NEG_DENTRY_LIMIT 16384 #define d_lock d_lockref.lock struct dentry { @@ -111,6 +112,8 @@ struct dentry { struct hlist_bl_node d_in_lookup_hash; /* only for in-lookup ones */ struct rcu_head d_rcu; } d_u; + /* negative dentry under this dentry, if it's dir */ + atomic_t d_neg_dnum; } __randomize_layout; /* @@ -212,6 +215,7 @@ struct dentry_operations { #define DCACHE_PAR_LOOKUP 0x10000000 /* being looked up (with parent locked shared) */ #define DCACHE_DENTRY_CURSOR 0x20000000 #define DCACHE_NORCU 0x40000000 /* No RCU delay for freeing */ +#define DCACHE_NEGATIVE_ACCOUNT 0x80000000 extern seqlock_t rename_lock; -- 2.39.2

2 1

[PATCH OLK-6.6] proc: fix ubsan warning in mem_lseek
by Zizhi Wo 30 Nov '23

30 Nov '23

From: yangerkun <yangerkun(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JE4E?from=project-issue --------------------------- UBSAN has reported a overflow with mem_lseek. And it's fine with mem_open set file mode with FMODE_UNSIGNED_OFFSET(memory_lseek). However, another file use mem_lseek do lseek can have not FMODE_UNSIGNED_OFFSET(proc_kpagecount_operations/proc_pagemap_operations), fix it by checking overflow and FMODE_UNSIGNED_OFFSET. Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> ================================================================== UBSAN: Undefined behaviour in ../fs/proc/base.c:941:15 signed integer overflow: 4611686018427387904 + 4611686018427387904 cannot be represented in type 'long long int' CPU: 4 PID: 4762 Comm: syz-executor.1 Not tainted 4.4.189 #3 Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 Call trace: [<ffffff90080a5f28>] dump_backtrace+0x0/0x590 arch/arm64/kernel/traps.c:91 [<ffffff90080a64f0>] show_stack+0x38/0x60 arch/arm64/kernel/traps.c:234 [<ffffff9008986a34>] __dump_stack lib/dump_stack.c:15 [inline] [<ffffff9008986a34>] dump_stack+0x128/0x184 lib/dump_stack.c:51 [<ffffff9008a2d120>] ubsan_epilogue+0x34/0x9c lib/ubsan.c:166 [<ffffff9008a2d8b8>] handle_overflow+0x228/0x280 lib/ubsan.c:197 [<ffffff9008a2da2c>] __ubsan_handle_add_overflow+0x4c/0x68 lib/ubsan.c:204 [<ffffff900862b9f4>] mem_lseek+0x12c/0x130 fs/proc/base.c:941 [<ffffff90084ef78c>] vfs_llseek fs/read_write.c:260 [inline] [<ffffff90084ef78c>] SYSC_lseek fs/read_write.c:285 [inline] [<ffffff90084ef78c>] SyS_lseek+0x164/0x1f0 fs/read_write.c:276 [<ffffff9008093c80>] el0_svc_naked+0x30/0x34 ================================================================== Signed-off-by: yangerkun <yangerkun(a)huawei.com> Signed-off-by: Zizhi Wo <wozizhi(a)huawei.com> --- fs/proc/base.c | 32 ++++++++++++++++++++++++-------- fs/read_write.c | 5 ----- include/linux/fs.h | 4 ++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index ffd54617c354..00642e7fe99f 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -903,18 +903,34 @@ static ssize_t mem_write(struct file *file, const char __user *buf, loff_t mem_lseek(struct file *file, loff_t offset, int orig) { + loff_t ret = 0; + + spin_lock(&file->f_lock); switch (orig) { - case 0: - file->f_pos = offset; - break; - case 1: - file->f_pos += offset; + case SEEK_CUR: + offset += file->f_pos; + __attribute__((__fallthrough__)); + case SEEK_SET: + /* to avoid userland mistaking f_pos=-9 as -EBADF=-9 */ + if ((unsigned long long)offset >= -MAX_ERRNO) + ret = -EOVERFLOW; break; default: - return -EINVAL; + ret = -EINVAL; + } + + if (!ret) { + if (offset < 0 && !(unsigned_offsets(file))) { + ret = -EINVAL; + } else { + file->f_pos = offset; + ret = file->f_pos; + force_successful_syscall_return(); + } } - force_successful_syscall_return(); - return file->f_pos; + + spin_unlock(&file->f_lock); + return ret; } static int mem_release(struct inode *inode, struct file *file) diff --git a/fs/read_write.c b/fs/read_write.c index 4771701c896b..2f456d5a1df5 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -34,11 +34,6 @@ const struct file_operations generic_ro_fops = { EXPORT_SYMBOL(generic_ro_fops); -static inline bool unsigned_offsets(struct file *file) -{ - return file->f_mode & FMODE_UNSIGNED_OFFSET; -} - /** * vfs_setpos - update the file offset for lseek * @file: file structure in question diff --git a/include/linux/fs.h b/include/linux/fs.h index 4f6b15e960ec..59d4edee1b96 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2932,6 +2932,10 @@ extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern loff_t noop_llseek(struct file *file, loff_t offset, int whence); +static inline bool unsigned_offsets(struct file *file) +{ + return file->f_mode & FMODE_UNSIGNED_OFFSET; +} #define no_llseek NULL extern loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize); extern loff_t generic_file_llseek(struct file *file, loff_t offset, int whence); -- 2.39.2

2 1

[PATCH OLK-6.6] fs/dcache.c: avoid panic while lockref of dentry overflow
by Zizhi Wo 30 Nov '23

30 Nov '23

From: yangerkun <yangerkun(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JDP6?from=project-issue --------------------------- We use lockref for dentry reference without notice that so many negative dentry under one dir can lead to overflow of lockref. This can lead to system crash if we do this under root dir. Since there is not a perfect solution, we just limit max number of dentry count up to INT_MAX / 2. Also, it will cost a lot of time from INT_MAX / 2 to INT_MAX, so we no need to do this under protection of dentry lock. Also, we limit the FILES_MAX to INT_MAX / 2, since a lot open for same file can lead to overflow too. Changelog: v1->v2: add a function to do check / add a Macro to mean INT_MAX / 2 Signed-off-by: yangerkun <yangerkun(a)huawei.com> Signed-off-by: Zizhi Wo <wozizhi(a)huawei.com> --- fs/dcache.c | 32 ++++++++++++++++++++++++++++---- include/linux/fs.h | 3 +++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 25ac74d30bff..7cdd8bbedd1c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1834,6 +1834,18 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) return dentry; } +static inline bool d_forbid_overflow(struct dentry *dentry) +{ + if (unlikely(d_count(dentry) >= D_COUNT_MAX)) { + shrink_dcache_parent(dentry); + + if (d_count(dentry) >= D_COUNT_MAX) + return false; + } + + return true; +} + /** * d_alloc - allocate a dcache entry * @parent: parent of entry to allocate @@ -1845,9 +1857,15 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) */ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) { - struct dentry *dentry = __d_alloc(parent->d_sb, name); + struct dentry *dentry = NULL; + + if (unlikely(!d_forbid_overflow(parent))) + goto out; + + dentry = __d_alloc(parent->d_sb, name); if (!dentry) - return NULL; + goto out; + spin_lock(&parent->d_lock); /* * don't need child lock because it is not subject @@ -1857,7 +1875,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) dentry->d_parent = parent; list_add(&dentry->d_child, &parent->d_subdirs); spin_unlock(&parent->d_lock); - +out: return dentry; } EXPORT_SYMBOL(d_alloc); @@ -1870,11 +1888,17 @@ EXPORT_SYMBOL(d_alloc_anon); struct dentry *d_alloc_cursor(struct dentry * parent) { - struct dentry *dentry = d_alloc_anon(parent->d_sb); + struct dentry *dentry = NULL; + + if (unlikely(!d_forbid_overflow(parent))) + goto out; + + dentry = d_alloc_anon(parent->d_sb); if (dentry) { dentry->d_flags |= DCACHE_DENTRY_CURSOR; dentry->d_parent = dget(parent); } +out: return dentry; } diff --git a/include/linux/fs.h b/include/linux/fs.h index 4a40823c3c67..4f6b15e960ec 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -47,6 +47,9 @@ #include <asm/byteorder.h> #include <uapi/linux/fs.h> +#define D_COUNT_MAX (INT_MAX / 2) + + struct backing_dev_info; struct bdi_writeback; struct bio; -- 2.39.2

2 1