unify sysfs device tree
Subsystems (5)
Here is a first test of the unification of the sysfs device tree. As already discussed to end in the context of stacked class devices, it moves all device objects into a single device tree at /sys/devices to expose the kernels device hierarchy to userspace.
All former objects in /sys/class will become only symlinks and are compatible to our current layout. This approach will not mix classification and device hierarchy.
The hierarchy in /sys/devices is not necessarily expected to be stable across kernel versions, it must be allowed to insert devices in the tree if needed, without breaking userspace applications. But the links in /sys/class are expected to be kept stable, but that's easy now, cause they will always be simple flat directories.
Every device event sent to userspace contains its natural dependency path in the DEVPATH, the ugly "device" symlink can be removed.
This patch is a simple hack, cause I want to prepare userspace to work with that. It already works without any problems on a recent udev system. (Besides HAL which needs to be adapted.)
The same way /sys/class is represented, /sys/block should be converted, so we finally end up with a buch of symlinks in /sys/class/block.
There is a lot of room for improvement in the driver core, cause a whole lot of infrastructure could be shared between the class / block / device core, if we only build a single device tree, but that's a different issue and independent from how it will looks like to userspace.
Here is for illustration the "input" layer as a flat /sys/class directory. All devices point to /sys/devices which exposes the device hierarchy if userspace wants to know that:
/sys/class/ ... |-- input | |-- input0 -> ../../devices/platform/i8042/serio1/input0 | |-- input1 -> ../../devices/platform/i8042/serio0/input1 | |-- input3 -> ../../devices/platform/i8042/serio0/serio2/input3 | |-- input4 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4 | |-- mice -> ../../devices/mice | |-- mouse0 -> ../../devices/platform/i8042/serio0/input1/mouse0 | |-- mouse1 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4/mouse1 | `-- mouse2 -> ../../devices/platform/i8042/serio0/serio2/input3/mouse2 |-- mem | |-- full -> ../../devices/full | |-- kmem -> ../../devices/kmem | |-- kmsg -> ../../devices/kmsg | |-- mem -> ../../devices/mem | |-- null -> ../../devices/null | |-- port -> ../../devices/port | |-- random -> ../../devices/random | |-- urandom -> ../../devices/urandom | `-- zero -> ../../devices/zero ... /sys/devices/ |-- platform | |-- i8042 | | |-- bus -> ../../../bus/platform | | |-- driver -> ../../../bus/platform/drivers/i8042 | | |-- power | | | |-- state | | | `-- wakeup | | |-- serio0 | | | |-- bind_mode | | | |-- bus -> ../../../../bus/serio | | | |-- description | | | |-- driver -> ../../../../bus/serio/drivers/psmouse | | | |-- drvctl | | | |-- id ... | | | | `-- type | | | |-- input1 | | | | |-- capabilities ... | | | | | `-- sw | | | | |-- device -> ../../../../../devices/platform/i8042/serio0 | | | | |-- id ... | | | | | `-- version | | | | |-- modalias | | | | |-- mouse0 | | | | | |-- dev | | | | | |-- device -> ../../../../../../devices/platform/i8042/serio0 | | | | | |-- subsystem -> ../../../../../../class/input | | | | | `-- uevent ...
This is the event sequence for a USB mouse, there are no "class" events anymore:
add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5/mouse1 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/usbdev3.4
Thanks,
Kay
---
Unify sysfs device tree
Move device objects from /sys/class to /sys/devices and add a link from /sys/class to the device object.
drivers/base/class.c +16 -1
@@ -20,6 +20,8 @@#include <linux/slab.h> #include "base.h" +extern struct subsystem devices_subsys; +#define to_class_attr (_attr) container_of(_attr, struct class_attribute, attr)#define to_class (obj) container_of(obj, struct class, subsys.kset.kobj)
@@ -518,15 +520,25 @@ int class_device_add(struct class_device/* first, register with generic layer. */ kobject_set_name (&class_dev->kobj,"%s" , class_dev->class_id); + +/* set parent for sysfs location */ if (parent_class_dev) class_dev->kobj.parent = &parent_class_dev->kobj; +else if (class_dev->dev) + class_dev->kobj.parent = &class_dev->dev->kobj;else - class_dev->kobj.parent = &parent_class->subsys.kset.kobj; + class_dev->kobj.parent = &devices_subsys.kset.kobj; error =kobject_add (&class_dev->kobj);if (error) goto register_done; +/* create link from class to device object */ +sysfs_create_link (&parent_class->subsys.kset.kobj, &class_dev->kobj, class_dev->class_id); + +/* create link from device object back to class */ +sysfs_create_link (&class_dev->kobj, &parent_class->subsys.kset.kobj,"subsystem" ); +/* add the needed attributes to this device */ class_dev->uevent_attr.attr.name ="uevent" ; class_dev->uevent_attr.attr.mode =S_IWUSR ;
@@ -664,6 +676,8 @@ void class_device_del(struct class_devicup (&parent_class->sem); } +sysfs_remove_link (&class_dev->kobj,"subsystem" ); +if (class_dev->dev) { class_name =make_class_name (class_dev);sysfs_remove_link (&class_dev->kobj,"device" );
@@ -675,6 +689,7 @@ void class_device_del(struct class_devicclass_device_remove_attrs (class_dev);kobject_uevent (&class_dev->kobj,KOBJ_REMOVE ); +sysfs_remove_link (&parent_class->subsys.kset.kobj, class_dev->class_id);kobject_del (&class_dev->kobj);class_device_put (parent_device);
drivers/input/evdev.c +0 -5
@@ -630,10 +630,6 @@ static struct input_handle *evdev_connecMKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + minor), dev->cdev.dev, evdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - evdev->name); -return &evdev->handle; }
@@ -642,7 +638,6 @@ static void evdev_disconnect(struct inpustruct evdev *evdev = handle->private;struct evdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, evdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + evdev->minor)); evdev->exist =0 ;
drivers/input/joydev.c +0 -5
@@ -518,10 +518,6 @@ static struct input_handle *joydev_conneMKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + minor), dev->cdev.dev, joydev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - joydev->name); -return &joydev->handle; }
@@ -530,7 +526,6 @@ static void joydev_disconnect(struct inpstruct joydev *joydev = handle->private;struct joydev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, joydev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + joydev->minor)); joydev->exist =0 ;
drivers/input/mousedev.c +0 -5
@@ -653,10 +653,6 @@ static struct input_handle *mousedev_conMKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + minor), dev->cdev.dev, mousedev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - mousedev->name); -return &mousedev->handle; }
@@ -665,7 +661,6 @@ static void mousedev_disconnect(struct istruct mousedev *mousedev = handle->private;struct mousedev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, mousedev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + mousedev->minor)); mousedev->exist =0 ;
drivers/input/tsdev.c +0 -5
@@ -414,10 +414,6 @@ static struct input_handle *tsdev_connecMKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + minor), dev->cdev.dev, tsdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - tsdev->name); -return &tsdev->handle; }
@@ -426,7 +422,6 @@ static void tsdev_disconnect(struct inpustruct tsdev *tsdev = handle->private;struct tsdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, tsdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + tsdev->minor)); tsdev->exist =0 ;
Quoted 5 lines · Kay Sievers
Here is for illustration the "input" layer as a flat
/sys/classdirectory. All devices point to/sys/deviceswhich exposes the device hierarchy if userspace wants to know that:
/sys/class/
...
Quoted 9 lines
|-- input | |-- input0 -> ../../devices/platform/i8042/serio1/input0 | |-- input1 -> ../../devices/platform/i8042/serio0/input1 | |-- input3 -> ../../devices/platform/i8042/serio0/serio2/input3 | |-- input4 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4 | |-- mice -> ../../devices/mice | |-- mouse0 -> ../../devices/platform/i8042/serio0/input1/mouse0 | |-- mouse1 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4/mouse1 | `-- mouse2 -> ../../devices/platform/i8042/serio0/serio2/input3/mouse2
Looks nice with exception of my standard argument that inputX and mouseX are objects of different (but related) classes.
I believe this also relies on overriding class' methods (release, uevent) by individual devices and inability for class to define standard attributes for such devices. Pretty yucky...
Signature · 1 line
Dmitry
Quoted 16 lines · Dmitry Torokhov
Quoted 5 lines · Kay Sievers
Here is for illustration the "input" layer as a flat
/sys/classdirectory. All devices point to/sys/deviceswhich exposes the device hierarchy if userspace wants to know that:
/sys/class/
...Quoted 9 lines
|-- input | |-- input0 -> ../../devices/platform/i8042/serio1/input0 | |-- input1 -> ../../devices/platform/i8042/serio0/input1 | |-- input3 -> ../../devices/platform/i8042/serio0/serio2/input3 | |-- input4 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4 | |-- mice -> ../../devices/mice | |-- mouse0 -> ../../devices/platform/i8042/serio0/input1/mouse0 | |-- mouse1 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4/mouse1 | `-- mouse2 -> ../../devices/platform/i8042/serio0/serio2/input3/mouse2
Quoted 2 lines
Looks nice with exception of my standard argument that inputX and mouseX are objects of different (but related) classes.
You can easily distinguish them by the device instance name, we have this in a lot of other classes too: /class/sound/controlC0 is very different from /class/sound/pcmC0D0p, /class/sound/timer, ...
Quoted 3 lines
I believe this also relies on overriding class' methods (release, uevent) by individual devices and inability for class to define standard attributes for such devices. Pretty yucky...
You can, if you want separate classes, put them in different classes. This will work fine with this model now, cause the device hierarchy is still nicely exposed in /sys/devices.
Thanks,
Kay
Quoted 91 lines · Kay Sievers
Here is a first test of the unification of the sysfs device tree. As already discussed to end in the context of stacked class devices, it moves all device objects into a single device tree at
/sys/devicesto expose the kernels device hierarchy to userspace.All former objects in
/sys/classwill become only symlinks and are compatible to our current layout. This approach will not mix classification and device hierarchy.The hierarchy in
/sys/devicesis not necessarily expected to be stable across kernel versions, it must be allowed to insert devices in the tree if needed, without breaking userspace applications. But the links in/sys/classare expected to be kept stable, but that's easy now, cause they will always be simple flat directories.Every device event sent to userspace contains its natural dependency path in the DEVPATH, the ugly "device" symlink can be removed.
This patch is a simple hack, cause I want to prepare userspace to work with that. It already works without any problems on a recent udev system. (Besides HAL which needs to be adapted.)
The same way
/sys/classis represented,/sys/blockshould be converted, so we finally end up with a buch of symlinks in/sys/class/block.There is a lot of room for improvement in the driver core, cause a whole lot of infrastructure could be shared between the class / block / device core, if we only build a single device tree, but that's a different issue and independent from how it will looks like to userspace.
Here is for illustration the "input" layer as a flat
/sys/classdirectory. All devices point to/sys/deviceswhich exposes the device hierarchy if userspace wants to know that:/sys/class/ ... |-- input | |-- input0 -> ../../devices/platform/i8042/serio1/input0 | |-- input1 -> ../../devices/platform/i8042/serio0/input1 | |-- input3 -> ../../devices/platform/i8042/serio0/serio2/input3 | |-- input4 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4 | |-- mice -> ../../devices/mice | |-- mouse0 -> ../../devices/platform/i8042/serio0/input1/mouse0 | |-- mouse1 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4/mouse1 | `-- mouse2 -> ../../devices/platform/i8042/serio0/serio2/input3/mouse2 |-- mem | |-- full -> ../../devices/full | |-- kmem -> ../../devices/kmem | |-- kmsg -> ../../devices/kmsg | |-- mem -> ../../devices/mem | |-- null -> ../../devices/null | |-- port -> ../../devices/port | |-- random -> ../../devices/random | |-- urandom -> ../../devices/urandom | `-- zero -> ../../devices/zero ... /sys/devices/ |-- platform | |-- i8042 | | |-- bus -> ../../../bus/platform | | |-- driver -> ../../../bus/platform/drivers/i8042 | | |-- power | | | |-- state | | | `-- wakeup | | |-- serio0 | | | |-- bind_mode | | | |-- bus -> ../../../../bus/serio | | | |-- description | | | |-- driver -> ../../../../bus/serio/drivers/psmouse | | | |-- drvctl | | | |-- id ... | | | | `-- type | | | |-- input1 | | | | |-- capabilities ... | | | | | `-- sw | | | | |-- device -> ../../../../../devices/platform/i8042/serio0 | | | | |-- id ... | | | | | `-- version | | | | |-- modalias | | | | |-- mouse0 | | | | | |-- dev | | | | | |-- device -> ../../../../../../devices/platform/i8042/serio0 | | | | | |-- subsystem -> ../../../../../../class/input | | | | | `-- uevent ...
Quoted 7 lines
This is the event sequence for a USB mouse, there are no "class" events anymore:
add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5/mouse1 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/usbdev3.4
Here is an updated patch, that:
o moves the devices in /sys/block to /sys/devices to match the class layout. Block devices will be childs of their physical device chain like every other class device too. Partitions will be childs of the disk device. A usual DEVPATH looks like:
/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1
o flattens the block class view and moves the block symlinks to /sys/class/block. Disks and partitons like /sys/class/block/sda and /sys/class/block/sda1 will be at the same level. /sys/block does not longer exist.
o removes all "device" links, cause the these devices are just the parent devices in /sys/devices and contained in the devpath anyway.
o removes all "block:<devname>" and "<classname>:<devname>" links, cause this relationship is expressed by the hierarchy in /sys/devices and these devices are just found as child devices.
o removes PHYSDEVBUS, PHYSDEVPATH, PHYSDEVDRIVER from the event environment. These have been added to work around bad sysfs timing and let udev know what to expect from sysfs. It's not longer needed, cause the dependency of devices is nicely contained in every device devpath itself.
o removes all "bus" links to make no distinction between the kernel implementation details at the device itself. All devices in /sys/devices have a "subsystem" symlink now, which points back to the bus or class directory the device belongs to. Class devices are collected by symlinks in /sys/class/<classname>/, bus devices are collected in /sys/bus/<busname>/devices/.
It looks like this for block:
/sys/
|-- class | |-- block | | |-- loop0 -> ../../devices/loop0 | | |-- loop1 -> ../../devices/loop1 | | |-- loop2 -> ../../devices/loop2 ... | | |-- sda -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda | | |-- sda1 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1 ... | | `-- sda9 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda9 ... |-- devices ... | |-- loop0 | | |-- dev | | |-- range | | |-- removable | | |-- size | | |-- stat | | |-- subsystem -> ../../class/block | | `-- uevent | |-- loop1 | | |-- dev | | |-- range | | |-- removable | | |-- size | | |-- stat | | |-- subsystem -> ../../class/block | | `-- uevent | |-- loop2 | | |-- dev ... | |-- pci0000:00 | | |-- 0000:00:1f.2 | | | |-- class | | | |-- config | | | |-- device | | | |-- driver -> ../../../bus/pci/drivers/ata_piix | | | |-- host0 | | | | |-- host0 | | | | | |-- cmd_per_lun | | | | | |-- host_busy | | | | | |-- proc_name | | | | | |-- scan | | | | | |-- sg_tablesize | | | | | |-- state | | | | | |-- subsystem -> ../../../../../class/scsi_host | | | | | |-- uevent | | | | | |-- unchecked_isa_dma | | | | | `-- unique_id | | | | |-- power | | | | | |-- state | | | | | `-- wakeup | | | | |-- target0:0:0 | | | | | |-- 0:0:0:0 | | | | | | |-- 0:0:0:0 | | | | | | | |-- subsystem -> ../../../../../../../class/scsi_device | | | | | | | `-- uevent | | | | | | |-- delete | | | | | | |-- device_blocked | | | | | | |-- driver -> ../../../../../../bus/scsi/drivers/sd | | | | | | |-- generic -> ../../../../../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sg0 | | | | | | |-- iocounterbits | | | | | | |-- iodone_cnt | | | | | | |-- ioerr_cnt | | | | | | |-- iorequest_cnt | | | | | | |-- model | | | | | | |-- power | | | | | | | |-- state | | | | | | | `-- wakeup | | | | | | |-- queue_depth | | | | | | |-- queue_type | | | | | | |-- rescan | | | | | | |-- rev | | | | | | |-- scsi_level | | | | | | |-- sda | | | | | | | |-- dev | | | | | | | |-- queue | | | | | | | | |-- iosched | | | | | | | | | |-- antic_expire | | | | | | | | | |-- est_time | | | | | | | | | |-- read_batch_expire | | | | | | | | | |-- read_expire | | | | | | | | | |-- write_batch_expire | | | | | | | | | `-- write_expire | | | | | | | | |-- max_hw_sectors_kb | | | | | | | | |-- max_sectors_kb | | | | | | | | |-- nr_requests | | | | | | | | |-- read_ahead_kb | | | | | | | | `-- scheduler | | | | | | | |-- range | | | | | | | |-- removable | | | | | | | |-- sda1 | | | | | | | | |-- dev | | | | | | | | |-- size | | | | | | | | |-- start | | | | | | | | |-- stat | | | | | | | | |-- subsystem -> ../../../../../../../../class/block | | | | | | | | `-- uevent | | | | | | | |-- sda10 | | | | | | | | |-- dev | | | | | | | | |-- size | | | | | | | | |-- start | | | | | | | | |-- stat | | | | | | | | |-- subsystem -> ../../../../../../../../class/block | | | | | | | | `-- uevent
...
Note, that this is still a patch, only to _fake_ sysfs to look like it should in the end and nothing to merge in the kernel tree. I didn't care about the implementation, it is just to prepare userspace to work with that long before we actually will change the kernel. The current udev already works with this patch and a fully dynamic /dev, that is populated from scratch on bootup.
I've removed all historical stuff like the "device" and "bus" link, cause they don't make sense anymore. What we will actually remove with the real conversion, does nobody know at this point. But this patch can be used today, to test software that uses sysfs. For udev, the udev related tools and HAL I will take care of and prepare them. Libsysfs, which udev does not longer use, will need to be adapted to this layout.
Thanks,
Kay
Unify sysfs device tree
Move device objects from /sys/class and /sys/block to /sys/devices and add a link from /sys/class to the device object.
--- Documentation/Changes | 2 - block/genhd.c | 40 ++++----------------- drivers/base/bus.c | 4 +- drivers/base/class.c | 89 +++++++++-------------------------------------- drivers/input/evdev.c | 5 -- drivers/input/joydev.c | 5 -- drivers/input/mousedev.c | 5 -- drivers/input/tsdev.c | 5 -- fs/partitions/check.c | 78 +++++++++++++++++++---------------------- init/do_mounts.c | 4 +- 10 files changed, 68 insertions(+), 169 deletions(-)
Documentation/Changes +1 -1
@@ -63,7 +63,7 @@ o isdn4k-utils 3.1pre1 o nfs-utils 1.0.5 # showmount --version o procps 3.2.0 # ps --version o oprofile 0.9 # oprofiled --version -o udev 071 # udevinfo -V +o udev 081 # udevinfo -V Kernel compilation ==================
block/genhd.c +8 -32
@@ -17,9 +17,8 @@#include <linux/buffer_head.h> #define MAX_PROBE_HASH 255/* random */ - -static struct subsystem block_subsys; - +struct subsystem block_subsys; +extern struct subsystem class_subsys;static DECLARE_MUTEX (block_subsys_sem);/*
@@ -312,7 +311,7 @@ static void *part_next(struct seq_file * {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -379,6 +378,8 @@ static int __init genhd_device_init(void { bdev_map =kobj_map_init (base_probe, &block_subsys_sem);blk_dev_init (); + + block_subsys.kset.kobj.parent = &class_subsys.kset.kobj;subsystem_register (&block_subsys);return 0 ; }
@@ -532,7 +533,6 @@ static int block_uevent(struct kset *kse int num_envp, char *buffer, int buffer_size) { struct kobj_type *ktype = get_ktype(kobj); -struct device *physdev;struct gendisk *disk;struct hd_struct *part;int length =0 ;
@@ -554,28 +554,6 @@ static int block_uevent(struct kset *kseadd_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length,"MAJOR=%u" , disk->major); -/* add physical device, backing this device */ - physdev = disk->driverfs_dev; -if (physdev) { -char *path =kobject_get_path (&physdev->kobj,GFP_KERNEL ); - -add_uevent_var (envp, num_envp, &i, buffer, buffer_size, - &length,"PHYSDEVPATH=%s" , path); -kfree (path); - -if (physdev->bus) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVBUS=%s" , - physdev->bus->name); - -if (physdev->driver) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVDRIVER=%s" , - physdev->driver->name); - } -/* terminate, set to next free slot, shrink available space */ envp[i] =NULL ; envp = &envp[i];
@@ -591,9 +569,7 @@ static struct kset_uevent_ops block_ueve .uevent = block_uevent, }; -/* declare block_subsys. */ -static decl_subsys(block, &ktype_block, &block_uevent_ops); - +decl_subsys (block, &ktype_block, &block_uevent_ops);/* * aggregate disk stat collector. Uses the same stats that the sysfs
@@ -622,7 +598,7 @@ static void *diskstats_next(struct seq_f {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -708,7 +684,7 @@ struct gendisk *alloc_disk_node(int minomemset (disk->part,0 , size); } disk->minors = minors; -kobj_set_kset_s (disk,block_subsys); +kobj_set_kset_s (disk, block_subsys);kobject_init (&disk->kobj);rand_initialize_disk (disk); }
drivers/base/bus.c +2 -2
@@ -369,7 +369,7 @@ int bus_add_device(struct device * dev) error =device_add_attrs (bus, dev);if (!error) {sysfs_create_link (&bus->devices.kobj, &dev->kobj, dev->bus_id); -sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"bus" ); +sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"subsystem" ); } }return error;
@@ -387,7 +387,7 @@ int bus_add_device(struct device * dev)void bus_remove_device (struct device * dev) {if (dev->bus) { -sysfs_remove_link (&dev->kobj,"bus" ); +sysfs_remove_link (&dev->kobj,"subsystem" );sysfs_remove_link (&dev->bus->devices.kobj, dev->bus_id);device_remove_attrs (dev->bus, dev);klist_remove (&dev->knode_bus);
drivers/base/class.c +18 -71
160 lines not on this page · raw message
drivers/input/evdev.c +0 -5
@@ -630,10 +630,6 @@ static struct input_handle *evdev_connecMKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + minor), dev->cdev.dev, evdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - evdev->name); -return &evdev->handle; }
@@ -642,7 +638,6 @@ static void evdev_disconnect(struct inpustruct evdev *evdev = handle->private;struct evdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, evdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + evdev->minor)); evdev->exist =0 ;
drivers/input/joydev.c +0 -5
@@ -518,10 +518,6 @@ static struct input_handle *joydev_conneMKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + minor), dev->cdev.dev, joydev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - joydev->name); -return &joydev->handle; }
@@ -530,7 +526,6 @@ static void joydev_disconnect(struct inpstruct joydev *joydev = handle->private;struct joydev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, joydev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + joydev->minor)); joydev->exist =0 ;
drivers/input/mousedev.c +0 -5
@@ -653,10 +653,6 @@ static struct input_handle *mousedev_conMKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + minor), dev->cdev.dev, mousedev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - mousedev->name); -return &mousedev->handle; }
@@ -665,7 +661,6 @@ static void mousedev_disconnect(struct istruct mousedev *mousedev = handle->private;struct mousedev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, mousedev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + mousedev->minor)); mousedev->exist =0 ;
drivers/input/tsdev.c +0 -5
@@ -414,10 +414,6 @@ static struct input_handle *tsdev_connecMKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + minor), dev->cdev.dev, tsdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - tsdev->name); -return &tsdev->handle; }
@@ -426,7 +422,6 @@ static void tsdev_disconnect(struct inpustruct tsdev *tsdev = handle->private;struct tsdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, tsdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + tsdev->minor)); tsdev->exist =0 ;
fs/partitions/check.c +37 -41
124 lines not on this page · raw message
init/do_mounts.c +2 -2
@@ -65,7 +65,7 @@ static dev_t try_name(char *name, int pa/* read device number from .../dev */ -sprintf (path,"/sys/block/%s/dev" , name); +sprintf (path,"/sys/class/block/%s/dev" , name); fd =sys_open (path,0 ,0 );if (fd <0 ) goto fail;
@@ -128,7 +128,7 @@ fail:* * If name doesn't have fall into the categories above, we return 0. * Sysfs is used to check if something is a disk name - it has -* all known disks under bus/block/devices. If the disk name +* all known disks under /sys/class/block/. If the disk name * contains slashes, name of sysfs node has them replaced with * bangs. try_name() does the actual checks, assuming that sysfs * is mounted on rootfs /sys.
Quoted 11 lines · Kay Sievers
Here is an updated patch, that:
o moves the devices in/sys/blockto/sys/devicesto match the class layout. Block devices will be childs of their physical device chain like every other class device too. Partitions will be childs of the disk device. A usual DEVPATH looks like:
/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1o flattens the block class view and moves the block symlinks to
/sys/class/block. Disks and partitons like/sys/class/block/sdaand/sys/class/block/sda1will be at the same level./sys/blockdoes not longer exist.
What is the problem with maintaining compatibility by having /sys/block be a symlink to /sys/class/block? Userspace applications shouldn't have to now conditionalize the path to block devices (/sys/block/... vs /sys/class/block/...). Forcing this kind of change is what taints Linux for use in hardened applications. Conditionalizing code for 2.4 vs 2.6 is understandable but having to do so for minor 2.6.x revisions is rediculous. <insert ref to Linus' views in the recent 'userspace breakage' thread here>.
Mike
Quoted 14 lines · Mike Snitzer
Quoted 11 lines · Kay Sievers
Here is an updated patch, that:
o moves the devices in/sys/blockto/sys/devicesto match the class layout. Block devices will be childs of their physical device chain like every other class device too. Partitions will be childs of the disk device. A usual DEVPATH looks like:
/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1o flattens the block class view and moves the block symlinks to
/sys/class/block. Disks and partitons like/sys/class/block/sdaand/sys/class/block/sda1will be at the same level./sys/blockdoes not longer exist.
Quoted 8 lines
What is the problem with maintaining compatibility by having
/sys/blockbe a symlink to/sys/class/block? Userspace applications shouldn't have to now conditionalize the path to block devices (/sys/block/... vs/sys/class/block/...). Forcing this kind of change is what taints Linux for use in hardened applications. Conditionalizing code for 2.4 vs 2.6 is understandable but having to do so for minor 2.6.x revisions is rediculous. <insert ref to Linus' views in the recent 'userspace breakage' thread here>.
Please read the whole mail before wasting other peoples time:
Quoted 3 lines
I've removed all historical stuff like the "device" and "bus" link, cause they don't make sense anymore. What we will actually remove with the real conversion, does nobody know at this point.
Thanks,
Kay
Quoted 250 lines · Kay Sievers
Quoted 91 lines · Kay Sievers
Here is a first test of the unification of the sysfs device tree. As already discussed to end in the context of stacked class devices, it moves all device objects into a single device tree at
/sys/devicesto expose the kernels device hierarchy to userspace.All former objects in
/sys/classwill become only symlinks and are compatible to our current layout. This approach will not mix classification and device hierarchy.The hierarchy in
/sys/devicesis not necessarily expected to be stable across kernel versions, it must be allowed to insert devices in the tree if needed, without breaking userspace applications. But the links in/sys/classare expected to be kept stable, but that's easy now, cause they will always be simple flat directories.Every device event sent to userspace contains its natural dependency path in the DEVPATH, the ugly "device" symlink can be removed.
This patch is a simple hack, cause I want to prepare userspace to work with that. It already works without any problems on a recent udev system. (Besides HAL which needs to be adapted.)
The same way
/sys/classis represented,/sys/blockshould be converted, so we finally end up with a buch of symlinks in/sys/class/block.There is a lot of room for improvement in the driver core, cause a whole lot of infrastructure could be shared between the class / block / device core, if we only build a single device tree, but that's a different issue and independent from how it will looks like to userspace.
Here is for illustration the "input" layer as a flat
/sys/classdirectory. All devices point to/sys/deviceswhich exposes the device hierarchy if userspace wants to know that:/sys/class/ ... |-- input | |-- input0 -> ../../devices/platform/i8042/serio1/input0 | |-- input1 -> ../../devices/platform/i8042/serio0/input1 | |-- input3 -> ../../devices/platform/i8042/serio0/serio2/input3 | |-- input4 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4 | |-- mice -> ../../devices/mice | |-- mouse0 -> ../../devices/platform/i8042/serio0/input1/mouse0 | |-- mouse1 -> ../../devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input4/mouse1 | `-- mouse2 -> ../../devices/platform/i8042/serio0/serio2/input3/mouse2 |-- mem | |-- full -> ../../devices/full | |-- kmem -> ../../devices/kmem | |-- kmsg -> ../../devices/kmsg | |-- mem -> ../../devices/mem | |-- null -> ../../devices/null | |-- port -> ../../devices/port | |-- random -> ../../devices/random | |-- urandom -> ../../devices/urandom | `-- zero -> ../../devices/zero ... /sys/devices/ |-- platform | |-- i8042 | | |-- bus -> ../../../bus/platform | | |-- driver -> ../../../bus/platform/drivers/i8042 | | |-- power | | | |-- state | | | `-- wakeup | | |-- serio0 | | | |-- bind_mode | | | |-- bus -> ../../../../bus/serio | | | |-- description | | | |-- driver -> ../../../../bus/serio/drivers/psmouse | | | |-- drvctl | | | |-- id ... | | | | `-- type | | | |-- input1 | | | | |-- capabilities ... | | | | | `-- sw | | | | |-- device -> ../../../../../devices/platform/i8042/serio0 | | | | |-- id ... | | | | | `-- version | | | | |-- modalias | | | | |-- mouse0 | | | | | |-- dev | | | | | |-- device -> ../../../../../../devices/platform/i8042/serio0 | | | | | |-- subsystem -> ../../../../../../class/input | | | | | `-- uevent ...Quoted 7 lines
This is the event sequence for a USB mouse, there are no "class" events anymore:
add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/3-2:1.0/input5/mouse1 add@/devices/pci0000:00/0000:00:1d.1/usb3/3-2/usbdev3.4Here is an updated patch, that:
o moves the devices in/sys/blockto/sys/devicesto match the class layout. Block devices will be childs of their physical device chain like every other class device too. Partitions will be childs of the disk device. A usual DEVPATH looks like:
/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1o flattens the block class view and moves the block symlinks to
/sys/class/block. Disks and partitons like/sys/class/block/sdaand/sys/class/block/sda1will be at the same level./sys/blockdoes not longer exist.o removes all "device" links, cause the these devices are just the parent devices in
/sys/devicesand contained in the devpath anyway.o removes all "block:<devname>" and "<classname>:<devname>" links, cause this relationship is expressed by the hierarchy in
/sys/devicesand these devices are just found as child devices.o removes PHYSDEVBUS, PHYSDEVPATH, PHYSDEVDRIVER from the event environment. These have been added to work around bad sysfs timing and let udev know what to expect from sysfs. It's not longer needed, cause the dependency of devices is nicely contained in every device devpath itself.
o removes all "bus" links to make no distinction between the kernel implementation details at the device itself. All devices in
/sys/deviceshave a "subsystem" symlink now, which points back to the bus or class directory the device belongs to. Class devices are collected by symlinks in /sys/class/<classname>/, bus devices are collected in /sys/bus/<busname>/devices/.It looks like this for block:
/sys/|-- class | |-- block | | |-- loop0 -> ../../devices/loop0 | | |-- loop1 -> ../../devices/loop1 | | |-- loop2 -> ../../devices/loop2 ... | | |-- sda -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda | | |-- sda1 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda1 ... | | `-- sda9 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sda/sda9 ... |-- devices ... | |-- loop0 | | |-- dev | | |-- range | | |-- removable | | |-- size | | |-- stat | | |-- subsystem -> ../../class/block | | `-- uevent | |-- loop1 | | |-- dev | | |-- range | | |-- removable | | |-- size | | |-- stat | | |-- subsystem -> ../../class/block | | `-- uevent | |-- loop2 | | |-- dev ... | |-- pci0000:00 | | |-- 0000:00:1f.2 | | | |-- class | | | |-- config | | | |-- device | | | |-- driver -> ../../../bus/pci/drivers/ata_piix | | | |-- host0 | | | | |-- host0 | | | | | |-- cmd_per_lun | | | | | |-- host_busy | | | | | |-- proc_name | | | | | |-- scan | | | | | |-- sg_tablesize | | | | | |-- state | | | | | |-- subsystem -> ../../../../../class/scsi_host | | | | | |-- uevent | | | | | |-- unchecked_isa_dma | | | | | `-- unique_id | | | | |-- power | | | | | |-- state | | | | | `-- wakeup | | | | |-- target0:0:0 | | | | | |-- 0:0:0:0 | | | | | | |-- 0:0:0:0 | | | | | | | |-- subsystem -> ../../../../../../../class/scsi_device | | | | | | | `-- uevent | | | | | | |-- delete | | | | | | |-- device_blocked | | | | | | |-- driver -> ../../../../../../bus/scsi/drivers/sd | | | | | | |-- generic -> ../../../../../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/sg0 | | | | | | |-- iocounterbits | | | | | | |-- iodone_cnt | | | | | | |-- ioerr_cnt | | | | | | |-- iorequest_cnt | | | | | | |-- model | | | | | | |-- power | | | | | | | |-- state | | | | | | | `-- wakeup | | | | | | |-- queue_depth | | | | | | |-- queue_type | | | | | | |-- rescan | | | | | | |-- rev | | | | | | |-- scsi_level | | | | | | |-- sda | | | | | | | |-- dev | | | | | | | |-- queue | | | | | | | | |-- iosched | | | | | | | | | |-- antic_expire | | | | | | | | | |-- est_time | | | | | | | | | |-- read_batch_expire | | | | | | | | | |-- read_expire | | | | | | | | | |-- write_batch_expire | | | | | | | | | `-- write_expire | | | | | | | | |-- max_hw_sectors_kb | | | | | | | | |-- max_sectors_kb | | | | | | | | |-- nr_requests | | | | | | | | |-- read_ahead_kb | | | | | | | | `-- scheduler | | | | | | | |-- range | | | | | | | |-- removable | | | | | | | |-- sda1 | | | | | | | | |-- dev | | | | | | | | |-- size | | | | | | | | |-- start | | | | | | | | |-- stat | | | | | | | | |-- subsystem -> ../../../../../../../../class/block | | | | | | | | `-- uevent | | | | | | | |-- sda10 | | | | | | | | |-- dev | | | | | | | | |-- size | | | | | | | | |-- start | | | | | | | | |-- stat | | | | | | | | |-- subsystem -> ../../../../../../../../class/block | | | | | | | | `-- uevent...
Note, that this is still a patch, only to _fake_ sysfs to look like it should in the end and nothing to merge in the kernel tree. I didn't care about the implementation, it is just to prepare userspace to work with that long before we actually will change the kernel. The current udev already works with this patch and a fully dynamic /dev, that is populated from scratch on bootup.
Quoted 6 lines
I've removed all historical stuff like the "device" and "bus" link, cause they don't make sense anymore. What we will actually remove with the real conversion, does nobody know at this point. But this patch can be used today, to test software that uses sysfs. For udev, the udev related tools and HAL I will take care of and prepare them. Libsysfs, which udev does not longer use, will need to be adapted to this layout.
Here is an updated patch against the current tree. The current udev version and the udev tools are fully functional now with this patch.
Thanks,
Kay
Unify sysfs device tree
Move device objects from /sys/class and /sys/block to /sys/devices and add
--- Documentation/Changes | 2 - block/genhd.c | 40 ++++----------------- drivers/base/bus.c | 4 +- drivers/base/class.c | 89 +++++++++-------------------------------------- drivers/base/core.c | 21 ----------- drivers/input/evdev.c | 5 -- drivers/input/joydev.c | 5 -- drivers/input/mousedev.c | 5 -- drivers/input/tsdev.c | 5 -- fs/partitions/check.c | 78 +++++++++++++++++++---------------------- init/do_mounts.c | 4 +- 11 files changed, 68 insertions(+), 190 deletions(-)
Documentation/Changes +1 -1
@@ -63,7 +63,7 @@ o isdn4k-utils 3.1pre1 o nfs-utils 1.0.5 # showmount --version o procps 3.2.0 # ps --version o oprofile 0.9 # oprofiled --version -o udev 071 # udevinfo -V +o udev 082 # udevinfo -V Kernel compilation ==================
block/genhd.c +8 -32
@@ -17,9 +17,8 @@#include <linux/buffer_head.h> #define MAX_PROBE_HASH 255/* random */ - -static struct subsystem block_subsys; - +struct subsystem block_subsys; +extern struct subsystem class_subsys;static DECLARE_MUTEX (block_subsys_sem);/*
@@ -312,7 +311,7 @@ static void *part_next(struct seq_file * {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -379,6 +378,8 @@ static int __init genhd_device_init(void { bdev_map =kobj_map_init (base_probe, &block_subsys_sem);blk_dev_init (); + + block_subsys.kset.kobj.parent = &class_subsys.kset.kobj;subsystem_register (&block_subsys);return 0 ; }
@@ -532,7 +533,6 @@ static int block_uevent(struct kset *kse int num_envp, char *buffer, int buffer_size) { struct kobj_type *ktype = get_ktype(kobj); -struct device *physdev;struct gendisk *disk;struct hd_struct *part;int length =0 ;
@@ -554,28 +554,6 @@ static int block_uevent(struct kset *kseadd_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length,"MAJOR=%u" , disk->major); -/* add physical device, backing this device */ - physdev = disk->driverfs_dev; -if (physdev) { -char *path =kobject_get_path (&physdev->kobj,GFP_KERNEL ); - -add_uevent_var (envp, num_envp, &i, buffer, buffer_size, - &length,"PHYSDEVPATH=%s" , path); -kfree (path); - -if (physdev->bus) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVBUS=%s" , - physdev->bus->name); - -if (physdev->driver) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVDRIVER=%s" , - physdev->driver->name); - } -/* terminate, set to next free slot, shrink available space */ envp[i] =NULL ; envp = &envp[i];
@@ -591,9 +569,7 @@ static struct kset_uevent_ops block_ueve .uevent = block_uevent, }; -/* declare block_subsys. */ -static decl_subsys(block, &ktype_block, &block_uevent_ops); - +decl_subsys (block, &ktype_block, &block_uevent_ops);/* * aggregate disk stat collector. Uses the same stats that the sysfs
@@ -622,7 +598,7 @@ static void *diskstats_next(struct seq_f {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -708,7 +684,7 @@ struct gendisk *alloc_disk_node(int minomemset (disk->part,0 , size); } disk->minors = minors; -kobj_set_kset_s (disk,block_subsys); +kobj_set_kset_s (disk, block_subsys);kobject_init (&disk->kobj);rand_initialize_disk (disk); }
drivers/base/bus.c +2 -2
@@ -369,7 +369,7 @@ int bus_add_device(struct device * dev) error =device_add_attrs (bus, dev);if (!error) {sysfs_create_link (&bus->devices.kobj, &dev->kobj, dev->bus_id); -sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"bus" ); +sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"subsystem" ); } }return error;
@@ -387,7 +387,7 @@ int bus_add_device(struct device * dev)void bus_remove_device (struct device * dev) {if (dev->bus) { -sysfs_remove_link (&dev->kobj,"bus" ); +sysfs_remove_link (&dev->kobj,"subsystem" );sysfs_remove_link (&dev->bus->devices.kobj, dev->bus_id);device_remove_attrs (dev->bus, dev);klist_remove (&dev->knode_bus);
drivers/base/class.c +18 -71
160 lines not on this page · raw message
drivers/base/core.c +0 -21
@@ -113,29 +113,8 @@ static int dev_uevent(struct kset *kset, int num_envp, char *buffer, int buffer_size) { struct device *dev = to_dev(kobj); -int i =0 ; -int length =0 ;int retval =0 ; -/* add bus name of physical device */ -if (dev->bus) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVBUS=%s" , dev->bus->name); - -/* add driver name of physical device */ -if (dev->driver) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVDRIVER=%s" , dev->driver->name); - -/* terminate, set to next free slot, shrink available space */ - envp[i] =NULL ; - envp = &envp[i]; - num_envp -= i; - buffer = &buffer[length]; - buffer_size -= length; -if (dev->bus && dev->bus->uevent) {/* have the bus specific function add its stuff */ retval = dev->bus->uevent (dev, envp, num_envp, buffer, buffer_size);
drivers/input/evdev.c +0 -5
@@ -630,10 +630,6 @@ static struct input_handle *evdev_connecMKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + minor), dev->cdev.dev, evdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - evdev->name); -return &evdev->handle; }
@@ -642,7 +638,6 @@ static void evdev_disconnect(struct inpustruct evdev *evdev = handle->private;struct evdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, evdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + evdev->minor)); evdev->exist =0 ;
drivers/input/joydev.c +0 -5
@@ -518,10 +518,6 @@ static struct input_handle *joydev_conneMKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + minor), dev->cdev.dev, joydev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - joydev->name); -return &joydev->handle; }
@@ -530,7 +526,6 @@ static void joydev_disconnect(struct inpstruct joydev *joydev = handle->private;struct joydev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, joydev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + joydev->minor)); joydev->exist =0 ;
drivers/input/mousedev.c +0 -5
@@ -653,10 +653,6 @@ static struct input_handle *mousedev_conMKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + minor), dev->cdev.dev, mousedev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - mousedev->name); -return &mousedev->handle; }
@@ -665,7 +661,6 @@ static void mousedev_disconnect(struct istruct mousedev *mousedev = handle->private;struct mousedev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, mousedev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + mousedev->minor)); mousedev->exist =0 ;
drivers/input/tsdev.c +0 -5
@@ -414,10 +414,6 @@ static struct input_handle *tsdev_connecMKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + minor), dev->cdev.dev, tsdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - tsdev->name); -return &tsdev->handle; }
@@ -426,7 +422,6 @@ static void tsdev_disconnect(struct inpustruct tsdev *tsdev = handle->private;struct tsdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, tsdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + tsdev->minor)); tsdev->exist =0 ;
fs/partitions/check.c +37 -41
124 lines not on this page · raw message
init/do_mounts.c +2 -2
@@ -65,7 +65,7 @@ static dev_t try_name(char *name, int pa/* read device number from .../dev */ -sprintf (path,"/sys/block/%s/dev" , name); +sprintf (path,"/sys/class/block/%s/dev" , name); fd =sys_open (path,0 ,0 );if (fd <0 ) goto fail;
@@ -128,7 +128,7 @@ fail:* * If name doesn't have fall into the categories above, we return 0. * Sysfs is used to check if something is a disk name - it has -* all known disks under bus/block/devices. If the disk name +* all known disks under /sys/class/block/. If the disk name * contains slashes, name of sysfs node has them replaced with * bangs. try_name() does the actual checks, assuming that sysfs * is mounted on rootfs /sys.
Quoted 5 lines · Kay Sievers
Unify sysfs device tree
Move device objects from
/sys/classand/sys/blockto/sys/devicesand add
---
Seems like your description got cut off on, and you forgot a
Signed-off-by: line so I can take it and start merging it in :)
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 5 lines · Kay Sievers
Unify sysfs device tree
Move device objects from
/sys/classand/sys/blockto/sys/devicesand add
---Seems like your description got cut off on, and you forgot a
Signed-off-by: line so I can take it and start merging it in :)
Here it is, with a big note and disclaimer what it is good for.
Thanks,
Kay
Author: Kay Sievers <[email protected]>
unify sysfs device tree
Move all devices into a unified tree at /sys/devices. All former objects in /sys/class become only symlinks and are compatible to our current layout.
This approach does not longer mix classification and device hierarchy. and avoids the stacking of devices in /sys/class, it does _not_ introduce a bunch of trees spreaded around /sys, with the need to be interconnected by a lot of symlinks.
The hierarchy in /sys/devices must not be expected to be stable across kernel releases, it should be allowed to insert devices here if needed, without breaking userspace applications. Users that walk up the devpath to find a parent device, must always check for the subsystem and search until they find the needed device and not expect a static device order.
The links in /sys/class and their names are expected to be kept stable, but that's easy, cause they are flat directories and will not have any hierarchy.
Every device event sent to userspace contains its complete dependency path in the DEVPATH now. The "device" link hack and the other cross reference link hacks, that have been used to bring the devices in /sys/class and /sys/devices together are no longer needed.
Note and Disclaimer:
This is _not_ a final implementation, it does not really care about the in-kernel implementation and does not improve anything in the driver core. It is just to let userspace look like it should look in the end and prepare sysfs users before the real change will happen.
It is the most extrem way to do such a transition, all the old and no longer needed stuff is removed, cause this patch is for users of sysfs to be adapted and tested with the new layout. How it will look like in the end, what will need to stay and what will be removed, needs to be decided case by case along with the _real_ driver core change.
--- Documentation/Changes | 2 - block/genhd.c | 40 ++++----------------- drivers/base/bus.c | 4 +- drivers/base/class.c | 89 +++++++++-------------------------------------- drivers/base/core.c | 21 ----------- drivers/input/evdev.c | 5 -- drivers/input/joydev.c | 5 -- drivers/input/mousedev.c | 5 -- drivers/input/tsdev.c | 5 -- fs/partitions/check.c | 78 +++++++++++++++++++---------------------- init/do_mounts.c | 4 +- 11 files changed, 68 insertions(+), 190 deletions(-)
Documentation/Changes +1 -1
@@ -63,7 +63,7 @@ o isdn4k-utils 3.1pre1 o nfs-utils 1.0.5 # showmount --version o procps 3.2.0 # ps --version o oprofile 0.9 # oprofiled --version -o udev 071 # udevinfo -V +o udev 082 # udevinfo -V Kernel compilation ==================
block/genhd.c +8 -32
@@ -17,9 +17,8 @@#include <linux/buffer_head.h> #define MAX_PROBE_HASH 255/* random */ - -static struct subsystem block_subsys; - +struct subsystem block_subsys; +extern struct subsystem class_subsys;static DECLARE_MUTEX (block_subsys_sem);/*
@@ -312,7 +311,7 @@ static void *part_next(struct seq_file * {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -379,6 +378,8 @@ static int __init genhd_device_init(void { bdev_map =kobj_map_init (base_probe, &block_subsys_sem);blk_dev_init (); + + block_subsys.kset.kobj.parent = &class_subsys.kset.kobj;subsystem_register (&block_subsys);return 0 ; }
@@ -532,7 +533,6 @@ static int block_uevent(struct kset *kse int num_envp, char *buffer, int buffer_size) { struct kobj_type *ktype = get_ktype(kobj); -struct device *physdev;struct gendisk *disk;struct hd_struct *part;int length =0 ;
@@ -554,28 +554,6 @@ static int block_uevent(struct kset *kseadd_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length,"MAJOR=%u" , disk->major); -/* add physical device, backing this device */ - physdev = disk->driverfs_dev; -if (physdev) { -char *path =kobject_get_path (&physdev->kobj,GFP_KERNEL ); - -add_uevent_var (envp, num_envp, &i, buffer, buffer_size, - &length,"PHYSDEVPATH=%s" , path); -kfree (path); - -if (physdev->bus) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVBUS=%s" , - physdev->bus->name); - -if (physdev->driver) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVDRIVER=%s" , - physdev->driver->name); - } -/* terminate, set to next free slot, shrink available space */ envp[i] =NULL ; envp = &envp[i];
@@ -591,9 +569,7 @@ static struct kset_uevent_ops block_ueve .uevent = block_uevent, }; -/* declare block_subsys. */ -static decl_subsys(block, &ktype_block, &block_uevent_ops); - +decl_subsys (block, &ktype_block, &block_uevent_ops);/* * aggregate disk stat collector. Uses the same stats that the sysfs
@@ -622,7 +598,7 @@ static void *diskstats_next(struct seq_f {struct list_head *p = ((struct gendisk *)v)->kobj.entry.next; ++*pos; -return p==&block_subsys.kset.list ?NULL : +return p == &block_subsys.kset.list ?NULL : list_entry(p, struct gendisk, kobj.entry); }
@@ -708,7 +684,7 @@ struct gendisk *alloc_disk_node(int minomemset (disk->part,0 , size); } disk->minors = minors; -kobj_set_kset_s (disk,block_subsys); +kobj_set_kset_s (disk, block_subsys);kobject_init (&disk->kobj);rand_initialize_disk (disk); }
drivers/base/bus.c +2 -2
@@ -369,7 +369,7 @@ int bus_add_device(struct device * dev) error =device_add_attrs (bus, dev);if (!error) {sysfs_create_link (&bus->devices.kobj, &dev->kobj, dev->bus_id); -sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"bus" ); +sysfs_create_link (&dev->kobj, &dev->bus->subsys.kset.kobj,"subsystem" ); } }return error;
@@ -387,7 +387,7 @@ int bus_add_device(struct device * dev)void bus_remove_device (struct device * dev) {if (dev->bus) { -sysfs_remove_link (&dev->kobj,"bus" ); +sysfs_remove_link (&dev->kobj,"subsystem" );sysfs_remove_link (&dev->bus->devices.kobj, dev->bus_id);device_remove_attrs (dev->bus, dev);klist_remove (&dev->knode_bus);
drivers/base/class.c +18 -71
160 lines not on this page · raw message
drivers/base/core.c +0 -21
@@ -113,29 +113,8 @@ static int dev_uevent(struct kset *kset, int num_envp, char *buffer, int buffer_size) { struct device *dev = to_dev(kobj); -int i =0 ; -int length =0 ;int retval =0 ; -/* add bus name of physical device */ -if (dev->bus) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVBUS=%s" , dev->bus->name); - -/* add driver name of physical device */ -if (dev->driver) -add_uevent_var (envp, num_envp, &i, - buffer, buffer_size, &length, -"PHYSDEVDRIVER=%s" , dev->driver->name); - -/* terminate, set to next free slot, shrink available space */ - envp[i] =NULL ; - envp = &envp[i]; - num_envp -= i; - buffer = &buffer[length]; - buffer_size -= length; -if (dev->bus && dev->bus->uevent) {/* have the bus specific function add its stuff */ retval = dev->bus->uevent (dev, envp, num_envp, buffer, buffer_size);
drivers/input/evdev.c +0 -5
@@ -630,10 +630,6 @@ static struct input_handle *evdev_connecMKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + minor), dev->cdev.dev, evdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - evdev->name); -return &evdev->handle; }
@@ -642,7 +638,6 @@ static void evdev_disconnect(struct inpustruct evdev *evdev = handle->private;struct evdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, evdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,EVDEV_MINOR_BASE + evdev->minor)); evdev->exist =0 ;
drivers/input/joydev.c +0 -5
@@ -518,10 +518,6 @@ static struct input_handle *joydev_conneMKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + minor), dev->cdev.dev, joydev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - joydev->name); -return &joydev->handle; }
@@ -530,7 +526,6 @@ static void joydev_disconnect(struct inpstruct joydev *joydev = handle->private;struct joydev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, joydev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + joydev->minor)); joydev->exist =0 ;
drivers/input/mousedev.c +0 -5
@@ -653,10 +653,6 @@ static struct input_handle *mousedev_conMKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + minor), dev->cdev.dev, mousedev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - mousedev->name); -return &mousedev->handle; }
@@ -665,7 +661,6 @@ static void mousedev_disconnect(struct istruct mousedev *mousedev = handle->private;struct mousedev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, mousedev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,MOUSEDEV_MINOR_BASE + mousedev->minor)); mousedev->exist =0 ;
drivers/input/tsdev.c +0 -5
@@ -414,10 +414,6 @@ static struct input_handle *tsdev_connecMKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + minor), dev->cdev.dev, tsdev->name); -/* temporary symlink to keep userspace happy */ -sysfs_create_link (&input_class.subsys.kset.kobj, &cdev->kobj, - tsdev->name); -return &tsdev->handle; }
@@ -426,7 +422,6 @@ static void tsdev_disconnect(struct inpustruct tsdev *tsdev = handle->private;struct tsdev_list *list; -sysfs_remove_link (&input_class.subsys.kset.kobj, tsdev->name);class_device_destroy (&input_class,MKDEV (INPUT_MAJOR ,TSDEV_MINOR_BASE + tsdev->minor)); tsdev->exist =0 ;
fs/partitions/check.c +37 -41
124 lines not on this page · raw message
init/do_mounts.c +2 -2
@@ -65,7 +65,7 @@ static dev_t try_name(char *name, int pa/* read device number from .../dev */ -sprintf (path,"/sys/block/%s/dev" , name); +sprintf (path,"/sys/class/block/%s/dev" , name); fd =sys_open (path,0 ,0 );if (fd <0 ) goto fail;
@@ -128,7 +128,7 @@ fail:* * If name doesn't have fall into the categories above, we return 0. * Sysfs is used to check if something is a disk name - it has -* all known disks under bus/block/devices. If the disk name +* all known disks under /sys/class/block/. If the disk name * contains slashes, name of sysfs node has them replaced with * bangs. try_name() does the actual checks, assuming that sysfs * is mounted on rootfs /sys.