- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] drm/amd/display: Check phantom_stream before it is used
by Kaixiong Yu 02 Dec '24

02 Dec '24

From: Alex Hung <alex.hung(a)amd.com> mainline inclusion from mainline-v6.12-rc1 commit 3718a619a8c0a53152e76bb6769b6c414e1e83f4 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRC5 CVE: CVE-2024-49897 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- dcn32_enable_phantom_stream can return null, so returned value must be checked before used. This fixes 1 NULL_RETURNS issue reported by Coverity. Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira(a)amd.com> Signed-off-by: Jerry Zuo <jerry.zuo(a)amd.com> Signed-off-by: Alex Hung <alex.hung(a)amd.com> Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Conflicts: drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c [Ma Wupeng: related function is moved to another file] Signed-off-by: Ma Wupeng <mawupeng1(a)huawei.com> --- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c index dc0ff24e9a66..bf110f992422 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c @@ -1791,6 +1791,9 @@ void dcn32_add_phantom_pipes(struct dc *dc, struct dc_state *context, // be a valid candidate for SubVP (i.e. has a plane, stream, doesn't // already have phantom pipe assigned, etc.) by previous checks. phantom_stream = dcn32_enable_phantom_stream(dc, context, pipes, pipe_cnt, index); + if (!phantom_stream) + return; + dcn32_enable_phantom_plane(dc, context, phantom_stream, index); for (i = 0; i < dc->res_pool->pipe_count; i++) { -- 2.34.1

2 5

[PATCH OLK-5.10] drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer
by Kaixiong Yu 02 Dec '24

02 Dec '24

From: Philip Yang <Philip.Yang(a)amd.com> mainline inclusion from mainline-v6.12-rc1 commit c86ad39140bbcb9dc75a10046c2221f657e8083b category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRB0 CVE: CVE-2024-49991 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Pass pointer reference to amdgpu_bo_unref to clear the correct pointer, otherwise amdgpu_bo_unref clear the local variable, the original pointer not set to NULL, this could cause use-after-free bug. Signed-off-by: Philip Yang <Philip.Yang(a)amd.com> Reviewed-by: Felix Kuehling <felix.kuehling(a)amd.com> Acked-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h drivers/gpu/drm/amd/amdkfd/kfd_chardev.c drivers/gpu/drm/amd/amdkfd/kfd_device.c drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c drivers/gpu/drm/amd/amdkfd/kfd_process.c drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c [Context conflicts due to 6bfc7c7e175e ("drm/amdkfd: replace kgd_dev in various amgpu_amdkfd funcs") isn't merged, and several amdgpu_amdkfd_free_gtt_mem() aren't introduced.] Signed-off-by: Jinjiang Tu <tujinjiang(a)huawei.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 ++-- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index d3a974d10552..7eae06d8c54e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -310,15 +310,15 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, return r; } -void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj) +void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void **mem_obj) { - struct amdgpu_bo *bo = (struct amdgpu_bo *) mem_obj; + struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj; - amdgpu_bo_reserve(bo, true); - amdgpu_bo_kunmap(bo); - amdgpu_bo_unpin(bo); - amdgpu_bo_unreserve(bo); - amdgpu_bo_unref(&(bo)); + amdgpu_bo_reserve(*bo, true); + amdgpu_bo_kunmap(*bo); + amdgpu_bo_unpin(*bo); + amdgpu_bo_unreserve(*bo); + amdgpu_bo_unref(bo); } int amdgpu_amdkfd_alloc_gws(struct kgd_dev *kgd, size_t size, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h index 32e385f287cb..24848048fb82 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h @@ -183,7 +183,7 @@ int amdgpu_amdkfd_evict_userptr(struct kgd_mem *mem, struct mm_struct *mm) int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, void **mem_obj, uint64_t *gpu_addr, void **cpu_ptr, bool mqd_gfx9); -void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj); +void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void **mem_obj); int amdgpu_amdkfd_alloc_gws(struct kgd_dev *kgd, size_t size, void **mem_obj); void amdgpu_amdkfd_free_gws(struct kgd_dev *kgd, void *mem_obj); int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 04126ffbc973..806c38492768 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -782,7 +782,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, kfd_doorbell_error: kfd_gtt_sa_fini(kfd); kfd_gtt_sa_init_error: - amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem); + amdgpu_amdkfd_free_gtt_mem(kfd->kgd, &kfd->gtt_mem); alloc_gtt_mem_failure: if (kfd->gws) amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws); @@ -803,7 +803,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd) kfd_doorbell_fini(kfd); ida_destroy(&kfd->doorbell_ida); kfd_gtt_sa_fini(kfd); - amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem); + amdgpu_amdkfd_free_gtt_mem(kfd->kgd, &kfd->gtt_mem); if (kfd->gws) amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws); } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 195b7e02dc4b..62f7aa61873d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -1971,7 +1971,7 @@ static void deallocate_hiq_sdma_mqd(struct kfd_dev *dev, { WARN(!mqd, "No hiq sdma mqd trunk to free"); - amdgpu_amdkfd_free_gtt_mem(dev->kgd, mqd->gtt_mem); + amdgpu_amdkfd_free_gtt_mem(dev->kgd, &mqd->gtt_mem); } void device_queue_manager_uninit(struct device_queue_manager *dqm) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c index dadeb2013fd9..b4727b768b57 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c @@ -293,7 +293,7 @@ static void free_mqd(struct mqd_manager *mm, void *mqd, struct kfd_dev *kfd = mm->dev; if (mqd_mem_obj->gtt_mem) { - amdgpu_amdkfd_free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem); + amdgpu_amdkfd_free_gtt_mem(kfd->kgd, &mqd_mem_obj->gtt_mem); kfree(mqd_mem_obj); } else { kfd_gtt_sa_free(mm->dev, mqd_mem_obj); -- 2.34.1

2 9

[PATCH OLK-6.6 v2 0/5] Optimize functions like get_user and put_user
by Ze Zuo 02 Dec '24

02 Dec '24

Due to the performance degradation of the lsmem command on the ARM architecture, unsafe_copy_to_user, unsafe_put_user, and unsafe_get_user have been introduced to bypass the usercopy checks. This optimizes the data exchange between user space and kernel space, thereby improving performance. v1->v2: -- Some commit message cleanup on patch 5. Linus Torvalds (2): arm64: start using 'asm goto' for get_user() when available arm64: start using 'asm goto' for put_user() Mark Rutland (2): init/Kconfig: remove CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND arm64: uaccess: correct thinko in __get_mem_asm() Ze Zuo (1): openeuler_defconfig: remove GCC_ASM_GOTO_OUTPUT_WORKAROUND for x86 and arm64 arch/arm64/Kconfig | 4 + arch/arm64/configs/openeuler_defconfig | 1 - arch/arm64/include/asm/asm-extable.h | 3 + arch/arm64/include/asm/uaccess.h | 169 ++++++++++++++++++------- arch/arm64/kernel/mte.c | 12 +- arch/x86/configs/openeuler_defconfig | 1 - include/linux/compiler-gcc.h | 20 --- init/Kconfig | 22 ++-- 8 files changed, 147 insertions(+), 85 deletions(-) -- 2.25.1

2 6

[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 02 Dec '24

02 Dec '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 9809e40d1abbcdf278f3db91f03a94507bdbb442 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/20241202/202412022008.S6r6cz7m-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/20241202/202412022008.S6r6cz7m-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/202412022008.S6r6cz7m-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

[PATCH OLK-6.6 00/18] Support haltpoll feature
by lishusen 02 Dec '24

02 Dec '24

Support haltpoll feature to improve performance Ankur Arora (10): asm-generic: add barrier smp_cond_load_relaxed_timeout() cpuidle/poll_state: poll via smp_cond_load_relaxed_timeout() cpuidle: rename ARCH_HAS_CPU_RELAX to ARCH_HAS_OPTIMIZED_POLL arm64: barrier: add support for smp_cond_relaxed_timeout() arm64: add support for polling in idle cpuidle-haltpoll: condition on ARCH_CPUIDLE_HALTPOLL arm64: idle: export arch_cpu_idle arm64: support cpuidle-haltpoll arm64/delay: add some constants to a separate header arm64: support WFET in smp_cond_relaxed_timeout() Joao Martins (4): Kconfig: move ARCH_HAS_OPTIMIZED_POLL to arch/Kconfig arm64: define TIF_POLLING_NRFLAG cpuidle-haltpoll: define arch_haltpoll_want() governors/haltpoll: drop kvm_para_available() check Lifeng Zheng (1): ACPI: processor_idle: Support polling state for LPI lishusen (3): cpuidle: edit cpuidle-haltpoll driver module parameter arm64/delay: remove USECS_TO_CYCLES to avoid conflict arm64: add config for cpuidle-haltpoll arch/Kconfig | 3 + arch/arm64/Kconfig | 9 ++ arch/arm64/configs/openeuler_defconfig | 3 + arch/arm64/include/asm/barrier.h | 62 ++++++++++++- arch/arm64/include/asm/cmpxchg.h | 26 ++++-- arch/arm64/include/asm/cpuidle_haltpoll.h | 20 +++++ arch/arm64/include/asm/delay-const.h | 15 ++++ arch/arm64/include/asm/thread_info.h | 2 + arch/arm64/kernel/idle.c | 1 + arch/x86/Kconfig | 5 +- arch/x86/include/asm/cpuidle_haltpoll.h | 1 + arch/x86/kernel/kvm.c | 13 +++ drivers/acpi/processor_idle.c | 43 +++++++-- drivers/cpuidle/Kconfig | 5 +- drivers/cpuidle/Makefile | 2 +- drivers/cpuidle/cpuidle-haltpoll.c | 105 +++++++++++++++++++--- drivers/cpuidle/governors/haltpoll.c | 6 +- drivers/cpuidle/poll_state.c | 31 +++---- drivers/idle/Kconfig | 1 + include/asm-generic/barrier.h | 42 +++++++++ include/linux/cpuidle.h | 2 +- include/linux/cpuidle_haltpoll.h | 5 ++ 22 files changed, 338 insertions(+), 64 deletions(-) create mode 100644 arch/arm64/include/asm/cpuidle_haltpoll.h create mode 100644 arch/arm64/include/asm/delay-const.h -- 2.33.0

2 19

[PATCH OLK-5.10 0/7] CVE-2024-40927
by Yongqiang Liu 02 Dec '24

02 Dec '24

Hector Martin (1): xhci: Handle TD clearing for multiple streams case Mathias Nyman (6): xhci: use xhci_td_cleanup() helper when giving back cancelled URBs xhci: split handling halted endpoints into two steps xhci: fix giving back URB with incorrect status regression in 5.12 xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall xhci: introduce a new move_dequeue_past_td() function to replace old code. xhci: Fix failure to give back some cached cancelled URBs. drivers/usb/host/xhci-ring.c | 377 +++++++++++++++++++++++++---------- drivers/usb/host/xhci.c | 94 +-------- drivers/usb/host/xhci.h | 9 + 3 files changed, 291 insertions(+), 189 deletions(-) -- 2.25.1

2 8

[openeuler:OLK-5.10 2439/2439] drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c:71:20: warning: no previous prototype for 'agent_smmu_unlocked_find'
by kernel test robot 02 Dec '24

02 Dec '24

Hi Binfeng, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: a1fd264a5653d0f3d66669ec3b88a99b929f8717 commit: 3bf501c87ffe1f045f86af89e8958fed62c02c94 [2439/2439] ascend agent smmu: an implementation of ARM SMMUv3 ATOS feature config: arm64-randconfig-004-20241117 (https://download.01.org/0day-ci/archive/20241202/202412021825.ykqFT7Io-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241202/202412021825.ykqFT7Io-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/202412021825.ykqFT7Io-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c:71:20: warning: no previous prototype for 'agent_smmu_unlocked_find' [-Wmissing-prototypes] 71 | struct agent_smmu *agent_smmu_unlocked_find(u64 device_id) | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c: In function 'agent_smmu_platform_probe': drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c:145:18: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration] 145 | status = acpi_evaluate_integer(ACPI_HANDLE(&pdev->dev), METHOD_NAME__UID, | ^~~~~~~~~~~~~~~~~~~~~ | acpi_evaluate_object drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c: At top level: >> drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c:420:36: warning: 'agent_smmu_acpi_match' defined but not used [-Wunused-const-variable=] 420 | static const struct acpi_device_id agent_smmu_acpi_match[] = { | ^~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/agent_smmu_unlocked_find +71 drivers/iommu/arm/arm-smmu-v3/ascend_smmu.c 70 > 71 struct agent_smmu *agent_smmu_unlocked_find(u64 device_id) 72 { 73 struct agent_smmu *temp = NULL; 74 75 list_for_each_entry(temp, &agent_smmu_list, list) { 76 if (temp->device_id == device_id) { 77 return temp; 78 } 79 } 80 return NULL; 81 } 82 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 00/18] Support haltpoll feature
by lishusen 02 Dec '24

02 Dec '24

Support haltpoll feature to improve performance Ankur Arora (10): asm-generic: add barrier smp_cond_load_relaxed_timeout() cpuidle/poll_state: poll via smp_cond_load_relaxed_timeout() cpuidle: rename ARCH_HAS_CPU_RELAX to ARCH_HAS_OPTIMIZED_POLL arm64: barrier: add support for smp_cond_relaxed_timeout() arm64: add support for polling in idle cpuidle-haltpoll: condition on ARCH_CPUIDLE_HALTPOLL arm64: idle: export arch_cpu_idle arm64: support cpuidle-haltpoll arm64/delay: move some constants out to a separate header arm64: support WFET in smp_cond_relaxed_timeout() Joao Martins (4): Kconfig: move ARCH_HAS_OPTIMIZED_POLL to arch/Kconfig arm64: define TIF_POLLING_NRFLAG cpuidle-haltpoll: define arch_haltpoll_want() governors/haltpoll: drop kvm_para_available() check Lifeng Zheng (1): ACPI: processor_idle: Support polling state for LPI lishusen (3): cpuidle: edit cpuidle-haltpoll driver module parameter arm64/delay: remove USECS_TO_CYCLES to avoid conflict arm64: add config for cpuidle-haltpoll arch/Kconfig | 3 + arch/arm64/Kconfig | 9 ++ arch/arm64/configs/openeuler_defconfig | 3 + arch/arm64/include/asm/barrier.h | 62 ++++++++++++- arch/arm64/include/asm/cmpxchg.h | 26 ++++-- arch/arm64/include/asm/cpuidle_haltpoll.h | 20 +++++ arch/arm64/include/asm/delay-const.h | 15 ++++ arch/arm64/include/asm/thread_info.h | 2 + arch/arm64/kernel/idle.c | 1 + arch/x86/Kconfig | 5 +- arch/x86/include/asm/cpuidle_haltpoll.h | 1 + arch/x86/kernel/kvm.c | 13 +++ drivers/acpi/processor_idle.c | 43 +++++++-- drivers/cpuidle/Kconfig | 5 +- drivers/cpuidle/Makefile | 2 +- drivers/cpuidle/cpuidle-haltpoll.c | 105 +++++++++++++++++++--- drivers/cpuidle/governors/haltpoll.c | 6 +- drivers/cpuidle/poll_state.c | 31 +++---- drivers/idle/Kconfig | 1 + include/asm-generic/barrier.h | 42 +++++++++ include/linux/cpuidle.h | 2 +- include/linux/cpuidle_haltpoll.h | 5 ++ 22 files changed, 338 insertions(+), 64 deletions(-) create mode 100644 arch/arm64/include/asm/cpuidle_haltpoll.h create mode 100644 arch/arm64/include/asm/delay-const.h -- 2.33.0

2 19

[openeuler:OLK-6.6 1455/1455] kernel/sched/fair.c:8325:9: error: call to undeclared function 'sched_idle_cpu'; ISO C99 and later do not support implicit function declarations
by kernel test robot 02 Dec '24

02 Dec '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: b3dd80fc71d804c0f15eb93352cf23452f7f2191 commit: 926b9b0cd97e640ee680347cf449c3dc152dddd2 [1455/1455] sched: Throttle qos cfs_rq when current cpu is running online task config: x86_64-randconfig-005-20241112 (https://download.01.org/0day-ci/archive/20241202/202412021846.xYjhWfl0-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/20241202/202412021846.xYjhWfl0-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/202412021846.xYjhWfl0-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from kernel/sched/fair.c:25: In file included from include/linux/hugetlb_inline.h:7: In file included from include/linux/mm.h:2174: include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ >> kernel/sched/fair.c:8325:9: error: call to undeclared function 'sched_idle_cpu'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 8325 | !sched_idle_cpu(smp_processor_id()) && | ^ kernel/sched/fair.c:8325:9: note: did you mean 'sched_idle_rq'? kernel/sched/fair.c:6517:12: note: 'sched_idle_rq' declared here 6517 | static int sched_idle_rq(struct rq *rq) | ^ >> kernel/sched/fair.c:8328:23: error: no member named 'online' in 'struct rq' 8328 | if (!rq_of(cfs_rq)->online) | ~~~~~~~~~~~~~ ^ >> kernel/sched/fair.c:8531:7: error: no member named 'idle_stamp' in 'struct rq'; did you mean 'idle_state'? 8531 | rq->idle_stamp = 0; | ^~~~~~~~~~ | idle_state kernel/sched/sched.h:1143:24: note: 'idle_state' declared here 1143 | struct cpuidle_state *idle_state; | ^ 1 warning and 3 errors generated. vim +/sched_idle_cpu +8325 kernel/sched/fair.c 8321 8322 static bool check_qos_cfs_rq(struct cfs_rq *cfs_rq) 8323 { 8324 if (unlikely(cfs_rq && cfs_rq->tg->qos_level < 0 && > 8325 !sched_idle_cpu(smp_processor_id()) && 8326 cfs_rq->h_nr_running == cfs_rq->idle_h_nr_running)) { 8327 > 8328 if (!rq_of(cfs_rq)->online) 8329 return false; 8330 8331 throttle_qos_cfs_rq(cfs_rq); 8332 return true; 8333 } 8334 8335 return false; 8336 } 8337 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1455/1455] kernel/sched/psi.c:387:1: error: function definition is not allowed here
by kernel test robot 02 Dec '24

02 Dec '24

Hi Lu, First bad commit (maybe != root cause): tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: b3dd80fc71d804c0f15eb93352cf23452f7f2191 commit: 654944510822988390470cbc5b6f914c19dd9b88 [1455/1455] sched/psi: add cpu fine grained stall tracking in pressure.stat config: x86_64-buildonly-randconfig-001-20241112 (https://download.01.org/0day-ci/archive/20241202/202412021807.OmlvOFCb-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/20241202/202412021807.OmlvOFCb-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/202412021807.OmlvOFCb-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from kernel/sched/build_utility.c:24: In file included from include/linux/cpuset.h:17: In file included from include/linux/mm.h:2181: include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ In file included from kernel/sched/build_utility.c:97: >> kernel/sched/psi.c:387:1: error: function definition is not allowed here 387 | { | ^ kernel/sched/psi.c:421:1: error: function definition is not allowed here 421 | { | ^ kernel/sched/psi.c:449:1: error: function definition is not allowed here 449 | { | ^ kernel/sched/psi.c:471:1: error: function definition is not allowed here 471 | { | ^ kernel/sched/psi.c:517:17: error: function definition is not allowed here 517 | bool next) {} | ^ kernel/sched/psi.c:523:1: error: function definition is not allowed here 523 | { | ^ kernel/sched/psi.c:590:1: error: function definition is not allowed here 590 | { | ^ kernel/sched/psi.c:608:1: error: function definition is not allowed here 608 | { | ^ kernel/sched/psi.c:635:1: error: function definition is not allowed here 635 | { | ^ kernel/sched/psi.c:707:1: error: function definition is not allowed here 707 | { | ^ kernel/sched/psi.c:772:1: error: function definition is not allowed here 772 | { | ^ kernel/sched/psi.c:808:1: error: function definition is not allowed here 808 | { | ^ kernel/sched/psi.c:822:1: error: function definition is not allowed here 822 | { | ^ kernel/sched/psi.c:848:1: error: function definition is not allowed here 848 | { | ^ kernel/sched/psi.c:932:1: error: function definition is not allowed here 932 | { | ^ kernel/sched/psi.c:950:1: error: function definition is not allowed here 950 | { | ^ kernel/sched/psi.c:958:1: error: function definition is not allowed here 958 | { | ^ kernel/sched/psi.c:993:1: error: function definition is not allowed here 993 | { | ^ kernel/sched/psi.c:1107:1: error: function definition is not allowed here 1107 | { | ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 1 warning and 20 errors generated. vim +387 kernel/sched/psi.c a65983d90bfb5e0 Lu Jialin 2024-01-04 383 a65983d90bfb5e0 Lu Jialin 2024-01-04 384 static bool test_fine_grained_stat(unsigned int *stat_tasks, a65983d90bfb5e0 Lu Jialin 2024-01-04 385 unsigned int nr_running, a65983d90bfb5e0 Lu Jialin 2024-01-04 386 enum psi_stat_states state) a65983d90bfb5e0 Lu Jialin 2024-01-04 @387 { a65983d90bfb5e0 Lu Jialin 2024-01-04 388 switch (state) { a65983d90bfb5e0 Lu Jialin 2024-01-04 389 case PSI_MEMCG_RECLAIM_SOME: a65983d90bfb5e0 Lu Jialin 2024-01-04 390 return unlikely(stat_tasks[NR_MEMCG_RECLAIM]); a65983d90bfb5e0 Lu Jialin 2024-01-04 391 case PSI_MEMCG_RECLAIM_FULL: a65983d90bfb5e0 Lu Jialin 2024-01-04 392 return unlikely(stat_tasks[NR_MEMCG_RECLAIM] && a65983d90bfb5e0 Lu Jialin 2024-01-04 393 nr_running == stat_tasks[NR_MEMCG_RECLAIM_RUNNING]); 25d00f6853c3c6c Lu Jialin 2024-01-04 394 case PSI_GLOBAL_RECLAIM_SOME: 25d00f6853c3c6c Lu Jialin 2024-01-04 395 return unlikely(stat_tasks[NR_GLOBAL_RECLAIM]); 25d00f6853c3c6c Lu Jialin 2024-01-04 396 case PSI_GLOBAL_RECLAIM_FULL: 25d00f6853c3c6c Lu Jialin 2024-01-04 397 return unlikely(stat_tasks[NR_GLOBAL_RECLAIM] && 25d00f6853c3c6c Lu Jialin 2024-01-04 398 nr_running == stat_tasks[NR_GLOBAL_RECLAIM_RUNNING]); 25d00f6853c3c6c Lu Jialin 2024-01-04 399 case PSI_COMPACT_SOME: 25d00f6853c3c6c Lu Jialin 2024-01-04 400 return unlikely(stat_tasks[NR_COMPACT]); 25d00f6853c3c6c Lu Jialin 2024-01-04 401 case PSI_COMPACT_FULL: 25d00f6853c3c6c Lu Jialin 2024-01-04 402 return unlikely(stat_tasks[NR_COMPACT] && 25d00f6853c3c6c Lu Jialin 2024-01-04 403 nr_running == stat_tasks[NR_COMPACT_RUNNING]); 25d00f6853c3c6c Lu Jialin 2024-01-04 404 case PSI_ASYNC_MEMCG_RECLAIM_SOME: 25d00f6853c3c6c Lu Jialin 2024-01-04 405 return unlikely(stat_tasks[NR_ASYNC_MEMCG_RECLAIM]); 25d00f6853c3c6c Lu Jialin 2024-01-04 406 case PSI_ASYNC_MEMCG_RECLAIM_FULL: 25d00f6853c3c6c Lu Jialin 2024-01-04 407 return unlikely(stat_tasks[NR_ASYNC_MEMCG_RECLAIM] && 25d00f6853c3c6c Lu Jialin 2024-01-04 408 nr_running == stat_tasks[NR_ASYNC_MEMCG_RECLAIM_RUNNING]); 25d00f6853c3c6c Lu Jialin 2024-01-04 409 case PSI_SWAP_SOME: 25d00f6853c3c6c Lu Jialin 2024-01-04 410 return unlikely(stat_tasks[NR_SWAP]); 25d00f6853c3c6c Lu Jialin 2024-01-04 411 case PSI_SWAP_FULL: 25d00f6853c3c6c Lu Jialin 2024-01-04 412 return unlikely(stat_tasks[NR_SWAP] && 25d00f6853c3c6c Lu Jialin 2024-01-04 413 nr_running == stat_tasks[NR_SWAP_RUNNING]); a65983d90bfb5e0 Lu Jialin 2024-01-04 414 default: a65983d90bfb5e0 Lu Jialin 2024-01-04 415 return false; a65983d90bfb5e0 Lu Jialin 2024-01-04 416 } a65983d90bfb5e0 Lu Jialin 2024-01-04 417 } a65983d90bfb5e0 Lu Jialin 2024-01-04 418 :::::: The code at line 387 was first introduced by commit :::::: a65983d90bfb5e031444fea492b32f931c83ffcf sched/psi: Introduce fine grained stall time collect for cgroup reclaim :::::: TO: Lu Jialin <lujialin4(a)huawei.com> :::::: CC: yanhaitao <yanhaitao2(a)huawei.com> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0