- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] fs/dcache: kabi: KABI reservation for dentry
by Baokun Li 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I91CF6 ---------------------------------------------------------------------- structure size reserves reserved dentry 200 2 216 dentry_operations 104 3 128 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- include/linux/dcache.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 1c5b08d804ce..0b9a7e1e8110 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -114,6 +114,9 @@ struct dentry { } d_u; /* negative dentry under this dentry, if it's dir */ atomic_t d_neg_dnum; + + KABI_RESERVE(1) + KABI_RESERVE(2) } __randomize_layout; /* @@ -143,6 +146,10 @@ struct dentry_operations { struct vfsmount *(*d_automount)(struct path *); int (*d_manage)(const struct path *, bool); struct dentry *(*d_real)(struct dentry *, const struct inode *); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) } ____cacheline_aligned; /* -- 2.31.1

2 1

[PATCH OLK-6.6 v3] jbd2: kabi: KABI reservation for jbd2
by Baokun Li 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918VT ---------------------------------------------------------------------- structure size reserves reserved jbd2_inode 64 2 80 jbd2_journal_handle 56 1 64 transaction_chp_stats_s 24 2 40 transaction_s 208 4(+2) 256 journal_s 1488 6 1536 jbd2_buffer_trigger_type 16 2 32 journal_head 112 2 128 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- V1->V2: Add KABI reservation for jbd2_inode/jbd2_journal_handle/journal_s/jbd2_buffer_trigger_type V2->V3: Add KABI reservation for journal_head include/linux/jbd2.h | 23 +++++++++++++++++++++++ include/linux/journal-head.h | 3 +++ 2 files changed, 26 insertions(+) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 52772c826c86..ec93843fb602 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -443,6 +443,9 @@ struct jbd2_inode { * ends. [j_list_lock] */ loff_t i_dirty_end; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct jbd2_revoke_table_s; @@ -501,6 +504,8 @@ struct jbd2_journal_handle unsigned int h_requested_credits; unsigned int saved_alloc_context; + + KABI_RESERVE(1) }; @@ -512,6 +517,9 @@ struct transaction_chp_stats_s { __u32 cs_forced_to_close; __u32 cs_written; __u32 cs_dropped; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* The transaction_t type is the guts of the journaling mechanism. It @@ -706,6 +714,11 @@ struct transaction_s * structures associated with the transaction */ struct list_head t_private_list; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; struct transaction_run_stats_s { @@ -1291,6 +1304,13 @@ struct journal_s * VFS bmap function. */ int (*j_bmap)(struct journal_s *journal, sector_t *block); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; #define jbd2_might_wait_for_commit(j) \ @@ -1464,6 +1484,9 @@ struct jbd2_buffer_trigger_type { */ void (*t_abort)(struct jbd2_buffer_trigger_type *type, struct buffer_head *bh); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern void jbd2_buffer_frozen_trigger(struct journal_head *jh, diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h index 75bc56109031..9e78c4d5edf9 100644 --- a/include/linux/journal-head.h +++ b/include/linux/journal-head.h @@ -109,6 +109,9 @@ struct journal_head { /* Trigger type for the committing transaction's frozen data */ struct jbd2_buffer_trigger_type *b_frozen_triggers; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif /* JOURNAL_HEAD_H_INCLUDED */ -- 2.31.1

2 1

[PATCH OLK-6.6 v3] block: kabi: KABI reservation for blk-cgroup
by Li Nan 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I9110C ---------------------------------------------------------------------- Reserve KABI for file blk-cgroup.h. Signed-off-by: Li Nan <linan122(a)huawei.com> --- v3: fix typo error of 'BLKG_IOSTAT_KABI_RESERVE' block/blk-cgroup.h | 30 ++++++++++++++++++++++++++++++ include/linux/blkdev.h | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index a2eb8be26f45..4485410faec2 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -33,6 +33,7 @@ enum blkg_iostat_type { BLKG_IOSTAT_READ, BLKG_IOSTAT_WRITE, BLKG_IOSTAT_DISCARD, + BLKG_IOSTAT_KABI_RESERVE, BLKG_IOSTAT_NR, }; @@ -49,6 +50,12 @@ struct blkg_iostat_set { int lqueued; /* queued in llist */ struct blkg_iostat cur; struct blkg_iostat last; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) }; /* association between a blk cgroup and a request queue */ @@ -88,6 +95,12 @@ struct blkcg_gq { int last_use; struct rcu_head rcu_head; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) }; struct blkcg { @@ -117,6 +130,12 @@ struct blkcg { #ifdef CONFIG_CGROUP_V1_WRITEBACK struct list_head memcg_list; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) }; static inline struct blkcg *css_to_blkcg(struct cgroup_subsys_state *css) @@ -140,6 +159,9 @@ struct blkg_policy_data { struct blkcg_gq *blkg; int plid; bool online; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -153,6 +175,9 @@ struct blkcg_policy_data { /* the blkcg and policy id this per-policy data belongs to */ struct blkcg *blkcg; int plid; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; typedef struct blkcg_policy_data *(blkcg_pol_alloc_cpd_fn)(gfp_t gfp); @@ -186,6 +211,11 @@ struct blkcg_policy { blkcg_pol_free_pd_fn *pd_free_fn; blkcg_pol_reset_pd_stats_fn *pd_reset_stats_fn; blkcg_pol_stat_pd_fn *pd_stat_fn; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; extern struct blkcg blkcg_root; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d8a0ee46ba37..7478cf6c6d63 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -48,7 +48,7 @@ extern struct class block_class; * Maximum number of blkcg policies allowed to be registered concurrently. * Defined here to simplify include dependency. */ -#define BLKCG_MAX_POLS 6 +#define BLKCG_MAX_POLS 10 #define DISK_MAX_PARTS 256 #define DISK_NAME_LEN 32 -- 2.39.2

2 1

[PATCH openEuler-1.0-LTS v2] fs:/dcache.c: fix negative dentry flag warning in dentry_free
by Long Li 06 Feb '24

06 Feb '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8WPQW CVE: NA -------------------------------- While run xfstests generic/429 on ext4, we get following report: WARNING: CPU: 4 PID: 5749 at fs/dcache.c:349 dentry_free.cold+0x20/0x76 CPU: 4 PID: 5749 Comm: t_encrypted_d_r Not tainted 4.19.90-00004-g0ec2c5ee4e0 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 RIP: 0010:dentry_free.cold+0x20/0x76 RSP: 0018:ffffbc0944a5bdf0 EFLAGS: 00010202 RAX: 0000000000000024 RBX: ffff955f06e74f30 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff955f3bb168f8 RDI: ffff955f3bb168f8 RBP: ffff955f06e4c6c0 R08: ffff955f3bb168f8 R09: 0000000000000005 R10: 0000000000000c27 R11: ffffffffb57d3bad R12: ffff955f06e4c718 R13: ffff955f06e4c718 R14: ffff955f06e74f30 R15: 0000000000000000 FS: 00007f4ba0307b40(0000) GS:ffff955f3bb00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f4b9bcd1ff8 CR3: 0000000123666000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __dentry_kill+0x219/0x340 shrink_dentry_list+0xee/0x3e0 shrink_dcache_parent+0x8c/0xc0 vfs_rmdir+0x142/0x230 do_rmdir+0x1c2/0x250 __x64_sys_rmdir+0x1b/0x30 do_syscall_64+0xcb/0x370 entry_SYSCALL_64_after_hwframe+0x5c/0xc1 Look at generic/429 test case, removing the directory and accessing the file that do not exist in the directory is done concurrently here. Consider the following concurrent call flow, which triggers the warning of negative dentry flag in dentry_free(). The root cause of the problem is that lack of lock protection when determining whether the dentry needs to make a fast put, it causes that the DCACHE_NEGATIVE_ACCOUNT flag to be set incorrectly. rmdir stat file ------------------------- ------------------------- fast_dput if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry)) shrink_dentry_list spin_lock(&dentry->d_lock) d_shrink_del(dentry) <clear DCACHE_LRU_LIST> __dentry_kill(dentry) dentry_unlist(dentry, parent) dentry->d_flags &= ~DCACHE_NEGATIVE_ACCOUNT <clear DCACHE_NEGATIVE_ACCOUNT> spin_unlock(&dentry->d_lock) spin_lock(&dentry->d_lock) limit_negative_dentry(dentry) <set DCACHE_NEGATIVE_ACCOUNT> spin_unlock(&dentry->d_lock) dentry_free(dentry) WARN_ON(dentry->d_flags & DCACHE_NEGATIVE_ACCOUNT) Fix the problem by checking the dentry is dead before set neagtive flag. Fixes: 0f4e7166bfab ("fs:/dcache.c: fix negative dentry limit not complete problem") Signed-off-by: Long Li <leo.lilong(a)huawei.com> --- fs/dcache.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/dcache.c b/fs/dcache.c index 2a7eaac0c3ef..926df08eeb0c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -643,6 +643,10 @@ static inline bool limit_negative_dentry(struct dentry *dentry) { struct dentry *parent; + /* The dentry is now unrecoverably dead, shuoldn't limit */ + if (unlikely(dentry->d_lockref.count < 0)) + return false; + parent = dentry->d_parent; if (unlikely(!parent)) return false; -- 2.31.1

2 1

[PATCH OLK-6.6 v2] jbd2: kabi: KABI reservation for jbd2
by Baokun Li 06 Feb '24

06 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I918VT ---------------------------------------------------------------------- structure size reserves reserved jbd2_inode 64 2 80 jbd2_journal_handle 56 1 64 transaction_chp_stats_s 24 2 40 transaction_s 208 4(+2) 256 journal_s 1488 6 1536 jbd2_buffer_trigger_type 16 2 32 Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- V1->V2: Add KABI reservation for jbd2_inode/jbd2_journal_handle/journal_s/jbd2_buffer_trigger_type include/linux/jbd2.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 52772c826c86..ec93843fb602 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -443,6 +443,9 @@ struct jbd2_inode { * ends. [j_list_lock] */ loff_t i_dirty_end; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct jbd2_revoke_table_s; @@ -501,6 +504,8 @@ struct jbd2_journal_handle unsigned int h_requested_credits; unsigned int saved_alloc_context; + + KABI_RESERVE(1) }; @@ -512,6 +517,9 @@ struct transaction_chp_stats_s { __u32 cs_forced_to_close; __u32 cs_written; __u32 cs_dropped; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* The transaction_t type is the guts of the journaling mechanism. It @@ -706,6 +714,11 @@ struct transaction_s * structures associated with the transaction */ struct list_head t_private_list; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; struct transaction_run_stats_s { @@ -1291,6 +1304,13 @@ struct journal_s * VFS bmap function. */ int (*j_bmap)(struct journal_s *journal, sector_t *block); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; #define jbd2_might_wait_for_commit(j) \ @@ -1464,6 +1484,9 @@ struct jbd2_buffer_trigger_type { */ void (*t_abort)(struct jbd2_buffer_trigger_type *type, struct buffer_head *bh); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern void jbd2_buffer_frozen_trigger(struct journal_head *jh, -- 2.31.1

2 1

[PATCH V4 OLK-6.6 00/13] Backport vDPA migration support patches
by Jiang Dongxu 06 Feb '24

06 Feb '24

From: jiangdongxu <jiangdongxu1(a)huawei.com> Backport vDPA migration support patches merged on branch OLK-5.10 V4: add CONFIG_VHOST_VDPA_MIGRATION to control vdpa migration code compile or not. V3: fix compile error of kernel-6.6 new vdpa driver pds_vdpa V2: fix compile error of kernel-6.6 new vdpa driver vduse and snet_vdpa jiangdongxu (13): vdpa: add log operations vhost-vdpa: add uAPI for logging vdpa: add device state operations vhost-vdpa: add uAPI for device buffer vdpa: add vdpa device migration status ops vhost-vdpa: add uAPI for device migration status vhost: add VHOST feature VHOST_BACKEND_F_BYTEMAPLOG vhost-vdpa: Allow transparent MSI IOV vhost-vdpa: fix msi irq request err vhost-vdpa: allow set feature VHOST_F_LOG_ALL when been negotiated. vhost-vdpa: add reset state params to indicate reset level vdpa: add vmstate header file vdpa: add CONFIG_VHOST_VDPA_MIGRATION drivers/vdpa/ifcvf/ifcvf_main.c | 2 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- drivers/vdpa/pds/vdpa_dev.c | 2 +- drivers/vdpa/solidrun/snet_main.c | 2 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +- drivers/vhost/Kconfig | 11 ++ drivers/vhost/vdpa.c | 238 ++++++++++++++++++++++++++--- drivers/virtio/virtio_vdpa.c | 2 +- include/linux/vdpa.h | 56 ++++++- include/linux/vdpa_vmstate.h | 182 ++++++++++++++++++++++ include/uapi/linux/vhost.h | 12 ++ include/uapi/linux/vhost_types.h | 19 +++ 14 files changed, 503 insertions(+), 31 deletions(-) create mode 100644 include/linux/vdpa_vmstate.h -- 2.27.0

2 14

[PATCH] libhns: Support hns direct verbs.
by Chengchang Tang 06 Feb '24

06 Feb '24

This patch add direct verbs API. Signed-off-by: Chengchang Tang <tangchengchang(a)huawei.com> --- debian/control | 2 +- debian/ibverbs-providers.install | 1 + debian/ibverbs-providers.lintian-overrides | 4 +- debian/ibverbs-providers.symbols | 10 ++ debian/libibverbs-dev.install | 4 + providers/hns/CMakeLists.txt | 9 +- providers/hns/hnsdv.h | 137 +++++++++++++++++++++ providers/hns/libhns.map | 13 ++ redhat/rdma-core.spec | 5 +- suse/rdma-core.spec | 20 +++ 10 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 providers/hns/hnsdv.h create mode 100644 providers/hns/libhns.map diff --git a/debian/control b/debian/control index 160824f..2a55372 100644 --- a/debian/control +++ b/debian/control @@ -87,7 +87,7 @@ Description: User space provider drivers for libibverbs - efa: Amazon Elastic Fabric Adapter - erdma: Alibaba Elastic RDMA (iWarp) Adapter - hfi1verbs: Intel Omni-Path HFI - - hns: HiSilicon Hip06 SoC + - hns: HiSilicon Hip08+ SoC - ipathverbs: QLogic InfiniPath HCAs - irdma: Intel Ethernet Connection RDMA - mana: Microsoft Azure Network Adapter diff --git a/debian/ibverbs-providers.install b/debian/ibverbs-providers.install index a003a30..6af92f5 100644 --- a/debian/ibverbs-providers.install +++ b/debian/ibverbs-providers.install @@ -2,5 +2,6 @@ etc/libibverbs.d/ usr/lib/*/libefa.so.* usr/lib/*/libibverbs/lib*-rdmav*.so usr/lib/*/libmana.so.* +usr/lib/*/libhns.so.* usr/lib/*/libmlx4.so.* usr/lib/*/libmlx5.so.* diff --git a/debian/ibverbs-providers.lintian-overrides b/debian/ibverbs-providers.lintian-overrides index 5815058..20e6557 100644 --- a/debian/ibverbs-providers.lintian-overrides +++ b/debian/ibverbs-providers.lintian-overrides @@ -1,2 +1,2 @@ -# libefa, libmana, libmlx4 and libmlx5 are ibverbs provider that provides more functions. -ibverbs-providers: package-name-doesnt-match-sonames libefa1 libmana1 libmlx4-1 libmlx5-1 +# libefa, libhns, libmlx4 and libmlx5 are ibverbs provider that provides more functions. +ibverbs-providers: package-name-doesnt-match-sonames libefa1 libhns-1 libmlx4-1 libmlx5-1 \ No newline at end of file diff --git a/debian/ibverbs-providers.symbols b/debian/ibverbs-providers.symbols index 72361bd..1527447 100644 --- a/debian/ibverbs-providers.symbols +++ b/debian/ibverbs-providers.symbols @@ -174,6 +174,16 @@ libefa.so.1 ibverbs-providers #MINVER# efadv_cq_from_ibv_cq_ex(a)EFA_1.2 43 efadv_create_cq(a)EFA_1.2 43 efadv_query_mr(a)EFA_1.3 50 +libhns.so.1 ibverbs-providers #MINVER# +* Build-Depends-Package: libibverbs-dev + HNS_1.0(a)HNS_1.0 51 + hnsdv_is_supported(a)HNS_1.0 51 + hnsdv_open_device(a)HNS_1.0 51 + hnsdv_create_qp(a)HNS_1.0 51 + hnsdv_query_device(a)HNS_1.0 51 + hnsdv_create_cq_ex(a)HNS_1.0 51 + hnsdv_update_sq_ci(a)HNS_1.0 51 + hnsdv_wr_write_notify(a)HNS_1.0 51 libmana.so.1 ibverbs-providers #MINVER# * Build-Depends-Package: libibverbs-dev MANA_1.0(a)MANA_1.0 41 diff --git a/debian/libibverbs-dev.install b/debian/libibverbs-dev.install index 5f2ffd5..ef5b9a4 100644 --- a/debian/libibverbs-dev.install +++ b/debian/libibverbs-dev.install @@ -1,5 +1,6 @@ usr/include/infiniband/arch.h usr/include/infiniband/efadv.h +usr/include/infiniband/hnsdv.h usr/include/infiniband/ib_user_ioctl_verbs.h usr/include/infiniband/manadv.h usr/include/infiniband/mlx4dv.h @@ -15,6 +16,8 @@ usr/include/infiniband/verbs_api.h usr/lib/*/lib*-rdmav*.a usr/lib/*/libefa.a usr/lib/*/libefa.so +usr/lib/*/libhns.a +usr/lib/*/libhns.so usr/lib/*/libibverbs*.so usr/lib/*/libibverbs.a usr/lib/*/libmana.a @@ -24,6 +27,7 @@ usr/lib/*/libmlx4.so usr/lib/*/libmlx5.a usr/lib/*/libmlx5.so usr/lib/*/pkgconfig/libefa.pc +usr/lib/*/pkgconfig/libhns.pc usr/lib/*/pkgconfig/libibverbs.pc usr/lib/*/pkgconfig/libmana.pc usr/lib/*/pkgconfig/libmlx4.pc diff --git a/providers/hns/CMakeLists.txt b/providers/hns/CMakeLists.txt index 7aaca75..0717b6e 100644 --- a/providers/hns/CMakeLists.txt +++ b/providers/hns/CMakeLists.txt @@ -1,7 +1,14 @@ -rdma_provider(hns +rdma_shared_provider(hns libhns.map + 1 1.0.${PACKAGE_VERSION} hns_roce_u.c hns_roce_u_buf.c hns_roce_u_db.c hns_roce_u_hw_v2.c hns_roce_u_verbs.c ) + +publish_headers(infiniband + hnsdv.h +) + +rdma_pkg_config("hns" "libibverbs" "${CMAKE_THREAD_LIBS_INIT}") \ No newline at end of file diff --git a/providers/hns/hnsdv.h b/providers/hns/hnsdv.h new file mode 100644 index 0000000..6df7b95 --- /dev/null +++ b/providers/hns/hnsdv.h @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ +/* + * Copyright (c) 2024 HiSilicon Limited. + */ + +#ifndef __HNSDV_H__ +#define __HNSDV_H__ + +#include <stdio.h> +#include <stdbool.h> + +#include <sys/types.h> + +#include <infiniband/verbs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +enum hnsdv_qp_create_flags { + HNSDV_QP_CREATE_ENABLE_DCA_MODE = 1 << 0, + HNSDV_QP_CREATE_ENABLE_UD_SL = 1 << 1, + HNSDV_QP_CREATE_ENABLE_STARS_MODE = 1 << 2, +}; + +enum hnsdv_context_comp_mask { + HNSDV_CONTEXT_MASK_DCA_PRIME_QPS = 1 << 0, + HNSDV_CONTEXT_MASK_DCA_UNIT_SIZE = 1 << 1, + HNSDV_CONTEXT_MASK_DCA_MAX_SIZE = 1 << 2, + HNSDV_CONTEXT_MASK_DCA_MIN_SIZE = 1 << 3, +}; +struct hnsdv_context_attr { + uint64_t flags; /* Use enum hnsdv_context_attr_flags */ + uint64_t comp_mask; /* Use enum hnsdv_context_comp_mask */ + uint32_t dca_prime_qps; + uint32_t dca_unit_size; + uint64_t dca_max_size; + uint64_t dca_min_size; +}; + +bool hnsdv_is_supported(struct ibv_device *device); +struct ibv_context *hnsdv_open_device(struct ibv_device *device, + struct hnsdv_context_attr *attr); + +enum hnsdv_qp_congest_ctrl_type { + HNSDV_QP_CREATE_ENABLE_DCQCN = 1 << 0, + HNSDV_QP_CREATE_ENABLE_LDCP = 1 << 1, + HNSDV_QP_CREATE_ENABLE_HC3 = 1 << 2, + HNSDV_QP_CREATE_ENABLE_DIP = 1 << 3, +}; + +enum hnsdv_qp_init_attr_mask { + HNSDV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS = 1 << 0, + HNSDV_QP_INIT_ATTR_MASK_QP_CONGEST_TYPE = 1 << 1, +}; + +struct hnsdv_qp_init_attr { + uint64_t comp_mask; /* Use enum hnsdv_qp_init_attr_mask */ + uint32_t create_flags; /* Use enum hnsdv_qp_create_flags */ + uint8_t congest_type; /* Use enum hnsdv_qp_congest_ctrl_type */ + uint8_t reserved[7]; +}; + +struct ibv_qp *hnsdv_create_qp(struct ibv_context *context, + struct ibv_qp_init_attr_ex *qp_attr, + struct hnsdv_qp_init_attr *hns_qp_attr); + +enum hnsdv_context_attr_flags { + HNSDV_CONTEXT_FLAGS_DCA = 1 << 0, +}; + +enum hnsdv_query_context_comp_mask { + HNSDV_CONTEXT_MASK_CONGEST_TYPE = 1 << 0, + HNSDV_CONTEXT_MASK_HW_ID = 1 << 1, +}; + +#define HNSDV_INVALID_HW_ID -1 +struct hnsdv_hw_id { + int32_t chip_id; + int32_t die_id; + int32_t func_id; + int32_t reserved; +}; + +struct hnsdv_context { + uint64_t comp_mask; /* use enum hnsdv_query_context_comp_mask */ + uint64_t flags; + uint8_t congest_type; /* Use enum hnsdv_qp_congest_ctrl_type */ + uint8_t rsv[7]; + struct hnsdv_hw_id hw_id; +}; + +int hnsdv_query_device(struct ibv_context *ctx_in, + struct hnsdv_context *attrs_out); + +enum hnsdv_cq_init_attr_mask { + HNSDV_CQ_INIT_ATTR_MASK_CREATE_FLAGS = 1 << 0, +}; + +enum hnsdv_cq_create_flags { + HNSDV_CQ_CREATE_ENABLE_POE_MODE = 1 << 0, + HNSDV_CQ_CREATE_ENABLE_NOTIFY = 1 << 1, +}; + +enum hnsdv_cq_notify_mode { + HNSDV_CQ_NOTIFY_MODE_64B_ALIGN = 0, + HNSDV_CQ_NOTIFY_MODE_4B_ALIGN = 1, + HNSDV_CQ_NOTIFY_MODE_DDR_64B_ALIGN = 2, + HNSDV_CQ_NOTIFY_MODE_DDR_4B_ALIGN = 3, + HNSDV_CQ_NOTIFY_MODE_GUARD = 4, /* Invalid for user */ +}; + +struct hnsdv_cq_init_attr { + uint64_t comp_mask; /* Use enum hnsdv_cq_init_attr_mask */ + uint64_t create_flags; /* Use enum hnsdv_cq_create_flags */ + uint8_t poe_channel; /* poe channel to use */ + uint8_t notify_mode; + uint16_t notify_idx; + uint32_t reserved; +}; + +struct ibv_cq_ex *hnsdv_create_cq_ex(struct ibv_context *context, + struct ibv_cq_init_attr_ex *cq_attr, + struct hnsdv_cq_init_attr *hns_cq_attr); + +/* used in stars mode */ +void hnsdv_update_sq_ci(struct ibv_qp *qp, uint32_t inc_idx); + +/* write with notify */ +void hnsdv_wr_write_notify(struct ibv_qp_ex *qpex, uint32_t rkey, + uint64_t remote_addr, uint32_t offset, uint8_t value); + +#ifdef __cplusplus +} +#endif + +#endif /* __HNSDV_H__ */ diff --git a/providers/hns/libhns.map b/providers/hns/libhns.map new file mode 100644 index 0000000..74d85e1 --- /dev/null +++ b/providers/hns/libhns.map @@ -0,0 +1,13 @@ +/* Export symbols should be added below according to + Documentation/versioning.md document. */ +HNS_1.0 { + global: + hnsdv_is_supported; + hnsdv_open_device; + hnsdv_create_qp; + hnsdv_query_device; + hnsdv_create_cq_ex; + hnsdv_update_sq_ci; + hnsdv_wr_write_notify; + local: *; +}; diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index c6ddcfd..c347195 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -158,6 +158,8 @@ Provides: liberdma = %{version}-%{release} Obsoletes: liberdma < %{version}-%{release} Provides: libhfi1 = %{version}-%{release} Obsoletes: libhfi1 < %{version}-%{release} +Provides: libhns = %{version}-%{release} +Obsoletes: libhns < %{version}-%{release} Provides: libipathverbs = %{version}-%{release} Obsoletes: libipathverbs < %{version}-%{release} Provides: libirdma = %{version}-%{release} @@ -188,7 +190,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libefa: Amazon Elastic Fabric Adapter - liberdma: Alibaba Elastic RDMA (iWarp) Adapter - libhfi1: Intel Omni-Path HFI -- libhns: HiSilicon Hip06 SoC +- libhns: HiSilicon Hip08+ SoC - libipathverbs: QLogic InfiniPath HCA - libirdma: Intel Ethernet Connection RDMA - libmana: Microsoft Azure Network Adapter @@ -575,6 +577,7 @@ fi %dir %{_sysconfdir}/libibverbs.d %dir %{_libdir}/libibverbs %{_libdir}/libefa.so.* +%{_libdir}/libhns.so.* %{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so %{_libdir}/libmana.so.* diff --git a/suse/rdma-core.spec b/suse/rdma-core.spec index d534dbc..647c82b 100644 --- a/suse/rdma-core.spec +++ b/suse/rdma-core.spec @@ -35,6 +35,7 @@ License: BSD-2-Clause OR GPL-2.0-only Group: Productivity/Networking/Other %define efa_so_major 1 +%define hns_so_major 1 %define verbs_so_major 1 %define rdmacm_so_major 1 %define umad_so_major 3 @@ -45,6 +46,7 @@ Group: Productivity/Networking/Other %define mad_major 5 %define efa_lname libefa%{efa_so_major} +%define hns_lname libhns%{hns_so_major} %define verbs_lname libibverbs%{verbs_so_major} %define rdmacm_lname librdmacm%{rdmacm_so_major} %define umad_lname libibumad%{umad_so_major} @@ -159,6 +161,7 @@ Requires: %{umad_lname} = %{version}-%{release} Requires: %{verbs_lname} = %{version}-%{release} %if 0%{?dma_coherent} Requires: %{efa_lname} = %{version}-%{release} +Requires: %{hns_lname} = %{version}-%{release} Requires: %{mana_lname} = %{version}-%{release} Requires: %{mlx4_lname} = %{version}-%{release} Requires: %{mlx5_lname} = %{version}-%{release} @@ -200,6 +203,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: libcxgb4-rdmav2 < %{version}-%{release} Obsoletes: libefa-rdmav2 < %{version}-%{release} Obsoletes: libhfi1verbs-rdmav2 < %{version}-%{release} +Obsoletes: libhns-rdmav2 < %{version}-%{release} Obsoletes: libipathverbs-rdmav2 < %{version}-%{release} Obsoletes: libmana-rdmav2 < %{version}-%{release} Obsoletes: libmlx4-rdmav2 < %{version}-%{release} @@ -209,6 +213,7 @@ Obsoletes: libocrdma-rdmav2 < %{version}-%{release} Obsoletes: librxe-rdmav2 < %{version}-%{release} %if 0%{?dma_coherent} Requires: %{efa_lname} = %{version}-%{release} +Requires: %{hns_lname} = %{version}-%{release} Requires: %{mana_lname} = %{version}-%{release} Requires: %{mlx4_lname} = %{version}-%{release} Requires: %{mlx5_lname} = %{version}-%{release} @@ -229,6 +234,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libefa: Amazon Elastic Fabric Adapter - libhfi1: Intel Omni-Path HFI - libhns: HiSilicon Hip06 SoC +- libhns: HiSilicon Hip08+ SoC - libipathverbs: QLogic InfiniPath HCA - libirdma: Intel Ethernet Connection RDMA - libmana: Microsoft Azure Network Adapter @@ -256,6 +262,13 @@ Group: System/Libraries %description -n %efa_lname This package contains the efa runtime library. +%package -n %hns_lname +Summary: HNS runtime library +Group: System/Libraries + +%description -n %hns_lname +This package contains the hns runtime library. + %package -n %mana_lname Summary: MANA runtime library Group: System/Libraries @@ -508,6 +521,9 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %post -n %efa_lname -p /sbin/ldconfig %postun -n %efa_lname -p /sbin/ldconfig +%post -n %hns_lname -p /sbin/ldconfig +%postun -n %hns_lname -p /sbin/ldconfig + %post -n %mana_lname -p /sbin/ldconfig %postun -n %mana_lname -p /sbin/ldconfig @@ -700,6 +716,10 @@ done %files -n %efa_lname %{_libdir}/libefa*.so.* +%files -n %hns_lname +%defattr(-,root,root) +%{_libdir}/libhns*.so.* + %files -n %mana_lname %{_libdir}/libmana*.so.* -- 2.30.0

1 0

[openeuler:OLK-5.10 22575/30000] mm/memcontrol.c:5402:26: error: implicit declaration of function 'ksm_process_profit'
by kernel test robot 06 Feb '24

06 Feb '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: afe6e074c110cd23d846380b34eb75227af9e24a commit: 0f6fb3570be40b783d8c756d64297be1a8e3d2b3 [22575/30000] memcg: support ksm merge any mode per cgroup config: x86_64-buildonly-randconfig-002-20240206 (https://download.01.org/0day-ci/archive/20240206/202402061338.z4QXS13G-lkp@…) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240206/202402061338.z4QXS13G-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/202402061338.z4QXS13G-lkp@intel.com/ All errors (new ones prefixed by >>): >> mm/memcontrol.c:5402:26: error: implicit declaration of function 'ksm_process_profit' [-Werror,-Wimplicit-function-declaration] 5402 | ksm_process_profits += ksm_process_profit(mm); | ^ 1 error generated. vim +/ksm_process_profit +5402 mm/memcontrol.c 5379 5380 static int memory_ksm_show(struct seq_file *m, void *v) 5381 { 5382 unsigned long ksm_merging_pages = 0; 5383 unsigned long ksm_rmap_items = 0; 5384 long ksm_process_profits = 0; 5385 unsigned int tasks = 0; 5386 struct task_struct *task; 5387 struct mm_struct *mm; 5388 struct css_task_iter it; 5389 struct mem_cgroup *memcg = mem_cgroup_from_seq(m); 5390 5391 css_task_iter_start(&memcg->css, CSS_TASK_ITER_PROCS, &it); 5392 while ((task = css_task_iter_next(&it))) { 5393 mm = get_task_mm(task); 5394 if (!mm) 5395 continue; 5396 5397 if (test_bit(MMF_VM_MERGE_ANY, &mm->flags)) 5398 tasks++; 5399 5400 ksm_rmap_items += mm->ksm_rmap_items; 5401 ksm_merging_pages += mm->ksm_merging_pages; > 5402 ksm_process_profits += ksm_process_profit(mm); 5403 mmput(mm); 5404 } 5405 css_task_iter_end(&it); 5406 5407 seq_printf(m, "merge any state: %d\n", READ_ONCE(memcg->ksm_merge_any)); 5408 seq_printf(m, "merge any tasks: %u\n", tasks); 5409 seq_printf(m, "ksm_rmap_items %lu\n", ksm_rmap_items); 5410 seq_printf(m, "ksm_merging_pages %lu\n", ksm_merging_pages); 5411 seq_printf(m, "ksm_process_profits %ld\n", ksm_process_profits); 5412 return 0; 5413 } 5414 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 16749/21616] drivers/cpuidle/.tmp_cpuidle-haltpoll.o: warning: objtool: missing symbol for section .exit.text
by kernel test robot 06 Feb '24

06 Feb '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 3a28772f4b29bdda924e9a5d2e3ff1ff1b23fd14 commit: 8104395ba98a81c8cb1ddd245482baca0d57d163 [16749/21616] add cpuidle-haltpoll driver config: x86_64-buildonly-randconfig-006-20240203 (https://download.01.org/0day-ci/archive/20240206/202402061323.krZA8tkb-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/20240206/202402061323.krZA8tkb-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/202402061323.krZA8tkb-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/cpuidle/.tmp_cpuidle-haltpoll.o: warning: objtool: missing symbol for section .exit.text -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 18194/21616] drivers/char/svm.c:249:20: sparse: sparse: symbol 'svm_find_mem_reg_node' was not declared. Should it be static?
by kernel test robot 06 Feb '24

06 Feb '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 3a28772f4b29bdda924e9a5d2e3ff1ff1b23fd14 commit: 9469d1759c2905dcef49df7e6240ad5c32b66296 [18194/21616] ascend: share_pool: enable svm to use share pool memory config: arm64-randconfig-r131-20240130 (https://download.01.org/0day-ci/archive/20240206/202402061249.86c5Hf3Q-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce: (https://download.01.org/0day-ci/archive/20240206/202402061249.86c5Hf3Q-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/202402061249.86c5Hf3Q-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) drivers/char/svm.c:240:24: sparse: sparse: symbol 'va2pa_trunk' was not declared. Should it be static? >> drivers/char/svm.c:249:20: sparse: sparse: symbol 'svm_find_mem_reg_node' was not declared. Should it be static? >> drivers/char/svm.c:320:14: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct svm_va2pa_slot *slot @@ got void [noderef] __iomem * @@ drivers/char/svm.c:320:14: sparse: expected struct svm_va2pa_slot *slot drivers/char/svm.c:320:14: sparse: got void [noderef] __iomem * drivers/char/svm.c:338:28: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected void volatile [noderef] __iomem *addr @@ got struct svm_va2pa_slot *[addressable] [assigned] [toplevel] slots @@ drivers/char/svm.c:338:28: sparse: expected void volatile [noderef] __iomem *addr drivers/char/svm.c:338:28: sparse: got struct svm_va2pa_slot *[addressable] [assigned] [toplevel] slots drivers/char/svm.c:419:6: sparse: sparse: symbol 'sysrq_sched_debug_show_export' was not declared. Should it be static? drivers/char/svm.c:1242:35: sparse: sparse: Using plain integer as NULL pointer drivers/char/svm.c:1502:5: sparse: sparse: symbol '__svm_get_mpam' was not declared. Should it be static? drivers/char/svm.c:249:21: warning: no previous prototype for 'svm_find_mem_reg_node' [-Wmissing-prototypes] 249 | struct device_node *svm_find_mem_reg_node(struct device *dev, const char *compat) | ^~~~~~~~~~~~~~~~~~~~~ drivers/char/svm.c:419:6: warning: no previous prototype for 'sysrq_sched_debug_show_export' [-Wmissing-prototypes] 419 | void sysrq_sched_debug_show_export(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/char/svm.c:1429:5: warning: no previous prototype for 'svm_get_pasid' [-Wmissing-prototypes] 1429 | int svm_get_pasid(pid_t vpid, int dev_id __maybe_unused) | ^~~~~~~~~~~~~ drivers/char/svm.c:1502:5: warning: no previous prototype for '__svm_get_mpam' [-Wmissing-prototypes] 1502 | int __svm_get_mpam(struct svm_mpam *mpam) | ^~~~~~~~~~~~~~ drivers/char/svm.c:2437:36: warning: 'svm_acpi_match' defined but not used [-Wunused-const-variable=] 2437 | static const struct acpi_device_id svm_acpi_match[] = { | ^~~~~~~~~~~~~~ In file included from arch/arm64/include/asm/atomic.h:34, from include/linux/atomic.h:7, from include/asm-generic/bitops/atomic.h:5, from arch/arm64/include/asm/bitops.h:37, from include/linux/bitops.h:19, from include/linux/kernel.h:11, from include/asm-generic/bug.h:18, from arch/arm64/include/asm/bug.h:37, from arch/arm64/include/asm/memory.h:27, from arch/arm64/include/asm/esr.h:21, from drivers/char/svm.c:10: In function '__cmpxchg_case_mb_4', inlined from '__cmpxchg_mb' at arch/arm64/include/asm/cmpxchg.h:143:1, inlined from 'svm_proc_load_flag' at drivers/char/svm.c:1967:12: arch/arm64/include/asm/atomic_lse.h:492:9: warning: array subscript 'long unsigned int[0]' is partly outside array bounds of 'atomic_t[1]' [-Warray-bounds=] 492 | asm volatile( 44- | ^~~ arch/arm64/include/asm/atomic_lse.h:523:1: note: in expansion of macro '__CMPXCHG_CASE' 523 | __CMPXCHG_CASE(w, , mb_4, al, "memory") | ^~~~~~~~~~~~~~ drivers/char/svm.c: In function 'svm_proc_load_flag': drivers/char/svm.c:1958:25: note: object 'l2buf_load_flag' of size 4 1958 | static atomic_t l2buf_load_flag = ATOMIC_INIT(0); | ^~~~~~~~~~~~~~~ In function '__cmpxchg_case_mb_4', inlined from '__cmpxchg_mb' at arch/arm64/include/asm/cmpxchg.h:143:1, inlined from 'svm_proc_load_flag' at drivers/char/svm.c:1967:12: arch/arm64/include/asm/atomic_lse.h:492:9: warning: array subscript 'long unsigned int[0]' is partly outside array bounds of 'atomic_t[1]' [-Warray-bounds=] 492 | asm volatile( 57- | ^~~ arch/arm64/include/asm/atomic_lse.h:523:1: note: in expansion of macro '__CMPXCHG_CASE' 523 | __CMPXCHG_CASE(w, , mb_4, al, "memory") | ^~~~~~~~~~~~~~ drivers/char/svm.c: In function 'svm_proc_load_flag': drivers/char/svm.c:1958:25: note: object 'l2buf_load_flag' of size 4 1958 | static atomic_t l2buf_load_flag = ATOMIC_INIT(0); | ^~~~~~~~~~~~~~~ vim +/svm_find_mem_reg_node +249 drivers/char/svm.c 248 > 249 struct device_node *svm_find_mem_reg_node(struct device *dev, const char *compat) 250 { 251 int index = 0; 252 struct device_node *tmp = NULL; 253 struct device_node *np = dev->of_node; 254 255 for (; ; index++) { 256 tmp = of_parse_phandle(np, "memory-region", index); 257 if (!tmp) 258 break; 259 260 if (of_device_is_compatible(tmp, compat)) 261 return tmp; 262 263 of_node_put(tmp); 264 } 265 266 return NULL; 267 } 268 269 static int svm_parse_trunk_memory(struct device *dev, phys_addr_t *base, unsigned long *size) 270 { 271 int err; 272 struct resource r; 273 struct device_node *trunk = NULL; 274 275 trunk = svm_find_mem_reg_node(dev, SVM_MEM_REG); 276 if (!trunk) { 277 dev_err(dev, "Didn't find reserved memory\n"); 278 return -EINVAL; 279 } 280 281 err = of_address_to_resource(trunk, 0, &r); 282 of_node_put(trunk); 283 if (err) { 284 dev_err(dev, "Couldn't address to resource for reserved memory\n"); 285 return -ENOMEM; 286 } 287 288 *base = r.start; 289 *size = resource_size(&r); 290 291 return 0; 292 } 293 294 static int svm_setup_trunk(struct device *dev, phys_addr_t base, unsigned long size) 295 { 296 int slot_total; 297 unsigned long *bitmap = NULL; 298 struct svm_va2pa_slot *slot = NULL; 299 300 if (!IS_ALIGNED(base, SVM_VA2PA_MEMORY_ALIGN)) { 301 dev_err(dev, "Didn't aligned to %u\n", SVM_VA2PA_MEMORY_ALIGN); 302 return -EINVAL; 303 } 304 305 if ((size == 0) || (size > SVM_VA2PA_TRUNK_SIZE_MAX)) { 306 dev_err(dev, "Size of reserved memory is not right\n"); 307 return -EINVAL; 308 } 309 310 slot_total = size / SVM_VA2PA_SLOT_SIZE; 311 if (slot_total < BITS_PER_LONG) 312 return -EINVAL; 313 314 bitmap = kvcalloc(slot_total / BITS_PER_LONG, sizeof(unsigned long), GFP_KERNEL); 315 if (!bitmap) { 316 dev_err(dev, "alloc memory failed\n"); 317 return -ENOMEM; 318 } 319 > 320 slot = ioremap(base, size); 321 if (!slot) { 322 kvfree(bitmap); 323 dev_err(dev, "Ioremap trunk failed\n"); 324 return -ENXIO; 325 } 326 327 va2pa_trunk.slots = slot; 328 va2pa_trunk.slot_used = 0; 329 va2pa_trunk.slot_total = slot_total; 330 va2pa_trunk.bitmap = bitmap; 331 mutex_init(&va2pa_trunk.mutex); 332 333 return 0; 334 } 335 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

2024

2023

2022

2021

2020

2019

Kernel