- Kernel - mailweb.openeuler.org

[openeuler:OLK-6.6 1474/1474] arch/x86/events/zhaoxin/uncore.c:2828:6: sparse: sparse: symbol 'kx7000_uncore_cpu_init' was not declared. Should it be static?
by kernel test robot 21 Nov '24

21 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: cce003012298a00277187319a2527882a18278c1 commit: 25fd62f6e8c9636272009dfcbe04fb1a260cbf8d [1474/1474] perf/x86/zhaoxin/uncore: update KX-7000 support config: x86_64-randconfig-121-20241118 (https://download.01.org/0day-ci/archive/20241121/202411210004.SQKwK1XS-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241121/202411210004.SQKwK1XS-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/202411210004.SQKwK1XS-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) arch/x86/events/zhaoxin/uncore.c:2426:28: sparse: sparse: symbol 'uncore_msr_cluster_uncores' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c:2431:28: sparse: sparse: symbol 'uncore_msr_subnode_uncores' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c:2437:28: sparse: sparse: symbol 'uncore_pci_subnode_uncores' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c:2798:6: sparse: sparse: symbol 'kx5000_uncore_cpu_init' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c:2807:6: sparse: sparse: symbol 'kh40000_uncore_cpu_init' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c:2812:5: sparse: sparse: symbol 'kh40000_uncore_pci_init' was not declared. Should it be static? >> arch/x86/events/zhaoxin/uncore.c:2828:6: sparse: sparse: symbol 'kx7000_uncore_cpu_init' was not declared. Should it be static? >> arch/x86/events/zhaoxin/uncore.c:2843:5: sparse: sparse: symbol 'kx7000_uncore_pci_init' was not declared. Should it be static? >> arch/x86/events/zhaoxin/uncore.c:2851:6: sparse: sparse: symbol 'kx7000_uncore_mmio_init' was not declared. Should it be static? arch/x86/events/zhaoxin/uncore.c: note: in included file (through include/linux/preempt.h, include/linux/spinlock.h, include/linux/mmzone.h, ...): include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true vim +/kx7000_uncore_cpu_init +2828 arch/x86/events/zhaoxin/uncore.c 2827 > 2828 void kx7000_uncore_cpu_init(void) 2829 { 2830 u64 val; 2831 int cpu; 2832 2833 uncore_msr_uncores = kx7000_msr_uncores; 2834 2835 /* clear bit 16 of MSR 0x1877 so that HIF can work normally */ 2836 for_each_present_cpu(cpu) { 2837 rdmsrl_on_cpu(cpu, 0x1877, &val); 2838 val = val & 0xfffffffffffeffffULL; 2839 wrmsrl_on_cpu(cpu, 0x1877, val); 2840 } 2841 } 2842 > 2843 int kx7000_uncore_pci_init(void) 2844 { 2845 uncore_pci_uncores = kx7000_pci_uncores; 2846 uncore_pci_driver = &kx7000_uncore_pci_driver; 2847 2848 return 0; 2849 } 2850 > 2851 void kx7000_uncore_mmio_init(void) 2852 { 2853 uncore_mmio_uncores = kx7000_mmio_uncores; 2854 } 2855 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1495/1495] drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c:299:28: warning: variable 'netdev' set but not used
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: cce003012298a00277187319a2527882a18278c1 commit: 2d861e6888256771288076b36aa9beba46c7af67 [1495/1495] Net: nebula_matrix: fix ci compile nbl_ethtool.c warning config: x86_64-rhel-9.4 (https://download.01.org/0day-ci/archive/20241120/202411202330.F8yFrBR6-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411202330.F8yFrBR6-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/202411202330.F8yFrBR6-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c: In function 'nbl_serv_adjust_interrpt_param': >> drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c:299:28: warning: variable 'netdev' set but not used [-Wunused-but-set-variable] 299 | struct net_device *netdev; | ^~~~~~ drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c: In function 'nbl_set_pause_param': >> drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c:1666:43: warning: variable 'net_resource_mgt' set but not used [-Wunused-but-set-variable] 1666 | struct nbl_serv_net_resource_mgt *net_resource_mgt; | ^~~~~~~~~~~~~~~~ vim +/netdev +299 drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_ethtool.c bad535d287c9c1 Bennie Yan 2024-09-24 293 2d861e68882567 Bennie Yan 2024-11-19 294 static void nbl_serv_adjust_interrpt_param(struct nbl_service_mgt *serv_mgt, bool ethtool) bad535d287c9c1 Bennie Yan 2024-09-24 295 { bad535d287c9c1 Bennie Yan 2024-09-24 296 struct nbl_serv_net_resource_mgt *net_resource_mgt; bad535d287c9c1 Bennie Yan 2024-09-24 297 struct nbl_serv_ring_mgt *ring_mgt; bad535d287c9c1 Bennie Yan 2024-09-24 298 struct nbl_dispatch_ops *disp_ops; bad535d287c9c1 Bennie Yan 2024-09-24 @299 struct net_device *netdev; bad535d287c9c1 Bennie Yan 2024-09-24 300 struct nbl_serv_ring_vsi_info *vsi_info; bad535d287c9c1 Bennie Yan 2024-09-24 301 u64 last_tx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 302 u64 last_rx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 303 u64 last_get_stats_jiffies, time_diff; bad535d287c9c1 Bennie Yan 2024-09-24 304 u64 tx_packets, rx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 305 u64 tx_rates, rx_rates, pkt_rates; bad535d287c9c1 Bennie Yan 2024-09-24 306 u16 local_vector_id, vector_num; bad535d287c9c1 Bennie Yan 2024-09-24 307 u16 intr_suppress_level; bad535d287c9c1 Bennie Yan 2024-09-24 308 bad535d287c9c1 Bennie Yan 2024-09-24 309 net_resource_mgt = NBL_SERV_MGT_TO_NET_RES_MGT(serv_mgt); bad535d287c9c1 Bennie Yan 2024-09-24 310 netdev = net_resource_mgt->netdev; bad535d287c9c1 Bennie Yan 2024-09-24 311 ring_mgt = NBL_SERV_MGT_TO_RING_MGT(serv_mgt); bad535d287c9c1 Bennie Yan 2024-09-24 312 disp_ops = NBL_SERV_MGT_TO_DISP_OPS(serv_mgt); bad535d287c9c1 Bennie Yan 2024-09-24 313 vsi_info = &ring_mgt->vsi_info[NBL_VSI_DATA]; bad535d287c9c1 Bennie Yan 2024-09-24 314 bad535d287c9c1 Bennie Yan 2024-09-24 315 last_tx_packets = net_resource_mgt->stats.tx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 316 last_rx_packets = net_resource_mgt->stats.rx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 317 last_get_stats_jiffies = net_resource_mgt->get_stats_jiffies; bad535d287c9c1 Bennie Yan 2024-09-24 318 disp_ops->get_net_stats(NBL_SERV_MGT_TO_DISP_PRIV(serv_mgt), &net_resource_mgt->stats); bad535d287c9c1 Bennie Yan 2024-09-24 319 /* ethtool -S don't adaptive interrupt suppression param */ bad535d287c9c1 Bennie Yan 2024-09-24 320 if (!vsi_info->itr_dynamic || ethtool) bad535d287c9c1 Bennie Yan 2024-09-24 321 return; bad535d287c9c1 Bennie Yan 2024-09-24 322 bad535d287c9c1 Bennie Yan 2024-09-24 323 tx_packets = net_resource_mgt->stats.tx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 324 rx_packets = net_resource_mgt->stats.rx_packets; bad535d287c9c1 Bennie Yan 2024-09-24 325 time_diff = jiffies - last_get_stats_jiffies; bad535d287c9c1 Bennie Yan 2024-09-24 326 bad535d287c9c1 Bennie Yan 2024-09-24 327 net_resource_mgt->get_stats_jiffies = jiffies; bad535d287c9c1 Bennie Yan 2024-09-24 328 tx_rates = (tx_packets - last_tx_packets) / time_diff * HZ; bad535d287c9c1 Bennie Yan 2024-09-24 329 rx_rates = (rx_packets - last_rx_packets) / time_diff * HZ; bad535d287c9c1 Bennie Yan 2024-09-24 330 pkt_rates = max_t(u64, tx_rates, rx_rates); bad535d287c9c1 Bennie Yan 2024-09-24 331 bad535d287c9c1 Bennie Yan 2024-09-24 332 intr_suppress_level = bad535d287c9c1 Bennie Yan 2024-09-24 333 disp_ops->get_intr_suppress_level(NBL_SERV_MGT_TO_DISP_PRIV(serv_mgt), pkt_rates, bad535d287c9c1 Bennie Yan 2024-09-24 334 ring_mgt->vectors->intr_suppress_level); bad535d287c9c1 Bennie Yan 2024-09-24 335 if (intr_suppress_level != ring_mgt->vectors->intr_suppress_level) { bad535d287c9c1 Bennie Yan 2024-09-24 336 local_vector_id = ring_mgt->vectors[vsi_info->ring_offset].local_vector_id; bad535d287c9c1 Bennie Yan 2024-09-24 337 vector_num = vsi_info->ring_num; bad535d287c9c1 Bennie Yan 2024-09-24 338 disp_ops->set_intr_suppress_level(NBL_SERV_MGT_TO_DISP_PRIV(serv_mgt), bad535d287c9c1 Bennie Yan 2024-09-24 339 local_vector_id, vector_num, bad535d287c9c1 Bennie Yan 2024-09-24 340 intr_suppress_level); bad535d287c9c1 Bennie Yan 2024-09-24 341 ring_mgt->vectors->intr_suppress_level = intr_suppress_level; bad535d287c9c1 Bennie Yan 2024-09-24 342 } bad535d287c9c1 Bennie Yan 2024-09-24 343 } bad535d287c9c1 Bennie Yan 2024-09-24 344 :::::: The code at line 299 was first introduced by commit :::::: bad535d287c9c1056d99de3666be7da84de4a8fc Net:nbl_core: Add nbl_core-driver for nebula-matrix S1055AS series smart NIC. :::::: TO: Bennie Yan <bennie.yan(a)nebula-matrix.com> :::::: CC: Bennie Yan <bennie.yan(a)nebula-matrix.com> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6][Backport] selftests: udpgro: no need to load xdp for gro
by Jiangshan Yi 20 Nov '24

20 Nov '24

From: Hangbin Liu <liuhangbin(a)gmail.com> mainline inclusion from mainline-v6.11-rc5 commit d7818402b1d80347c764001583f6d63fa68c2e1a category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB5TVE Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- After commit d7db7775ea2e ("net: veth: do not manipulate GRO when using XDP"), there is no need to load XDP program to enable GRO. On the other hand, the current test is failed due to loading the XDP program. e.g. # selftests: net: udpgro.sh # ipv4 # no GRO ok # no GRO chk cmsg ok # GRO ./udpgso_bench_rx: recv: bad packet len, got 1472, expected 14720 # # failed [...] # bad GRO lookup ok # multiple GRO socks ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520 # # ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520 # # failed ok 1 selftests: net: udpgro.sh After fix, all the test passed. # ./udpgro.sh ipv4 no GRO ok [...] multiple GRO socks ok Fixes: d7db7775ea2e ("net: veth: do not manipulate GRO when using XDP") Reported-by: Yi Chen <yiche(a)redhat.com> Closes: https://issues.redhat.com/browse/RHEL-53858 Reviewed-by: Toke Høiland-Jørgensen <toke(a)redhat.com> Acked-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Hangbin Liu <liuhangbin(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Jiangshan Yi <yijiangshan(a)kylinos.cn> --- tools/testing/selftests/net/udpgro.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/udpgro.sh b/tools/testing/selftests/net/udpgro.sh index 53341c8135e8..d5ffd8c9172e 100755 --- a/tools/testing/selftests/net/udpgro.sh +++ b/tools/testing/selftests/net/udpgro.sh @@ -7,8 +7,6 @@ source net_helper.sh readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" -BPF_FILE="xdp_dummy.o" - # set global exit status, but never reset nonzero one. check_err() { @@ -38,7 +36,7 @@ cfg_veth() { ip -netns "${PEER_NS}" addr add dev veth1 192.168.1.1/24 ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad ip -netns "${PEER_NS}" link set dev veth1 up - ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp + ip netns exec "${PEER_NS}" ethtool -K veth1 gro on } run_one() { @@ -206,11 +204,6 @@ run_all() { return $ret } -if [ ! -f ${BPF_FILE} ]; then - echo "Missing ${BPF_FILE}. Run 'make' first" - exit -1 -fi - if [[ $# -eq 0 ]]; then run_all elif [[ $1 == "__subprocess" ]]; then -- 2.27.0

2 1

[PATCH OLK-6.6 00/13] Some patches for RDMA/hns
by Chengchang Tang 20 Nov '24

20 Nov '24

From: Xinghai Cen <cenxinghai(a)h-partners.com> Some patches for RDMA/hns Chengchang Tang (6): RDMA/hns: Fix HW UAF when destroy context timeout RDMA/hns: Fix integer overflow in calc_loading_percent() RDMA/hns: Fix possible RAS when DCA is not attached RDMA/hns: Fix a meaningless loop in active_dca_pages_proc() RDMA/hns: Fix list_*_careful() not being used in pairs RDMA/hns: Use one CQ bank per context Junxian Huang (5): RDMA/hns: Fix wrong output of sysfs scc pram when configuration failed RDMA/hns: Fix concurrency between sysfs store and FW configuration of scc params RDMA/hns: Fix mixed use of u32 and __le32 in sysfs RDMA/hns: Fix dereference of noderef expression RDMA/hns: Fix "Should it be static?" warnings wenglianfa (2): RDMA/hns: Fix the modification of max_send_sge RDMA/hns: Fix RoCEE hang when multiple QP banks use EXT_SGE EXT_SGE drivers/infiniband/hw/hns/hns_roce_bond.c | 8 ++- drivers/infiniband/hw/hns/hns_roce_cq.c | 73 +++++++++++++++++-- drivers/infiniband/hw/hns/hns_roce_dca.c | 60 ++++++++++++++-- drivers/infiniband/hw/hns/hns_roce_dca.h | 2 + drivers/infiniband/hw/hns/hns_roce_debugfs.c | 10 ++- drivers/infiniband/hw/hns/hns_roce_device.h | 17 ++++- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 +++++-- drivers/infiniband/hw/hns/hns_roce_main.c | 20 ++++++ drivers/infiniband/hw/hns/hns_roce_mr.c | 6 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 74 ++++++++++++++++---- drivers/infiniband/hw/hns/hns_roce_srq.c | 6 +- drivers/infiniband/hw/hns/hns_roce_sysfs.c | 41 +++++++---- 12 files changed, 288 insertions(+), 55 deletions(-) -- 2.33.0

2 14

[PATCH OLK-6.6] RDMA/hns: Fix different dgids mapping to the same dip_idx
by Chengchang Tang 20 Nov '24

20 Nov '24

From: Feng Fang <fangfeng4(a)huawei.com> maillist inclusion commit faa62440a5772b40bb7d78bf9e29556a82ecf153 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB4OOG Reference: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=fa… --------------------------------------------------------------------- DIP algorithm requires a one-to-one mapping between dgid and dip_idx. Currently a queue 'spare_idx' is used to store QPN of QPs that use DIP algorithm. For a new dgid, use a QPN from spare_idx as dip_idx. This method lacks a mechanism for deduplicating QPN, which may result in different dgids sharing the same dip_idx and break the one-to-one mapping requirement. This patch replaces spare_idx with xarray and introduces a refcnt of a dip_idx to indicate the number of QPs that using this dip_idx. The state machine for dip_idx management is implemented as: * The entry at an index in xarray is empty -- This indicates that the corresponding dip_idx hasn't been created. * The entry at an index in xarray is not empty but with 0 refcnt -- This indicates that the corresponding dip_idx has been created but not used as dip_idx yet. * The entry at an index in xarray is not empty and with non-0 refcnt -- This indicates that the corresponding dip_idx is being used by refcnt number of DIP QPs. Fixes: eb653eda1e91 ("RDMA/hns: Bugfix for incorrect association between dip_idx and dgid") Fixes: f91696f2f053 ("RDMA/hns: Support congestion control type selection according to the FW") Signed-off-by: Feng Fang <fangfeng4(a)huawei.com> Signed-off-by: Junxian Huang <huangjunxian6(a)hisilicon.com> Link: https://patch.msgid.link/20241112055553.3681129-1-huangjunxian6@hisilicon.c… Signed-off-by: Leon Romanovsky <leon(a)kernel.org> Signed-off-by: Xinghai Cen <cenxinghai(a)h-partners.com> --- drivers/infiniband/hw/hns/hns_roce_device.h | 11 +-- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 96 +++++++++++++++------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- drivers/infiniband/hw/hns/hns_roce_main.c | 2 - drivers/infiniband/hw/hns/hns_roce_qp.c | 8 +- 5 files changed, 75 insertions(+), 44 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h index fdc1fe5e6a81..e3303cc3584a 100644 --- a/drivers/infiniband/hw/hns/hns_roce_device.h +++ b/drivers/infiniband/hw/hns/hns_roce_device.h @@ -570,12 +570,6 @@ struct hns_roce_bank { u32 next; /* Next ID to allocate. */ }; -struct hns_roce_idx_table { - u32 *spare_idx; - u32 head; - u32 tail; -}; - struct hns_roce_qp_table { struct hns_roce_hem_table qp_table; struct hns_roce_hem_table irrl_table; @@ -584,7 +578,7 @@ struct hns_roce_qp_table { struct mutex scc_mutex; struct hns_roce_bank bank[HNS_ROCE_QP_BANK_NUM]; struct mutex bank_mutex; - struct hns_roce_idx_table idx_table; + struct xarray dip_xa; }; struct hns_roce_cq_table { @@ -742,6 +736,7 @@ struct hns_roce_qp { bool delayed_destroy_flag; struct hns_roce_mtr_node *mtr_node; spinlock_t flush_lock; + struct hns_roce_dip *dip; }; struct hns_roce_ib_iboe { @@ -1102,8 +1097,6 @@ struct hns_roce_dev { enum hns_roce_device_state state; struct list_head qp_list; /* list of all qps on this dev */ spinlock_t qp_list_lock; /* protect qp_list */ - struct list_head dip_list; /* list of all dest ips on this dev */ - spinlock_t dip_list_lock; /* protect dip_list */ struct list_head pgdir_list; struct mutex pgdir_mutex; diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 3f254ac48b42..88bd75c5743e 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -2720,20 +2720,19 @@ static void hns_roce_free_link_table(struct hns_roce_dev *hr_dev) free_link_table_buf(hr_dev, &priv->ext_llm); } -static void free_dip_list(struct hns_roce_dev *hr_dev) +static void free_dip_entry(struct hns_roce_dev *hr_dev) { struct hns_roce_dip *hr_dip; - struct hns_roce_dip *tmp; - unsigned long flags; + unsigned long idx; - spin_lock_irqsave(&hr_dev->dip_list_lock, flags); + xa_lock(&hr_dev->qp_table.dip_xa); - list_for_each_entry_safe(hr_dip, tmp, &hr_dev->dip_list, node) { - list_del(&hr_dip->node); + xa_for_each(&hr_dev->qp_table.dip_xa, idx, hr_dip) { + __xa_erase(&hr_dev->qp_table.dip_xa, hr_dip->dip_idx); kfree(hr_dip); } - spin_unlock_irqrestore(&hr_dev->dip_list_lock, flags); + xa_unlock(&hr_dev->qp_table.dip_xa); } static int hns_roce_v2_get_reset_page(struct hns_roce_dev *hr_dev) @@ -3182,7 +3181,7 @@ static void hns_roce_v2_exit(struct hns_roce_dev *hr_dev) hns_roce_v2_put_reset_page(hr_dev); if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP09) - free_dip_list(hr_dev); + free_dip_entry(hr_dev); } static inline void mbox_desc_init(struct hns_roce_post_mbox *mb, @@ -5042,26 +5041,49 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, int attr_mask, return 0; } +static int alloc_dip_entry(struct xarray *dip_xa, u32 qpn) +{ + struct hns_roce_dip *hr_dip; + int ret; + + hr_dip = xa_load(dip_xa, qpn); + if (hr_dip) + return 0; + + hr_dip = kzalloc(sizeof(*hr_dip), GFP_KERNEL); + if (!hr_dip) + return -ENOMEM; + + ret = xa_err(xa_store(dip_xa, qpn, hr_dip, GFP_KERNEL)); + if (ret) + kfree(hr_dip); + + return ret; +} + static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr, u32 *dip_idx) { const struct ib_global_route *grh = rdma_ah_read_grh(&attr->ah_attr); struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device); - u32 *spare_idx = hr_dev->qp_table.idx_table.spare_idx; - u32 *head = &hr_dev->qp_table.idx_table.head; - u32 *tail = &hr_dev->qp_table.idx_table.tail; + struct xarray *dip_xa = &hr_dev->qp_table.dip_xa; + struct hns_roce_qp *hr_qp = to_hr_qp(ibqp); struct hns_roce_dip *hr_dip; - unsigned long flags; + unsigned long idx; int ret = 0; - spin_lock_irqsave(&hr_dev->dip_list_lock, flags); + ret = alloc_dip_entry(dip_xa, ibqp->qp_num); + if (ret) + return ret; - spare_idx[*tail] = ibqp->qp_num; - *tail = (*tail == hr_dev->caps.num_qps - 1) ? 0 : (*tail + 1); + xa_lock(dip_xa); - list_for_each_entry(hr_dip, &hr_dev->dip_list, node) { - if (!memcmp(grh->dgid.raw, hr_dip->dgid, GID_LEN_V2)) { + xa_for_each(dip_xa, idx, hr_dip) { + if (hr_dip->qp_cnt && + !memcmp(grh->dgid.raw, hr_dip->dgid, GID_LEN_V2)) { *dip_idx = hr_dip->dip_idx; + hr_dip->qp_cnt++; + hr_qp->dip = hr_dip; goto out; } } @@ -5069,19 +5091,24 @@ static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr, /* If no dgid is found, a new dip and a mapping between dgid and * dip_idx will be created. */ - hr_dip = kzalloc(sizeof(*hr_dip), GFP_ATOMIC); - if (!hr_dip) { - ret = -ENOMEM; - goto out; + xa_for_each(dip_xa, idx, hr_dip) { + if (hr_dip->qp_cnt) + continue; + + *dip_idx = idx; + memcpy(hr_dip->dgid, grh->dgid.raw, sizeof(grh->dgid.raw)); + hr_dip->dip_idx = idx; + hr_dip->qp_cnt++; + hr_qp->dip = hr_dip; + break; } - memcpy(hr_dip->dgid, grh->dgid.raw, sizeof(grh->dgid.raw)); - hr_dip->dip_idx = *dip_idx = spare_idx[*head]; - *head = (*head == hr_dev->caps.num_qps - 1) ? 0 : (*head + 1); - list_add_tail(&hr_dip->node, &hr_dev->dip_list); + /* This should never happen. */ + if (WARN_ON_ONCE(!hr_qp->dip)) + ret = -ENOSPC; out: - spin_unlock_irqrestore(&hr_dev->dip_list_lock, flags); + xa_unlock(dip_xa); return ret; } @@ -6005,6 +6032,20 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, return ret; } +static void put_dip_ctx_idx(struct hns_roce_dev *hr_dev, + struct hns_roce_qp *hr_qp) +{ + struct hns_roce_dip *hr_dip = hr_qp->dip; + + xa_lock(&hr_dev->qp_table.dip_xa); + + hr_dip->qp_cnt--; + if (!hr_dip->qp_cnt) + memset(hr_dip->dgid, 0, GID_LEN_V2); + + xa_unlock(&hr_dev->qp_table.dip_xa); +} + int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device); @@ -6018,6 +6059,9 @@ int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) spin_unlock_irqrestore(&hr_qp->flush_lock, flags); flush_work(&hr_qp->flush_work.work); + if (hr_qp->cong_type == CONG_TYPE_DIP) + put_dip_ctx_idx(hr_dev, hr_qp); + ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, udata); if (ret) ibdev_err_ratelimited(&hr_dev->ib_dev, diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h index 201902dff611..f43444be0308 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h @@ -1366,7 +1366,7 @@ struct hns_roce_v2_priv { struct hns_roce_dip { u8 dgid[GID_LEN_V2]; u32 dip_idx; - struct list_head node; /* all dips are on a list */ + u32 qp_cnt; }; struct fmea_ram_ecc { diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index d488c3d5986f..520112bd43d5 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -1250,8 +1250,6 @@ static int hns_roce_setup_hca(struct hns_roce_dev *hr_dev) INIT_LIST_HEAD(&hr_dev->qp_list); spin_lock_init(&hr_dev->qp_list_lock); - INIT_LIST_HEAD(&hr_dev->dip_list); - spin_lock_init(&hr_dev->dip_list_lock); INIT_LIST_HEAD(&hr_dev->uctx_list); mutex_init(&hr_dev->uctx_list_mutex); diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c index 5ed2647567aa..77ec0c8678d3 100644 --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -1701,14 +1701,10 @@ int hns_roce_init_qp_table(struct hns_roce_dev *hr_dev) unsigned int reserved_from_bot; unsigned int i; - qp_table->idx_table.spare_idx = kcalloc(hr_dev->caps.num_qps, - sizeof(u32), GFP_KERNEL); - if (!qp_table->idx_table.spare_idx) - return -ENOMEM; - mutex_init(&qp_table->scc_mutex); mutex_init(&qp_table->bank_mutex); xa_init(&hr_dev->qp_table_xa); + xa_init(&qp_table->dip_xa); reserved_from_bot = hr_dev->caps.reserved_qps; @@ -1733,7 +1729,7 @@ void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev) for (i = 0; i < HNS_ROCE_QP_BANK_NUM; i++) ida_destroy(&hr_dev->qp_table.bank[i].ida); + xa_destroy(&hr_dev->qp_table.dip_xa); mutex_destroy(&hr_dev->qp_table.bank_mutex); mutex_destroy(&hr_dev->qp_table.scc_mutex); - kfree(hr_dev->qp_table.idx_table.spare_idx); } -- 2.33.0

2 1

[PATCH OLK-6.6][Backport] netdevsim: fix rtnetlink.sh selftest
by Jiangshan Yi 20 Nov '24

20 Nov '24

From: David Wei <dw(a)davidwei.uk> mainline inclusion from mainline-v6.9-rc1 commit 8ee60f9c41fb01440e8a8f97127869c9b1978362 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB5TUY Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- I cleared IFF_NOARP flag from netdevsim dev->flags in order to support skb forwarding. This breaks the rtnetlink.sh selftest kci_test_ipsec_offload() test because ipsec does not connect to peers it cannot transmit to. Fix the issue by adding a neigh entry manually. ipsec_offload test now successfully pass. Signed-off-by: David Wei <dw(a)davidwei.uk> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Jiangshan Yi <yijiangshan(a)kylinos.cn> --- tools/testing/selftests/net/rtnetlink.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 488f4964365e..8320d9c1edc9 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -915,6 +915,8 @@ kci_test_ipsec_offload() check_err 1 fi + # we didn't create a peer, make sure we can Tx + ip neigh add $dstip dev $dev lladdr 00:11:22:33:44:55 # use ping to exercise the Tx path ping -I $dev -c 3 -W 1 -i 0 $dstip >/dev/null -- 2.27.0

2 1

[openeuler:OLK-6.6 1474/1474] arch/x86/kernel/early-quirks.c:720:22: sparse: sparse: symbol 'zhaoxin_kh40000' was not declared. Should it be static?
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: cce003012298a00277187319a2527882a18278c1 commit: 11557c1ae4529f133483879b7ee00b7d8c653be7 [1474/1474] x86/cpu/zhaoxin: Encapsulate access to kh40000_dma_direct_ops within function config: x86_64-randconfig-121-20241118 (https://download.01.org/0day-ci/archive/20241120/202411201915.hYUwc9VU-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201915.hYUwc9VU-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/202411201915.hYUwc9VU-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) arch/x86/kernel/early-quirks.c:680:49: sparse: sparse: restricted pci_power_t degrades to integer arch/x86/kernel/early-quirks.c:686:57: sparse: sparse: restricted pci_power_t degrades to integer vim +/zhaoxin_kh40000 +720 arch/x86/kernel/early-quirks.c 62187910b0fc7a Feng Tang 2014-04-24 719 8eaba08b2d7271 leoliu-oc 2024-06-03 @720 bool __ro_after_init zhaoxin_kh40000; 8eaba08b2d7271 leoliu-oc 2024-06-03 721 :::::: The code at line 720 was first introduced by commit :::::: 8eaba08b2d72718a40cafe3402ab4f26b0dc62eb x86/cpu/zhaoxin: Encapsulate access to global variables within functions :::::: TO: leoliu-oc <leoliu-oc(a)zhaoxin.com> :::::: CC: leoliu-oc <leoliu-oc(a)zhaoxin.com> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10 2451/2451] ld: fs/proc/base.o:undefined reference to `proc_mm_idle_operations'
by kernel test robot 20 Nov '24

20 Nov '24

Hi liubo, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: bf0212daf6239e1b0e65e6dd7ee9fdec378c5dd4 commit: 4232d9005401d839ceeb1a02da34749b6dab1376 [2451/2451] etmem: add CONFIG_ETMEM macro definition for etmem feature config: x86_64-randconfig-074-20241119 (https://download.01.org/0day-ci/archive/20241120/202411201912.lsG6nV6W-lkp@…) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201912.lsG6nV6W-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/202411201912.lsG6nV6W-lkp@intel.com/ All errors (new ones prefixed by >>): ld: warning: arch/x86/lib/retpoline.o: missing .note.GNU-stack section implies executable stack ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker ld: warning: arch/x86/lib/retpoline.o: missing .note.GNU-stack section implies executable stack ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker ld: warning: .tmp_vmlinux.kallsyms1 has a LOAD segment with RWX permissions >> ld: fs/proc/base.o:(.rodata+0x18a8): undefined reference to `proc_mm_idle_operations' >> ld: fs/proc/base.o:(.rodata+0x18d0): undefined reference to `proc_mm_swap_operations' ld: fs/proc/base.o:(.rodata+0x23e0): undefined reference to `proc_mm_idle_operations' ld: fs/proc/base.o:(.rodata+0x2408): undefined reference to `proc_mm_swap_operations' ld: crypto/asymmetric_keys/pgp_preload.o: in function `preload_pgp_keys': crypto/asymmetric_keys/pgp_preload.c:110: undefined reference to `pgp_parse_packets' ld: crypto/asymmetric_keys/pgp_public_key.o: in function `pgp_key_parse': crypto/asymmetric_keys/pgp_public_key.c:315: undefined reference to `pgp_parse_packets' ld: crypto/asymmetric_keys/pgp_public_key.c:357: undefined reference to `public_key_subtype' ld: crypto/asymmetric_keys/pgp_public_key.c:357: undefined reference to `public_key_subtype' ld: crypto/asymmetric_keys/pgp_public_key.c:358: undefined reference to `public_key_subtype' ld: crypto/asymmetric_keys/pgp_public_key.c:367: undefined reference to `public_key_free' ld: crypto/asymmetric_keys/pgp_public_key.c:357: undefined reference to `public_key_subtype' ld: crypto/asymmetric_keys/pgp_public_key.o: in function `pgp_process_public_key': crypto/asymmetric_keys/pgp_public_key.c:228: undefined reference to `pgp_parse_public_key' ld: crypto/asymmetric_keys/pgp_public_key.c:234: undefined reference to `pgp_to_public_key_algo' ld: crypto/asymmetric_keys/pgp_public_key.c:234: undefined reference to `pgp_to_public_key_algo' Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for PGP_KEY_PARSER Depends on [m]: CRYPTO [=y] && ASYMMETRIC_KEY_TYPE [=y] && ASYMMETRIC_PUBLIC_KEY_SUBTYPE [=m] Selected by [y]: - PGP_PRELOAD [=y] && CRYPTO [=y] && ASYMMETRIC_KEY_TYPE [=y] -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10 2421/2421] net/netfilter/nft_set_pipapo.o: warning: objtool: nft_pipapo_remove()+0x166b: unreachable instruction
by kernel test robot 20 Nov '24

20 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: bf0212daf6239e1b0e65e6dd7ee9fdec378c5dd4 commit: 6da9c2b3be7f43cb2dc8c55be00b80bcdc27dba1 [2421/2421] netfilter: nft_set_pipapo: do not free live element config: x86_64-rhel-8.3-kselftests (https://download.01.org/0day-ci/archive/20241120/202411201853.6hew7upQ-lkp@…) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241120/202411201853.6hew7upQ-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/202411201853.6hew7upQ-lkp@intel.com/ All warnings (new ones prefixed by >>): >> net/netfilter/nft_set_pipapo.o: warning: objtool: nft_pipapo_remove()+0x166b: unreachable instruction -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10 0/2] CVE-2024-46713
by Luo Gengkun 20 Nov '24

20 Nov '24

Luo Gengkun (1): perf: Fix kabi problem by put mutex in front of perf_buffer Peter Zijlstra (1): perf/aux: Fix AUX buffer serialization kernel/events/core.c | 21 +++++++++++++++------ kernel/events/internal.h | 5 +++++ kernel/events/ring_buffer.c | 30 ++++++++++++++++++++---------- 3 files changed, 40 insertions(+), 16 deletions(-) -- 2.34.1

2 3