Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39106dcf authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

cpumask: use new cpus_scnprintf function 



  * Cleaned up references to cpumask_scnprintf() and added new
    cpulist_scnprintf() interfaces where appropriate.

  * Fix some small bugs (or code efficiency improvments) for various uses
    of cpumask_scnprintf.

  * Clean up some checkpatch errors.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fb0f330e

drivers/base/node.c

+19 −5
Original line number Diff line number Diff line
@@ -19,22 +19,34 @@ static struct sysdev_class node_class = { 
};





static ssize_t node_read_cpumap(struct sys_device * dev, char * buf)

static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)

{

	struct node *node_dev = to_node(dev);

	node_to_cpumask_ptr(mask, node_dev->sysdev.id);

	int len;



	/* 2004/06/03: buf currently PAGE_SIZE, need > 1 char per 4 bits. */

	BUILD_BUG_ON(MAX_NUMNODES/4 > PAGE_SIZE/2);

	/* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */

	BUILD_BUG_ON((NR_CPUS/32 * 9) > (PAGE_SIZE-1));



	len = cpumask_scnprintf(buf, PAGE_SIZE-2, *mask);

	len = type?

		cpulist_scnprintf(buf, PAGE_SIZE-2, *mask):

		cpumask_scnprintf(buf, PAGE_SIZE-2, *mask);

 	buf[len++] = '\n';

 	buf[len] = '\0';

	return len;

}



static SYSDEV_ATTR(cpumap, S_IRUGO, node_read_cpumap, NULL);

static inline ssize_t node_read_cpumask(struct sys_device *dev, char *buf)

{

	return node_read_cpumap(dev, 0, buf);

}

static inline ssize_t node_read_cpulist(struct sys_device *dev, char *buf)

{

	return node_read_cpumap(dev, 1, buf);

}



static SYSDEV_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);

static SYSDEV_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);



#define K(x) ((x) << (PAGE_SHIFT - 10))

