Greetings, programs.
I would like to submit this patch to the sysdev subsystem.
Previously, sysdev show/store methods were only passed pointers to
sys_device objects, but not pointers to the actual sysdev_attribute
object that the show/store method is operating on. This is bad
because:
1. it means you need to have one show and one store method defined
for every attribute
2. it precludes the ability to create sys_device objects whose
attributes are not known at compile time (such as an sysfs
representation of the smbios table for some platforms -- which will be
my next patch submission).
I also took the liberty of adding a glib-style "void *" pointer to the
sysdev_attribute object, enabling us to stuff arbitrary identifying
information into that structure. This saves us the trouble of having
to do something silly such as identify the attribute by parsing the
name string, or comparing against a table of attribute pointers.
I've compiled and tested this on my x86_64 test systems. It's a
pretty simple patch, I have high hopes it'll "just work" on all
platforms.
Hey, my first kernel patch! Rock! Did I do it right?
- Jonathan Mayer
----->8 snip
diff -ur linux-2.6.13.4.orig/arch/arm/kernel/time.c
linux-2.6.13.4.new/arch/arm/kernel/time.c
--- linux-2.6.13.4.orig/arch/arm/kernel/time.c 2005-10-19
10:26:09.000000000 -0700
+++ linux-2.6.13.4.new/arch/arm/kernel/time.c 2005-10-19
10:32:25.000000000 -0700
@@ -143,7 +143,7 @@
{ "red", led_red_on, led_red_off },
};
-static ssize_t leds_store(struct sys_device *dev, const char *buf, size_t size)
+static ssize_t leds_store(struct sys_device *dev, struct
sysdev_attribute *attr, const char *buf, size_t size)
{
int ret = -EINVAL, len = strcspn(buf, " ");
diff -ur linux-2.6.13.4.orig/arch/ppc64/kernel/sysfs.c
linux-2.6.13.4.new/arch/ppc64/kernel/sysfs.c
--- linux-2.6.13.4.orig/arch/ppc64/kernel/sysfs.c 2005-10-19
10:26:10.000000000 -0700
+++ linux-2.6.13.4.new/arch/ppc64/kernel/sysfs.c 2005-10-19
10:32:25.000000000 -0700
@@ -28,8 +28,8 @@
/* default to snooze disabled */
DEFINE_PER_CPU(unsigned long, smt_snooze_delay);
-static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
- size_t count)
+static ssize_t store_smt_snooze_delay(struct sys_device *dev, struct
sysdev_attribute *attr,
+ const char *buf, size_t count)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
ssize_t ret;
@@ -44,7 +44,8 @@
return count;
}
-static ssize_t show_smt_snooze_delay(struct sys_device *dev, char *buf)
+static ssize_t show_smt_snooze_delay(struct sys_device *dev, struct
sysdev_attribute *attr,
+ char *buf)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
@@ -200,14 +201,14 @@
mtspr(ADDRESS, val); \
return 0; \
} \
-static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
+static ssize_t show_##NAME(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf) \
{ \
struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
unsigned long val = run_on_cpu(cpu->sysdev.id, read_##NAME, 0); \
return sprintf(buf, "%lx\n", val); \
} \
static ssize_t __attribute_used__ \
- store_##NAME(struct sys_device *dev, const char *buf, size_t count) \
+ store_##NAME(struct sys_device *dev, struct sysdev_attribute *attr,
const char *buf, size_t count) \
{ \
struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
unsigned long val; \
@@ -367,7 +368,7 @@
#endif
/* Only valid if CPU is present. */
-static ssize_t show_physical_id(struct sys_device *dev, char *buf)
+static ssize_t show_physical_id(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
diff -ur linux-2.6.13.4.orig/arch/sh/drivers/dma/dma-sysfs.c
linux-2.6.13.4.new/arch/sh/drivers/dma/dma-sysfs.c
--- linux-2.6.13.4.orig/arch/sh/drivers/dma/dma-sysfs.c 2005-10-19
10:26:11.000000000 -0700
+++ linux-2.6.13.4.new/arch/sh/drivers/dma/dma-sysfs.c 2005-10-19
10:32:25.000000000 -0700
@@ -21,7 +21,7 @@
EXPORT_SYMBOL(dma_sysclass);
-static ssize_t dma_show_devices(struct sys_device *dev, char *buf)
+static ssize_t dma_show_devices(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf)
{
ssize_t len = 0;
int i;
@@ -53,13 +53,13 @@
postcore_initcall(dma_sysclass_init);
-static ssize_t dma_show_dev_id(struct sys_device *dev, char *buf)
+static ssize_t dma_show_dev_id(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf)
{
struct dma_channel *channel = to_dma_channel(dev);
return sprintf(buf, "%s\n", channel->dev_id);
}
-static ssize_t dma_store_dev_id(struct sys_device *dev,
+static ssize_t dma_store_dev_id(struct sys_device *dev, struct
sysdev_attribute *attr,
const char *buf, size_t count)
{
struct dma_channel *channel = to_dma_channel(dev);
@@ -69,7 +69,7 @@
static SYSDEV_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id,
dma_store_dev_id);
-static ssize_t dma_store_config(struct sys_device *dev,
+static ssize_t dma_store_config(struct sys_device *dev, struct
sysdev_attribute *attr,
const char *buf, size_t count)
{
struct dma_channel *channel = to_dma_channel(dev);
@@ -83,13 +83,13 @@
static SYSDEV_ATTR(config, S_IWUSR, NULL, dma_store_config);
-static ssize_t dma_show_mode(struct sys_device *dev, char *buf)
+static ssize_t dma_show_mode(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf)
{
struct dma_channel *channel = to_dma_channel(dev);
return sprintf(buf, "0x%08x\n", channel->mode);
}
-static ssize_t dma_store_mode(struct sys_device *dev,
+static ssize_t dma_store_mode(struct sys_device *dev, struct
sysdev_attribute *attr,
const char *buf, size_t count)
{
struct dma_channel *channel = to_dma_channel(dev);
@@ -100,7 +100,9 @@
static SYSDEV_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
#define dma_ro_attr(field, fmt) \
-static ssize_t dma_show_##field(struct sys_device *dev, char *buf) \
+static ssize_t dma_show_##field(struct sys_device *dev, \
+ struct sysdev_attribute *attr, \
+ char *buf) \
{ \
struct dma_channel *channel = to_dma_channel(dev); \
return sprintf(buf, fmt, channel->field); \
diff -ur linux-2.6.13.4.orig/arch/x86_64/kernel/mce.c
linux-2.6.13.4.new/arch/x86_64/kernel/mce.c
--- linux-2.6.13.4.orig/arch/x86_64/kernel/mce.c 2005-10-19
10:26:19.000000000 -0700
+++ linux-2.6.13.4.new/arch/x86_64/kernel/mce.c 2005-10-19
10:32:25.000000000 -0700
@@ -528,10 +528,14 @@
/* Why are there no generic functions for this? */
#define ACCESSOR(name, var, start) \
- static ssize_t show_ ## name(struct sys_device *s, char *buf) { \
+ static ssize_t show_ ## name(struct sys_device *s, \
+ struct sysdev_attribute *attr,
\
+ char *buf) { \
return sprintf(buf, "%lx\n", (unsigned long)var); \
} \
- static ssize_t set_ ## name(struct sys_device *s,const char
*buf,size_t siz) { \
+ static ssize_t set_ ## name(struct sys_device *s, \
+ struct sysdev_attribute *attr,
\
+ const char *buf,size_t siz) {
\
char *end; \
unsigned long new = simple_strtoul(buf, &end, 0); \
if (end == buf) return -EINVAL; \
diff -ur linux-2.6.13.4.orig/drivers/base/cpu.c
linux-2.6.13.4.new/drivers/base/cpu.c
--- linux-2.6.13.4.orig/drivers/base/cpu.c 2005-10-19 10:26:20.000000000 -0700
+++ linux-2.6.13.4.new/drivers/base/cpu.c 2005-10-19 10:34:23.000000000 -0700
@@ -21,15 +21,15 @@
return 0;
}
-static ssize_t show_online(struct sys_device *dev, char *buf)
+static ssize_t show_online(struct sys_device *dev, struct
sysdev_attribute *attr, char *buf)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
return sprintf(buf, "%u\n", !!cpu_online(cpu->sysdev.id));
}
-static ssize_t store_online(struct sys_device *dev, const char *buf,
- size_t count)
+static ssize_t store_online(struct sys_device *dev, struct
sysdev_attribute *attr,
+ const char *buf, size_t count)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
ssize_t ret;
diff -ur linux-2.6.13.4.orig/drivers/base/node.c
linux-2.6.13.4.new/drivers/base/node.c
--- linux-2.6.13.4.orig/drivers/base/node.c 2005-10-19 10:26:20.000000000 -0700
+++ linux-2.6.13.4.new/drivers/base/node.c 2005-10-19 10:32:25.000000000 -0700
@@ -17,7 +17,7 @@
};
-static ssize_t node_read_cpumap(struct sys_device * dev, char * buf)
+static ssize_t node_read_cpumap(struct sys_device * dev, struct
sysdev_attribute *attr, char * buf)
{
struct node *node_dev = to_node(dev);
cpumask_t mask = node_to_cpumask(node_dev->sysdev.id);
@@ -34,7 +34,8 @@
static SYSDEV_ATTR(cpumap, S_IRUGO, node_read_cpumap, NULL);
#define K(x) ((x) << (PAGE_SHIFT - 10))
-static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
+static ssize_t node_read_meminfo(struct sys_device * dev, struct
sysdev_attribute *attr,
+ char * buf)
{
int n;
int nid = dev->id;
@@ -72,7 +73,8 @@
#undef K
static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
-static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
+static ssize_t node_read_numastat(struct sys_device * dev, struct
sysdev_attribute *attr,
+ char * buf)
{
unsigned long numa_hit, numa_miss, interleave_hit, numa_foreign;
unsigned long local_node, other_node;
@@ -112,7 +114,8 @@
}
static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
-static ssize_t node_read_distance(struct sys_device * dev, char * buf)
+static ssize_t node_read_distance(struct sys_device * dev, struct
sysdev_attribute *attr,
+ char * buf)
{
int nid = dev->id;
int len = 0;
diff -ur linux-2.6.13.4.orig/drivers/base/sys.c
linux-2.6.13.4.new/drivers/base/sys.c
--- linux-2.6.13.4.orig/drivers/base/sys.c 2005-10-19 10:26:20.000000000 -0700
+++ linux-2.6.13.4.new/drivers/base/sys.c 2005-10-19 10:35:33.000000000 -0700
@@ -35,7 +35,7 @@
struct sysdev_attribute * sysdev_attr = to_sysdev_attr(attr);
if (sysdev_attr->show)
- return sysdev_attr->show(sysdev, buffer);
+ return sysdev_attr->show(sysdev, sysdev_attr, buffer);
return -EIO;
}
@@ -48,7 +48,7 @@
struct sysdev_attribute * sysdev_attr = to_sysdev_attr(attr);
if (sysdev_attr->store)
- return sysdev_attr->store(sysdev, buffer, count);
+ return sysdev_attr->store(sysdev, sysdev_attr, buffer, count);
return -EIO;
}
diff -ur linux-2.6.13.4.orig/include/linux/sysdev.h
linux-2.6.13.4.new/include/linux/sysdev.h
--- linux-2.6.13.4.orig/include/linux/sysdev.h 2005-10-19
10:27:19.000000000 -0700
+++ linux-2.6.13.4.new/include/linux/sysdev.h 2005-10-19
10:32:25.000000000 -0700
@@ -74,21 +74,26 @@
extern int sysdev_register(struct sys_device *);
extern void sysdev_unregister(struct sys_device *);
-
-struct sysdev_attribute {
+struct sysdev_attribute {
struct attribute attr;
- ssize_t (*show)(struct sys_device *, char *);
- ssize_t (*store)(struct sys_device *, const char *, size_t);
+ ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *);
+ ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
const char *, size_t);
+ void * data;
};
-#define SYSDEV_ATTR(_name,_mode,_show,_store) \
+
+#define SYSDEV_ATTR_WITH_DATA(_name,_mode,_show,_store,_data) \
struct sysdev_attribute attr_##_name = { \
.attr = {.name = __stringify(_name), .mode = _mode }, \
.show = _show, \
.store = _store, \
+ .data = _data, \
};
+#define SYSDEV_ATTR(_name,_mode,_show,_store) \
+ SYSDEV_ATTR_WITH_DATA(_name,_mode,_show,_store,NULL)
+
extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);
extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
