January 2024 - Kernel - mailweb.openeuler.org

[openeuler:openEuler-1.0-LTS 15455/21561] drivers/staging/gmjstcm/tcm_tis_spi.c:817:36: warning: 'tcm_tis_spi_acpi_match' defined but not used
by kernel test robot 22 Jan '24

22 Jan '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: d7de179b5122c922d0dcae88231947a26f47b632 commit: 5ebbfc8c29eb5eb6dfdab853bdb2a622e0533d7e [15455/21561] staging: TCM: add GMJS(Nationz Tech) TCM driver. config: arm64-randconfig-002-20240120 (https://download.01.org/0day-ci/archive/20240122/202401222135.PnRKwawm-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240122/202401222135.PnRKwawm-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401222135.PnRKwawm-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/staging/gmjstcm/tcm_tis_spi.c:109:5: warning: no previous prototype for 'tcm_tis_spi_transfer' [-Wmissing-prototypes] 109 | int tcm_tis_spi_transfer(struct device *dev, u32 addr, u16 len, | ^~~~~~~~~~~~~~~~~~~~ drivers/staging/gmjstcm/tcm_tis_spi.c: In function 'recv_data': drivers/staging/gmjstcm/tcm_tis_spi.c:423:13: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 423 | int ret; | ^~~ drivers/staging/gmjstcm/tcm_tis_spi.c: At top level: >> drivers/staging/gmjstcm/tcm_tis_spi.c:817:36: warning: 'tcm_tis_spi_acpi_match' defined but not used [-Wunused-const-variable=] 817 | static const struct acpi_device_id tcm_tis_spi_acpi_match[] = { | ^~~~~~~~~~~~~~~~~~~~~~ drivers/staging/gmjstcm/tcm_tis_spi.c: In function 'cleanup_tis': >> drivers/staging/gmjstcm/tcm_tis_spi.c:249:17: warning: 'inten' may be used uninitialized [-Wmaybe-uninitialized] 249 | tcm_tis_writel(chip->dev, TCM_INT_ENABLE(chip->vendor.locality), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 250 | ~TCM_GLOBAL_INT_ENABLE & inten); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/staging/gmjstcm/tcm_tis_spi.c:237:13: note: 'inten' was declared here 237 | u32 inten; | ^~~~~ drivers/staging/gmjstcm/tcm_tis_spi.c: In function 'tcm_tis_init': >> drivers/staging/gmjstcm/tcm_tis_spi.c:264:21: warning: 'vendor' may be used uninitialized [-Wmaybe-uninitialized] 264 | if ((vendor & 0xffff) != 0x19f5 && (vendor & 0xffff) != 0x1B4E) | ~~~~~~~~^~~~~~~~~ drivers/staging/gmjstcm/tcm_tis_spi.c:260:13: note: 'vendor' was declared here 260 | u32 vendor, intfcaps; | ^~~~~~ vim +/tcm_tis_spi_acpi_match +817 drivers/staging/gmjstcm/tcm_tis_spi.c 816 > 817 static const struct acpi_device_id tcm_tis_spi_acpi_match[] = { 818 {"TCMS0001", 0}, 819 {"SMO0768", 0}, 820 {"ZIC0601", 0}, 821 {} 822 }; 823 MODULE_DEVICE_TABLE(acpi, tcm_tis_spi_acpi_match); 824 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10 26784/30000] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:721:43: warning: 'hclge_dbg_tqp_reg' defined but not used
by kernel test robot 22 Jan '24

