UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology/sysfs: export cluster attributes only if an architectures has support 

mainline inclusion
from mainline-v5.17-rc1
commit e795707703 upstream.

----------------------------------------------------------------------

The cluster_id and cluster_cpus topology sysfs attributes have been
added with commit c5e22feffd ("topology: Represent clusters of CPUs
within a die").

They are currently only used for x86, arm64, and riscv (via generic
arch topology), however they are still present with bogus default
values for all other architectures. Instead of enforcing such new
sysfs attributes to all architectures, make them only optional visible
if an architecture opts in by defining both the topology_cluster_id
and topology_cluster_cpumask attributes.

This is similar to what was done when the book and drawer topology
levels were introduced: avoid useless and therefore confusing sysfs
attributes for architectures which cannot make use of them.

This should not break any existing applications, since this is a
new interface introduced with the v5.16 merge window.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20211129130309.3256168-3-hca@linux.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Xue Sinian <tangyuan911@yeah.net>
This commit is contained in:
Heiko Carstens 2021-11-29 14:03:08 +01:00 committed by XueSinian
parent 1c10a174c1
commit e9220219f0
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/admin-guide/cputopology.rst
View File

@ -102,6 +102,9 @@ Architecture-neutral, drivers/base/topology.c, exports these attributes.
However, the book and drawer related sysfs files will only be created if However, the book and drawer related sysfs files will only be created if
CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are selected, respectively. CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are selected, respectively.
The cluster hierarchy related sysfs files will only be created if an
architecture provides the related macros as described below.
CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are currently only used on s390, CONFIG_SCHED_BOOK and CONFIG_SCHED_DRAWER are currently only used on s390,
where they reflect the cpu and cache hierarchy. where they reflect the cpu and cache hierarchy.

8
drivers/base/topology.c
View File

@ -46,8 +46,10 @@ static DEVICE_ATTR_RO(physical_package_id);
define_id_show_func(die_id); define_id_show_func(die_id);
static DEVICE_ATTR_RO(die_id); static DEVICE_ATTR_RO(die_id);
#ifdef TOPOLOGY_CLUSTER_SYSFS
define_id_show_func(cluster_id); define_id_show_func(cluster_id);
static DEVICE_ATTR_RO(cluster_id); static DEVICE_ATTR_RO(cluster_id);
#endif
define_id_show_func(core_id); define_id_show_func(core_id);
static DEVICE_ATTR_RO(core_id); static DEVICE_ATTR_RO(core_id);
@ -64,9 +66,11 @@ define_siblings_show_func(core_siblings, core_cpumask);
static DEVICE_ATTR_RO(core_siblings); static DEVICE_ATTR_RO(core_siblings);
static DEVICE_ATTR_RO(core_siblings_list); static DEVICE_ATTR_RO(core_siblings_list);
#ifdef TOPOLOGY_CLUSTER_SYSFS
define_siblings_show_func(cluster_cpus, cluster_cpumask); define_siblings_show_func(cluster_cpus, cluster_cpumask);
static DEVICE_ATTR_RO(cluster_cpus); static DEVICE_ATTR_RO(cluster_cpus);
static DEVICE_ATTR_RO(cluster_cpus_list); static DEVICE_ATTR_RO(cluster_cpus_list);
#endif
define_siblings_show_func(die_cpus, die_cpumask); define_siblings_show_func(die_cpus, die_cpumask);
static DEVICE_ATTR_RO(die_cpus); static DEVICE_ATTR_RO(die_cpus);
@ -95,7 +99,9 @@ static DEVICE_ATTR_RO(drawer_siblings_list);
static struct attribute *default_attrs[] = { static struct attribute *default_attrs[] = {
&dev_attr_physical_package_id.attr, &dev_attr_physical_package_id.attr,
&dev_attr_die_id.attr, &dev_attr_die_id.attr,
#ifdef TOPOLOGY_CLUSTER_SYSFS
&dev_attr_cluster_id.attr, &dev_attr_cluster_id.attr,
#endif
&dev_attr_core_id.attr, &dev_attr_core_id.attr,
&dev_attr_thread_siblings.attr, &dev_attr_thread_siblings.attr,
&dev_attr_thread_siblings_list.attr, &dev_attr_thread_siblings_list.attr,
@ -103,8 +109,10 @@ static struct attribute *default_attrs[] = {
&dev_attr_core_cpus_list.attr, &dev_attr_core_cpus_list.attr,
&dev_attr_core_siblings.attr, &dev_attr_core_siblings.attr,
&dev_attr_core_siblings_list.attr, &dev_attr_core_siblings_list.attr,
#ifdef TOPOLOGY_CLUSTER_SYSFS
&dev_attr_cluster_cpus.attr, &dev_attr_cluster_cpus.attr,
&dev_attr_cluster_cpus_list.attr, &dev_attr_cluster_cpus_list.attr,
#endif
&dev_attr_die_cpus.attr, &dev_attr_die_cpus.attr,
&dev_attr_die_cpus_list.attr, &dev_attr_die_cpus_list.attr,
&dev_attr_package_cpus.attr, &dev_attr_package_cpus.attr,

4
include/linux/topology.h
View File

@ -197,6 +197,10 @@ static inline int cpu_to_mem(int cpu)
#endif /* [!]CONFIG_HAVE_MEMORYLESS_NODES */ #endif /* [!]CONFIG_HAVE_MEMORYLESS_NODES */
#if defined(topology_cluster_id) && defined(topology_cluster_cpumask)
#define TOPOLOGY_CLUSTER_SYSFS
#endif
#ifndef topology_physical_package_id #ifndef topology_physical_package_id
#define topology_physical_package_id(cpu) ((void)(cpu), -1) #define topology_physical_package_id(cpu) ((void)(cpu), -1)
#endif #endif