- Kernel - mailweb.openeuler.org

[PATCH openEuler-23.09 v2 0/2] configs: open drivers' config
by Liu Chao 04 Sep '23

04 Sep '23

From: root <root(a)localhost.localdomain> openeuler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7VEEV CVE: NA -------------------------------- The number of drivers opened by openEuler is less than other distributions. In order to narrow the gap with other distributions and support more hardware devices, especially various PC hardware commonly used by developers and personal users, more hardware driver modules need to be enabled. Reference:https://gitee.com/openeuler/TC/blob/master/oEEP/oEEP-0006%20openE… Changes in v2: Enable more driver configurations, such as crypto, Intel platform, virtio, vdpa, and so on. Liu Chao (2): configs: aarch64: open drivers' config configs: x86_64: open drivers' config arch/arm64/configs/openeuler_defconfig | 4525 ++++++++++++++++++----- arch/x86/configs/openeuler_defconfig | 4617 ++++++++++++++++-------- 2 files changed, 6594 insertions(+), 2548 deletions(-) -- 2.33.0

2 3

[PATCH OLK-5.10] RDMA/irdma: Prevent zero-length STAG registration
by Liu Jian 04 Sep '23

04 Sep '23

mainline inclusion from mainline-v6.6-rc1 commit bb6d73d9add68ad270888db327514384dfa44958 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7YFVN CVE: CVE-2023-25775 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… --------------------------- Currently irdma allows zero-length STAGs to be programmed in HW during the kernel mode fast register flow. Zero-length MR or STAG registration disable HW memory length checks. Improve gaps in bounds checking in irdma by preventing zero-length STAG or MR registrations except if the IB_PD_UNSAFE_GLOBAL_RKEY is set. This addresses the disclosure CVE-2023-25775. Fixes: b48c24c2d710 ("RDMA/irdma: Implement device supported verb APIs") Signed-off-by: Christopher Bednarz <christopher.n.bednarz(a)intel.com> Signed-off-by: Shiraz Saleem <shiraz.saleem(a)intel.com> Link: https://lore.kernel.org/r/20230818144838.1758-1-shiraz.saleem@intel.com Signed-off-by: Leon Romanovsky <leon(a)kernel.org> Signed-off-by: Liu Jian <liujian56(a)huawei.com> Conflicts: drivers/infiniband/hw/i40iw/i40iw_ctrl.c drivers/infiniband/hw/i40iw/i40iw_type.h drivers/infiniband/hw/i40iw/i40iw_verbs.c drivers/infiniband/hw/irdma/ctrl.c drivers/infiniband/hw/irdma/type.h drivers/infiniband/hw/irdma/verbs.c --- drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 6 ++++++ drivers/infiniband/hw/i40iw/i40iw_type.h | 2 ++ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c index 86d3f8aff329..2b18bb36e4e3 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c +++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c @@ -3033,6 +3033,9 @@ static enum i40iw_status_code i40iw_sc_alloc_stag( u64 header; enum i40iw_page_size page_size; + if (!info->total_len && !info->all_memory) + return -EINVAL; + page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K; cqp = dev->cqp; wqe = i40iw_sc_cqp_get_next_send_wqe(cqp, scratch); @@ -3091,6 +3094,9 @@ static enum i40iw_status_code i40iw_sc_mr_reg_non_shared( u8 addr_type; enum i40iw_page_size page_size; + if (!info->total_len && !info->all_memory) + return -EINVAL; + page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K; if (info->access_rights & (I40IW_ACCESS_FLAGS_REMOTEREAD_ONLY | I40IW_ACCESS_FLAGS_REMOTEWRITE_ONLY)) diff --git a/drivers/infiniband/hw/i40iw/i40iw_type.h b/drivers/infiniband/hw/i40iw/i40iw_type.h index c3babf3cbb8e..341aa6b1b6c1 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_type.h +++ b/drivers/infiniband/hw/i40iw/i40iw_type.h @@ -786,6 +786,7 @@ struct i40iw_allocate_stag_info { bool use_hmc_fcn_index; u8 hmc_fcn_index; bool use_pf_rid; + bool all_memory; }; struct i40iw_reg_ns_stag_info { @@ -804,6 +805,7 @@ struct i40iw_reg_ns_stag_info { bool use_hmc_fcn_index; u8 hmc_fcn_index; bool use_pf_rid; + bool all_memory; }; struct i40iw_fast_reg_stag_info { diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c index 533f3caecb7a..89654dc91d81 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c @@ -1494,7 +1494,8 @@ static int i40iw_handle_q_mem(struct i40iw_device *iwdev, static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr) { struct i40iw_allocate_stag_info *info; - struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd); + struct ib_pd *pd = iwmr->ibmr.pd; + struct i40iw_pd *iwpd = to_iwpd(pd); enum i40iw_status_code status; int err = 0; struct i40iw_cqp_request *cqp_request; @@ -1511,6 +1512,7 @@ static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr info->stag_idx = iwmr->stag >> I40IW_CQPSQ_STAG_IDX_SHIFT; info->pd_id = iwpd->sc_pd.pd_id; info->total_len = iwmr->length; + info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY; info->remote_access = true; cqp_info->cqp_cmd = OP_ALLOC_STAG; cqp_info->post_sq = 1; @@ -1563,6 +1565,8 @@ static struct ib_mr *i40iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, iwmr->type = IW_MEMREG_TYPE_MEM; palloc = &iwpbl->pble_alloc; iwmr->page_cnt = max_num_sg; + /* Use system PAGE_SIZE as the sg page sizes are unknown at this point */ + iwmr->length = max_num_sg * PAGE_SIZE; mutex_lock(&iwdev->pbl_mutex); status = i40iw_get_pble(&iwdev->sc_dev, iwdev->pble_rsrc, palloc, iwmr->page_cnt); mutex_unlock(&iwdev->pbl_mutex); @@ -1659,7 +1663,8 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, { struct i40iw_pbl *iwpbl = &iwmr->iwpbl; struct i40iw_reg_ns_stag_info *stag_info; - struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd); + struct ib_pd *pd = iwmr->ibmr.pd; + struct i40iw_pd *iwpd = to_iwpd(pd); struct i40iw_pble_alloc *palloc = &iwpbl->pble_alloc; enum i40iw_status_code status; int err = 0; @@ -1679,6 +1684,7 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, stag_info->total_len = iwmr->length; stag_info->access_rights = access; stag_info->pd_id = iwpd->sc_pd.pd_id; + stag_info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY; stag_info->addr_type = I40IW_ADDR_TYPE_VA_BASED; stag_info->page_size = iwmr->page_size; -- 2.34.1

