linux-hotplug.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hmm, handle net devices with udev?
@ 2004-03-23  3:07 Kay Sievers
  2004-03-23 19:43 ` Marco d'Itri
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Kay Sievers @ 2004-03-23  3:07 UTC (permalink / raw)
  To: linux-hotplug

[-- Attachment #1: Type: text/plain, Size: 2649 bytes --]

Hmm, Arndt Bergmann sent a patch like this one a few weeks ago and
I want to bring the question back, if we want to handle net device
naming with udev.

With this patch it is actually possible to specify something like this
in udev.rules:

  KERNEL="dummy*", SYSFS{address}="00:00:00:00:00:00", SYSFS{features}="0x0", NAME="blind%n"
  KERNEL="eth*", SYSFS{address}="00:0d:60:77:30:91", NAME="private"

and you will get:

  [root@pim udev.kay]# cat /proc/net/dev
  Inter-|   Receive                                                | Transmit
   face |bytes    packets errs drop fifo frame compressed multicast|bytes   packets errs drop fifo colls carrier compressed
       lo:    1500     30    0    0    0     0          0         0    1500      30    0    0    0     0       0          0
  private:  278393   1114    0    0    0     0          0         0  153204    1468    0    0    0     0       0          0
     sit0:       0      0    0    0    0     0          0         0       0       0    0    0    0     0       0          0
   blind0:       0      0    0    0    0     0          0         0       0       0    0    0    0     0       0          0


The udevinfo program is also working:

  [root@pim udev.kay]# ./udevinfo -a -p /sys/class/net/private
    looking at class device '/sys/class/net/private':
      SYSFS{addr_len}="6"
      SYSFS{address}="00:0d:60:77:30:91"
      SYSFS{broadcast}="ff:ff:ff:ff:ff:ff"
      SYSFS{features}="0x3a9"
      SYSFS{flags}="0x1003"
      SYSFS{ifindex}="2"
      SYSFS{iflink}="2"
      SYSFS{mtu}="1500"
      SYSFS{tx_queue_len}="1000"
      SYSFS{type}="1"

  follow the class device's "device"
    looking at the device chain at '/sys/devices/pci0000:00/0000:00:1e.0/0000:02:01.0':
      BUS="pci"
      ID="0000:02:01.0"
      SYSFS{class}="0x020000"
      SYSFS{detach_state}="0"
      SYSFS{device}="0x101e"
      SYSFS{irq}="11"
      SYSFS{subsystem_device}="0x0549"
      SYSFS{subsystem_vendor}="0x1014"
      SYSFS{vendor}="0x8086"
 

The matching device will be renamed to the given name. The device name
will not be put into the udev database, cause the kernel renames the
device and the sysfs name disappears.

I like it, cause it plugs in nicely. We have all the naming features
and sysfs queries and walks inside of  udev. The sysfs timing races
are already solved and the management tools are working for net devices
too. nameif can only match the MAC address now. udev can match any sysfs
value of the device tree the net device is connected to.
But right, net devices do not have device nodes :)

So, please share your thoughts, if we want something like this.

thanks,
Kay


[-- Attachment #2: 70-nameif.patch --]
[-- Type: text/plain, Size: 9289 bytes --]

===== namedev.c 1.131 vs edited =====
--- 1.131/namedev.c	Wed Mar 17 23:40:12 2004
+++ edited/namedev.c	Tue Mar 23 03:09:15 2004
@@ -832,12 +832,21 @@
 		}
 	}
 
+	if (udev->type == 'n') {
+		dbg("no name for net device '%s' configured", udev->kernel_name);
+		return -1;
+	}
+
 	/* no rule was found so we use the kernel name */
 	strfieldcpy(udev->name, udev->kernel_name);
 	goto done;
 
 found:
 	apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+
+	if (udev->type == 'n')
+		return 0;
+
 	apply_format(udev, udev->symlink, sizeof(udev->symlink), class_dev, sysfs_device);
 	udev->partitions = dev->partitions;
 
===== udev-add.c 1.62 vs edited =====
--- 1.62/udev-add.c	Wed Mar 17 23:40:12 2004
+++ edited/udev-add.c	Tue Mar 23 02:57:27 2004
@@ -30,6 +30,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <grp.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <linux/sockios.h>
 #ifndef __KLIBC__
 #include <pwd.h>
 #include <utmp.h>
@@ -347,16 +351,16 @@
 /* wait for the "dev" file to show up in the directory in sysfs.
  * If it doesn't happen in about 10 seconds, give up.
  */
-#define SECONDS_TO_WAIT_FOR_DEV		10
-static int sleep_for_dev(char *path)
+#define SECONDS_TO_WAIT_FOR_FILE	10
+static int sleep_for_file(char *path, char* file)
 {
 	char filename[SYSFS_PATH_MAX + 6];
-	int loop = SECONDS_TO_WAIT_FOR_DEV;
+	int loop = SECONDS_TO_WAIT_FOR_FILE;
 	int retval;
 
 	strfieldcpy(filename, sysfs_path);
 	strfieldcat(filename, path);
-	strfieldcat(filename, "/dev");
+	strfieldcat(filename, file);
 
 	while (loop--) {
 		struct stat buf;
@@ -374,6 +378,30 @@
 	return retval;
 }
 
+static int rename_net_if(struct udevice *dev)
+{
+	int sk;
+	struct ifreq ifr;
+	int retval;
+
+	sk = socket(PF_INET, SOCK_DGRAM, 0);
+	if (sk < 0) {
+		dbg("error opening socket");
+		return -1;
+	}
+
+	memset(&ifr, 0x00, sizeof(struct ifreq));
+	strfieldcpy(ifr.ifr_name, dev->kernel_name);
+	strfieldcpy(ifr.ifr_newname, dev->name);
+
+	dbg("changing net interface name from '%s' to '%s'", dev->kernel_name, dev->name);
+	retval = ioctl(sk, SIOCSIFNAME, &ifr);
+	if (retval != 0)
+		dbg("error changing net interface name");
+
+	return retval;
+}
+
 int udev_add_device(char *path, char *subsystem, int fake)
 {
 	struct sysfs_class_device *class_dev = NULL;
@@ -383,39 +411,61 @@
 	memset(&dev, 0x00, sizeof(dev));
 
 	/* for now, the block layer is the only place where block devices are */
-	if (strcmp(subsystem, "block") == 0)
-		dev.type = 'b';
-	else
-		dev.type = 'c';
 
-	retval = sleep_for_dev(path);
-	if (retval != 0)
-		goto exit;
+	dev.type = get_device_type(path, subsystem);
+
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = sleep_for_file(path, "/dev");
+		break;
+
+	case 'n':
+		retval = sleep_for_file(path, "/address");
+		break;
+
+	default:
+		dbg("unknown device type '%c'", dev.type);
+		retval = -EINVAL;
+	}
 
 	class_dev = get_class_dev(path);
 	if (class_dev == NULL)
 		goto exit;
 
-	retval = get_major_minor(class_dev, &dev);
-	if (retval != 0) {
-		dbg("get_major_minor failed");
-		goto exit;
+	if (dev.type == 'b' || dev.type == 'c') {
+		retval = get_major_minor(class_dev, &dev);
+		if (retval != 0) {
+			dbg("get_major_minor failed");
+			goto exit;
+		}
 	}
 
 	retval = namedev_name_device(class_dev, &dev);
 	if (retval != 0)
 		goto exit;
 
-	if (!fake) {
+	if (!fake && (dev.type == 'b' || dev.type == 'c')) {
 		retval = udevdb_add_dev(path, &dev);
 		if (retval != 0)
 			dbg("udevdb_add_dev failed, but we are going to try "
 			    "to create the node anyway. But remove might not "
 			    "work properly for this device.");
-
 	}
+
 	dbg("name='%s'", dev.name);
-	retval = create_node(&dev, fake);
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = create_node(&dev, fake);
+		break;
+
+	case 'n':
+		retval = rename_net_if(&dev);
+		if (retval != 0)
+			dbg("net device naming failed");
+		break;
+	}
 
 	if ((retval == 0) && (!fake))
 		sysbus_send_create(&dev, path);
===== udev-remove.c 1.26 vs edited =====
--- 1.26/udev-remove.c	Wed Mar 17 23:40:12 2004
+++ edited/udev-remove.c	Tue Mar 23 02:56:35 2004
@@ -136,22 +136,36 @@
 	char *temp;
 	int retval;
 
-	memset(&dev, 0, sizeof(dev));
+	memset(&dev, 0x00, sizeof(dev));
 
-	retval = udevdb_get_dev(path, &dev);
-	if (retval) {
-		dbg("'%s' not found in database, falling back on default name", path);
-		temp = strrchr(path, '/');
-		if (temp == NULL)
-			return -ENODEV;
-		strfieldcpy(dev.name, &temp[1]);
-	}
+	dev.type = get_device_type(path, subsystem);
+
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = udevdb_get_dev(path, &dev);
+		if (retval) {
+			dbg("'%s' not found in database, falling back on default name", path);
+			temp = strrchr(path, '/');
+			if (temp == NULL)
+				return -ENODEV;
+			strfieldcpy(dev.name, &temp[1]);
+		}
 
-	dbg("name is '%s'", dev.name);
-	udevdb_delete_dev(path);
+		dbg("name='%s'", dev.name);
+		udevdb_delete_dev(path);
+		sysbus_send_remove(dev.name, path);
+		retval = delete_node(&dev);
+		break;
 
-	sysbus_send_remove(dev.name, path);
+	case 'n':
+		retval = 0;
+		break;
+
+	default:
+		dbg("unknown device type '%c'", dev.type);
+		retval = -EINVAL;
+	}
 
-	retval = delete_node(&dev);
 	return retval;
 }
===== udev.c 1.53 vs edited =====
--- 1.53/udev.c	Wed Mar 17 23:40:12 2004
+++ edited/udev.c	Tue Mar 23 03:00:06 2004
@@ -70,7 +70,6 @@
 }
 
 static char *subsystem_blacklist[] = {
-	"net",
 	"scsi_host",
 	"scsi_device",
 	"usb_host",
@@ -87,6 +86,7 @@
 	int retval = -EINVAL;
 	int i;
 	struct sigaction act;
+	const int nofake = 0;
 
 	action = get_action();
 	if (!action) {
@@ -140,19 +140,21 @@
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* initialize the naming deamon */
-	namedev_init();
-
-	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem, 0);
+	if (strcmp(action, "add") == 0) {
+		namedev_init();
+		retval = udev_add_device(devpath, subsystem, nofake);
+		goto action_done;
+	}
 
-	else if (strcmp(action, "remove") == 0)
+	if (strcmp(action, "remove") == 0) {
 		retval = udev_remove_device(devpath, subsystem);
-
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
+		goto action_done;
 	}
+
+	dbg("unknown action '%s'", action);
+	retval = -EINVAL;
+
+action_done:
 	udevdb_exit();
 
 exit_sysbus:
@@ -160,10 +162,7 @@
 	sysbus_disconnect();
 
 exit:
-	if (retval > 0)
-		retval = 0;
-
-	return -retval;
+	return retval;
 }
 
 int main(int argc, char *argv[], char *envp[])
===== udev_lib.c 1.1 vs edited =====
--- 1.1/udev_lib.c	Wed Mar 17 23:40:12 2004
+++ edited/udev_lib.c	Tue Mar 23 02:51:54 2004
@@ -70,6 +70,22 @@
 	return subsystem;
 }
 
+char get_device_type(const char *path, const char *subsystem)
+{
+	if (strcmp(subsystem, "block") == 0 ||
+	    strstr(path, "/block/") != NULL)
+		return 'b';
+
+	if (strcmp(subsystem, "net") == 0 ||
+	    strstr(path, "/class/net/") != NULL)
+		return 'n';
+
+	if (strstr(path, "/class/") != NULL)
+		return 'c';
+
+	return '\0';
+}
+
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
 	struct stat stats;
===== udev_lib.h 1.1 vs edited =====
--- 1.1/udev_lib.h	Wed Mar 17 23:40:12 2004
+++ edited/udev_lib.h	Tue Mar 23 00:33:01 2004
@@ -70,6 +70,7 @@
 extern char *get_devpath(void);
 extern char *get_seqnum(void);
 extern char *get_subsystem(char *subsystem);
+extern char get_device_type(const char *path, const char *subsystem);
 extern int file_map(const char *filename, char **buf, size_t *bufsize);
 extern void file_unmap(char *buf, size_t bufsize);
 extern size_t buf_get_line(char *buf, size_t buflen, size_t cur);
===== udevinfo.c 1.19 vs edited =====
--- 1.19/udevinfo.c	Wed Mar 17 23:40:12 2004
+++ edited/udevinfo.c	Tue Mar 23 00:33:02 2004
@@ -135,6 +135,10 @@
 	struct sysfs_device *sysfs_dev;
 	struct sysfs_device *sysfs_dev_parent;
 	int retval = 0;
+	char type;
+
+	type = get_device_type(path, "");
+	dbg("device type is %c", type);
 
 	/*  get the class dev */
 	class_dev = sysfs_open_class_device_path(path);
@@ -143,22 +147,25 @@
 		return -1;
 	}
 
-	/* read the 'dev' file for major/minor*/
-	attr = sysfs_get_classdev_attr(class_dev, "dev");
-	if (attr == NULL) {
-		printf("couldn't get the \"dev\" file\n");
-		retval = -1;
-		goto exit;
-	}
-
 	printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
 	       "device chain, to print for every device found, all possibly useful attributes\n"
 	       "in the udev key format.\n"
 	       "Only attributes within one device section may be used together in one rule,\n"
 	       "to match the device for which the node will be created.\n"
 	       "\n");
-	printf("device '%s' has major:minor %s", class_dev->path, attr->value);
-	sysfs_close_attribute(attr);
+
+	if (type == 'b' || type =='c') {
+		/* read the 'dev' file for major/minor*/
+		attr = sysfs_get_classdev_attr(class_dev, "dev");
+		if (attr == NULL) {
+			printf("couldn't get the \"dev\" file\n");
+			retval = -1;
+			goto exit;
+		}
+
+		printf("device '%s' has major:minor %s", class_dev->path, attr->value);
+		sysfs_close_attribute(attr);
+	}
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-03-24 23:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-23  3:07 [PATCH] hmm, handle net devices with udev? Kay Sievers
2004-03-23 19:43 ` Marco d'Itri
2004-03-24 18:03 ` Greg KH
2004-03-24 23:12 ` Kay Sievers
2004-03-24 23:33 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).