Commit 9d1fe323 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

cpumask: add show cpu map functions 



  * Add cpu_sysdev_class functions to display the following maps
    with cpulist_scnprintf().

	cpu_online_map
	cpu_present_map
	cpu_possible_map

  * Small change to include/linux/sysdev.h to allow the attribute
    name and label to be different (to avoid collision with the
    "attr_online" entry for bringing cpus on- and off-line.)

Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 39106dcf

drivers/base/cpu.c

+48 −0
Original line number Diff line number Diff line
@@ -102,6 +102,51 @@ static ssize_t show_crash_notes(struct sys_device *dev, char *buf) 
static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);

#endif



/*

 * Print cpu online, possible, present, and system maps

 */

static ssize_t print_cpus_map(char *buf, cpumask_t *map)

{

	int n = cpulist_scnprintf(buf, PAGE_SIZE-2, *map);



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

	buf[n] = '\0';

	return n;

}



#define	print_cpus_func(type) \

static ssize_t print_cpus_##type(struct sysdev_class *class, char *buf)	\

{									\

	return print_cpus_map(buf, &cpu_##type##_map);			\

}									\

struct sysdev_class_attribute attr_##type##_map = 			\

	_SYSDEV_CLASS_ATTR(type, 0444, print_cpus_##type, NULL)



print_cpus_func(online);

print_cpus_func(possible);

print_cpus_func(present);



struct sysdev_class_attribute *cpu_state_attr[] = {

	&attr_online_map,

	&attr_possible_map,

	&attr_present_map,

};



static int cpu_states_init(void)

{

	int i;

	int err = 0;



	for (i = 0;  i < ARRAY_SIZE(cpu_state_attr); i++) {

		int ret;

		ret = sysdev_class_create_file(&cpu_sysdev_class,

						cpu_state_attr[i]);

		if (!err)

			err = ret;

	}

	return err;

}



/*

 * register_cpu - Setup a sysfs device for a CPU.

 * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
@@ -147,6 +192,9 @@ int __init cpu_dev_init(void) 
	int err;



	err = sysdev_class_register(&cpu_sysdev_class);

	if (!err)

		err = cpu_states_init();



#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)

	if (!err)

		err = sched_create_sysfs_power_savings_entries(&cpu_sysdev_class);

include/linux/sysdev.h

+11 −6
Original line number Diff line number Diff line
@@ -45,12 +45,16 @@ struct sysdev_class_attribute { 
	ssize_t (*store)(struct sysdev_class *, const char *, size_t);

};



#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) 		\

struct sysdev_class_attribute attr_##_name = { 			\

#define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) 		\

{					 			\

	.attr = {.name = __stringify(_name), .mode = _mode },	\

	.show	= _show,					\

	.store	= _store,					\

};

}



#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) 		\

	struct sysdev_class_attribute attr_##_name = 		\

		_SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)





extern int sysdev_class_register(struct sysdev_class *);
@@ -108,7 +112,8 @@ struct sysdev_attribute { 
}



#define SYSDEV_ATTR(_name, _mode, _show, _store)		\

struct sysdev_attribute attr_##_name = _SYSDEV_ATTR(_name,_mode,_show,_store);

	struct sysdev_attribute attr_##_name =			\

		_SYSDEV_ATTR(_name, _mode, _show, _store);



extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);

extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE