X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-net_id.c;h=a5da29149746a703caf83581afc53c3084326d27;hb=d5a89d7dc17a5ba5cf4fc71f82963c5c94a31c3d;hp=e6db2e4798871da81cfc6458843c87dc0748d2ac;hpb=971e7fb62548f2c9c4e32684bb13409e6579dc6a;p=elogind.git diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index e6db2e479..a5da29149 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -30,12 +30,12 @@ * ww -- wwan * * Type of names: - * o -- on-board device index number - * s[f] -- hotplug slot index number - * x -- MAC address - * ps[f] -- PCI geographical location - * ps[f][u][...][c][i] - * -- USB port number chain + * o -- on-board device index number + * s[f][d] -- hotplug slot index number + * x -- MAC address + * ps[f][d] -- PCI geographical location + * ps[f][u][..][c][i] + * -- USB port number chain * * All multi-function PCI devices will carry the [f] number in the * device name, including the function 0 device. @@ -45,22 +45,24 @@ * exported. * The usual USB configuration == 1 and interface == 0 values are suppressed. * - * PCI ethernet card with firmware index + * PCI ethernet card with firmware index "1": * ID_NET_NAME_ONBOARD=eno1 * ID_NET_NAME_ONBOARD_LABEL=Ethernet Port 1 * - * PCI ethernet card - * /sys/devices/pci0000:00/0000:00:1c.3/0000:05:00.0/net/ens1 - * ID_NET_NAME_MAC=enx000000000466 - * ID_NET_NAME_PATH=enp5s0 - * ID_NET_NAME_SLOT=ens1 - * * PCI ethernet card in hotplug slot with firmware index number: * /sys/devices/pci0000:00/0000:00:1c.3/0000:05:00.0/net/ens1 * ID_NET_NAME_MAC=enx000000000466 * ID_NET_NAME_PATH=enp5s0 * ID_NET_NAME_SLOT=ens1 * + * PCI ethernet multi-function card with 2 ports: + * /sys/devices/pci0000:00/0000:00:1c.0/0000:02:00.0/net/enp2s0f0 + * ID_NET_NAME_MAC=enx78e7d1ea46da + * ID_NET_NAME_PATH=enp2s0f0 + * /sys/devices/pci0000:00/0000:00:1c.0/0000:02:00.1/net/enp2s0f1 + * ID_NET_NAME_MAC=enx78e7d1ea46dc + * ID_NET_NAME_PATH=enp2s0f1 + * * PCI wlan card: * /sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlp3s0 * ID_NET_NAME_MAC=wlx0024d7e31130 @@ -132,11 +134,11 @@ static int dev_pci_onboard(struct udev_device *dev, struct netnames *names) { } /* read the 256 bytes PCI configuration space to check the multi-function bit */ -static bool is_pci_singlefunction(struct udev_device *dev) { +static bool is_pci_multifunction(struct udev_device *dev) { char filename[256]; - FILE *f; + FILE *f = NULL; char config[64]; - bool single = false; + bool multi = false; snprintf(filename, sizeof(filename), "%s/config", udev_device_get_syspath(dev)); f = fopen(filename, "re"); @@ -146,11 +148,12 @@ static bool is_pci_singlefunction(struct udev_device *dev) { goto out; /* bit 0-6 header type, bit 7 multi/single function device */ - if ((config[PCI_HEADER_TYPE] & 0x80) == 0) - single = true; + if ((config[PCI_HEADER_TYPE] & 0x80) != 0) + multi = true; out: - fclose(f); - return single; + if(f) + fclose(f); + return multi; } static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { @@ -158,6 +161,10 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { unsigned int bus; unsigned int slot; unsigned int func; + unsigned int dev_id = 0; + size_t l; + char *s; + const char *attr; struct udev_device *pci = NULL; char slots[256]; DIR *dir; @@ -166,13 +173,23 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { int hotplug_slot = 0; int err = 0; - /* compose a name based on the raw kernel's PCI bus, slot numbers */ if (sscanf(udev_device_get_sysname(names->pcidev), "0000:%x:%x.%d", &bus, &slot, &func) != 3) return -ENOENT; - if (func == 0 && is_pci_singlefunction(names->pcidev)) - snprintf(names->pci_path, sizeof(names->pci_path), "p%ds%d", bus, slot); - else - snprintf(names->pci_path, sizeof(names->pci_path), "p%ds%df%d", bus, slot, func); + + /* kernel provided multi-device index */ + attr = udev_device_get_sysattr_value(dev, "dev_id"); + if (attr) + dev_id = strtol(attr, NULL, 16); + + /* compose a name based on the raw kernel's PCI bus, slot numbers */ + s = names->pci_path; + l = strpcpyf(&s, sizeof(names->pci_path), "p%ds%d", bus, slot); + if (func > 0 || is_pci_multifunction(names->pcidev)) + l = strpcpyf(&s, l, "f%d", func); + if (dev_id > 0) + l = strpcpyf(&s, l, "d%d", dev_id); + if (l == 0) + names->pci_path[0] = '\0'; /* ACPI _SUN -- slot user number */ pci = udev_device_new_from_subsystem_sysname(udev, "subsystem", "pci"); @@ -213,10 +230,14 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { closedir(dir); if (hotplug_slot > 0) { - if (func == 0 && is_pci_singlefunction(names->pcidev)) - snprintf(names->pci_slot, sizeof(names->pci_slot), "s%d", hotplug_slot); - else - snprintf(names->pci_slot, sizeof(names->pci_slot), "s%df%d", hotplug_slot, func); + s = names->pci_slot; + l = strpcpyf(&s, sizeof(names->pci_slot), "s%d", hotplug_slot); + if (func > 0 || is_pci_multifunction(names->pcidev)) + l = strpcpyf(&s, l, "f%d", func); + if (dev_id > 0) + l = strpcpyf(&s, l, "d%d", dev_id); + if (l == 0) + names->pci_path[0] = '\0'; } out: udev_device_unref(pci); @@ -256,7 +277,7 @@ static int names_usb(struct udev_device *dev, struct netnames *names) { return -ENOENT; /* get USB port number chain, configuration, interface */ - util_strscpy(name, sizeof(name), udev_device_get_sysname(names->usbdev)); + strscpy(name, sizeof(name), udev_device_get_sysname(names->usbdev)); s = strchr(name, '-'); if (!s) return -EINVAL; @@ -279,15 +300,15 @@ static int names_usb(struct udev_device *dev, struct netnames *names) { while ((s = strchr(s, '.'))) s[0] = 'u'; s = names->usb_ports; - l = util_strpcpyl(&s, sizeof(names->usb_ports), "u", ports, NULL); + l = strpcpyl(&s, sizeof(names->usb_ports), "u", ports, NULL); /* append USB config number, suppress the common config == 1 */ if (!streq(config, "1")) - l = util_strpcpyl(&s, sizeof(names->usb_ports), "c", config, NULL); + l = strpcpyl(&s, sizeof(names->usb_ports), "c", config, NULL); /* append USB interface number, suppress the interface == 0 */ if (!streq(interf, "0")) - l = util_strpcpyl(&s, sizeof(names->usb_ports), "i", interf, NULL); + l = strpcpyl(&s, sizeof(names->usb_ports), "i", interf, NULL); if (l == 0) return -ENAMETOOLONG; @@ -346,6 +367,7 @@ static int ieee_oui(struct udev_device *dev, struct netnames *names, bool test) static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool test) { const char *s; + const char *p; unsigned int i; const char *devtype; const char *prefix = "en"; @@ -360,6 +382,16 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool if (i != 1) return 0; + /* skip stacked devices, like VLANs, ... */ + s = udev_device_get_sysattr_value(dev, "ifindex"); + if (!s) + return EXIT_FAILURE; + p = udev_device_get_sysattr_value(dev, "iflink"); + if (!p) + return EXIT_FAILURE; + if (strcmp(s, p) != 0) + return 0; + devtype = udev_device_get_devtype(dev); if (devtype) { if (streq("wlan", devtype))