在 2021/5/25 16:12, Jonathan Cameron 写道:

On Mon, 24 May 2021 19:05:53 +0800 Tian Tao tiantao6@hisilicon.com wrote:

...

Use bin_attribute to display thread_siblings/core_cpus/core_siblings, die_cpus/package_cpus/book_siblings/drawer_siblings,avoiding NR_CPUS too big to cause buff overflow.

, avoiding buffer overflow if NR_CPUS is too big.

...

This patch is based on the following discussion. https://www.spinics.net/lists/linux-doc/msg95921.html

Signed-off-by: Tian Tao tiantao6@hisilicon.com

v2: rewrite the function name##_read v3: remove the temp buffer. v4: rewrite the function name##_read

---

drivers/base/topology.c | 64 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 4d254fc..6b160ea 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -14,6 +14,9 @@ #include <linux/hardirq.h> #include <linux/topology.h>

+/* BUFF_SIZE need 9 chars per 32 bits. */ +#define BUFF_SIZE ((NR_CPUS/32)*9)

• #define define_id_show_func(name) \ static ssize_t name##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \

@@ -21,11 +24,22 @@ static ssize_t name##_show(struct device *dev, \ return sysfs_emit(buf, "%d\n", topology_##name(dev->id)); \ }

-#define define_siblings_show_map(name, mask) \ -static ssize_t name##_show(struct device *dev, \

• 	   struct device_attribute *attr, char *buf)	\
  

-{ \

• return cpumap_print_to_pagebuf(false, buf, topology_##mask(dev->id));\

+#define define_siblings_read(name, mask) \ +static ssize_t name##_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); \
• int len; \
• void *data; \
• data = kvmalloc(BUFF_SIZE, GFP_KERNEL); \
• if (!data) \

• return -ENOMEM;							\
  

• len = scnprintf(data, BUFF_SIZE, "%*pb\n", nr_cpu_ids, \

• 	cpumask_bits(topology_##mask(dev->id)));		\
  

Could you do something similar to kvasprintf() which calls vsnprintf twice.

1. Get the size.
2. Allocate that size of buffer
3. Print the string into the buffer.

thank you, I will think about it.

...

• len = memory_read_from_buffer(buf, count, &off, data, len); \

• kvfree(data); \

• return len; \ }

  #define define_siblings_show_list(name, mask) \

@@ -37,7 +51,7 @@ static ssize_t name##_list_show(struct device *dev, \ }

#define define_siblings_show_func(name, mask) \

• define_siblings_show_map(name, mask); \

• define_siblings_read(name, mask); \ define_siblings_show_list(name, mask)

  define_id_show_func(physical_package_id);

@@ -50,30 +64,30 @@ define_id_show_func(core_id); static DEVICE_ATTR_RO(core_id);

define_siblings_show_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);

define_siblings_show_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);

define_siblings_show_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);

define_siblings_show_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);

define_siblings_show_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);

#ifdef CONFIG_SCHED_BOOK define_id_show_func(book_id); static DEVICE_ATTR_RO(book_id); define_siblings_show_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); #endif

@@ -81,32 +95,41 @@ static DEVICE_ATTR_RO(book_siblings_list); define_id_show_func(drawer_id); static DEVICE_ATTR_RO(drawer_id); define_siblings_show_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); #endif

+static struct bin_attribute *bin_attrs[] = {

• &bin_attr_thread_siblings,
• &bin_attr_core_cpus,
• &bin_attr_core_siblings,
• &bin_attr_die_cpus,
• &bin_attr_package_cpus,

+#ifdef CONFIG_SCHED_BOOK

• &bin_attr_book_siblings,

+#endif +#ifdef CONFIG_SCHED_DRAWER

• &bin_attr_drawer_siblings,

+#endif

• NULL,

+};

• static struct attribute *default_attrs[] = { &dev_attr_physical_package_id.attr, &dev_attr_die_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 &dev_attr_book_id.attr,
• &dev_attr_book_siblings.attr, &dev_attr_book_siblings_list.attr, #endif #ifdef CONFIG_SCHED_DRAWER &dev_attr_drawer_id.attr,
• &dev_attr_drawer_siblings.attr, &dev_attr_drawer_siblings_list.attr, #endif NULL

@@ -114,6 +137,7 @@ static struct attribute *default_attrs[] = {

static const struct attribute_group topology_attr_group = { .attrs = default_attrs,

• .bin_attrs = bin_attrs, .name = "topology" };

.