- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 v3 0/3] CVE-2024-27079
by Guo Mengqi 29 May '25

29 May '25

CVE-2024-27079 Guo Mengqi (1): iommu: Fix kabi breakage for release_domain in struct iommu_ops Lu Baolu (2): iommu: Add static iommu_ops->release_domain iommu/vt-d: Fix NULL domain on device release drivers/iommu/intel/iommu.c | 31 ++++-------------- drivers/iommu/intel/pasid.c | 64 +++++++++++++++++++++++++++++++++++++ drivers/iommu/intel/pasid.h | 1 + drivers/iommu/iommu.c | 19 ++++++++--- include/linux/iommu.h | 2 +- 5 files changed, 87 insertions(+), 30 deletions(-) -- 2.22.0

2 4

[openeuler:OLK-6.6 2331/2331] arch/arm64/kvm/hisilicon/hisi_virt.h:116:13: warning: 'hisi_ipiv_enable_per_vm' defined but not used
by kernel test robot 29 May '25

29 May '25

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 66b0cef2a959be1562a528e3d8cc260dc3803e61 commit: cd77c03a1ee1bcae1ffbde74afcc32a0a1bb0273 [2331/2331] KVM: arm64: Implement PV_SGI related calls config: arm64-defconfig (https://download.01.org/0day-ci/archive/20250529/202505291449.qcY77e1i-lkp@…) compiler: aarch64-linux-gcc (GCC) 15.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250529/202505291449.qcY77e1i-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/202505291449.qcY77e1i-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from arch/arm64/kvm/arm.c:53: >> arch/arm64/kvm/hisilicon/hisi_virt.h:116:13: warning: 'hisi_ipiv_enable_per_vm' defined but not used [-Wunused-function] 116 | static void hisi_ipiv_enable_per_vm(struct kvm_vcpu *vcpu) {} | ^~~~~~~~~~~~~~~~~~~~~~~ >> arch/arm64/kvm/hisilicon/hisi_virt.h:112:13: warning: 'hisi_ipiv_supported_per_vm' defined but not used [-Wunused-function] 112 | static bool hisi_ipiv_supported_per_vm(struct kvm_vcpu *vcpu) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ vim +/hisi_ipiv_enable_per_vm +116 arch/arm64/kvm/hisilicon/hisi_virt.h 89 90 int kvm_sched_affinity_vcpu_init(struct kvm_vcpu *vcpu); 91 void kvm_sched_affinity_vcpu_destroy(struct kvm_vcpu *vcpu); 92 int kvm_sched_affinity_vm_init(struct kvm *kvm); 93 void kvm_sched_affinity_vm_destroy(struct kvm *kvm); 94 void kvm_tlbi_dvmbm_vcpu_load(struct kvm_vcpu *vcpu); 95 void kvm_tlbi_dvmbm_vcpu_put(struct kvm_vcpu *vcpu); 96 void kvm_hisi_reload_lsudvmbm(struct kvm *kvm); 97 #else 98 static inline void probe_hisi_cpu_type(void) {} 99 static inline bool hisi_ncsnp_supported(void) 100 { 101 return false; 102 } 103 static inline bool hisi_dvmbm_supported(void) 104 { 105 return false; 106 } 107 #ifdef CONFIG_ARM64_HISI_IPIV 108 static inline bool hisi_ipiv_supported(void) 109 { 110 return false; 111 } > 112 static bool hisi_ipiv_supported_per_vm(struct kvm_vcpu *vcpu) 113 { 114 return false; 115 } > 116 static void hisi_ipiv_enable_per_vm(struct kvm_vcpu *vcpu) {} 117 static inline void ipiv_gicd_init(void) {} 118 #endif /* CONFIG_ARM64_HISI_IPIV */ 119 static inline void kvm_get_pg_cfg(void) {} 120 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 2331/2331] kismet: WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS when selected by FAST_SYSCALL
by kernel test robot 29 May '25

29 May '25

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 66b0cef2a959be1562a528e3d8cc260dc3803e61 commit: c294b5b18fc820cc006dd69fadefe24d4c321412 [2331/2331] arm64/Kconfig: Add turbo features submenuconfig config: arm64-kismet-CONFIG_DEBUG_FEATURE_BYPASS-CONFIG_FAST_SYSCALL-0-0 (https://download.01.org/0day-ci/archive/20250529/202505291329.BZ34eEzz-lkp@…) reproduce: (https://download.01.org/0day-ci/archive/20250529/202505291329.BZ34eEzz-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/202505291329.BZ34eEzz-lkp@intel.com/ kismet warnings: (new ones prefixed by >>) >> kismet: WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS when selected by FAST_SYSCALL WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS Depends on [n]: (FAST_SYSCALL [=y] || FAST_IRQ [=n]) && !LOCKDEP [=y] Selected by [y]: - FAST_SYSCALL [=y] WARNING: unmet direct dependencies detected for HALTPOLL_CPUIDLE Depends on [n]: CPU_IDLE [=n] && ARCH_CPUIDLE_HALTPOLL [=y] && ARCH_HAS_OPTIMIZED_POLL [=y] Selected by [y]: - ARM64 [=y] WARNING: unmet direct dependencies detected for RESCTRL_FS Depends on [n]: MISC_FILESYSTEMS [=n] && ARCH_HAS_CPU_RESCTRL [=y] Selected by [y]: - ARM64_MPAM [=y] -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 v2] arm64: entry: Fix ACTLR_XCALL_XINT not set build problem
by Jinjie Ruan 29 May '25

29 May '25

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/IBV2E4 -------------------------------- When ACTLR_XCALL_XINT not set, the "el0t_64_xcall" and "el0t_64_xint" will not be defind, the following build problem occurs. Use config isolation to fix it. aarch64-linux-gnu-ld: arch/arm64/kernel/entry.o: in function `vectors_xcall_xint': ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:597: undefined reference to `el0t_64_xint' Fixes: 7f2e02718bba ("arm64: entry: Support hardware xcall and xint") Signed-off-by: Jinjie Ruan <ruanjinjie(a)huawei.com> --- arch/arm64/include/asm/vectors.h | 2 ++ arch/arm64/kernel/entry.S | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h index 0addb4bd2b3d..9ecf45b67091 100644 --- a/arch/arm64/include/asm/vectors.h +++ b/arch/arm64/include/asm/vectors.h @@ -11,7 +11,9 @@ #include <asm/fixmap.h> extern char vectors[]; +#ifdef CONFIG_ACTLR_XCALL_XINT extern char vectors_xcall_xint[]; +#endif extern char tramp_vectors[]; extern char __bp_harden_el1_vectors[]; diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 801a521613ad..bd43e39d35c0 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -48,6 +48,7 @@ mrs x30, tpidrro_el0 msr tpidrro_el0, xzr .else +#ifdef CONFIG_ACTLR_XCALL_XINT alternative_if ARM64_HAS_HW_XCALL_XINT mrs x30, tpidrro_el0 msr tpidrro_el0, xzr @@ -55,6 +56,9 @@ mov x30, xzr nop alternative_endif +#else + mov x30, xzr +#endif .endif .Lskip_tramp_vectors_cleanup\@: .endif @@ -576,6 +580,7 @@ SYM_CODE_START(vectors) kernel_ventry 0, t, 32, error // Error 32-bit EL0 SYM_CODE_END(vectors) +#ifdef CONFIG_ACTLR_XCALL_XINT .align 11 SYM_CODE_START(vectors_xcall_xint) kernel_ventry 1, t, 64, sync // Synchronous EL1t @@ -598,6 +603,7 @@ SYM_CODE_START(vectors_xcall_xint) kernel_ventry 0, t, 32, fiq // FIQ 32-bit EL0 kernel_ventry 0, t, 32, error // Error 32-bit EL0 SYM_CODE_END(vectors_xcall_xint) +#endif #ifdef CONFIG_VMAP_STACK SYM_CODE_START_LOCAL(__bad_stack) @@ -882,11 +888,13 @@ alternative_else_nop_endif msr tpidrro_el0, x30 // Restored in kernel_ventry .endif +#ifdef CONFIG_ACTLR_XCALL_XINT .if \regsize == 32 alternative_if ARM64_HAS_HW_XCALL_XINT msr tpidrro_el0, x30 // Restored in kernel_ventry alternative_else_nop_endif .endif +#endif .if \bhb == BHB_MITIGATION_LOOP /* @@ -912,12 +920,16 @@ alternative_else_nop_endif 2: tramp_map_kernel x30 alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 +#ifdef CONFIG_ACTLR_XCALL_XINT alternative_if_not ARM64_HAS_HW_XCALL_XINT tramp_data_read_var x30, vectors b 3f alternative_else_nop_endif tramp_data_read_var x30, vectors_xcall_xint 3: +#else + tramp_data_read_var x30, vectors +#endif alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM prfm plil1strm, [x30, #(1b - \vector_start)] alternative_else_nop_endif @@ -925,11 +937,15 @@ alternative_else_nop_endif msr vbar_el1, x30 isb .else +#ifdef CONFIG_ACTLR_XCALL_XINT alternative_if_not ARM64_HAS_HW_XCALL_XINT adr_l x30, vectors alternative_else adr_l x30, vectors_xcall_xint alternative_endif +#else + adr_l x30, vectors +#endif .endif // \kpti == 1 .if \bhb == BHB_MITIGATION_FW -- 2.34.1

2 1

[openeuler:OLK-6.6 2331/2331] kismet: WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS when selected by FAST_IRQ
by kernel test robot 29 May '25

29 May '25

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 66b0cef2a959be1562a528e3d8cc260dc3803e61 commit: c294b5b18fc820cc006dd69fadefe24d4c321412 [2331/2331] arm64/Kconfig: Add turbo features submenuconfig config: arm64-kismet-CONFIG_DEBUG_FEATURE_BYPASS-CONFIG_FAST_IRQ-0-0 (https://download.01.org/0day-ci/archive/20250529/202505291226.uUVxetsW-lkp@…) reproduce: (https://download.01.org/0day-ci/archive/20250529/202505291226.uUVxetsW-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/202505291226.uUVxetsW-lkp@intel.com/ kismet warnings: (new ones prefixed by >>) >> kismet: WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS when selected by FAST_IRQ WARNING: unmet direct dependencies detected for PGP_PRELOAD Depends on [n]: CRYPTO [=y] && ASYMMETRIC_KEY_TYPE [=n] Selected by [y]: - PGP_PRELOAD_PUBLIC_KEYS [=y] && CRYPTO [=y] WARNING: unmet direct dependencies detected for DEBUG_FEATURE_BYPASS Depends on [n]: (FAST_SYSCALL [=n] || FAST_IRQ [=y]) && !LOCKDEP [=y] Selected by [y]: - FAST_IRQ [=y] && ARM_GIC_V3 [=y] -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6] arm64: entry: Fix ACTLR_XCALL_XINT not set build problem
by Jinjie Ruan 29 May '25

29 May '25

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/IBV2E4 -------------------------------- When ACTLR_XCALL_XINT not set, the "el0t_64_xcall" and "el0t_64_xint" will not be defind, the following build problem occurs. Define el0t_64_xcall and el0t_64_xint unconditionally to fix it because the vectors_xcall_xint will be used in alternative_if/else code and must be defined unconditionally. aarch64-linux-gnu-ld: arch/arm64/kernel/entry.o: in function `vectors_xcall_xint': ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:597: undefined reference to `el0t_64_xint' Fixes: 7f2e02718bba ("arm64: entry: Support hardware xcall and xint") Signed-off-by: Jinjie Ruan <ruanjinjie(a)huawei.com> --- arch/arm64/kernel/entry-common.c | 2 -- arch/arm64/kernel/entry.S | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index a90231346751..7b7146a9b480 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -1051,7 +1051,6 @@ UNHANDLED(el0t, 32, fiq) UNHANDLED(el0t, 32, error) #endif /* CONFIG_AARCH32_EL0 */ -#ifdef CONFIG_ACTLR_XCALL_XINT asmlinkage void noinstr el0t_64_xcall_handler(struct pt_regs *regs) { el0_svc(regs); @@ -1060,7 +1059,6 @@ asmlinkage void noinstr el0t_64_xint_handler(struct pt_regs *regs) { el0_interrupt(regs, ISR_EL1_IS, handle_arch_irq, handle_arch_nmi_irq); } -#endif #ifdef CONFIG_VMAP_STACK asmlinkage void noinstr __noreturn handle_bad_stack(struct pt_regs *regs) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 801a521613ad..e111874869ab 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -788,10 +788,8 @@ SYM_CODE_END(el\el\ht\()_\regsize\()_\label) entry_handler 0, t, 64, fiq entry_handler 0, t, 64, error -#ifdef CONFIG_ACTLR_XCALL_XINT entry_handler 0, t, 64, xcall entry_handler 0, t, 64, xint -#endif entry_handler 0, t, 32, sync entry_handler 0, t, 32, irq entry_handler 0, t, 32, fiq -- 2.34.1

2 1

[PATCH OLK-6.6] drm/amd/display: Fix slab-use-after-free in hdcp
by Liu Chuang 29 May '25

29 May '25

From: Chris Bainbridge <chris.bainbridge(a)gmail.com> stable inclusion from stable-v6.6.90 commit bbc66abcd297be67e3d835276e21e6fdc65205a6 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IC990T CVE: CVE-2025-37903 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- [ Upstream commit be593d9d91c5a3a363d456b9aceb71029aeb3f1d ] The HDCP code in amdgpu_dm_hdcp.c copies pointers to amdgpu_dm_connector objects without incrementing the kref reference counts. When using a USB-C dock, and the dock is unplugged, the corresponding amdgpu_dm_connector objects are freed, creating dangling pointers in the HDCP code. When the dock is plugged back, the dangling pointers are dereferenced, resulting in a slab-use-after-free: [ 66.775837] BUG: KASAN: slab-use-after-free in event_property_validate+0x42f/0x6c0 [amdgpu] [ 66.776171] Read of size 4 at addr ffff888127804120 by task kworker/0:1/10 [ 66.776179] CPU: 0 UID: 0 PID: 10 Comm: kworker/0:1 Not tainted 6.14.0-rc7-00180-g54505f727a38-dirty #233 [ 66.776183] Hardware name: HP HP Pavilion Aero Laptop 13-be0xxx/8916, BIOS F.17 12/18/2024 [ 66.776186] Workqueue: events event_property_validate [amdgpu] [ 66.776494] Call Trace: [ 66.776496] <TASK> [ 66.776497] dump_stack_lvl+0x70/0xa0 [ 66.776504] print_report+0x175/0x555 [ 66.776507] ? __virt_addr_valid+0x243/0x450 [ 66.776510] ? kasan_complete_mode_report_info+0x66/0x1c0 [ 66.776515] kasan_report+0xeb/0x1c0 [ 66.776518] ? event_property_validate+0x42f/0x6c0 [amdgpu] [ 66.776819] ? event_property_validate+0x42f/0x6c0 [amdgpu] [ 66.777121] __asan_report_load4_noabort+0x14/0x20 [ 66.777124] event_property_validate+0x42f/0x6c0 [amdgpu] [ 66.777342] ? __lock_acquire+0x6b40/0x6b40 [ 66.777347] ? enable_assr+0x250/0x250 [amdgpu] [ 66.777571] process_one_work+0x86b/0x1510 [ 66.777575] ? pwq_dec_nr_in_flight+0xcf0/0xcf0 [ 66.777578] ? assign_work+0x16b/0x280 [ 66.777580] ? lock_is_held_type+0xa3/0x130 [ 66.777583] worker_thread+0x5c0/0xfa0 [ 66.777587] ? process_one_work+0x1510/0x1510 [ 66.777588] kthread+0x3a2/0x840 [ 66.777591] ? kthread_is_per_cpu+0xd0/0xd0 [ 66.777594] ? trace_hardirqs_on+0x4f/0x60 [ 66.777597] ? _raw_spin_unlock_irq+0x27/0x60 [ 66.777599] ? calculate_sigpending+0x77/0xa0 [ 66.777602] ? kthread_is_per_cpu+0xd0/0xd0 [ 66.777605] ret_from_fork+0x40/0x90 [ 66.777607] ? kthread_is_per_cpu+0xd0/0xd0 [ 66.777609] ret_from_fork_asm+0x11/0x20 [ 66.777614] </TASK> [ 66.777643] Allocated by task 10: [ 66.777646] kasan_save_stack+0x39/0x60 [ 66.777649] kasan_save_track+0x14/0x40 [ 66.777652] kasan_save_alloc_info+0x37/0x50 [ 66.777655] __kasan_kmalloc+0xbb/0xc0 [ 66.777658] __kmalloc_cache_noprof+0x1c8/0x4b0 [ 66.777661] dm_dp_add_mst_connector+0xdd/0x5c0 [amdgpu] [ 66.777880] drm_dp_mst_port_add_connector+0x47e/0x770 [drm_display_helper] [ 66.777892] drm_dp_send_link_address+0x1554/0x2bf0 [drm_display_helper] [ 66.777901] drm_dp_check_and_send_link_address+0x187/0x1f0 [drm_display_helper] [ 66.777909] drm_dp_mst_link_probe_work+0x2b8/0x410 [drm_display_helper] [ 66.777917] process_one_work+0x86b/0x1510 [ 66.777919] worker_thread+0x5c0/0xfa0 [ 66.777922] kthread+0x3a2/0x840 [ 66.777925] ret_from_fork+0x40/0x90 [ 66.777927] ret_from_fork_asm+0x11/0x20 [ 66.777932] Freed by task 1713: [ 66.777935] kasan_save_stack+0x39/0x60 [ 66.777938] kasan_save_track+0x14/0x40 [ 66.777940] kasan_save_free_info+0x3b/0x60 [ 66.777944] __kasan_slab_free+0x52/0x70 [ 66.777946] kfree+0x13f/0x4b0 [ 66.777949] dm_dp_mst_connector_destroy+0xfa/0x150 [amdgpu] [ 66.778179] drm_connector_free+0x7d/0xb0 [ 66.778184] drm_mode_object_put.part.0+0xee/0x160 [ 66.778188] drm_mode_object_put+0x37/0x50 [ 66.778191] drm_atomic_state_default_clear+0x220/0xd60 [ 66.778194] __drm_atomic_state_free+0x16e/0x2a0 [ 66.778197] drm_mode_atomic_ioctl+0x15ed/0x2ba0 [ 66.778200] drm_ioctl_kernel+0x17a/0x310 [ 66.778203] drm_ioctl+0x584/0xd10 [ 66.778206] amdgpu_drm_ioctl+0xd2/0x1c0 [amdgpu] [ 66.778375] __x64_sys_ioctl+0x139/0x1a0 [ 66.778378] x64_sys_call+0xee7/0xfb0 [ 66.778381] do_syscall_64+0x87/0x140 [ 66.778385] entry_SYSCALL_64_after_hwframe+0x4b/0x53 Fix this by properly incrementing and decrementing the reference counts when making and deleting copies of the amdgpu_dm_connector pointers. (Mario: rebase on current code and update fixes tag) Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4006 Signed-off-by: Chris Bainbridge <chris.bainbridge(a)gmail.com> Fixes: da3fd7ac0bcf3 ("drm/amd/display: Update CP property based on HW query") Reviewed-by: Alex Hung <alex.hung(a)amd.com> Link: https://lore.kernel.org/r/20250417215005.37964-1-mario.limonciello@amd.com Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> (cherry picked from commit d4673f3c3b3dcb74e36e53cdfc880baa7a87b330) Cc: stable(a)vger.kernel.org Signed-off-by: Sasha Levin <sashal(a)kernel.org> Conflicts: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c [Conflicts due to context differences.] Signed-off-by: Liu Chuang <liuchuang40(a)huawei.com> --- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c index 20cfc5be21a4..0b615f0cb283 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c @@ -173,6 +173,9 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work, unsigned int conn_index = aconnector->base.index; mutex_lock(&hdcp_w->mutex); + drm_connector_get(&aconnector->base); + if (hdcp_w->aconnector[conn_index]) + drm_connector_put(&hdcp_w->aconnector[conn_index]->base); hdcp_w->aconnector[conn_index] = aconnector; memset(&link_adjust, 0, sizeof(link_adjust)); @@ -221,7 +224,6 @@ static void hdcp_remove_display(struct hdcp_workqueue *hdcp_work, unsigned int conn_index = aconnector->base.index; mutex_lock(&hdcp_w->mutex); - hdcp_w->aconnector[conn_index] = aconnector; /* the removal of display will invoke auth reset -> hdcp destroy and * we'd expect the Content Protection (CP) property changed back to @@ -237,7 +239,10 @@ static void hdcp_remove_display(struct hdcp_workqueue *hdcp_work, } mod_hdcp_remove_display(&hdcp_w->hdcp, aconnector->base.index, &hdcp_w->output); - + if (hdcp_w->aconnector[conn_index]) { + drm_connector_put(&hdcp_w->aconnector[conn_index]->base); + hdcp_w->aconnector[conn_index] = NULL; + } process_output(hdcp_w); mutex_unlock(&hdcp_w->mutex); } @@ -256,6 +261,10 @@ void hdcp_reset_display(struct hdcp_workqueue *hdcp_work, unsigned int link_inde for (conn_index = 0; conn_index < AMDGPU_DM_MAX_DISPLAY_INDEX; conn_index++) { hdcp_w->encryption_status[conn_index] = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF; + if (hdcp_w->aconnector[conn_index]) { + drm_connector_put(&hdcp_w->aconnector[conn_index]->base); + hdcp_w->aconnector[conn_index] = NULL; + } } process_output(hdcp_w); @@ -503,6 +512,7 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) struct hdcp_workqueue *hdcp_work = handle; struct amdgpu_dm_connector *aconnector = config->dm_stream_ctx; int link_index = aconnector->dc_link->link_index; + unsigned int conn_index = aconnector->base.index; struct mod_hdcp_display *display = &hdcp_work[link_index].display; struct mod_hdcp_link *link = &hdcp_work[link_index].link; struct hdcp_workqueue *hdcp_w = &hdcp_work[link_index]; @@ -559,7 +569,10 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) mutex_lock(&hdcp_w->mutex); mod_hdcp_add_display(&hdcp_w->hdcp, link, display, &hdcp_w->output); - + drm_connector_get(&aconnector->base); + if (hdcp_w->aconnector[conn_index]) + drm_connector_put(&hdcp_w->aconnector[conn_index]->base); + hdcp_w->aconnector[conn_index] = aconnector; process_output(hdcp_w); mutex_unlock(&hdcp_w->mutex); -- 2.34.1

2 1

[PATCH OLK-6.6] interference: Fix compilation issue
by Pu Lehui 29 May '25

29 May '25

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICAOAT -------------------------------- kernel test robot reported the following compilation error: drivers/base/arch_topology.c:811:2: error: implicit declaration of function 'cgroup_ifs_set_smt' [-Werror=implicit-function-declaration] Let's fix it by adding cgroup_ifs_set_smt related header file. Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202505282112.qVJOB1Zd-lkp@intel.com/ Fixes: edff31302c6d ("interference: Add smt interference track support") Signed-off-by: Pu Lehui <pulehui(a)huawei.com> --- drivers/base/arch_topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index a26169094712..b776ba4127db 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -15,6 +15,7 @@ #include <linux/of.h> #include <linux/slab.h> #include <linux/sched/topology.h> +#include <linux/cgroup.h> #include <linux/cpuset.h> #include <linux/cpumask.h> #include <linux/init.h> -- 2.34.1

2 1

[PATCH openEuler-1.0-LTS] mmc: sdhci-pci: Fix possible memory leak caused by missing pci_dev_put()
by Yi Yang 29 May '25

29 May '25

From: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> stable inclusion from stable-v4.19.267 commit 5dbd6378dbf96787d6dbcca44156c511ae085ea3 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IC5BUQ CVE: CVE-2022-49787 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 222cfa0118aa68687ace74aab8fdf77ce8fbd7e6 upstream. pci_get_device() will increase the reference count for the returned pci_dev. We need to use pci_dev_put() to decrease the reference count before amd_probe() returns. There is no problem for the 'smbus_dev == NULL' branch because pci_dev_put() can also handle the NULL input parameter case. Fixes: 659c9bc114a8 ("mmc: sdhci-pci: Build o2micro support in the same module") Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20221114083100.149200-1-wangxiongfeng2@huawei.com Signed-off-by: Ulf Hansson <ulf.hansson(a)linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yi Yang <yiyang13(a)huawei.com> --- drivers/mmc/host/sdhci-pci-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 65985dc3e1a7..14d585140d51 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1501,6 +1501,8 @@ static int amd_probe(struct sdhci_pci_chip *chip) } } + pci_dev_put(smbus_dev); + if (gen == AMD_CHIPSET_BEFORE_ML || gen == AMD_CHIPSET_CZ) chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD; -- 2.25.1

2 1

[PATCH OLK-5.10 V1] sched: Support NUMA parallel scheduling for multiple processes
by Cheng Yu 29 May '25

29 May '25

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICBBNL -------------------------------- For architectures with multiple NUMA node levels and large distances between nodes, a better approach is to support processes running in parallel on each NUMA node. The usage is restricted to the following scenarios: 1. No CPU binding for user-space processes; 2. It is applicable to distributed applications, such as business architectures with one master and multiple slaves running in parallel; 3. The existing "qos dynamic affinity" and "qos smart grid" features must not be used simultaneously. Signed-off-by: Cheng Yu <serein.chengyu(a)huawei.com> --- arch/arm64/Kconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/mm/numa.c | 73 ++++++++++++++++++++++++++ include/linux/perf_event.h | 2 + include/linux/sched.h | 3 ++ init/Kconfig | 22 ++++++++ kernel/cgroup/cpuset.c | 8 ++- kernel/events/core.c | 13 +++++ kernel/sched/debug.c | 37 +++++++++++++ kernel/sched/fair.c | 26 ++++++++- kernel/sched/features.h | 4 ++ 11 files changed, 186 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 93ced97f8c6c..76f07a283d4e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -79,6 +79,7 @@ config ARM64 select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && (GCC_VERSION >= 50000 || CC_IS_CLANG) select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_SUPPORTS_SCHED_KEEP_ON_CORE + select ARCH_SUPPORTS_SCHED_PARAL select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH select ARCH_WANT_COMPAT_IPC_PARSE_VERSION if COMPAT select ARCH_WANT_DEFAULT_BPF_JIT diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index fb9f92d11bde..4dd4994d6fbb 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -190,6 +190,7 @@ CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_STEAL=y CONFIG_SCHED_KEEP_ON_CORE=y +CONFIG_SCHED_PARAL=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 99a746e14f2b..712321af83fb 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -12,6 +12,7 @@ #include <linux/memblock.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/perf_event.h> #include <asm/acpi.h> #include <asm/sections.h> @@ -777,3 +778,75 @@ void __init arm64_numa_init(void) numa_init(dummy_numa_init); } + +#ifdef CONFIG_SCHED_PARAL +static atomic_t paral_nid_last = ATOMIC_INIT(-1); + +int probe_pmu_numa_event(void) +{ + struct perf_event *event; + struct perf_event_attr attr = {}; + int type = perf_pmu_type_of_name("hisi_sccl3_hha0"); + + if (type == -1) + return -EINVAL; + + attr.type = type; + attr.config = 0x02; + attr.size = sizeof(struct perf_event_attr); + attr.pinned = 1; + attr.disabled = 1; + attr.sample_period = 0; + + event = perf_event_create_kernel_counter(&attr, smp_processor_id(), + NULL, NULL, NULL); + if (IS_ERR(event)) + return PTR_ERR(event); + + perf_event_release_kernel(event); + + return 0; +} + +static inline int update_sched_paral_nid(void) +{ + int onid, nnid; + + do { + onid = atomic_read(&paral_nid_last); + nnid = (onid >= INT_MAX) ? 0 : (onid + 1); + } while (atomic_cmpxchg(&paral_nid_last, onid, nnid) != onid); + + return nnid; +} + +void set_task_paral_node(struct task_struct *p) +{ + int nid; + int i = 0; + const cpumask_t *cpus_mask; + + if (is_global_init(current)) + return; + + if (p->flags & PF_KTHREAD || p->tgid != p->pid) + return; + + while (i < nr_node_ids) { + nid = update_sched_paral_nid() % nr_node_ids; + cpus_mask = cpumask_of_node(nid); + + if (cpumask_empty(cpus_mask) || + !cpumask_subset(cpus_mask, p->cpus_ptr)) { + i++; + continue; + } + + cpumask_copy(p->prefer_cpus, cpus_mask); + break; + } +} +#else +void set_task_paral_node(struct task_struct *p) {} +int probe_pmu_numa_event(void) { return -1; } +#endif diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 2544bfdd948b..7814ff2e45c7 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1485,6 +1485,7 @@ extern void perf_event_task_tick(void); extern int perf_event_account_interrupt(struct perf_event *event); extern int perf_event_period(struct perf_event *event, u64 value); extern u64 perf_event_pause(struct perf_event *event, bool reset); +extern int perf_pmu_type_of_name(const char *name); #else /* !CONFIG_PERF_EVENTS: */ static inline void * perf_aux_output_begin(struct perf_output_handle *handle, @@ -1577,6 +1578,7 @@ static inline u64 perf_event_pause(struct perf_event *event, bool reset) { return 0; } +static inline int perf_pmu_type_of_name(const char *name) { return -1; } #endif #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL) diff --git a/include/linux/sched.h b/include/linux/sched.h index e3170b7f81fa..181230773350 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2309,6 +2309,9 @@ int set_prefer_cpus_ptr(struct task_struct *p, int sched_prefer_cpus_fork(struct task_struct *p, struct cpumask *mask); void sched_prefer_cpus_free(struct task_struct *p); void dynamic_affinity_enable(void); +bool sched_paral_used(void); +void set_task_paral_node(struct task_struct *p); +int probe_pmu_numa_event(void); #endif #ifdef CONFIG_QOS_SCHED_SMART_GRID diff --git a/init/Kconfig b/init/Kconfig index 3a6a14e66acd..5f88cce193e8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1389,6 +1389,28 @@ config SCHED_KEEP_ON_CORE otherwise the task will not be migrated and the cpu0 will still be used. +# +# For architectures that want to enable the support for SCHED_PARAL +# +config ARCH_SUPPORTS_SCHED_PARAL + bool + +config SCHED_PARAL + bool "Parallelly schedule processes on different NUMA nodes" + depends on ARCH_SUPPORTS_SCHED_PARAL + depends on QOS_SCHED_DYNAMIC_AFFINITY + default n + help + By enabling this feature, processes can be scheduled in parallel + on various NUMA nodes to better utilize the cache in NUMA node. + The usage is restricted to the following scenarios: + 1. No CPU binding is performed for user-space processes; + 2. It is applicable to distributed applications, such as business + architectures with one master and multiple slaves running in + parallel; + 3. The existing "qos dynamic affinity" and "qos smart grid" + features must not be used simultaneously. + config CHECKPOINT_RESTORE bool "Checkpoint/restore support" select PROC_CHILDREN diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 7ecff06d2026..1f6ed08af9f5 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2423,7 +2423,8 @@ static void cpuset_attach(struct cgroup_taskset *tset) */ WARN_ON_ONCE(set_cpus_allowed_ptr(task, cpus_attach)); #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY - set_prefer_cpus_ptr(task, prefer_cpus_attach); + if (!sched_paral_used() || !cpumask_empty(prefer_cpus_attach)) + set_prefer_cpus_ptr(task, prefer_cpus_attach); #endif cpuset_change_task_nodemask(task, &cpuset_attach_nodemask_to); @@ -3131,7 +3132,10 @@ static void cpuset_fork(struct task_struct *task) set_cpus_allowed_ptr(task, current->cpus_ptr); #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY - set_prefer_cpus_ptr(task, current->prefer_cpus); + rcu_read_lock(); + if (!sched_paral_used() || !cpumask_empty(task_cs(current)->prefer_cpus)) + set_prefer_cpus_ptr(task, current->prefer_cpus); + rcu_read_unlock(); #endif task->mems_allowed = current->mems_allowed; } diff --git a/kernel/events/core.c b/kernel/events/core.c index b56b572f1bd0..e0c193083aa0 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -13167,6 +13167,19 @@ static int __init perf_event_sysfs_init(void) } device_initcall(perf_event_sysfs_init); +int perf_pmu_type_of_name(const char *name) +{ + unsigned int i; + struct pmu *pmu; + + idr_for_each_entry(&pmu_idr, pmu, i) { + if (!strcmp(pmu->name, name)) + return pmu->type; + } + + return -1; +} + #ifdef CONFIG_CGROUP_PERF static struct cgroup_subsys_state * perf_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 4275398bc713..d6b53d54dcf5 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -96,6 +96,39 @@ static void sched_feat_disable(int i) { }; static void sched_feat_enable(int i) { }; #endif /* CONFIG_JUMP_LABEL */ +#ifdef CONFIG_SCHED_PARAL +static void sched_feat_disable_paral(char *cmp) +{ + struct task_struct *tsk, *t; + + if (strncmp(cmp, "PARAL", 5) == 0) { + read_lock(&tasklist_lock); + for_each_process(tsk) { + if (tsk->flags & PF_KTHREAD || is_global_init(tsk)) + continue; + + for_each_thread(tsk, t) + cpumask_clear(t->prefer_cpus); + } + read_unlock(&tasklist_lock); + } +} + +static bool sched_feat_enable_paral(char *cmp) +{ + if (strncmp(cmp, "PARAL", 5) != 0) + return true; + + if (probe_pmu_numa_event() != 0) + return false; + + return true; +} +#else +static void sched_feat_disable_paral(char *cmp) {}; +static bool sched_feat_enable_paral(char *cmp) { return true; }; +#endif /* CONFIG_SCHED_PARAL */ + static int sched_feat_set(char *cmp) { int i; @@ -112,8 +145,12 @@ static int sched_feat_set(char *cmp) if (neg) { sysctl_sched_features &= ~(1UL << i); + sched_feat_disable_paral(cmp); sched_feat_disable(i); } else { + if (!sched_feat_enable_paral(cmp)) + return -EPERM; + sysctl_sched_features |= (1UL << i); sched_feat_enable(i); } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 437572c568ee..396c2b87c012 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8063,6 +8063,16 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) } #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY +bool sched_paral_used(void) +{ +#ifdef CONFIG_SCHED_PARAL + if (sched_feat(PARAL)) + return true; +#endif + + return false; +} + static DEFINE_STATIC_KEY_FALSE(__dynamic_affinity_used); static __always_inline bool dynamic_affinity_used(void) @@ -8168,6 +8178,14 @@ static void set_task_select_cpus(struct task_struct *p, int *idlest_cpu, } rcu_read_unlock(); + /* In extreme cases, it may cause uneven system load. */ + if (sched_paral_used() && sysctl_sched_util_low_pct == 100 && nr_cpus_valid > 0) { + p->select_cpus = p->prefer_cpus; + if (sd_flag & SD_BALANCE_WAKE) + schedstat_inc(p->se.statistics.nr_wakeups_preferred_cpus); + return; + } + /* * Follow cases should select cpus_ptr, checking by condition of * tg_capacity > nr_cpus_valid: @@ -8225,7 +8243,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f #endif #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY - if (dynamic_affinity_used() || smart_grid_used()) + if (dynamic_affinity_used() || smart_grid_used() || sched_paral_used()) set_task_select_cpus(p, &idlest_cpu, sd_flag); #endif @@ -9867,7 +9885,7 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) #ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY p->select_cpus = p->cpus_ptr; - if (dynamic_affinity_used() || smart_grid_used()) + if (dynamic_affinity_used() || smart_grid_used() || sched_paral_used()) set_task_select_cpus(p, NULL, 0); if (!cpumask_test_cpu(env->dst_cpu, p->select_cpus)) { #else @@ -13549,6 +13567,10 @@ static void task_fork_fair(struct task_struct *p) } se->vruntime -= cfs_rq->min_vruntime; + + if (sched_paral_used()) + set_task_paral_node(p); + rq_unlock(rq, &rf); } diff --git a/kernel/sched/features.h b/kernel/sched/features.h index fb885b20ba34..1fd89af55681 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -74,6 +74,10 @@ SCHED_FEAT(STEAL, false) SCHED_FEAT(KEEP_ON_CORE, false) #endif +#ifdef CONFIG_SCHED_PARAL +SCHED_FEAT(PARAL, false) +#endif + /* * Issue a WARN when we do multiple update_rq_clock() calls * in a single rq->lock section. Default disabled because the -- 2.25.1

2 1