22 Jan '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: 5b9222cde1b41a53fc814d98cd15aea84832aca3 commit: 193e5e1d2edcd566ccf9d920354ac22c3241434e [26784/30000] UNIC: add nfe ras for PFA and TXPM module config: arm64-defconfig (https://download.01.org/0day-ci/archive/20240122/202401222119.vrDbjHb2-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240122/202401222119.vrDbjHb2-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401222119.vrDbjHb2-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_udma.c:19: >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:721:43: warning: 'hclge_dbg_tqp_reg' defined but not used [-Wunused-const-variable=] 721 | static const struct hclge_dbg_dfx_message hclge_dbg_tqp_reg[] = { | ^~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:649:43: warning: 'hclge_dbg_rcb_reg' defined but not used [-Wunused-const-variable=] 649 | static const struct hclge_dbg_dfx_message hclge_dbg_rcb_reg[] = { | ^~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:493:43: warning: 'hclge_dbg_ppp_reg' defined but not used [-Wunused-const-variable=] 493 | static const struct hclge_dbg_dfx_message hclge_dbg_ppp_reg[] = { | ^~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:463:43: warning: 'hclge_dbg_rtc_reg' defined but not used [-Wunused-const-variable=] 463 | static const struct hclge_dbg_dfx_message hclge_dbg_rtc_reg[] = { | ^~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:391:43: warning: 'hclge_dbg_ncsi_reg' defined but not used [-Wunused-const-variable=] 391 | static const struct hclge_dbg_dfx_message hclge_dbg_ncsi_reg[] = { | ^~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:375:43: warning: 'hclge_dbg_rpu_reg_1' defined but not used [-Wunused-const-variable=] 375 | static const struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_1[] = { | ^~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:366:43: warning: 'hclge_dbg_rpu_reg_0' defined but not used [-Wunused-const-variable=] 366 | static const struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_0[] = { | ^~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:301:43: warning: 'hclge_dbg_igu_egu_reg' defined but not used [-Wunused-const-variable=] 301 | static const struct hclge_dbg_dfx_message hclge_dbg_igu_egu_reg[] = { | ^~~~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:292:43: warning: 'hclge_dbg_ssu_reg_2' defined but not used [-Wunused-const-variable=] 292 | static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_2[] = { | ^~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:185:43: warning: 'hclge_dbg_ssu_reg_1' defined but not used [-Wunused-const-variable=] 185 | static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_1[] = { | ^~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:113:43: warning: 'hclge_dbg_ssu_reg_0' defined but not used [-Wunused-const-variable=] 113 | static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_0[] = { | ^~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:97:43: warning: 'hclge_dbg_bios_common_reg' defined but not used [-Wunused-const-variable=] 97 | static const struct hclge_dbg_dfx_message hclge_dbg_bios_common_reg[] = { | ^~~~~~~~~~~~~~~~~~~~~~~~~ vim +/hclge_dbg_tqp_reg +721 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h 27cf979a15841e liuzhongzhu 2018-12-15 648 e4b9146849f246 Rikard Falkeborn 2020-09-22 @649 static const struct hclge_dbg_dfx_message hclge_dbg_rcb_reg[] = { 27cf979a15841e liuzhongzhu 2018-12-15 650 {false, "Reserved"}, 27cf979a15841e liuzhongzhu 2018-12-15 651 {true, "FSM_DFX_ST0"}, 27cf979a15841e liuzhongzhu 2018-12-15 652 {true, "FSM_DFX_ST1"}, 27cf979a15841e liuzhongzhu 2018-12-15 653 {true, "FSM_DFX_ST2"}, 27cf979a15841e liuzhongzhu 2018-12-15 654 {true, "FIFO_DFX_ST0"}, 27cf979a15841e liuzhongzhu 2018-12-15 655 {true, "FIFO_DFX_ST1"}, 27cf979a15841e liuzhongzhu 2018-12-15 656 27cf979a15841e liuzhongzhu 2018-12-15 657 {true, "FIFO_DFX_ST2"}, 27cf979a15841e liuzhongzhu 2018-12-15 658 {true, "FIFO_DFX_ST3"}, 27cf979a15841e liuzhongzhu 2018-12-15 659 {true, "FIFO_DFX_ST4"}, 27cf979a15841e liuzhongzhu 2018-12-15 660 {true, "FIFO_DFX_ST5"}, 27cf979a15841e liuzhongzhu 2018-12-15 661 {true, "FIFO_DFX_ST6"}, 27cf979a15841e liuzhongzhu 2018-12-15 662 {true, "FIFO_DFX_ST7"}, 27cf979a15841e liuzhongzhu 2018-12-15 663 27cf979a15841e liuzhongzhu 2018-12-15 664 {true, "FIFO_DFX_ST8"}, 27cf979a15841e liuzhongzhu 2018-12-15 665 {true, "FIFO_DFX_ST9"}, 27cf979a15841e liuzhongzhu 2018-12-15 666 {true, "FIFO_DFX_ST10"}, 27cf979a15841e liuzhongzhu 2018-12-15 667 {true, "FIFO_DFX_ST11"}, 27cf979a15841e liuzhongzhu 2018-12-15 668 {true, "Q_CREDIT_VLD_0"}, 27cf979a15841e liuzhongzhu 2018-12-15 669 {true, "Q_CREDIT_VLD_1"}, 27cf979a15841e liuzhongzhu 2018-12-15 670 27cf979a15841e liuzhongzhu 2018-12-15 671 {true, "Q_CREDIT_VLD_2"}, 27cf979a15841e liuzhongzhu 2018-12-15 672 {true, "Q_CREDIT_VLD_3"}, 27cf979a15841e liuzhongzhu 2018-12-15 673 {true, "Q_CREDIT_VLD_4"}, 27cf979a15841e liuzhongzhu 2018-12-15 674 {true, "Q_CREDIT_VLD_5"}, 27cf979a15841e liuzhongzhu 2018-12-15 675 {true, "Q_CREDIT_VLD_6"}, 27cf979a15841e liuzhongzhu 2018-12-15 676 {true, "Q_CREDIT_VLD_7"}, 27cf979a15841e liuzhongzhu 2018-12-15 677 27cf979a15841e liuzhongzhu 2018-12-15 678 {true, "Q_CREDIT_VLD_8"}, 27cf979a15841e liuzhongzhu 2018-12-15 679 {true, "Q_CREDIT_VLD_9"}, 27cf979a15841e liuzhongzhu 2018-12-15 680 {true, "Q_CREDIT_VLD_10"}, 27cf979a15841e liuzhongzhu 2018-12-15 681 {true, "Q_CREDIT_VLD_11"}, 27cf979a15841e liuzhongzhu 2018-12-15 682 {true, "Q_CREDIT_VLD_12"}, 27cf979a15841e liuzhongzhu 2018-12-15 683 {true, "Q_CREDIT_VLD_13"}, 27cf979a15841e liuzhongzhu 2018-12-15 684 27cf979a15841e liuzhongzhu 2018-12-15 685 {true, "Q_CREDIT_VLD_14"}, 27cf979a15841e liuzhongzhu 2018-12-15 686 {true, "Q_CREDIT_VLD_15"}, 27cf979a15841e liuzhongzhu 2018-12-15 687 {true, "Q_CREDIT_VLD_16"}, 27cf979a15841e liuzhongzhu 2018-12-15 688 {true, "Q_CREDIT_VLD_17"}, 27cf979a15841e liuzhongzhu 2018-12-15 689 {true, "Q_CREDIT_VLD_18"}, 27cf979a15841e liuzhongzhu 2018-12-15 690 {true, "Q_CREDIT_VLD_19"}, 27cf979a15841e liuzhongzhu 2018-12-15 691 27cf979a15841e liuzhongzhu 2018-12-15 692 {true, "Q_CREDIT_VLD_20"}, 27cf979a15841e liuzhongzhu 2018-12-15 693 {true, "Q_CREDIT_VLD_21"}, 27cf979a15841e liuzhongzhu 2018-12-15 694 {true, "Q_CREDIT_VLD_22"}, 27cf979a15841e liuzhongzhu 2018-12-15 695 {true, "Q_CREDIT_VLD_23"}, 27cf979a15841e liuzhongzhu 2018-12-15 696 {true, "Q_CREDIT_VLD_24"}, 27cf979a15841e liuzhongzhu 2018-12-15 697 {true, "Q_CREDIT_VLD_25"}, 27cf979a15841e liuzhongzhu 2018-12-15 698 27cf979a15841e liuzhongzhu 2018-12-15 699 {true, "Q_CREDIT_VLD_26"}, 27cf979a15841e liuzhongzhu 2018-12-15 700 {true, "Q_CREDIT_VLD_27"}, 27cf979a15841e liuzhongzhu 2018-12-15 701 {true, "Q_CREDIT_VLD_28"}, 27cf979a15841e liuzhongzhu 2018-12-15 702 {true, "Q_CREDIT_VLD_29"}, 27cf979a15841e liuzhongzhu 2018-12-15 703 {true, "Q_CREDIT_VLD_30"}, 27cf979a15841e liuzhongzhu 2018-12-15 704 {true, "Q_CREDIT_VLD_31"}, 27cf979a15841e liuzhongzhu 2018-12-15 705 27cf979a15841e liuzhongzhu 2018-12-15 706 {true, "GRO_BD_SERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 707 {true, "GRO_CONTEXT_SERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 708 {true, "RX_STASH_CFG_SERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 709 {true, "AXI_RD_FBD_SERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 710 {true, "GRO_BD_MERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 711 {true, "GRO_CONTEXT_MERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 712 27cf979a15841e liuzhongzhu 2018-12-15 713 {true, "RX_STASH_CFG_MERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 714 {true, "AXI_RD_FBD_MERR_CNT"}, 27cf979a15841e liuzhongzhu 2018-12-15 715 {false, "Reserved"}, 27cf979a15841e liuzhongzhu 2018-12-15 716 {false, "Reserved"}, 27cf979a15841e liuzhongzhu 2018-12-15 717 {false, "Reserved"}, 27cf979a15841e liuzhongzhu 2018-12-15 718 {false, "Reserved"}, 27cf979a15841e liuzhongzhu 2018-12-15 719 }; 27cf979a15841e liuzhongzhu 2018-12-15 720 e4b9146849f246 Rikard Falkeborn 2020-09-22 @721 static const struct hclge_dbg_dfx_message hclge_dbg_tqp_reg[] = { 27cf979a15841e liuzhongzhu 2018-12-15 722 {true, "q_num"}, 27cf979a15841e liuzhongzhu 2018-12-15 723 {true, "RCB_CFG_RX_RING_TAIL"}, 27cf979a15841e liuzhongzhu 2018-12-15 724 {true, "RCB_CFG_RX_RING_HEAD"}, 27cf979a15841e liuzhongzhu 2018-12-15 725 {true, "RCB_CFG_RX_RING_FBDNUM"}, 27cf979a15841e liuzhongzhu 2018-12-15 726 {true, "RCB_CFG_RX_RING_OFFSET"}, 27cf979a15841e liuzhongzhu 2018-12-15 727 {true, "RCB_CFG_RX_RING_FBDOFFSET"}, 27cf979a15841e liuzhongzhu 2018-12-15 728 27cf979a15841e liuzhongzhu 2018-12-15 729 {true, "RCB_CFG_RX_RING_PKTNUM_RECORD"}, 27cf979a15841e liuzhongzhu 2018-12-15 730 {true, "RCB_CFG_TX_RING_TAIL"}, 27cf979a15841e liuzhongzhu 2018-12-15 731 {true, "RCB_CFG_TX_RING_HEAD"}, 27cf979a15841e liuzhongzhu 2018-12-15 732 {true, "RCB_CFG_TX_RING_FBDNUM"}, 27cf979a15841e liuzhongzhu 2018-12-15 733 {true, "RCB_CFG_TX_RING_OFFSET"}, 27cf979a15841e liuzhongzhu 2018-12-15 734 {true, "RCB_CFG_TX_RING_EBDNUM"}, 27cf979a15841e liuzhongzhu 2018-12-15 735 }; 27cf979a15841e liuzhongzhu 2018-12-15 736 :::::: The code at line 721 was first introduced by commit :::::: e4b9146849f246e77da4787657a3a95c1b6d2833 net: hns3: Constify static structs :::::: TO: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> :::::: CC: David S. Miller <davem(a)davemloft.net> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS] sctp: fix potential deadlock on &net->sctp.addr_wq_lock
by Dong Chenchen 22 Jan '24

22 Jan '24

From: Chengfeng Ye <dg573847474(a)gmail.com> stable inclusion from stable-v4.19.290 commit 0ad0e8b0cb0e28626ab6dffe3da883941b9cbc4b category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8WZLA CVE: CVE-2024-0639 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 6feb37b3b06e9049e20dcf7e23998f92c9c5be9a ] As &net->sctp.addr_wq_lock is also acquired by the timer sctp_addr_wq_timeout_handler() in protocal.c, the same lock acquisition at sctp_auto_asconf_init() seems should disable irq since it is called from sctp_accept() under process context. Possible deadlock scenario: sctp_accept() -> sctp_sock_migrate() -> sctp_auto_asconf_init() -> spin_lock(&net->sctp.addr_wq_lock) <timer interrupt> -> sctp_addr_wq_timeout_handler() -> spin_lock_bh(&net->sctp.addr_wq_lock); (deadlock here) This flaw was found using an experimental static analysis tool we are developing for irq-related deadlock. The tentative patch fix the potential deadlock by spin_lock_bh(). Signed-off-by: Chengfeng Ye <dg573847474(a)gmail.com> Fixes: 34e5b0118685 ("sctp: delay auto_asconf init until binding the first addr") Acked-by: Xin Long <lucien.xin(a)gmail.com> Link: https://lore.kernel.org/r/20230627120340.19432-1-dg573847474@gmail.com Signed-off-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/sctp/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 261ff3dd5a94..2a11b464182e 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -380,9 +380,9 @@ static void sctp_auto_asconf_init(struct sctp_sock *sp) struct net *net = sock_net(&sp->inet.sk); if (net->sctp.default_auto_asconf) { - spin_lock(&net->sctp.addr_wq_lock); + spin_lock_bh(&net->sctp.addr_wq_lock); list_add_tail(&sp->auto_asconf_list, &net->sctp.auto_asconf_splist); - spin_unlock(&net->sctp.addr_wq_lock); + spin_unlock_bh(&net->sctp.addr_wq_lock); sp->do_auto_asconf = 1; } } -- 2.25.1

2 1

[PATCH OLK-6.6 0/4] KABI reservation for driver
by Yi Yang 22 Jan '24

22 Jan '24

KABI reservation for tty/mtd/mmc/ipmi Yi Yang (4): tty: kabi: KABI reservation for tty mtd: kabi: KABI reservation for mtd mmc: kabi: KABI reservation for mmc ipmi: kabi: KABI reservation for ipmi drivers/char/ipmi/ipmi_msghandler.c | 7 +++++++ include/linux/ipmi.h | 3 +++ include/linux/ipmi_smi.h | 5 +++++ include/linux/mmc/card.h | 6 ++++++ include/linux/mmc/host.h | 8 ++++++++ include/linux/mtd/mtd.h | 11 +++++++++++ include/linux/mtd/partitions.h | 3 +++ include/linux/tty.h | 7 +++++++ include/linux/tty_buffer.h | 5 +++++ include/linux/tty_driver.h | 3 +++ include/linux/tty_ldisc.h | 3 +++ include/linux/tty_port.h | 3 +++ 12 files changed, 64 insertions(+) -- 2.25.1

2 5

[PATCH OLK-5.10 v2] fs:/dcache.c: fix negative dentry limit not complete problem
by Long Li 22 Jan '24

22 Jan '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8WPQW CVE: NA -------------------------------- Restrictions of negative dentry can avoid softlock when too many dentry in memory, but restrictions before do not always take effect. For example, removing files which has been created would not enter retain_dentry(), because the dentry of file maybe has been added to lru list of superblock, it caused that fast_dput() reutrn true in last dput(). So, add restriction logic for the file which has been added to the lru list in fast_dput(), it prevents the negative dentry exceeding the limit when deleting existing file. Factor out negative dentry limit logic into limit_negative_dentry(), make the coude more clean. Fixes: c44e1f780873 ("fs/dcache.c: avoid softlock since too many negative dentry") Signed-off-by: Long Li <leo.lilong(a)huawei.com> --- fs/dcache.c | 58 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index f5b78cc80a00..cd00c22f0005 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -647,10 +647,36 @@ static inline struct dentry *lock_parent(struct dentry *dentry) return __lock_parent(dentry); } -static inline bool retain_dentry(struct dentry *dentry) +/* + * Return true if dentry is negative and exceed negative dentry limit. + */ +static inline bool limit_negative_dentry(struct dentry *dentry) { struct dentry *parent; + parent = dentry->d_parent; + if (unlikely(!parent)) + return false; + + 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 (atomic_read(&parent->d_neg_dnum) >= NEG_DENTRY_LIMIT) + return true; + } + + return false; +} + +static inline bool retain_dentry(struct dentry *dentry) +{ WARN_ON(d_in_lookup(dentry)); /* Unreachable? Get rid of it */ @@ -668,27 +694,9 @@ 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) + if (unlikely(limit_negative_dentry(dentry))) return false; -noparent: /* retain; LRU fodder */ dentry->d_lockref.count--; if (unlikely(!(dentry->d_flags & DCACHE_LRU_LIST))) @@ -837,8 +845,14 @@ static inline bool fast_dput(struct dentry *dentry) d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED; /* Nothing to do? Dropping the reference was all we needed? */ - if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry)) - return true; + if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry)) { + /* + * If dentry is negative and need to be limitted, it maybe need + * to be killed, so shouldn't fast put and retain in memory. + */ + if (likely(!limit_negative_dentry(dentry))) + return true; + } /* * Not the fast normal case? Get the lock. We've already decremented -- 2.31.1

2 1

[PATCH OLK-6.6 0/1] arm64: Add CONFIG_IPI_AS_NMI to IPI as NMI
by Liao Chen 22 Jan '24

22 Jan '24

This patch adds CONFIG_IPI_AS_NMI to control the availability of pseudo NMIs, which follows upstream commit 41ddf73f9f7e (arm64: Add framework to turn IPI as NMI). CONFIG_IPI_AS_NMI depends on: ARM64_PSEUDO_NMI=y Liao Chen (1): arm64: Add CONFIG_IPI_AS_NMI to IPI as NMI feature arch/arm64/Kconfig | 12 +++++++++++- arch/arm64/kernel/kgdb.c | 2 ++ arch/arm64/kernel/smp.c | 6 ++++++ include/linux/nmi.h | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) -- 2.34.1

2 2

[PATCH OLK-6.6 0/1] arm64: Add CONFIG_IPI_AS_NMI to IPI as NMI
by Liao Chen 22 Jan '24

22 Jan '24

This patch adds CONFIG_IPI_AS_NMI to control the availability of pseudo NMIs, which follows upstream commit 41ddf73f9f7e (arm64: Add framework to turn IPI as NMI). CONFIG_IPI_AS_NMI depends on: ARM64_PSEUDO_NMI=y Liao Chen (1): arm64: Add CONFIG_IPI_AS_NMI to IPI as NMI feature arch/arm64/Kconfig | 12 +++++++++++- arch/arm64/kernel/kgdb.c | 2 ++ arch/arm64/kernel/smp.c | 6 ++++++ include/linux/nmi.h | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) -- 2.34.1

2 2

[PATCH OLK-6.6] drm/qxl: Fix missing free_irq
by Wei Li 22 Jan '24

22 Jan '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5Q4S3 -------------------------------- When doing "cat /proc/interrupts" after qxl.ko is unloaded, an oops occurs: BUG: unable to handle page fault for address: ffffffffc0274769 PGD 2a0d067 P4D 2a0d067 PUD 2a0f067 PMD 103f39067 PTE 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 6 PID: 246 Comm: cat Not tainted 6.1.0-rc2 #24 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:string_nocheck+0x34/0x50 Code: 66 85 c0 74 3c 83 e8 01 4c 8d 5c 07 01 31 c0 eb 19 49 39 fa 76 03 44 88 07 48 83 c7 RSP: 0018:ffffc90000893bb8 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffffc90000893c50 RCX: ffff0a00ffffff04 RDX: ffffffffc0274769 RSI: ffff888102812000 RDI: ffff88810281133e RBP: ffff888102812000 R08: ffffffff823fa5e6 R09: 0000000000000007 R10: ffff888102812000 R11: ffff88820281133d R12: ffffffffc0274769 R13: ffff0a00ffffff04 R14: 0000000000000cc4 R15: ffffffff823276b4 FS: 000000000214f8c0(0000) GS:ffff88842fd80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffc0274769 CR3: 00000001025c4005 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> string+0x46/0x60 vsnprintf+0x27a/0x4f0 seq_vprintf+0x34/0x50 seq_printf+0x53/0x70 ? seq_read_iter+0x365/0x450 show_interrupts+0x259/0x330 seq_read_iter+0x2a3/0x450 proc_reg_read_iter+0x47/0x70 generic_file_splice_read+0x94/0x160 splice_direct_to_actor+0xb0/0x230 ? do_splice_direct+0xd0/0xd0 do_splice_direct+0x8b/0xd0 do_sendfile+0x345/0x4f0 __x64_sys_sendfile64+0xa1/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x4bb0ce Code: c3 0f 1f 00 4c 89 d2 4c 89 c6 e9 bd fd ff ff 0f 1f 44 00 00 31 c0 c3 0f 1f 44 00 00 RSP: 002b:00007ffd99dc3fb8 EFLAGS: 00000246 ORIG_RAX: 0000000000000028 RAX: ffffffffffffffda RBX: 0000000001000000 RCX: 00000000004bb0ce RDX: 0000000000000000 RSI: 0000000000000003 RDI: 0000000000000001 RBP: 0000000000000001 R08: 000000000068f240 R09: 0000000001000000 R10: 0000000001000000 R11: 0000000000000246 R12: 0000000000000003 R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000000 </TASK> It seems that qxl doesn't free the interrupt it requests during unload, fix this by adding the missing free_irq(). Fixes: f64122c1f6ad ("drm: add new QXL driver. (v1.4)") Signed-off-by: Wei Li <liwei391(a)huawei.com> --- drivers/gpu/drm/qxl/qxl_kms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index dc3828db1991..d591084824de 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -283,6 +283,8 @@ int qxl_device_init(struct qxl_device *qdev, void qxl_device_fini(struct qxl_device *qdev) { int cur_idx; + struct drm_device *ddev = &qdev->ddev; + struct pci_dev *pdev = to_pci_dev(ddev->dev); /* check if qxl_device_init() was successful (gc_work is initialized last) */ if (!qdev->gc_work.func) @@ -305,6 +307,7 @@ void qxl_device_fini(struct qxl_device *qdev) wait_event_timeout(qdev->release_event, atomic_read(&qdev->release_count) == 0, HZ); + free_irq(pdev->irq, ddev); flush_work(&qdev->gc_work); qxl_surf_evict(qdev); qxl_vram_evict(qdev); -- 2.25.1

