Commit 8fe914ec authored by Lennart Poettering's avatar Lennart Poettering
Browse files

device: do not merge devices

Don't try to merge devices that have been created via dependencies when
they appear in the system and can be recognized as the same.  Instead,
simply continue to maintain them independently of each other, however
with the same state cycle. Why? Because otherwise we'd have a hard time
to seperate the dependencies after the devices are unplugged again and
we hence cannot be sure anymore that next time the device is plugged in
it will carry the same names.

Example: if one depndency refers to dev-sda.device and another one to
dev-by-id-xxxyyy.device we only learn at time of plug in of the device
that it is actually the same device that was ment. In the moment the
device is unplugged again we won't know anymore their relation to each
other and the next time the harddisk is plugged it might even appear as
dev-by-id-xxxyyy.device and dev-sdb.service. To ensure the dependencies
continue to have the meaning they were intended to have let's hence keep
the .device objects seperate all the time, even when they are plugged
in.

This patch also introduces a new Following= property which points from
the various .device units of a specific device to the main .device unit
for it. This can be used by the client side to figure out the relation
of the .device units to each other and even filter units from display.
parent 5632e374
......@@ -38,8 +38,11 @@
* place /etc/inittab with explaining blurb.
* In command lines, support both "$FOO" and $FOO
* /etc must always take precedence even if we follow symlinks!
* fix merging of device units
* color aus bei stdout auf !tty
getty before prefdm
* /lib/init/rw
......@@ -49,13 +52,17 @@
* fingerprint.target, wireless.target, gps.target
* fix merging of device units
* set_put(), hashmap_put() return values checken. i.e. == 0 macht kein free()!
* crash on missing hostname
* fix merging in .swap units
* pahole
* color aus bei stdout auf !tty
* io priority
* network.target darf nm nicht unbedingt starten
External:
......
......@@ -115,6 +115,15 @@
they are set or not.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--full</option></term>
<listitem><para>Do not ellipsize unit
names in the output of
<command>list-units</command> and
<command>list-jobs</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--fail</option></term>
......
......@@ -82,7 +82,7 @@
" <method name=\"ClearJobs\"/>\n" \
" <method name=\"ResetMaintenance\"/>\n" \
" <method name=\"ListUnits\">\n" \
" <arg name=\"units\" type=\"a(sssssouso)\" direction=\"out\"/>\n" \
" <arg name=\"units\" type=\"a(ssssssouso)\" direction=\"out\"/>\n" \
" </method>\n" \
" <method name=\"ListJobs\">\n" \
" <arg name=\"jobs\" type=\"a(usssoo)\" direction=\"out\"/>\n" \
......@@ -405,12 +405,12 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
dbus_message_iter_init_append(reply, &iter);
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(sssssouso)", &sub))
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(ssssssouso)", &sub))
goto oom;
HASHMAP_FOREACH_KEY(u, k, m->units, i) {
char *u_path, *j_path;
const char *description, *load_state, *active_state, *sub_state, *sjob_type;
const char *description, *load_state, *active_state, *sub_state, *sjob_type, *following;
DBusMessageIter sub2;
uint32_t job_id;
......@@ -424,6 +424,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
load_state = unit_load_state_to_string(u->meta.load_state);
active_state = unit_active_state_to_string(unit_active_state(u));
sub_state = unit_sub_state_to_string(u);
following = u->meta.following ? u->meta.following->meta.id : "";
if (!(u_path = unit_dbus_path(u)))
goto oom;
......@@ -448,6 +449,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &load_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &active_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sub_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &following) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &u_path) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &job_id) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sjob_type) ||
......
......@@ -47,6 +47,23 @@ int bus_unit_append_names(Manager *m, DBusMessageIter *i, const char *property,
return 0;
}
int bus_unit_append_following(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Unit *u = data;
const char *d;
assert(m);
assert(i);
assert(property);
assert(u);
d = u->meta.following ? u->meta.following->meta.id : "";
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
return -ENOMEM;
return 0;
}
int bus_unit_append_dependencies(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Unit *u;
Iterator j;
......
......@@ -60,6 +60,7 @@
" <signal name=\"Changed\"/>\n" \
" <property name=\"Id\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"Names\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"Following\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"Requires\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"RequiresOverridable\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"Requisite\" type=\"as\" access=\"read\"/>\n" \
......@@ -97,6 +98,7 @@
#define BUS_UNIT_PROPERTIES \
{ "org.freedesktop.systemd1.Unit", "Id", bus_property_append_string, "s", u->meta.id }, \
{ "org.freedesktop.systemd1.Unit", "Names", bus_unit_append_names, "as", u }, \
{ "org.freedesktop.systemd1.Unit", "Following", bus_unit_append_following, "s", u }, \
{ "org.freedesktop.systemd1.Unit", "Requires", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUIRES] }, \
{ "org.freedesktop.systemd1.Unit", "RequiresOverridable", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE] }, \
{ "org.freedesktop.systemd1.Unit", "Requisite", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUISITE] }, \
......@@ -131,6 +133,7 @@
{ "org.freedesktop.systemd1.Unit", "JobTimeoutUSec", bus_property_append_usec, "t", &u->meta.job_timeout }
int bus_unit_append_names(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_following(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_dependencies(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_description(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char *property, void *data);
......
......@@ -35,12 +35,40 @@ static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
[DEVICE_PLUGGED] = UNIT_ACTIVE
};
static void device_unset_sysfs(Device *d) {
Device *first;
assert(d);
if (d->sysfs) {
/* Remove this unit from the chain of devices which share the
* same sysfs path. */
first = hashmap_get(d->meta.manager->devices_by_sysfs, d->sysfs);
LIST_REMOVE(Device, same_sysfs, first, d);
if (first)
hashmap_remove_and_replace(d->meta.manager->devices_by_sysfs, d->sysfs, first->sysfs, first);
else
hashmap_remove(d->meta.manager->devices_by_sysfs, d->sysfs);
free(d->sysfs);
d->sysfs = NULL;
}
d->meta.following = NULL;
}
static void device_init(Unit *u) {
Device *d = DEVICE(u);
assert(d);
assert(d->meta.load_state == UNIT_STUB);
/* In contrast to all other unit types we timeout jobs waiting
* for devices by default. This is because they otherwise wait
* indefinetely for plugged in devices, something which cannot
* happen for the other units since their operations time out
* anyway. */
d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
}
......@@ -49,8 +77,7 @@ static void device_done(Unit *u) {
assert(d);
free(d->sysfs);
d->sysfs = NULL;
device_unset_sysfs(d);
}
static void device_set_state(Device *d, DeviceState state) {
......@@ -105,7 +132,7 @@ static const char *device_sub_state_to_string(Unit *u) {
return device_state_to_string(DEVICE(u)->state);
}
static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) {
static int device_add_escaped_name(Unit *u, const char *dn) {
char *e;
int r;
......@@ -117,10 +144,6 @@ static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) {
return -ENOMEM;
r = unit_add_name(u, e);
if (r >= 0 && make_id)
unit_choose_id(u, e);
free(e);
if (r < 0 && r != -EEXIST)
......@@ -152,134 +175,108 @@ static int device_find_escape_name(Manager *m, const char *dn, Unit **_u) {
return 0;
}
static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
const char *dn, *wants, *sysfs, *model, *alias;
static int device_update_unit(Manager *m, struct udev_device *dev, const char *path, bool main) {
const char *sysfs, *model;
Unit *u = NULL;
int r;
char *w, *state;
size_t l;
bool delete;
struct udev_list_entry *item = NULL, *first = NULL;
assert(m);
if (!(sysfs = udev_device_get_syspath(dev)))
return -ENOMEM;
/* Check whether this entry is even relevant for us. */
dn = udev_device_get_devnode(dev);
wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS");
alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
/* We allow exactly one alias to be configured a this time and
* it must be a path */
if (alias && !is_path(alias)) {
log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias);
alias = NULL;
}
if ((r = device_find_escape_name(m, sysfs, &u)) < 0)
if ((r = device_find_escape_name(m, path, &u)) < 0)
return r;
if (r == 0 && dn)
if ((r = device_find_escape_name(m, dn, &u)) < 0)
return r;
if (r == 0) {
first = udev_device_get_devlinks_list_entry(dev);
udev_list_entry_foreach(item, first) {
if ((r = device_find_escape_name(m, udev_list_entry_get_name(item), &u)) < 0)
return r;
if (r > 0)
break;
}
}
if (r == 0 && alias)
if ((r = device_find_escape_name(m, alias, &u)) < 0)
return r;
/* FIXME: this needs proper merging */
assert((r > 0) == !!u);
/* If this is a different unit, then let's not merge things */
if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs))
u = NULL;
if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs)) {
log_error("Hmm, something's broken. Asked to create two devices with same name but different sysfs paths.");
return -EEXIST;
}
if (!u) {
Device *first;
delete = true;
if (!(u = unit_new(m)))
return -ENOMEM;
if ((r = device_add_escaped_name(u, sysfs, true)) < 0)
if ((r = device_add_escaped_name(u, path)) < 0)
goto fail;
unit_add_to_load_queue(u);
} else
delete = false;
if (!(DEVICE(u)->sysfs))
if (!(DEVICE(u)->sysfs = strdup(sysfs))) {
r = -ENOMEM;
goto fail;
}
if (alias)
if ((r = device_add_escaped_name(u, alias, true)) < 0)
goto fail;
unit_add_to_load_queue(u);
if (dn)
if ((r = device_add_escaped_name(u, dn, true)) < 0)
goto fail;
if (!m->devices_by_sysfs)
if (!(m->devices_by_sysfs = hashmap_new(string_hash_func, string_compare_func))) {
r = -ENOMEM;
goto fail;
}
first = udev_device_get_devlinks_list_entry(dev);
udev_list_entry_foreach(item, first)
if ((r = device_add_escaped_name(u, udev_list_entry_get_name(item), false)) < 0)
first = hashmap_get(m->devices_by_sysfs, sysfs);
LIST_PREPEND(Device, same_sysfs, first, DEVICE(u));
if ((r = hashmap_replace(m->devices_by_sysfs, DEVICE(u)->sysfs, first)) < 0)
goto fail;
} else
delete = false;
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
(model = udev_device_get_property_value(dev, "ID_MODEL"))) {
if ((r = unit_set_description(u, model)) < 0)
goto fail;
} else if (dn) {
if ((r = unit_set_description(u, dn)) < 0)
goto fail;
} else
if ((r = unit_set_description(u, sysfs)) < 0)
if ((r = unit_set_description(u, path)) < 0)
goto fail;
if (wants) {
FOREACH_WORD_QUOTED(w, l, wants, state) {
char *e;
if (!(e = strndup(w, l))) {
r = -ENOMEM;
goto fail;
if (main) {
/* The additional systemd udev properties we only
* interpret for the main object */
const char *wants, *alias;
if ((alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS"))) {
if (!is_path(alias))
log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias);
else {
if ((r = device_add_escaped_name(u, alias)) < 0)
goto fail;
}
}
r = unit_add_dependency_by_name(u, UNIT_WANTS, e, NULL, true);
free(e);
if ((wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS"))) {
char *state, *w;
size_t l;
if (r < 0)
goto fail;
FOREACH_WORD_QUOTED(w, l, wants, state) {
char *e;
if (!(e = strndup(w, l))) {
r = -ENOMEM;
goto fail;
}
r = unit_add_dependency_by_name(u, UNIT_WANTS, e, NULL, true);
free(e);
if (r < 0)
goto fail;
}
}
}
if (update_state) {
manager_dispatch_load_queue(u->meta.manager);
device_set_state(DEVICE(u), DEVICE_PLUGGED);
}
u->meta.following = NULL;
} else
device_find_escape_name(m, sysfs, &u->meta.following);
unit_add_to_dbus_queue(u);
return 0;
fail:
log_warning("Failed to load device unit: %s", strerror(-r));
if (delete && u)
......@@ -288,6 +285,50 @@ fail:
return r;
}
static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
const char *sysfs, *dn;
struct udev_list_entry *item = NULL, *first = NULL;
assert(m);
if (!(sysfs = udev_device_get_syspath(dev)))
return -ENOMEM;
/* Add the main unit named after the sysfs path */
device_update_unit(m, dev, sysfs, true);
/* Add an additional unit for the device node */
if ((dn = udev_device_get_devnode(dev)))
device_update_unit(m, dev, dn, false);
/* Add additional units for all symlinks */
first = udev_device_get_devlinks_list_entry(dev);
udev_list_entry_foreach(item, first) {
const char *p;
/* Don't bother with the /dev/block links */
p = udev_list_entry_get_name(item);
if (path_startswith(p, "/dev/block/") ||
path_startswith(p, "/dev/char/"))
continue;
device_update_unit(m, dev, p, false);
}
if (update_state) {
Device *d, *l;
manager_dispatch_load_queue(m);
l = hashmap_get(m->devices_by_sysfs, sysfs);
LIST_FOREACH(same_sysfs, d, l)
device_set_state(d, DEVICE_PLUGGED);
}
return 0;
}
static int device_process_path(Manager *m, const char *path, bool update_state) {
int r;
struct udev_device *dev;
......@@ -307,8 +348,6 @@ static int device_process_path(Manager *m, const char *path, bool update_state)
static int device_process_removed_device(Manager *m, struct udev_device *dev) {
const char *sysfs;
char *e;
Unit *u;
Device *d;
assert(m);
......@@ -317,21 +356,12 @@ static int device_process_removed_device(Manager *m, struct udev_device *dev) {
if (!(sysfs = udev_device_get_syspath(dev)))
return -ENOMEM;
assert(sysfs[0] == '/');
if (!(e = unit_name_from_path(sysfs, ".device")))
return -ENOMEM;
u = manager_get_unit(m, e);
free(e);
if (!u)
return 0;
d = DEVICE(u);
free(d->sysfs);
d->sysfs = NULL;
/* Remove all units of this sysfs path */
while ((d = hashmap_get(m->devices_by_sysfs, sysfs))) {
device_unset_sysfs(d);
device_set_state(d, DEVICE_DEAD);
}
device_set_state(d, DEVICE_DEAD);
return 0;
}
......@@ -347,6 +377,9 @@ static void device_shutdown(Manager *m) {
udev_unref(m->udev);
m->udev = NULL;
}
hashmap_free(m->devices_by_sysfs);
m->devices_by_sysfs = NULL;
}
static int device_enumerate(Manager *m) {
......@@ -464,6 +497,7 @@ const UnitVTable device_vtable = {
.no_instances = true,
.no_snapshots = true,
.no_isolate = true,
.no_alias = true,
.init = device_init,
......
......@@ -41,6 +41,12 @@ struct Device {
DeviceState state;
char *sysfs;
/* In order to be able to distuingish dependencies on
different device nodes we might end up creating multiple
devices for the same sysfs path. We chain them up here. */
LIST_FIELDS(struct Device, same_sysfs);
};
extern const UnitVTable device_vtable;
......
......@@ -296,6 +296,33 @@ int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key,
return 0;
}
int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value) {
struct hashmap_entry *e, *k;
unsigned old_hash, new_hash;
if (!h)
return -ENOENT;
old_hash = h->hash_func(old_key) % NBUCKETS;
if (!(e = hash_scan(h, old_hash, old_key)))
return -ENOENT;
new_hash = h->hash_func(new_key) % NBUCKETS;
if ((k = hash_scan(h, new_hash, new_key)))
if (e != k)
remove_entry(h, k);
unlink_entry(h, e, old_hash);
e->key = new_key;
e->value = value;
link_entry(h, e, new_hash);
return 0;
}
void* hashmap_remove_value(Hashmap *h, const void *key, void *value) {
struct hashmap_entry *e;
unsigned hash;
......
......@@ -56,6 +56,7 @@ void* hashmap_get(Hashmap *h, const void *key);
void* hashmap_remove(Hashmap *h, const void *key);
void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);
int hashmap_merge(Hashmap *h, Hashmap *other);
void hashmap_move(Hashmap *h, Hashmap *other);
......
......@@ -146,6 +146,7 @@ struct Manager {
struct udev* udev;
struct udev_monitor* udev_monitor;
Watch udev_watch;
Hashmap *devices_by_sysfs;
/* Data specific to the mount subsystem */
FILE *proc_self_mountinfo;
......
......@@ -45,16 +45,18 @@ typedef enum PathType {
} PathType;
typedef struct PathSpec {
PathType type;
char *path;
Watch watch;
LIST_FIELDS(struct PathSpec, spec);
PathType type;
int inotify_fd;
int primary_wd;
bool previous_exists;
Watch watch;
bool previous_exists;
LIST_FIELDS(struct PathSpec, spec);
} PathSpec;
struct Path {
......@@ -62,9 +64,10 @@ struct Path {
LIST_HEAD(PathSpec, specs);
PathState state, deserialized_state;
Unit *unit;
PathState state, deserialized_state;
bool failure;
};
......
......@@ -90,8 +90,6 @@ struct Service {
ServiceType type;
ServiceRestart restart;
NotifyAccess notify_access;
/* If set we'll read the main daemon PID from this file */
char *pid_file;
......@@ -101,10 +99,6 @@ struct Service {
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
bool permissions_start_only;
bool root_directory_start_only;
bool valid_no_process;
ServiceState state, deserialized_state;
ExecStatus main_exec_status;
......@@ -112,6 +106,11 @@ struct Service {
ExecCommand *control_command;
ServiceExecCommand control_command_id;
pid_t main_pid, control_pid;