- Kernel - mailweb.openeuler.org

[PATCH openEuler-5.10 00/67] Backport 5.10.106 LTS
by Zheng Zengkai 07 Jun '22

07 Jun '22

Backport 5.10.106 LTS patches from upstream watch_queue: Fix filter limit check ext4: add check to prevent attempting to resize an fs with sparse_super2 x86/traps: Mark do_int3() NOKPROBE_SYMBOL x86/boot: Add setup_indirect support in early_memremap_is_setup_data() x86/boot: Fix memremap of setup_indirect structures watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix to release page in ->release() watch_queue, pipe: Free watchqueue state after clearing pipe ring virtio: acknowledge all features before access virtio: unexport virtio_finalize_features arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 riscv: Fix auipc+jalr relocation range checks mmc: meson: Fix usage of meson_mmc_post_req() net: macb: Fix lost RX packet wakeup race in NAPI receive staging: gdm724x: fix use after free in gdm_lte_rx() staging: rtl8723bs: Fix access-point mode deadlock selftests/memfd: clean up mapping in mfd_fail_write selftest/vm: fix map_fixed_noreplace test failure tracing: Ensure trace buffer is at least 4096 bytes large ipv6: prevent a possible race condition with lifetimes Revert "xen-netback: Check for hotplug-status existence before watching" Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" gpio: Return EPROBE_DEFER if gc->to_irq is NULL hwmon: (pmbus) Clear pmbus fault/warning bits after read net-sysfs: add check for netdevice being present to speed_show spi: rockchip: terminate dma transmission when slave abort spi: rockchip: Fix error in getting num-cs property selftests/bpf: Add test for bpf_timer overwriting crash net: bcmgenet: Don't claim WOL when its not available sctp: fix kernel-infoleak for SCTP sockets net: phy: DP83822: clear MISR2 register to disable interrupts gianfar: ethtool: Fix refcount leak in gfar_get_ts_info gpio: ts4900: Do not set DAT and OE together selftests: pmtu.sh: Kill tcpdump processes launched by subshell. NFC: port100: fix use-after-free in port100_send_complete net/mlx5e: Lag, Only handle events from highest priority multipath entry net/mlx5: Fix a race on command flush flow net/mlx5: Fix size field in bufferx_reg struct net: ethernet: lpc_eth: Handle error for clk_enable net: ethernet: ti: cpts: Handle error for clk_enable tipc: fix incorrect order of state message data sanity check ethernet: Fix error handling in xemaclite_of_probe ice: Fix curr_link_speed advertised speed ice: Rename a couple of variables ice: Remove unnecessary checker loop ice: Align macro names to the specification ice: stop disabling VFs due to PF error responses i40e: stop disabling VFs due to PF error responses ARM: dts: aspeed: Fix AST2600 quad spi group net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() drm/sun4i: mixer: Fix P010 and P210 format numbers qed: return status of qed_iov_get_link esp: Fix BEET mode inter address family tunneling on GSO net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero mISDN: Fix memory leak in dsp_pipeline_build() mISDN: Remove obsolete PIPELINE_DEBUG debugging information tipc: fix kernel panic when enabling bearer arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias HID: vivaldi: fix sysfs attributes leak clk: qcom: gdsc: Add support to update GDSC transition delay ARM: boot: dts: bcm2711: Fix HVS register range Already merged: ax25: Fix NULL pointer dereference in ax25_kill_by_device ARM: Spectre-BHB: provide empty stub for non-config fuse: fix pipe buffer lifetime for direct_io ARM: fix Thumb2 regression with Spectre BHB Total patches: 71 - 4 = 67 Alexey Khoroshilov (1): mISDN: Fix memory leak in dsp_pipeline_build() Aneesh Kumar K.V (1): selftest/vm: fix map_fixed_noreplace test failure Anirudh Venkataramanan (3): ice: Align macro names to the specification ice: Remove unnecessary checker loop ice: Rename a couple of variables Clément Léger (1): net: phy: DP83822: clear MISR2 register to disable interrupts Dan Carpenter (1): staging: gdm724x: fix use after free in gdm_lte_rx() David Howells (8): watch_queue, pipe: Free watchqueue state after clearing pipe ring watch_queue: Fix to release page in ->release() watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix filter limit check Dmitry Torokhov (1): HID: vivaldi: fix sysfs attributes leak Emil Renner Berthing (1): riscv: Fix auipc+jalr relocation range checks Eric Dumazet (1): sctp: fix kernel-infoleak for SCTP sockets Guillaume Nault (1): selftests: pmtu.sh: Kill tcpdump processes launched by subshell. Hans de Goede (1): staging: rtl8723bs: Fix access-point mode deadlock Jacob Keller (2): i40e: stop disabling VFs due to PF error responses ice: stop disabling VFs due to PF error responses Jedrzej Jagielski (1): ice: Fix curr_link_speed advertised speed Jeremy Linton (1): net: bcmgenet: Don't claim WOL when its not available Jernej Skrabec (1): drm/sun4i: mixer: Fix P010 and P210 format numbers Jia-Ju Bai (2): isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() Jiasheng Jiang (2): net: ethernet: ti: cpts: Handle error for clk_enable net: ethernet: lpc_eth: Handle error for clk_enable Joel Stanley (1): ARM: dts: aspeed: Fix AST2600 quad spi group Jon Lin (2): spi: rockchip: Fix error in getting num-cs property spi: rockchip: terminate dma transmission when slave abort Josh Triplett (1): ext4: add check to prevent attempting to resize an fs with sparse_super2 Kumar Kartikeya Dwivedi (1): selftests/bpf: Add test for bpf_timer overwriting crash Li Huafei (1): x86/traps: Mark do_int3() NOKPROBE_SYMBOL Marek Marczykowski-Górecki (2): Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" Revert "xen-netback: Check for hotplug-status existence before watching" Mark Featherston (1): gpio: ts4900: Do not set DAT and OE together Maxime Ripard (1): ARM: boot: dts: bcm2711: Fix HVS register range Miaoqian Lin (2): ethernet: Fix error handling in xemaclite_of_probe gianfar: ethtool: Fix refcount leak in gfar_get_ts_info Michael S. Tsirkin (2): virtio: unexport virtio_finalize_features virtio: acknowledge all features before access Mike Kravetz (1): selftests/memfd: clean up mapping in mfd_fail_write Mohammad Kabat (1): net/mlx5: Fix size field in bufferx_reg struct Moshe Shemesh (1): net/mlx5: Fix a race on command flush flow Niels Dossche (1): ipv6: prevent a possible race condition with lifetimes Pali Rohár (2): arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 Pavel Skripkin (1): NFC: port100: fix use-after-free in port100_send_complete Robert Hancock (1): net: macb: Fix lost RX packet wakeup race in NAPI receive Roi Dayan (1): net/mlx5e: Lag, Only handle events from highest priority multipath entry Rong Chen (1): mmc: meson: Fix usage of meson_mmc_post_req() Ross Philipson (2): x86/boot: Fix memremap of setup_indirect structures x86/boot: Add setup_indirect support in early_memremap_is_setup_data() Russell King (Oracle) (1): net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() Shreeya Patel (1): gpio: Return EPROBE_DEFER if gc->to_irq is NULL Steffen Klassert (1): esp: Fix BEET mode inter address family tunneling on GSO Sven Schnelle (1): tracing: Ensure trace buffer is at least 4096 bytes large Taniya Das (1): clk: qcom: gdsc: Add support to update GDSC transition delay Tom Rix (1): qed: return status of qed_iov_get_link Tung Nguyen (2): tipc: fix kernel panic when enabling bearer tipc: fix incorrect order of state message data sanity check Vikash Chandola (1): hwmon: (pmbus) Clear pmbus fault/warning bits after read Xie Yongji (1): virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero Zhen Lei (1): mISDN: Remove obsolete PIPELINE_DEBUG debugging information suresh kumar (1): net-sysfs: add check for netdevice being present to speed_show arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 2 +- arch/arm/boot/dts/bcm2711.dtsi | 1 + .../dts/marvell/armada-3720-turris-mox.dts | 8 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- arch/riscv/kernel/module.c | 21 +++-- arch/x86/kernel/e820.c | 41 +++++++--- arch/x86/kernel/kdebugfs.c | 37 ++++++--- arch/x86/kernel/ksysfs.c | 77 +++++++++++++++---- arch/x86/kernel/setup.c | 34 ++++++-- arch/x86/kernel/traps.c | 1 + arch/x86/mm/ioremap.c | 57 ++++++++++++-- drivers/block/virtio_blk.c | 10 ++- drivers/clk/qcom/gdsc.c | 26 +++++-- drivers/clk/qcom/gdsc.h | 8 +- drivers/gpio/gpio-ts4900.c | 24 ++++-- drivers/gpio/gpiolib.c | 10 +++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 8 +- drivers/hid/hid-vivaldi.c | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 5 ++ drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- drivers/isdn/mISDN/dsp_pipeline.c | 52 ++----------- drivers/mmc/host/meson-gx-mmc.c | 15 ++-- drivers/net/dsa/mt7530.c | 2 +- .../ethernet/broadcom/genet/bcmgenet_wol.c | 7 ++ drivers/net/ethernet/cadence/macb_main.c | 25 +++++- .../net/ethernet/freescale/gianfar_ethtool.c | 1 + .../net/ethernet/intel/i40e/i40e_debugfs.c | 6 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 57 ++------------ .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 -- .../net/ethernet/intel/ice/ice_adminq_cmd.h | 10 +-- drivers/net/ethernet/intel/ice/ice_common.c | 13 ++-- drivers/net/ethernet/intel/ice/ice_ethtool.c | 70 ++++++++--------- drivers/net/ethernet/intel/ice/ice_main.c | 12 +-- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 18 ----- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 3 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 15 ++-- .../net/ethernet/mellanox/mlx5/core/lag_mp.c | 11 ++- drivers/net/ethernet/nxp/lpc_eth.c | 5 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++-- drivers/net/ethernet/qlogic/qed/qed_vf.c | 7 ++ drivers/net/ethernet/ti/cpts.c | 4 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- drivers/net/phy/dp83822.c | 2 +- drivers/net/xen-netback/xenbus.c | 14 ++-- drivers/nfc/port100.c | 2 + drivers/spi/spi-rockchip.c | 13 +++- drivers/staging/gdm724x/gdm_lte.c | 5 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 ++- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 22 +++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 ++-- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 + drivers/virtio/virtio.c | 40 +++++----- fs/ext4/resize.c | 5 ++ fs/pipe.c | 11 ++- include/linux/mlx5/mlx5_ifc.h | 4 +- include/linux/virtio.h | 1 - include/linux/virtio_config.h | 3 +- include/linux/watch_queue.h | 3 +- kernel/trace/trace.c | 10 ++- kernel/watch_queue.c | 15 ++-- net/core/net-sysfs.c | 2 +- net/ipv4/esp4_offload.c | 3 + net/ipv6/addrconf.c | 2 + net/ipv6/esp6_offload.c | 3 + net/sctp/diag.c | 9 +-- net/tipc/bearer.c | 12 +-- net/tipc/link.c | 9 ++- .../selftests/bpf/prog_tests/timer_crash.c | 32 ++++++++ .../testing/selftests/bpf/progs/timer_crash.c | 54 +++++++++++++ tools/testing/selftests/memfd/memfd_test.c | 1 + tools/testing/selftests/net/pmtu.sh | 7 +- .../selftests/vm/map_fixed_noreplace.c | 49 +++++++++--- 73 files changed, 714 insertions(+), 394 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_crash.c create mode 100644 tools/testing/selftests/bpf/progs/timer_crash.c -- 2.20.1