2 1

[PATCH OLK-6.6] drm/qxl: Fix missing free_irq
by Wei Li 22 Jan '24

22 Jan '24

When doing "cat /proc/interrupts" after qxl.ko is unloaded, an oops occurs: BUG: unable to handle page fault for address: ffffffffc0274769 PGD 2a0d067 P4D 2a0d067 PUD 2a0f067 PMD 103f39067 PTE 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 6 PID: 246 Comm: cat Not tainted 6.1.0-rc2 #24 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:string_nocheck+0x34/0x50 Code: 66 85 c0 74 3c 83 e8 01 4c 8d 5c 07 01 31 c0 eb 19 49 39 fa 76 03 44 88 07 48 83 c7 RSP: 0018:ffffc90000893bb8 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffffc90000893c50 RCX: ffff0a00ffffff04 RDX: ffffffffc0274769 RSI: ffff888102812000 RDI: ffff88810281133e RBP: ffff888102812000 R08: ffffffff823fa5e6 R09: 0000000000000007 R10: ffff888102812000 R11: ffff88820281133d R12: ffffffffc0274769 R13: ffff0a00ffffff04 R14: 0000000000000cc4 R15: ffffffff823276b4 FS: 000000000214f8c0(0000) GS:ffff88842fd80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffc0274769 CR3: 00000001025c4005 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> string+0x46/0x60 vsnprintf+0x27a/0x4f0 seq_vprintf+0x34/0x50 seq_printf+0x53/0x70 ? seq_read_iter+0x365/0x450 show_interrupts+0x259/0x330 seq_read_iter+0x2a3/0x450 proc_reg_read_iter+0x47/0x70 generic_file_splice_read+0x94/0x160 splice_direct_to_actor+0xb0/0x230 ? do_splice_direct+0xd0/0xd0 do_splice_direct+0x8b/0xd0 do_sendfile+0x345/0x4f0 __x64_sys_sendfile64+0xa1/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x4bb0ce Code: c3 0f 1f 00 4c 89 d2 4c 89 c6 e9 bd fd ff ff 0f 1f 44 00 00 31 c0 c3 0f 1f 44 00 00 RSP: 002b:00007ffd99dc3fb8 EFLAGS: 00000246 ORIG_RAX: 0000000000000028 RAX: ffffffffffffffda RBX: 0000000001000000 RCX: 00000000004bb0ce RDX: 0000000000000000 RSI: 0000000000000003 RDI: 0000000000000001 RBP: 0000000000000001 R08: 000000000068f240 R09: 0000000001000000 R10: 0000000001000000 R11: 0000000000000246 R12: 0000000000000003 R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000000 </TASK> It seems that qxl doesn't free the interrupt it requests during unload, fix this by adding the missing free_irq(). Fixes: f64122c1f6ad ("drm: add new QXL driver. (v1.4)") Signed-off-by: Wei Li <liwei391(a)huawei.com> --- drivers/gpu/drm/qxl/qxl_kms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index dc3828db1991..d591084824de 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -283,6 +283,8 @@ int qxl_device_init(struct qxl_device *qdev, void qxl_device_fini(struct qxl_device *qdev) { int cur_idx; + struct drm_device *ddev = &qdev->ddev; + struct pci_dev *pdev = to_pci_dev(ddev->dev); /* check if qxl_device_init() was successful (gc_work is initialized last) */ if (!qdev->gc_work.func) @@ -305,6 +307,7 @@ void qxl_device_fini(struct qxl_device *qdev) wait_event_timeout(qdev->release_event, atomic_read(&qdev->release_count) == 0, HZ); + free_irq(pdev->irq, ddev); flush_work(&qdev->gc_work); qxl_surf_evict(qdev); qxl_vram_evict(qdev); -- 2.25.1

