openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: use bin_attribute to break the size limitation of cpumap ABI 

Reading /sys/devices/system/cpu/cpuX/topology/ returns cpu topology.
However, the size of this file is limited to PAGE_SIZE because of
the limitation for sysfs attribute.
This patch moves to use bin_attribute to extend the ABI to be more
than one page so that cpumap bitmask and list won't be potentially
trimmed.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Link: https://lore.kernel.org/r/20210806110251.560-4-song.bao.hua@hisilicon.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tian Tao 2021-08-06 23:02:49 +12:00 committed by Greg Kroah-Hartman
parent 291f93ca33
commit bb9ec13d15
1 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
drivers/base/topology.c
View File

@ -21,25 +21,27 @@ static ssize_t name##_show(struct device *dev, \
return sysfs_emit(buf, "%d\n", topology_##name(dev->id)); \ return sysfs_emit(buf, "%d\n", topology_##name(dev->id)); \
} }
#define define_siblings_show_map(name, mask) \ #define define_siblings_read_func(name, mask) \
static ssize_t name##_show(struct device *dev, \ static ssize_t name##_read(struct file *file, struct kobject *kobj, \
struct device_attribute *attr, char *buf) \ struct bin_attribute *attr, char *buf, \
{ \ loff_t off, size_t count) \
return cpumap_print_to_pagebuf(false, buf, topology_##mask(dev->id));\ { \
struct device *dev = kobj_to_dev(kobj); \
\
return cpumap_print_bitmask_to_buf(buf, topology_##mask(dev->id), \
off, count); \
} \
\
static ssize_t name##_list_read(struct file *file, struct kobject *kobj, \
struct bin_attribute *attr, char *buf, \
loff_t off, size_t count) \
{ \
struct device *dev = kobj_to_dev(kobj); \
\
return cpumap_print_list_to_buf(buf, topology_##mask(dev->id), \
off, count); \
} }
#define define_siblings_show_list(name, mask) \
static ssize_t name##_list_show(struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return cpumap_print_to_pagebuf(true, buf, topology_##mask(dev->id));\
}
#define define_siblings_show_func(name, mask) \
define_siblings_show_map(name, mask); \
define_siblings_show_list(name, mask)
define_id_show_func(physical_package_id); define_id_show_func(physical_package_id);
static DEVICE_ATTR_RO(physical_package_id); static DEVICE_ATTR_RO(physical_package_id);
@ -49,71 +51,80 @@ static DEVICE_ATTR_RO(die_id);
define_id_show_func(core_id); define_id_show_func(core_id);
static DEVICE_ATTR_RO(core_id); static DEVICE_ATTR_RO(core_id);
define_siblings_show_func(thread_siblings, sibling_cpumask); define_siblings_read_func(thread_siblings, sibling_cpumask);
static DEVICE_ATTR_RO(thread_siblings); static BIN_ATTR_RO(thread_siblings, 0);
static DEVICE_ATTR_RO(thread_siblings_list); static BIN_ATTR_RO(thread_siblings_list, 0);
define_siblings_show_func(core_cpus, sibling_cpumask); define_siblings_read_func(core_cpus, sibling_cpumask);
static DEVICE_ATTR_RO(core_cpus); static BIN_ATTR_RO(core_cpus, 0);
static DEVICE_ATTR_RO(core_cpus_list); static BIN_ATTR_RO(core_cpus_list, 0);
define_siblings_show_func(core_siblings, core_cpumask); define_siblings_read_func(core_siblings, core_cpumask);
static DEVICE_ATTR_RO(core_siblings); static BIN_ATTR_RO(core_siblings, 0);
static DEVICE_ATTR_RO(core_siblings_list); static BIN_ATTR_RO(core_siblings_list, 0);
define_siblings_show_func(die_cpus, die_cpumask); define_siblings_read_func(die_cpus, die_cpumask);
static DEVICE_ATTR_RO(die_cpus); static BIN_ATTR_RO(die_cpus, 0);
static DEVICE_ATTR_RO(die_cpus_list); static BIN_ATTR_RO(die_cpus_list, 0);
define_siblings_show_func(package_cpus, core_cpumask); define_siblings_read_func(package_cpus, core_cpumask);
static DEVICE_ATTR_RO(package_cpus); static BIN_ATTR_RO(package_cpus, 0);
static DEVICE_ATTR_RO(package_cpus_list); static BIN_ATTR_RO(package_cpus_list, 0);
#ifdef CONFIG_SCHED_BOOK #ifdef CONFIG_SCHED_BOOK
define_id_show_func(book_id); define_id_show_func(book_id);
static DEVICE_ATTR_RO(book_id); static DEVICE_ATTR_RO(book_id);
define_siblings_show_func(book_siblings, book_cpumask); define_siblings_read_func(book_siblings, book_cpumask);
static DEVICE_ATTR_RO(book_siblings); static BIN_ATTR_RO(book_siblings, 0);
static DEVICE_ATTR_RO(book_siblings_list); static BIN_ATTR_RO(book_siblings_list, 0);
#endif #endif
#ifdef CONFIG_SCHED_DRAWER #ifdef CONFIG_SCHED_DRAWER
define_id_show_func(drawer_id); define_id_show_func(drawer_id);
static DEVICE_ATTR_RO(drawer_id); static DEVICE_ATTR_RO(drawer_id);
define_siblings_show_func(drawer_siblings, drawer_cpumask); define_siblings_read_func(drawer_siblings, drawer_cpumask);
static DEVICE_ATTR_RO(drawer_siblings); static BIN_ATTR_RO(drawer_siblings, 0);
static DEVICE_ATTR_RO(drawer_siblings_list); static BIN_ATTR_RO(drawer_siblings_list, 0);
#endif #endif
static struct bin_attribute *bin_attrs[] = {
&bin_attr_core_cpus,
&bin_attr_core_cpus_list,
&bin_attr_thread_siblings,
&bin_attr_thread_siblings_list,
&bin_attr_core_siblings,
&bin_attr_core_siblings_list,
&bin_attr_die_cpus,
&bin_attr_die_cpus_list,
&bin_attr_package_cpus,
&bin_attr_package_cpus_list,
#ifdef CONFIG_SCHED_BOOK
&bin_attr_book_siblings,
&bin_attr_book_siblings_list,
#endif
#ifdef CONFIG_SCHED_DRAWER
&bin_attr_drawer_siblings,
&bin_attr_drawer_siblings_list,
#endif
NULL
};
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,
&dev_attr_core_id.attr, &dev_attr_core_id.attr,
&dev_attr_thread_siblings.attr,
&dev_attr_thread_siblings_list.attr,
&dev_attr_core_cpus.attr,
&dev_attr_core_cpus_list.attr,
&dev_attr_core_siblings.attr,
&dev_attr_core_siblings_list.attr,
&dev_attr_die_cpus.attr,
&dev_attr_die_cpus_list.attr,
&dev_attr_package_cpus.attr,
&dev_attr_package_cpus_list.attr,
#ifdef CONFIG_SCHED_BOOK #ifdef CONFIG_SCHED_BOOK
&dev_attr_book_id.attr, &dev_attr_book_id.attr,
&dev_attr_book_siblings.attr,
&dev_attr_book_siblings_list.attr,
#endif #endif
#ifdef CONFIG_SCHED_DRAWER #ifdef CONFIG_SCHED_DRAWER
&dev_attr_drawer_id.attr, &dev_attr_drawer_id.attr,
&dev_attr_drawer_siblings.attr,
&dev_attr_drawer_siblings_list.attr,
#endif #endif
NULL NULL
}; };
static const struct attribute_group topology_attr_group = { static const struct attribute_group topology_attr_group = {
.attrs = default_attrs, .attrs = default_attrs,
.bin_attrs = bin_attrs,
.name = "topology" .name = "topology"
}; };