2 1

[PATCH openEuler-23.09 v2 0/2] configs: open drivers' config
by Liu Chao 04 Sep '23

04 Sep '23

From: root <root(a)localhost.localdomain> openeuler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7VEEV CVE: NA -------------------------------- Changes in v2: Enable more driver configurations, such as crypto, Intel platform, virtio, vdpa, and so on. Liu Chao (2): configs: aarch64: open drivers' config configs: open drivers' config arch/arm64/configs/openeuler_defconfig | 4525 ++++++++++++++++++----- arch/x86/configs/openeuler_defconfig | 4617 ++++++++++++++++-------- 2 files changed, 6594 insertions(+), 2548 deletions(-) -- 2.33.0

2 3

[PATCH openEuler-23.09 0/2] configs: open drivers' config
by Liu Chao 04 Sep '23

04 Sep '23

The number of drivers opened by openEuler is less than other distributions. In order to narrow the gap with other distributions and support more hardware devices, especially various PC hardware commonly used by developers and personal users, more hardware driver modules need to be enabled. Reference:https://gitee.com/openeuler/TC/blob/master/oEEP/oEEP-0006%20openE… Liu Chao (2): configs: aarch64: open drivers' config configs: x86_64: open drivers' config arch/arm64/configs/openeuler_defconfig | 3107 +++++++++++++++++++----- arch/x86/configs/openeuler_defconfig | 2694 ++++++++++++-------- 2 files changed, 4142 insertions(+), 1659 deletions(-) -- 2.33.0

1 3

[PATCH OLK-5.10] sched/smt: fix unbalance sched_smt_present dec/inc
by Yu Liao 04 Sep '23

04 Sep '23

From: Yang Yingliang <yangyingliang(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7YBSW CVE: NA -------------------------------- If cpuset_cpu_inactive() fails in sched_cpu_deactivate(), the cpu offline failed, but sched_smt_present is decreased before calling sched_cpu_deactivate, it leads unbalance dec/inc, so fix it by increasing sched_smt_present in the error path. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Yu Liao <liaoyu15(a)huawei.com> --- kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 920a5af0e346..669a62d16ba6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8060,6 +8060,10 @@ int sched_cpu_deactivate(unsigned int cpu) ret = cpuset_cpu_inactive(cpu); if (ret) { +#ifdef CONFIG_SCHED_SMT + if (cpumask_weight(cpu_smt_mask(cpu)) == 2) + static_branch_inc_cpuslocked(&sched_smt_present); +#endif set_cpu_active(cpu, true); return ret; } -- 2.25.1

2 4

[PATCH openEuler-23.09 0/9] add kabi macros helpers
by Yu Liao 04 Sep '23

04 Sep '23

Add kabi macros helpers. Li Lingfeng (1): kabi: deduplication friendly structs Wei Li (2): kabi: fix build error when CONFIG_KABI_RESERVE=n kabi: cleanup config entries of kabi Xie XiuQi (3): kabi: add kabi helper macros kabi: add KABI_SIZE_ALIGN_CHECKS for more stringent kabi checks kabi: enables more stringent kabi checks Zheng Zengkai (3): KABI: Add CONFIG_KABI_RESERVE to control KABI padding reserve openeuler_defconfig: Enable CONFIG_KABI_RESERVE for x86 and arm64 kabi: Generalize naming of kabi helper macros arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/kabi.h | 509 +++++++++++++++++++++++++ init/Kconfig | 16 + 4 files changed, 529 insertions(+) create mode 100644 include/linux/kabi.h -- 2.33.0

2 10

[PATCH openEuler-23.09 0/8] support Android vendor hooks
by Yu Liao 04 Sep '23

04 Sep '23

support android vendor hooks for openEuler-23.09 Jialin Zhang (2): vendor_hooks: make android vendor hooks feature generic. openeuler_defconfig: enable CONFIG_VENDOR_HOOKS for x86 and arm64 Nick Desaulniers (1): ANDROID: vendor_hooks: fix __section macro Todd Kjos (5): ANDROID: add support for vendor hooks ANDROID: fix redefinition error for restricted vendor hooks ANDROID: use static_call() for restricted hooks ANDROID: simplify vendor hooks for non-GKI builds ANDROID: fixup restricted hooks after tracepont refactoring arch/arm64/configs/openeuler_defconfig | 6 ++ arch/x86/configs/openeuler_defconfig | 6 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/hooks/Kconfig | 13 +++ drivers/hooks/Makefile | 4 + drivers/hooks/vendor_hooks.c | 16 ++++ include/trace/hooks/vendor_hooks.h | 119 +++++++++++++++++++++++++ 8 files changed, 167 insertions(+) create mode 100644 drivers/hooks/Kconfig create mode 100644 drivers/hooks/Makefile create mode 100644 drivers/hooks/vendor_hooks.c create mode 100644 include/trace/hooks/vendor_hooks.h -- 2.33.0

2 9

[PATCH openEuler-23.09 0/8] support Android vendor hooks
by Yu Liao 04 Sep '23

04 Sep '23

support android vendor hooks for openEuler-23.09 Jialin Zhang (2): vendor_hooks: make android vendor hooks feature generic. openeuler_defconfig: enable CONFIG_VENDOR_HOOKS for x86 and arm64 Nick Desaulniers (1): ANDROID: vendor_hooks: fix __section macro Todd Kjos (5): ANDROID: add support for vendor hooks ANDROID: fix redefinition error for restricted vendor hooks ANDROID: use static_call() for restricted hooks ANDROID: simplify vendor hooks for non-GKI builds ANDROID: fixup restricted hooks after tracepont refactoring arch/arm64/configs/openeuler_defconfig | 6 ++ arch/x86/configs/openeuler_defconfig | 6 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/hooks/Kconfig | 13 +++ drivers/hooks/Makefile | 4 + drivers/hooks/vendor_hooks.c | 16 ++++ include/trace/hooks/vendor_hooks.h | 119 +++++++++++++++++++++++++ 8 files changed, 167 insertions(+) create mode 100644 drivers/hooks/Kconfig create mode 100644 drivers/hooks/Makefile create mode 100644 drivers/hooks/vendor_hooks.c create mode 100644 include/trace/hooks/vendor_hooks.h -- 2.33.0

1 8

[PATCH openEuler-23.09 0/1] Fix wrong initialization of rpg_kmsg_cbftns
by Chen Jun 04 Sep '23

04 Sep '23

*** BLURB HERE *** Chen Jun (1): remote_pager: Fix wrong initialization of rpg_kmsg_cbftns drivers/remote_pager/main.c | 4 ++-- drivers/remote_pager/msg_handler_comm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1

2 2

[PATCH openEuler-23.09 1/1] remote_pager: Fix wrong initialization of rpg_kmsg_cbftns
by Chen Jun 04 Sep '23

04 Sep '23

euleros inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7WLVX --------------------------------------------- The handlers for GMEM_PAGE_FAULT_REQUEST and GMEM_EVICT_PAGE_REQUEST are not set if CONFIG_REMOTE_PAGER_MASTER=m Signed-off-by: Chen Jun <chenjun102(a)huawei.com> --- drivers/remote_pager/main.c | 4 ++-- drivers/remote_pager/msg_handler_comm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/remote_pager/main.c b/drivers/remote_pager/main.c index 66f303ce61c9..b7c8d8440bfa 100644 --- a/drivers/remote_pager/main.c +++ b/drivers/remote_pager/main.c @@ -10,7 +10,7 @@ #include "msg_chan/msg_layer/msg_layer.h" #include "msg_handler.h" -#ifdef CONFIG_REMOTE_PAGER_SLAVE +#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE) #include "swap/device/swap_manager.h" #endif @@ -18,7 +18,7 @@ static int __init remote_pager_init(void) { msg_handle_init(); -#ifdef CONFIG_REMOTE_PAGER_SLAVE +#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE) init_swap_manager("list_lru"); #endif return 0; diff --git a/drivers/remote_pager/msg_handler_comm.c b/drivers/remote_pager/msg_handler_comm.c index 129a4247305f..f195ad15e646 100644 --- a/drivers/remote_pager/msg_handler_comm.c +++ b/drivers/remote_pager/msg_handler_comm.c @@ -17,7 +17,7 @@ static struct workqueue_struct *remote_pager_wq; struct msg_handler_st rpg_kmsg_cbftns[GMEM_MSG_MAX_ID] = { -#ifdef CONFIG_REMOTE_PAGER_SLAVE +#if IS_ENABLED(CONFIG_REMOTE_PAGER_SLAVE) /* HOST TO REMOTE */ [GMEM_TASK_PAIRING_REQUEST] = { gmem_handle_task_pairing @@ -42,7 +42,7 @@ struct msg_handler_st rpg_kmsg_cbftns[GMEM_MSG_MAX_ID] = { }, #endif -#ifdef CONFIG_REMOTE_PAGER_MASTER +#if IS_ENABLED(CONFIG_REMOTE_PAGER_MASTER) /* REMOTE TO HOST */ [GMEM_PAGE_FAULT_REQUEST] = { gmem_handle_dev_fault -- 2.17.1

2 1