arch_topology: Clear LLC sibling when cacheinfo teardown
Subsystems (2)
PATCH 1/1 arch_topology: Clear LLC sibling when cacheinfo teardown
The teardown of CPUHP_AP_BASE_CACHEINFO_ONLINE now only invokes free_cache_attributes() to clear share_cpu_map of cacheinfo list. At the same time, clearing cpu_topology[].llc_sibling is called quite late at the teardown code in hotplug STARTING section.
To avoid the incorrect LLC sibling masks generated, move its clearing right after free_cache_attributes().
--- drivers/base/arch_topology.c | 16 ++++++++++++++-- drivers/base/cacheinfo.c | 2 ++ include/linux/arch_topology.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-)
drivers/base/arch_topology.c +14 -2
@@ -769,6 +769,20 @@ void update_siblings_masks(unsigned int cpuid) } } +void clear_llc_topology (unsigned int cpu) +{ +int sib; + +for_each_cpu (sib,topology_llc_cpumask (cpu)) { +if (sib == cpu) +continue ; +if (last_level_cache_is_shared (cpu, sib)) { +cpumask_clear_cpu (cpu,topology_llc_cpumask (sib)); +cpumask_clear_cpu (sib,topology_llc_cpumask (cpu)); + } + } +} +static void clear_cpu_topology (int cpu) {struct cpu_topology *cpu_topo = &cpu_topology[cpu];
@@ -811,8 +825,6 @@ void remove_cpu_topology(unsigned int cpu)cpumask_clear_cpu (cpu,topology_sibling_cpumask (sibling));for_each_cpu (sibling,topology_cluster_cpumask (cpu))cpumask_clear_cpu (cpu,topology_cluster_cpumask (sibling)); -for_each_cpu (sibling,topology_llc_cpumask (cpu)) -cpumask_clear_cpu (cpu,topology_llc_cpumask (sibling));clear_cpu_topology (cpu); }
drivers/base/cacheinfo.c +2 -0
@@ -19,6 +19,7 @@#include <linux/slab.h> #include <linux/smp.h> #include <linux/sysfs.h> +#include <linux/arch_topology.h> /* pointer to per cpu cacheinfo */ static DEFINE_PER_CPU(struct cpu_cacheinfo, ci_cpu_cacheinfo);
@@ -814,6 +815,7 @@ static int cacheinfo_cpu_pre_down(unsigned int cpu)cpu_cache_sysfs_exit (cpu);free_cache_attributes (cpu); +clear_llc_topology (cpu);return 0 ; }
include/linux/arch_topology.h +1 -0
@@ -89,6 +89,7 @@ void store_cpu_topology(unsigned int cpuid);const struct cpumask *cpu_coregroup_mask (int cpu);const struct cpumask *cpu_clustergroup_mask (int cpu);void update_siblings_masks (unsigned int cpu); +void clear_llc_topology (unsigned int cpu);void remove_cpu_topology (unsigned int cpuid);void reset_cpu_topology (void );int parse_acpi_topology (void );
Signature · 1 line
2.20.1
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Song,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on driver-core/driver-core-testing]
[also build test ERROR on driver-core/driver-core-next driver-core/driver-core-linus linus/master v6.3-rc2 next-20230310] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 patch link: https://lore.kernel.org/r/20230313102752.1134472-1-suagrfillet%40gmail.com patch subject: [PATCH] arch_topology: Clear LLC sibling when cacheinfo teardown config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20230313/[email protected]/config) compiler: m68k-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/a9aca0a81b31b421e3bbfa08fd205a8bec651afe
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 git checkout a9aca0a81b31b421e3bbfa08fd205a8bec651afe
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/base/cacheinfo.c: In function 'cacheinfo_cpu_pre_down':
>> drivers/base/cacheinfo.c:818:9: error: implicit declaration of function 'clear_llc_topology' [-Werror=implicit-function-declaration]
818 | clear_llc_topology(cpu);
| ^~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/clear_llc_topology +818 drivers/base/cacheinfo.c
811
812 static int cacheinfo_cpu_pre_down(unsigned int cpu)
813 {
814 if (cpumask_test_and_clear_cpu(cpu, &cache_dev_map))
815 cpu_cache_sysfs_exit(cpu);
816
817 free_cache_attributes(cpu);
> 818 clear_llc_topology(cpu);
819 return 0;
820 }
821
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Song,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on driver-core/driver-core-testing]
[also build test ERROR on driver-core/driver-core-next driver-core/driver-core-linus linus/master v6.3-rc2 next-20230310] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 patch link: https://lore.kernel.org/r/20230313102752.1134472-1-suagrfillet%40gmail.com patch subject: [PATCH] arch_topology: Clear LLC sibling when cacheinfo teardown config: x86_64-randconfig-a014-20230313 (https://download.01.org/0day-ci/archive/20230314/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/a9aca0a81b31b421e3bbfa08fd205a8bec651afe
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 git checkout a9aca0a81b31b421e3bbfa08fd205a8bec651afe
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/base/cacheinfo.c:818:2: error: implicit declaration of function 'clear_llc_topology' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
clear_llc_topology(cpu);
^1 error generated.
vim +/clear_llc_topology +818 drivers/base/cacheinfo.c
811
812 static int cacheinfo_cpu_pre_down(unsigned int cpu)
813 {
814 if (cpumask_test_and_clear_cpu(cpu, &cache_dev_map))
815 cpu_cache_sysfs_exit(cpu);
816
817 free_cache_attributes(cpu);
> 818 clear_llc_topology(cpu);
819 return 0;
820 }
821
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Song,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on driver-core/driver-core-testing]
[also build test ERROR on driver-core/driver-core-next driver-core/driver-core-linus linus/master v6.3-rc2 next-20230310] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 patch link: https://lore.kernel.org/r/20230313102752.1134472-1-suagrfillet%40gmail.com patch subject: [PATCH] arch_topology: Clear LLC sibling when cacheinfo teardown config: arm-randconfig-r046-20230312 (https://download.01.org/0day-ci/archive/20230314/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/intel-lab-lkp/linux/commit/a9aca0a81b31b421e3bbfa08fd205a8bec651afe
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Song-Shuai/arch_topology-Clear-LLC-sibling-when-cacheinfo-teardown/20230313-182946 git checkout a9aca0a81b31b421e3bbfa08fd205a8bec651afe
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/base/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/base/cacheinfo.c:818:2: error: call to undeclared function 'clear_llc_topology'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
clear_llc_topology(cpu);
^1 error generated.
vim +/clear_llc_topology +818 drivers/base/cacheinfo.c
811
812 static int cacheinfo_cpu_pre_down(unsigned int cpu)
813 {
814 if (cpumask_test_and_clear_cpu(cpu, &cache_dev_map))
815 cpu_cache_sysfs_exit(cpu);
816
817 free_cache_attributes(cpu);
> 818 clear_llc_topology(cpu);
819 return 0;
820 }
821
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests