X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=0b2ec2fd905d3da2bad341a26653c738f68da2a8;hp=1c5cf71ff4fee7caf0949211ba4c0f7ee48afd37;hb=30a68ef1ba00b24f50efef4f22c426396176462d;hpb=f611bde3f182e9a4befb48a0160d1831708aca67 diff --git a/discover/udev.c b/discover/udev.c index 1c5cf71..0b2ec2f 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 @@ -22,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; @@ -66,18 +60,16 @@ static void udev_setup_device_params(struct udev_device *udev, udev_list_entry_get_value(entry)); } -static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) +static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev, + const char *name) { struct discover_device *ddev; const char *typestr; + const char *uuid; const char *path; - const char *name; - - name = udev_device_get_sysname(dev); - if (!name) { - pb_debug("udev_device_get_sysname failed\n"); - return -1; - } + const char *node; + const char *prop; + bool cdrom; typestr = udev_device_get_devtype(dev); if (!typestr) { @@ -90,6 +82,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) return 0; } + node = udev_device_get_devnode(dev); path = udev_device_get_devpath(dev); if (path && (strstr(path, "virtual/block/loop") || strstr(path, "virtual/block/ram"))) { @@ -97,27 +90,79 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) return 0; } - /* 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; + 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; + } + } + + + /* 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 = udev_device_get_devnode(dev); - ddev->uuid = udev_device_get_property_value(dev, "ID_FS_UUID"); - ddev->label = udev_device_get_property_value(dev, "ID_FS_LABEL"); - ddev->device->type = DEVICE_TYPE_DISK; + 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 = cdrom ? DEVICE_TYPE_OPTICAL : DEVICE_TYPE_DISK; udev_setup_device_params(dev, ddev); - device_handler_discover(udev->handler, ddev, CONF_METHOD_LOCAL_FILE); + device_handler_discover(udev->handler, ddev); return 0; } +static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) +{ + const char *subsys; + const char *name; + + name = udev_device_get_sysname(dev); + if (!name) { + pb_debug("udev_device_get_sysname failed\n"); + return -1; + } + + subsys = udev_device_get_subsystem(dev); + if (!subsys) { + pb_debug("udev_device_get_subsystem failed\n"); + return -1; + } + + if (device_lookup_by_id(udev->handler, name)) { + pb_debug("device %s is already present?\n", name); + return -1; + } + + if (!strcmp(subsys, "block")) { + return udev_handle_block_add(udev, dev, name); + } + + pb_debug("SKIP %s: unknown subsystem %s\n", name, subsys); + return -1; +} + + static int udev_handle_dev_remove(struct pb_udev *udev, struct udev_device *dev) { struct discover_device *ddev; @@ -137,16 +182,103 @@ static int udev_handle_dev_remove(struct pb_udev *udev, struct udev_device *dev) return 0; } + +/* returns true if further event processing should stop (eg., we've + * ejected the cdrom) + */ +static bool udev_handle_cdrom_events(struct pb_udev *udev, + struct udev_device *dev, struct discover_device *ddev) +{ + const char *node; + + node = udev_device_get_devnode(dev); + + /* 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. + */ + if (ddev) { + eject = ddev->mounted; + udev_handle_dev_remove(udev, dev); + return false; + } + + if (eject) + cdrom_eject(node); + + return true; + } + + if (udev_device_get_property_value(dev, "DISK_MEDIA_CHANGE")) { + if (cdrom_media_present(node)) + udev_handle_dev_add(udev, dev); + else + udev_handle_dev_remove(udev, dev); + return true; + } + + return false; +} + +static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev) +{ + struct discover_device *ddev; + const char *name; + int rc = 0; + + name = udev_device_get_sysname(dev); + + ddev = device_lookup_by_id(udev->handler, name); + + /* if this is a CDROM device, process eject & media change requests; + * these may stop further processing */ + if (!udev_device_get_property_value(dev, "ID_CDROM")) { + if (udev_handle_cdrom_events(udev, dev, ddev)) + return 0; + } + + /* if this is a new device, treat it as an add */ + if (!ddev) + rc = udev_handle_dev_add(udev, dev); + + return rc; +} + 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__); + + 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 + if (!strcmp(action, "add")) return udev_handle_dev_add(udev, dev); else if (!strcmp(action, "remove")) return udev_handle_dev_remove(udev, dev); + else if (!strcmp(action, "change")) + return udev_handle_dev_change(udev, dev); + return 0; } @@ -164,12 +296,17 @@ static int udev_enumerate(struct udev *udev) } result = udev_enumerate_add_match_subsystem(enumerate, "block"); - if (result) { pb_log("udev_enumerate_add_match_subsystem failed\n"); goto fail; } + result = udev_enumerate_add_match_is_initialized(enumerate); + if (result) { + pb_log("udev_enumerate_add_match_is_initialised failed\n"); + goto fail; + } + udev_enumerate_scan_devices(enumerate); list = udev_enumerate_get_list_entry(enumerate); @@ -298,24 +435,23 @@ struct pb_udev *udev_init(struct waitset *waitset, udev_set_log_fn(udev->udev, udev_log_fn); - result = udev_enumerate(udev->udev); - - if (result) - goto fail_enumerate; - result = udev_setup_monitor(udev->udev, &udev->monitor); - if (result) goto fail_monitor; + result = udev_enumerate(udev->udev); + if (result) + goto fail_enumerate; + waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN, udev_process, udev->monitor); - pb_log("%s: waiting on udev\n", __func__); + pb_debug("%s: waiting on udev\n", __func__); return udev; fail_monitor: + udev_monitor_unref(udev->monitor); fail_enumerate: udev_unref(udev->udev); fail_new: