X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=09c24fdf5912791e67fc093878a2918abc32e27b;hp=3942a3d70018268570fdd83bbb127631b571576c;hb=b2ba8efeb3ea00a9b404f403549caa692fe34cc7;hpb=0c3348684455144089d1da574b1096c95f4b0a80 diff --git a/discover/udev.c b/discover/udev.c index 3942a3d..09c24fd 100644 --- a/discover/udev.c +++ b/discover/udev.c @@ -1,5 +1,7 @@ -#define _GNU_SOURCE +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif #include #include @@ -13,6 +15,7 @@ #include #include +#include #include #include #include @@ -21,15 +24,7 @@ #include "udev.h" #include "pb-discover.h" #include "device-handler.h" - -#if defined(DEBUG) -#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) -#define DBGS(fmt, args...) \ - pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) -#else -#define DBG(fmt, args...) -#define DBGS(fmt, args...) -#endif +#include "cdrom.h" struct pb_udev { struct udev *udev; @@ -50,97 +45,198 @@ static int udev_destructor(void *p) return 0; } -static void print_device_properties(struct udev_device *dev) +static void udev_setup_device_params(struct udev_device *udev, + struct discover_device *dev) { struct udev_list_entry *list, *entry; - assert(dev); + list = udev_device_get_properties_list_entry(udev); + if (!list) + return; - if (1) { - list = udev_device_get_properties_list_entry(dev); - - assert(list); - - udev_list_entry_foreach(entry, list) - DBG("property: %s - %s\n", + udev_list_entry_foreach(entry, list) + discover_device_set_param(dev, udev_list_entry_get_name(entry), - udev_device_get_property_value(dev, - udev_list_entry_get_name(entry))); - } + udev_list_entry_get_value(entry)); } -static int udev_handle_dev_action(struct udev_device *dev, const char *action) +static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) { - const char *devtype; - const char *devpath; - const char *devnode; - struct pb_udev *udev; - struct event *event; - enum event_action eva = 0; + struct discover_device *ddev; + const char *typestr; + const char *uuid; + const char *path; + const char *name; + const char *node; + const char *prop; + bool cdrom; + + name = udev_device_get_sysname(dev); + if (!name) { + pb_debug("udev_device_get_sysname failed\n"); + return -1; + } - assert(dev); - assert(action); + typestr = udev_device_get_devtype(dev); + if (!typestr) { + pb_debug("udev_device_get_devtype failed\n"); + return -1; + } - devtype = udev_device_get_devtype(dev); /* DEVTYPE */ + if (!(!strcmp(typestr, "disk") || !strcmp(typestr, "partition"))) { + pb_debug("SKIP %s: invalid type %s\n", name, typestr); + return 0; + } - if (!devtype) { - pb_log("udev_device_get_devtype failed\n"); - return -1; + node = udev_device_get_devnode(dev); + path = udev_device_get_devpath(dev); + if (path && (strstr(path, "virtual/block/loop") + || strstr(path, "virtual/block/ram"))) { + pb_debug("SKIP: %s: ignored (path=%s)\n", name, path); + return 0; } - devpath = udev_device_get_devpath(dev); /* DEVPATH */ + cdrom = node && !!udev_device_get_property_value(dev, "ID_CDROM"); + if (cdrom) { + /* CDROMs require a little initialisation, to get + * petitboot-compatible tray behaviour */ + cdrom_init(node); + if (!cdrom_media_present(node)) { + pb_debug("SKIP: %s: no media present\n", name); + return 0; + } + } - if (!devpath) { - pb_log("udev_device_get_devpath failed\n"); + /* We have enough info to create the device and start discovery */ + ddev = device_lookup_by_id(udev->handler, name); + if (ddev) { + pb_debug("device %s is already present?\n", name); return -1; } - devnode = udev_device_get_devnode(dev); /* DEVNAME */ + /* We may see multipath devices; they'll have the same uuid as an + * existing device, so only parse the first. */ + uuid = udev_device_get_property_value(dev, "ID_FS_UUID"); + if (uuid) { + ddev = device_lookup_by_uuid(udev->handler, uuid); + if (ddev) { + pb_log("SKIP: %s UUID [%s] already present (as %s)\n", + name, uuid, ddev->device->id); + return -1; + } + } + + ddev = discover_device_create(udev->handler, name); + + ddev->device_path = talloc_strdup(ddev, node); + + if (uuid) + ddev->uuid = talloc_strdup(ddev, uuid); + prop = udev_device_get_property_value(dev, "ID_FS_LABEL"); + if (prop) + ddev->label = talloc_strdup(ddev, prop); + ddev->device->type = DEVICE_TYPE_DISK; + + udev_setup_device_params(dev, ddev); + + device_handler_discover(udev->handler, ddev); + + return 0; +} + +static int udev_handle_dev_remove(struct pb_udev *udev, struct udev_device *dev) +{ + struct discover_device *ddev; + const char *name; - if (!devnode) { - pb_log("udev_device_get_devnode failed\n"); + name = udev_device_get_sysname(dev); + if (!name) { + pb_debug("udev_device_get_sysname failed\n"); return -1; } - print_device_properties(dev); + ddev = device_lookup_by_id(udev->handler, name); + if (!ddev) + return 0; + + device_handler_remove(udev->handler, ddev); + + return 0; +} + +static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev) +{ + struct discover_device *ddev; + const char *name, *node; - /* Ignore non disk or partition, ram, loop. */ + name = udev_device_get_sysname(dev); + node = udev_device_get_devnode(dev); - if (!(strstr(devtype, "disk") || strstr(devtype, "partition")) - || strstr(devpath, "virtual/block/loop") - || strstr(devpath, "virtual/block/ram")) { - pb_log("SKIP: %s - %s\n", devtype, devnode); + /* we're only interested in CDROM change events at present */ + if (!udev_device_get_property_value(dev, "ID_CDROM")) return 0; - } - if (!strcmp(action, "add")) { - pb_log("ADD: %s - %s\n", devtype, devnode); - eva = EVENT_ACTION_ADD; - } else if (!strcmp(action, "remove")) { - pb_log("REMOVE: %s - %s\n", devtype, devnode); - eva = EVENT_ACTION_REMOVE; - } else { - pb_log("SKIP: %s: %s - %s\n", action, devtype, devnode); + /* handle CDROM eject requests */ + if (udev_device_get_property_value(dev, "DISK_EJECT_REQUEST")) { + bool eject = false; + + pb_debug("udev: eject request\n"); + + /* If the device is mounted, cdrom_id's own eject request may + * have failed. So, we'll need to do our own here. + */ + ddev = device_lookup_by_id(udev->handler, name); + if (ddev) { + eject = ddev->mounted; + udev_handle_dev_remove(udev, dev); + } + + if (eject) + cdrom_eject(node); + return 0; } - event = talloc(NULL, struct event); + if (udev_device_get_property_value(dev, "DISK_MEDIA_CHANGE")) { + if (cdrom_media_present(node)) + return udev_handle_dev_add(udev, dev); + else + return udev_handle_dev_remove(udev, dev); + } + + return 0; +} + +static int udev_handle_dev_action(struct udev_device *dev, const char *action) +{ + struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev)); + +#ifdef DEBUG + { + struct udev_list_entry *list; + const char *name; + + list = udev_device_get_properties_list_entry(dev); + name = udev_device_get_sysname(dev); + + pb_debug("%s: action %s, device %s\n", __func__, action, name); + pb_debug("%s properties:\n", __func__); - event->type = EVENT_TYPE_UDEV; - event->action = eva; - event->device = devpath; + for (; list; list = udev_list_entry_get_next(list)) + pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list), + udev_list_entry_get_value(list)); + } while (0); +#endif - event->n_params = 1; - event->params = talloc(event, struct param); - event->params->name = "DEVNAME"; - event->params->value = devnode; + if (!strcmp(action, "add")) + return udev_handle_dev_add(udev, dev); - udev = udev_get_userdata(udev_device_get_udev(dev)); - assert(udev); + else if (!strcmp(action, "remove")) + return udev_handle_dev_remove(udev, dev); - device_handler_event(udev->handler, event); + else if (!strcmp(action, "change")) + return udev_handle_dev_change(udev, dev); - talloc_free(event); return 0; } @@ -302,10 +398,10 @@ struct pb_udev *udev_init(struct waitset *waitset, if (result) goto fail_monitor; - waiter_register(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN, + waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN, udev_process, udev->monitor); - pb_log("%s: waiting on %s\n", __func__, udev_get_sys_path(udev->udev)); + pb_debug("%s: waiting on udev\n", __func__); return udev; @@ -317,11 +413,6 @@ fail_new: return NULL; } -int udev_trigger(struct pb_udev __attribute__((unused)) *udev) -{ - return 0; -} - void udev_destroy(struct pb_udev *udev) { talloc_free(udev);