#include "device-handler.h"
#include "cdrom.h"
+/* We set a default monitor buffer size, as we may not process monitor
+ * events while performing device discvoery. systemd uses a 128M buffer, so
+ * we'll do the same here */
+static const int monitor_bufsize = 128 * 1024 * 1024;
+
struct pb_udev {
struct udev *udev;
struct udev_monitor *monitor;
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;
const char *node;
const char *prop;
+ const char *type;
bool cdrom;
- name = udev_device_get_sysname(dev);
- if (!name) {
- pb_debug("udev_device_get_sysname failed\n");
- return -1;
- }
-
typestr = udev_device_get_devtype(dev);
if (!typestr) {
pb_debug("udev_device_get_devtype failed\n");
}
if (!(!strcmp(typestr, "disk") || !strcmp(typestr, "partition"))) {
- pb_debug("SKIP %s: invalid type %s\n", name, typestr);
+ pb_log("SKIP %s: invalid type %s\n", name, typestr);
return 0;
}
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);
+ pb_log("SKIP: %s: ignored (path=%s)\n", name, path);
return 0;
}
* petitboot-compatible tray behaviour */
cdrom_init(node);
if (!cdrom_media_present(node)) {
- pb_debug("SKIP: %s: no media present\n", name);
+ pb_log("SKIP: %s: no media present\n", name);
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;
+ type = udev_device_get_property_value(dev, "ID_FS_TYPE");
+ if (!type) {
+ pb_log("SKIP: %s: no ID_FS_TYPE property\n", name);
+ return 0;
}
/* We may see multipath devices; they'll have the same uuid as an
if (ddev) {
pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
name, uuid, ddev->device->id);
- return -1;
+ return 0;
}
}
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_log("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;
return 0;
}
-static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
+/* 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)
{
- struct discover_device *ddev;
- const char *name, *node;
+ const char *node;
- name = udev_device_get_sysname(dev);
node = udev_device_get_devnode(dev);
- /* we're only interested in CDROM change events at present */
- if (!udev_device_get_property_value(dev, "ID_CDROM"))
- return 0;
-
/* handle CDROM eject requests */
if (udev_device_get_property_value(dev, "DISK_EJECT_REQUEST")) {
bool eject = false;
/* 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);
+ return false;
}
if (eject)
cdrom_eject(node);
- return 0;
+ return true;
}
if (udev_device_get_property_value(dev, "DISK_MEDIA_CHANGE")) {
if (cdrom_media_present(node))
- return udev_handle_dev_add(udev, dev);
+ udev_handle_dev_add(udev, dev);
else
- return udev_handle_dev_remove(udev, dev);
+ udev_handle_dev_remove(udev, dev);
+ return true;
}
- return 0;
+ 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)
}
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);
goto out_err;
}
+ result = udev_monitor_set_receive_buffer_size(m, monitor_bufsize);
+ if (result) {
+ pb_log("udev_monitor_set_rx_bufsize(%d) failed\n",
+ monitor_bufsize);
+ }
+
result = udev_monitor_filter_add_match_subsystem_devtype(m, "block",
NULL);
struct udev_monitor *monitor = arg;
struct udev_device *dev;
const char *action;
- int result;
dev = udev_monitor_receive_device(monitor);
-
if (!dev) {
pb_log("udev_monitor_receive_device failed\n");
return -1;
if (!action) {
pb_log("udev_device_get_action failed\n");
- goto fail;
+ } else {
+ udev_handle_dev_action(dev, action);
}
- result = udev_handle_dev_action(dev, action);
-
- udev_device_unref(dev);
- return result;
-
-fail:
udev_device_unref(dev);
- return -1;
+ return 0;
}
static void udev_log_fn(struct udev __attribute__((unused)) *udev,
vfprintf(pb_log_get_stream(), format, args);
}
-struct pb_udev *udev_init(struct waitset *waitset,
- struct device_handler *handler)
+struct pb_udev *udev_init(struct device_handler *handler,
+ struct waitset *waitset)
{
+ struct pb_udev *udev;
int result;
- struct pb_udev *udev = talloc(NULL, struct pb_udev);
+ udev = talloc(handler, struct pb_udev);
talloc_set_destructor(udev, udev_destructor);
udev->handler = handler;
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);
return udev;
fail_monitor:
+ udev_monitor_unref(udev->monitor);
fail_enumerate:
udev_unref(udev->udev);
fail_new:
talloc_free(udev);
return NULL;
}
-
-void udev_destroy(struct pb_udev *udev)
-{
- talloc_free(udev);
-}
projects / petitboot / blobdiff