static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
@@ -150,6 +162,7 @@ int register_node(struct node *node, int num, struct node *parent) 


	if (!error){

		sysdev_create_file(&node->sysdev, &attr_cpumap);

		sysdev_create_file(&node->sysdev, &attr_cpulist);

		sysdev_create_file(&node->sysdev, &attr_meminfo);

		sysdev_create_file(&node->sysdev, &attr_numastat);

		sysdev_create_file(&node->sysdev, &attr_distance);
@@ -167,6 +180,7 @@ int register_node(struct node *node, int num, struct node *parent) 
void unregister_node(struct node *node)

{

	sysdev_remove_file(&node->sysdev, &attr_cpumap);

	sysdev_remove_file(&node->sysdev, &attr_cpulist);

	sysdev_remove_file(&node->sysdev, &attr_meminfo);

	sysdev_remove_file(&node->sysdev, &attr_numastat);

	sysdev_remove_file(&node->sysdev, &attr_distance);

drivers/base/topology.c

+34 −7
Original line number Diff line number Diff line
@@ -40,15 +40,38 @@ static ssize_t show_##name(struct sys_device *dev, char *buf) \ 
	return sprintf(buf, "%d\n", topology_##name(cpu));	\

}



#define define_siblings_show_func(name)					\

static ssize_t show_##name(struct sys_device *dev, char *buf)		\

static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)

{

	ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;

	int n = 0;



	if (len > 1) {

		n = type?

			cpulist_scnprintf(buf, len-2, *mask):

			cpumask_scnprintf(buf, len-2, *mask);

		buf[n++] = '\n';

		buf[n] = '\0';

	}

	return n;

}



#define define_siblings_show_map(name)					\

static inline ssize_t show_##name(struct sys_device *dev, char *buf)	\

{									\

	ssize_t len = -1;						\

	unsigned int cpu = dev->id;					\

	len = cpumask_scnprintf(buf, NR_CPUS+1, topology_##name(cpu));	\

	return (len + sprintf(buf + len, "\n"));			\

	return show_cpumap(0, &(topology_##name(cpu)), buf);		\

}



#define define_siblings_show_list(name)					\

static inline ssize_t show_##name##_list(struct sys_device *dev, char *buf) \

{									\

	unsigned int cpu = dev->id;					\

	return show_cpumap(1, &(topology_##name(cpu)), buf);		\

}



#define define_siblings_show_func(name)		\

	define_siblings_show_map(name); define_siblings_show_list(name)



#ifdef	topology_physical_package_id

define_id_show_func(physical_package_id);

define_one_ro(physical_package_id);
@@ -68,7 +91,9 @@ define_one_ro(core_id); 
#ifdef topology_thread_siblings

define_siblings_show_func(thread_siblings);

define_one_ro(thread_siblings);

#define ref_thread_siblings_attr	&attr_thread_siblings.attr,

define_one_ro(thread_siblings_list);

#define ref_thread_siblings_attr	\

		&attr_thread_siblings.attr, &attr_thread_siblings_list.attr,

#else

#define ref_thread_siblings_attr

#endif
@@ -76,7 +101,9 @@ define_one_ro(thread_siblings); 
#ifdef topology_core_siblings

define_siblings_show_func(core_siblings);

define_one_ro(core_siblings);

#define ref_core_siblings_attr		&attr_core_siblings.attr,

define_one_ro(core_siblings_list);

#define ref_core_siblings_attr		\

		&attr_core_siblings.attr, &attr_core_siblings_list.attr,

#else

#define ref_core_siblings_attr

#endif

drivers/pci/pci-sysfs.c

+18 −2
Original line number Diff line number Diff line
@@ -73,8 +73,23 @@ static ssize_t local_cpus_show(struct device *dev, 


	mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);

	len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);

	strcat(buf,"\n"); 

	return 1+len;

	buf[len++] = '\n';

	buf[len] = '\0';

	return len;

}





static ssize_t local_cpulist_show(struct device *dev,

			struct device_attribute *attr, char *buf)

{

	cpumask_t mask;

	int len;



	mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);

	len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask);

	buf[len++] = '\n';

	buf[len] = '\0';

	return len;

}



/* show resources */
@@ -201,6 +216,7 @@ struct device_attribute pci_dev_attrs[] = { 
	__ATTR_RO(class),

	__ATTR_RO(irq),

	__ATTR_RO(local_cpus),

	__ATTR_RO(local_cpulist),

	__ATTR_RO(modalias),

#ifdef CONFIG_NUMA

	__ATTR_RO(numa_node),

drivers/pci/probe.c

+23 −4
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ void pci_remove_legacy_files(struct pci_bus *bus) { return; } 
 * PCI Bus Class Devices

 */

static ssize_t pci_bus_show_cpuaffinity(struct device *dev,

					int type,

					struct device_attribute *attr,

					char *buf)

{
@@ -89,12 +90,30 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev, 
	cpumask_t cpumask;



	cpumask = pcibus_to_cpumask(to_pci_bus(dev));

	ret = cpumask_scnprintf(buf, PAGE_SIZE, cpumask);

	if (ret < PAGE_SIZE)

	ret = type?

		cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask):

		cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask);

	buf[ret++] = '\n';

	buf[ret] = '\0';

	return ret;

}

DEVICE_ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpuaffinity, NULL);



static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	return pci_bus_show_cpuaffinity(dev, 0, attr, buf);

}



static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	return pci_bus_show_cpuaffinity(dev, 1, attr, buf);

}



DEVICE_ATTR(cpuaffinity,     S_IRUGO, pci_bus_show_cpumaskaffinity, NULL);

DEVICE_ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL);



/*

 * PCI Bus Class

kernel/cpuset.c

+8 −0
Original line number Diff line number Diff line
@@ -2254,8 +2254,16 @@ void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task) 
	m->count += cpumask_scnprintf(m->buf + m->count, m->size - m->count,

					task->cpus_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Cpus_allowed_list:\t");

	m->count += cpulist_scnprintf(m->buf + m->count, m->size - m->count,

					task->cpus_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Mems_allowed:\t");

	m->count += nodemask_scnprintf(m->buf + m->count, m->size - m->count,

					task->mems_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Mems_allowed_list:\t");

	m->count += nodelist_scnprintf(m->buf + m->count, m->size - m->count,

					task->mems_allowed);

	seq_printf(m, "\n");

}