2 1

[PATCH OLK-6.6] openeuler_defconfig: enable CONFIG_BLK_CGROUP_FC_APPID
by Li Nan 22 Jan '24

22 Jan '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8Y0RR -------------------------------- Enable CONFIG_BLK_CGROUP_FC_APPID for x86, arm64 by default. Signed-off-by: Li Nan <linan122(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 10f6012b44ec..cd928ac518b0 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -894,7 +894,7 @@ CONFIG_BLK_DEV_SUPPORT_LEGACY_GLOBAL_LIMIT=y CONFIG_BLK_WBT=y CONFIG_BLK_WBT_MQ=y # CONFIG_BLK_CGROUP_IOLATENCY is not set -# CONFIG_BLK_CGROUP_FC_APPID is not set +CONFIG_BLK_CGROUP_FC_APPID=y CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_LEGACY_IOCOST=y # CONFIG_BLK_CGROUP_IOPRIO is not set diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 16381ff5b9ae..052cde08be9d 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -958,7 +958,7 @@ CONFIG_BLK_DEV_SUPPORT_LEGACY_GLOBAL_LIMIT=y CONFIG_BLK_WBT=y CONFIG_BLK_WBT_MQ=y # CONFIG_BLK_CGROUP_IOLATENCY is not set -# CONFIG_BLK_CGROUP_FC_APPID is not set +CONFIG_BLK_CGROUP_FC_APPID=y CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_LEGACY_IOCOST=y # CONFIG_BLK_CGROUP_IOPRIO is not set -- 2.39.2

2 1