1 67

[PATCH] nvme: Assign subsys instance from first ctrl upstream 733e4b69
by Chen Taotao 06 Jun '22

06 Jun '22

The namespace disk names must be unique for the lifetime of the subsystem. This was accomplished by using their parent subsystems' instances which were allocated independently from the controllers connected to that subsystem. This allowed name prefixes assigned to namespaces to match a controller from an unrelated subsystem, and has created confusion among users examining device nodes. Ensure a namespace's subsystem instance never clashes with a controller instance of another subsystem by transferring the instance ownership to the parent subsystem from the first controller discovered in that subsystem. Reviewed-by: Logan Gunthorpe <logang(a)deltatee.com> Signed-off-by: Keith Busch <kbusch(a)kernel.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Minwoo Im <minwoo.im(a)samsung.com> Reviewed-by: Hannes Reinecke <hare(a)suse.com> Reviewed-off-by: Sagi Grimberg <sagi(a)grimberg.me> Signed-off-by: Sagi Grimberg <sagi(a)grimberg.me> --- drivers/nvme/host/core.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8c760493354f..576da5820a57 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -88,7 +88,6 @@ EXPORT_SYMBOL_GPL(nvme_reset_wq); struct workqueue_struct *nvme_delete_wq; EXPORT_SYMBOL_GPL(nvme_delete_wq); -static DEFINE_IDA(nvme_subsystems_ida); static LIST_HEAD(nvme_subsystems); static DEFINE_MUTEX(nvme_subsystems_lock); @@ -2308,7 +2307,8 @@ static void nvme_release_subsystem(struct device *dev) struct nvme_subsystem *subsys = container_of(dev, struct nvme_subsystem, dev); - ida_simple_remove(&nvme_subsystems_ida, subsys->instance); + if (subsys->instance >= 0) + ida_simple_remove(&nvme_instance_ida, subsys->instance); kfree(subsys); } @@ -2419,12 +2419,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys = kzalloc(sizeof(*subsys), GFP_KERNEL); if (!subsys) return -ENOMEM; - ret = ida_simple_get(&nvme_subsystems_ida, 0, 0, GFP_KERNEL); - if (ret < 0) { - kfree(subsys); - return ret; - } - subsys->instance = ret; + + subsys->instance = -1; mutex_init(&subsys->lock); kref_init(&subsys->ref); INIT_LIST_HEAD(&subsys->ctrls); @@ -2439,7 +2435,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys->dev.class = nvme_subsys_class; subsys->dev.release = nvme_release_subsystem; subsys->dev.groups = nvme_subsys_attrs_groups; - dev_set_name(&subsys->dev, "nvme-subsys%d", subsys->instance); + dev_set_name(&subsys->dev, "nvme-subsys%d", ctrl->instance); device_initialize(&subsys->dev); mutex_lock(&nvme_subsystems_lock); @@ -2472,6 +2468,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) list_add_tail(&subsys->entry, &nvme_subsystems); } + if (!found) + subsys->instance = ctrl->instance; ctrl->subsys = subsys; mutex_unlock(&nvme_subsystems_lock); @@ -3749,7 +3747,9 @@ static void nvme_free_ctrl(struct device *dev) container_of(dev, struct nvme_ctrl, ctrl_device); struct nvme_subsystem *subsys = ctrl->subsys; - ida_simple_remove(&nvme_instance_ida, ctrl->instance); + if (subsys && ctrl->instance != subsys->instance) + ida_simple_remove(&nvme_instance_ida, ctrl->instance); + kfree(ctrl->effects); nvme_mpath_uninit(ctrl); __free_page(ctrl->discard_page); @@ -4009,7 +4009,6 @@ int __init nvme_core_init(void) void nvme_core_exit(void) { - ida_destroy(&nvme_subsystems_ida); class_destroy(nvme_subsys_class); class_destroy(nvme_class); unregister_chrdev_region(nvme_chr_devt, NVME_MINORS); -- 2.27.0

1 0

Re: [PATCH OLK-5.10 1/4] eulerfs: add socket_num to eufs_sb_info
by Yu Kuai 06 Jun '22

06 Jun '22

在 2022/06/02 19:24, Gou Hao 写道: > > 在 2022/6/2 17:10, Yu Kuai 写道: >> 在 2022/06/02 10:50, Gou Hao 写道: >>> uniontech inclusion >>> category: bugfix >>> bugzilla: NA >>> CVE: NA >>> >>> ---------------------- >>> >>> We should not get the socket num in init_eufs_fs, becuse >>> system usually supports cpu hotplug,so we should get socket >>> num in dep_int. >> Hi, >> >> What if cpu is offline during mount, and online afterwards? >> > Well, in this case, we have to add a monitoring mechanism to > > dynamically adjust the number of threads according to the > > online status of the CPU. > > Or there are other better ways ... I prefer to keep the current implementation for now. Thanks, Kuai >> Thanks, >> Kuai >>> >>> Socket num is not necessarily the same when file system >>> mount,so it shoule be eufs_sb_info's member. >>> >>> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >>> --- >>> fs/eulerfs/dep.c | 28 ++++++++++++++++++++++------ >>> fs/eulerfs/euler.h | 2 -- >>> fs/eulerfs/euler_def.h | 1 + >>> fs/eulerfs/super.c | 15 +-------------- >>> 4 files changed, 24 insertions(+), 22 deletions(-) >>

2 1

[openEuler-22.09 00/34] bcache backport for openEuler-22.09 (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[openEuler-22.03-LTS 00/34] bcache backport for openEuler-22.03-LTS (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[OLK-5.10 PATCH 00/34] bcache backport for OLK-5.10 (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[PATCH openEuler-1.0-LTS] xfs: show the proper user quota options
by tangbin 02 Jun '22

02 Jun '22

From: Kaixu Xia <kaixuxia(a)tencent.com> mainline inclusion from mainline-v5.11-rc6 commit 237d7887ae723af7d978e8b9a385fdff416f357b category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5AG18 CVE: NA -------------------------------- The quota option 'usrquota' should be shown if both the XFS_UQUOTA_ACCT and XFS_UQUOTA_ENFD flags are set. The option 'uqnoenforce' should be shown when only the XFS_UQUOTA_ACCT flag is set. The current code logic seems wrong, Fix it and show proper options. Signed-off-by: Kaixu Xia <kaixuxia(a)tencent.com> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> --- fs/xfs/xfs_super.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e126bc6cdeb8..5d8e3a4d2671 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -505,10 +505,12 @@ xfs_showargs( seq_printf(m, ",swidth=%d", (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); - if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) - seq_puts(m, ",usrquota"); - else if (mp->m_qflags & XFS_UQUOTA_ACCT) - seq_puts(m, ",uqnoenforce"); + if (mp->m_qflags & XFS_UQUOTA_ACCT) { + if (mp->m_qflags & XFS_UQUOTA_ENFD) + seq_puts(m, ",usrquota"); + else + seq_puts(m, ",uqnoenforce"); + } if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_PQUOTA_ENFD) -- 2.18.4

1 0

[PATCH] xfs: show the proper user quota options
by tangbin 02 Jun '22

02 Jun '22

From: Kaixu Xia <kaixuxia(a)tencent.com> mainline inclusion from mainline-v5.11-rc6 commit 237d7887ae723af7d978e8b9a385fdff416f357b category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5AG18 CVE: NA -------------------------------- The quota option 'usrquota' should be shown if both the XFS_UQUOTA_ACCT and XFS_UQUOTA_ENFD flags are set. The option 'uqnoenforce' should be shown when only the XFS_UQUOTA_ACCT flag is set. The current code logic seems wrong, Fix it and show proper options. Signed-off-by: Kaixu Xia <kaixuxia(a)tencent.com> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> --- fs/xfs/xfs_super.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e126bc6cdeb8..5d8e3a4d2671 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -505,10 +505,12 @@ xfs_showargs( seq_printf(m, ",swidth=%d", (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); - if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) - seq_puts(m, ",usrquota"); - else if (mp->m_qflags & XFS_UQUOTA_ACCT) - seq_puts(m, ",uqnoenforce"); + if (mp->m_qflags & XFS_UQUOTA_ACCT) { + if (mp->m_qflags & XFS_UQUOTA_ENFD) + seq_puts(m, ",usrquota"); + else + seq_puts(m, ",uqnoenforce"); + } if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_PQUOTA_ENFD) -- 2.18.4

1 0

Re: [PATCH OLK-5.10 1/4] eulerfs: add socket_num to eufs_sb_info
by Gou Hao 02 Jun '22

02 Jun '22

在 2022/6/2 17:10, Yu Kuai 写道: > 在 2022/06/02 10:50, Gou Hao 写道: >> uniontech inclusion >> category: bugfix >> bugzilla: NA >> CVE: NA >> >> ---------------------- >> >> We should not get the socket num in init_eufs_fs, becuse >> system usually supports cpu hotplug,so we should get socket >> num in dep_int. > Hi, > > What if cpu is offline during mount, and online afterwards? > Well, in this case, we have to add a monitoring mechanism to dynamically adjust the number of threads according to the online status of the CPU. Or there are other better ways ... > Thanks, > Kuai >> >> Socket num is not necessarily the same when file system >> mount,so it shoule be eufs_sb_info's member. >> >> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >> --- >> fs/eulerfs/dep.c | 28 ++++++++++++++++++++++------ >> fs/eulerfs/euler.h | 2 -- >> fs/eulerfs/euler_def.h | 1 + >> fs/eulerfs/super.c | 15 +-------------- >> 4 files changed, 24 insertions(+), 22 deletions(-) > -- thanks, Gou Hao

1 0

Re: [PATCH OLK-5.10 4/4] eulerfs: fix potential sbi->persisters free error
by Gou Hao 02 Jun '22

02 Jun '22

在 2022/6/2 17:15, Yu Kuai 写道: > 在 2022/06/02 10:51, Gou Hao 写道: >> uniontech inclusion >> category: bugfix >> bugzilla: NA >> CVE: NA >> >> ------------------- >> >> After alloc the sbi->persisters memory, dep_init >> will call dep_fini when error happened.Because >> sbi->persisters is not set to 0, kthread_stop >> may happened error. > > Looks good to me, just one language fixup: > > sbi->persisters is not set to 0 > -> dep_fini() can be called with sbi->persisters[] uninitialized, thus > kthread_stop() can be called with random value. > ok, thank you : ) > Thanks, > Kuai >> >> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >> --- >> fs/eulerfs/dep.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/eulerfs/dep.c b/fs/eulerfs/dep.c >> index da826a18fa31..62fd1376f980 100644 >> --- a/fs/eulerfs/dep.c >> +++ b/fs/eulerfs/dep.c >> @@ -728,8 +728,8 @@ int dep_init(struct super_block *sb) >> node_num++; >> sbi->persister_num = node_num * persisters_per_socket; >> - >> - sbi->persisters = kmalloc(sizeof(struct task_struct *) * >> + >> + sbi->persisters = kzalloc(sizeof(struct task_struct *) * >> sbi->persister_num, GFP_KERNEL); >> if (!sbi->persisters) { >> err = -ENOMEM; >> > -- thanks, Gou Hao

1 0