Merge 58c45a5ed8 into 52b0351a15

udev: add option to trigger parent devices despite filters
This commit add the `-i` option to `udevadm trigger` that force it to match parent devices even if they're excluded from filters. The rationale is that some embedded devices have a huge number of platform devices ( ~ 4k for MX8 ) they are there because they're defined in the device tree but there isn't any action or udev rules associated with them. So at boot a significant time is spend triggering and processing rules for devices that don't produce any effect and we would like to filter them by calling: ``` udevadm trigger --type=device --action=add -s block -s tty ``` instead of the normal ``` udevadm trigger --type=device --action=add ``` so we can use filter to filter out only subsystems for we we know that we have rules in place that do something useful. On the other side action / rules are not triggered until the parent is triggered ( which is part of another subsystem), so the additional option will allows udev to complete the coldplug with only the devices we care. Example on iMX8: .Without the new option ``` root@dev:~# udevadm trigger --dry-run -s block --action=add -v /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot0 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot1 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p1 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p2 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p3 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p4 ``` .With the new option ``` root@dev:~# udevadm trigger --dry-run -i -s block --action=add -v /sys/devices/platform /sys/devices/platform/bus@5b000000 /sys/devices/platform/bus@5b000000/5b010000.mmc /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot0 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0boot1 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p1 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p2 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p3 /sys/devices/platform/bus@5b000000/5b010000.mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p4 ``` Boot time reduction with this is place is ~ 1 second.
2024-11-20 17:38:35 +09:00 · 2024-11-19 11:31:01 +01:00
11 changed files with 66 additions and 100 deletions
--- a/po/fi.po
+++ b/po/fi.po
@ -3,13 +3,12 @@
 # Finnish translation of systemd.
 # Jan Kuparinen <copper_fin@hotmail.com>, 2021, 2022, 2023.
 # Ricky Tigg <ricky.tigg@gmail.com>, 2022, 2024.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2024.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-06 14:42+0000\n"
-"PO-Revision-Date: 2024-11-20 19:13+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"PO-Revision-Date: 2024-09-12 13:43+0000\n"
+"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
 "Language-Team: Finnish <https://translate.fedoraproject.org/projects/systemd/"
 "main/fi/>\n"
 "Language: fi\n"
@ -17,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.2\n"
+"X-Generator: Weblate 5.7.2\n"

 #: src/core/org.freedesktop.systemd1.policy.in:22
 msgid "Send passphrase back to system"
@ -113,12 +112,14 @@ msgid "Authentication is required to update a user's home area."
 msgstr "Todennus vaaditaan käyttäjän kotialueen päivittämiseksi."

 #: src/home/org.freedesktop.home1.policy:53
+#, fuzzy
 msgid "Update your home area"
 msgstr "Päivitä kotialue"

 #: src/home/org.freedesktop.home1.policy:54
+#, fuzzy
 msgid "Authentication is required to update your home area."
-msgstr "Todennus vaaditaan kotialueen päivittämiseksi."
+msgstr "Todennus vaaditaan käyttäjän kotialueen päivittämiseksi."

 #: src/home/org.freedesktop.home1.policy:63
 msgid "Resize a home area"
@ -1173,11 +1174,14 @@ msgstr "Todennus vaaditaan vanhojen järjestelmäpäivitysten puhdistamiseen."

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:75
 msgid "Manage optional features"
-msgstr "Hallitse valinnaisia ominaisuuksia"
+msgstr ""

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:76
+#, fuzzy
 msgid "Authentication is required to manage optional features"
-msgstr "Todennus vaaditaan valinnaisten ominaisuuksien hallintaan"
+msgstr ""
+"Todennus vaaditaan aktiivisten istuntojen, käyttäjien ja paikkojen "
+"hallintaan."

 #: src/timedate/org.freedesktop.timedate1.policy:22
 msgid "Set system time"
--- a/po/fr.po
+++ b/po/fr.po
@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-06 14:42+0000\n"
-"PO-Revision-Date: 2024-11-20 19:13+0000\n"
+"PO-Revision-Date: 2024-11-07 09:30+0000\n"
 "Last-Translator: Léane GRASSER <leane.grasser@proton.me>\n"
 "Language-Team: French <https://translate.fedoraproject.org/projects/systemd/"
 "main/fr/>\n"
@ -360,8 +360,8 @@ msgid ""
 "Authentication is required to set the statically configured local hostname, "
 "as well as the pretty hostname."
 msgstr ""
-"Une authentification est requise pour définir le nom d'hôte local configuré "
-"de manière statique, ainsi que le nom d'hôte convivial."
+"Une authentification est requise pour définir le nom d'hôte local de manière "
+"statique, ainsi que le nom d'hôte familier."

 #: src/hostname/org.freedesktop.hostname1.policy:41
 msgid "Set machine information"
--- a/po/sl.po
+++ b/po/sl.po
@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-06 14:42+0000\n"
-"PO-Revision-Date: 2024-11-20 19:13+0000\n"
+"PO-Revision-Date: 2024-08-26 19:38+0000\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Slovenian <https://translate.fedoraproject.org/projects/"
 "systemd/main/sl/>\n"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3;\n"
-"X-Generator: Weblate 5.8.2\n"
+"X-Generator: Weblate 5.7\n"

 #: src/core/org.freedesktop.systemd1.policy.in:22
 msgid "Send passphrase back to system"
@ -125,13 +125,16 @@ msgstr ""
 "območja."

 #: src/home/org.freedesktop.home1.policy:53
+#, fuzzy
 msgid "Update your home area"
 msgstr "Posodobite domače območje"

 #: src/home/org.freedesktop.home1.policy:54
+#, fuzzy
 msgid "Authentication is required to update your home area."
 msgstr ""
-"Preverjanje pristnosti je potrebno za posodobitev vašega domačega območja."
+"Preverjanje pristnosti je potrebno za posodobitev uporabnikovega domačega "
+"območja."

 #: src/home/org.freedesktop.home1.policy:63
 msgid "Resize a home area"
@ -1231,12 +1234,14 @@ msgstr ""

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:75
 msgid "Manage optional features"
-msgstr "Upravljaj dodatne funkcionalnosti"
+msgstr ""

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:76
+#, fuzzy
 msgid "Authentication is required to manage optional features"
 msgstr ""
-"Preverjanje pristnosti je potrebno za upravljanje dodatnih funkcionalnosti."
+"Preverjanje pristnosti je potrebno za upravljanje aktivnih sej, uporabnikov "
+"in delovišč."

 #: src/timedate/org.freedesktop.timedate1.policy:22
 msgid "Set system time"
--- a/po/uk.po
+++ b/po/uk.po
@ -4,13 +4,12 @@
 # Eugene Melnik <jeka7js@gmail.com>, 2014.
 # Daniel Korostil <ted.korostiled@gmail.com>, 2014, 2016, 2018.
 # Yuri Chornoivan <yurchor@ukr.net>, 2019, 2020, 2021, 2022, 2023, 2024.
-# Dmytro Markevych <hotr1pak@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-06 14:42+0000\n"
-"PO-Revision-Date: 2024-11-20 19:13+0000\n"
-"Last-Translator: Dmytro Markevych <hotr1pak@gmail.com>\n"
+"PO-Revision-Date: 2024-08-24 10:36+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
 "systemd/main/uk/>\n"
 "Language: uk\n"
@ -19,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.8.2\n"
+"X-Generator: Weblate 5.7\n"

 #: src/core/org.freedesktop.systemd1.policy.in:22
 msgid "Send passphrase back to system"
@ -119,12 +118,14 @@ msgid "Authentication is required to update a user's home area."
 msgstr "Для оновлення домашньої теки користувача слід пройти розпізнавання."

 #: src/home/org.freedesktop.home1.policy:53
+#, fuzzy
 msgid "Update your home area"
-msgstr "Оновіть свій домашній простір"
+msgstr "Оновлення домашньої теки"

 #: src/home/org.freedesktop.home1.policy:54
+#, fuzzy
 msgid "Authentication is required to update your home area."
-msgstr "Для оновлення домашньої області потрібна автентифікація."
+msgstr "Для оновлення домашньої теки користувача слід пройти розпізнавання."

 #: src/home/org.freedesktop.home1.policy:63
 msgid "Resize a home area"
@ -1211,11 +1212,14 @@ msgstr "Для вилучення застарілих оновлень сист

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:75
 msgid "Manage optional features"
-msgstr "Керування додатковими функціями"
+msgstr ""

 #: src/sysupdate/org.freedesktop.sysupdate1.policy:76
+#, fuzzy
 msgid "Authentication is required to manage optional features"
-msgstr "Для керування додатковими функціями потрібна автентифікація"
+msgstr ""
+"Для того, щоб керувати сеансами, користувачами і робочими місцями, слід "
+"пройти розпізнавання."

 #: src/timedate/org.freedesktop.timedate1.policy:22
 msgid "Set system time"
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@ -803,10 +803,6 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                if (!path)
                        return -ENOMEM;

-                /* Refuse cgroup paths from outside our cgroup namespace */
-                if (startswith(path, "/../"))
-                        return -EUNATCH;
-
                /* Truncate suffix indicating the process is a zombie */
                e = endswith(path, " (deleted)");
                if (e)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@ -102,8 +102,8 @@ int pid_get_comm(pid_t pid, char **ret) {
        _cleanup_free_ char *escaped = NULL, *comm = NULL;
        int r;

-        assert(pid >= 0);
        assert(ret);
+        assert(pid >= 0);

        if (pid == 0 || pid == getpid_cached()) {
                comm = new0(char, TASK_COMM_LEN + 1); /* Must fit in 16 byte according to prctl(2) */
@ -143,9 +143,6 @@ int pidref_get_comm(const PidRef *pid, char **ret) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        r = pid_get_comm(pid->pid, &comm);
        if (r < 0)
                return r;
@ -292,9 +289,6 @@ int pidref_get_cmdline(const PidRef *pid, size_t max_columns, ProcessCmdlineFlag
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        r = pid_get_cmdline(pid->pid, max_columns, flags, &s);
        if (r < 0)
                return r;
@ -337,9 +331,6 @@ int pidref_get_cmdline_strv(const PidRef *pid, ProcessCmdlineFlags flags, char *
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        r = pid_get_cmdline_strv(pid->pid, flags, &args);
        if (r < 0)
                return r;
@ -486,9 +477,6 @@ int pidref_is_kernel_thread(const PidRef *pid) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        result = pid_is_kernel_thread(pid->pid);
        if (result < 0)
                return result;
@ -606,9 +594,6 @@ int pidref_get_uid(const PidRef *pid, uid_t *ret) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        r = pid_get_uid(pid->pid, &uid);
        if (r < 0)
                return r;
@ -809,9 +794,6 @@ int pidref_get_start_time(const PidRef *pid, usec_t *ret) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        r = pid_get_start_time(pid->pid, ret ? &t : NULL);
        if (r < 0)
                return r;
@ -1111,9 +1093,6 @@ int pidref_is_my_child(const PidRef *pid) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        result = pid_is_my_child(pid->pid);
        if (result < 0)
                return result;
@ -1149,9 +1128,6 @@ int pidref_is_unwaited(const PidRef *pid) {
        if (!pidref_is_set(pid))
                return -ESRCH;

-        if (pidref_is_remote(pid))
-                return -EREMOTE;
-
        if (pid->pid == 1 || pidref_is_self(pid))
                return true;

@ -1193,9 +1169,6 @@ int pidref_is_alive(const PidRef *pidref) {
        if (!pidref_is_set(pidref))
                return -ESRCH;

-        if (pidref_is_remote(pidref))
-                return -EREMOTE;
-
        result = pid_is_alive(pidref->pid);
        if (result < 0) {
                assert(result != -ESRCH);
--- a/src/cryptenroll/cryptenroll-fido2.c
+++ b/src/cryptenroll/cryptenroll-fido2.c
@ -193,7 +193,7 @@ int enroll_fido2(
                fflush(stdout);

                fprintf(stderr,
-                        "\nPlease save this FIDO2 credential ID. It is required when unlocking the volume\n"
+                        "\nPlease save this FIDO2 credential ID. It is required when unloocking the volume\n"
                        "using the associated FIDO2 keyslot which we just created. To configure automatic\n"
                        "unlocking using this FIDO2 token, add an appropriate entry to your /etc/crypttab\n"
                        "file, see %s for details.\n", link);
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@ -291,8 +291,6 @@ _public_ int sd_device_enumerator_add_all_parents(sd_device_enumerator *enumerat

        enumerator->parent_match_flags = MATCH_NONE;

-        enumerator->scan_uptodate = false;
-
        return 1;
 }

--- a/src/libsystemd/sd-device/test-sd-device.c
+++ b/src/libsystemd/sd-device/test-sd-device.c
@ -501,41 +501,33 @@ TEST(sd_device_enumerator_add_match_parent) {

 TEST(sd_device_enumerator_add_all_parents) {
        _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
-        unsigned int devices_count_with_parents = 0;
-        unsigned int devices_count_without_parents = 0;
+        int r;

-        /* STEP 1: enumerate all block devices without all_parents() */
-        ASSERT_OK(sd_device_enumerator_new(&e) >= 0);
-        ASSERT_OK(sd_device_enumerator_allow_uninitialized(e) >= 0);
+        assert_se(sd_device_enumerator_new(&e) >= 0);
+        assert_se(sd_device_enumerator_allow_uninitialized(e) >= 0);
+        /* See comments in TEST(sd_device_enumerator_devices). */
+        assert_se(sd_device_enumerator_add_match_subsystem(e, "bdi", false) >= 0);
+        assert_se(sd_device_enumerator_add_nomatch_sysname(e, "loop*") >= 0);
+        assert_se(sd_device_enumerator_add_match_subsystem(e, "net", false) >= 0);

-        /* filter in only a subsystem */
-        ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "block", true) >= 0);
-        ASSERT_OK(sd_device_enumerator_add_match_property(e, "DEVTYPE", "partition"));
+        /*enable all_parents*/
+        assert_se(sd_device_enumerator_add_all_parents(e) >= 0);
+        /*filter in only a subsystem*/
+        assert_se(sd_device_enumerator_add_match_subsystem(e, "block", true) >= 0);

+        int not_filtered_parent_count = 0;
        FOREACH_DEVICE(e, dev) {
                const char *subsystem;
-                ASSERT_OK(sd_device_get_subsystem(dev, &subsystem) >= 0);
-                ASSERT_OK(device_in_subsystem(dev, "block") != 0);
-                devices_count_without_parents++;
+                r = sd_device_get_subsystem(dev, &subsystem);
+                if (r < 0) {
+                        assert_se(r == -ENOENT);
+                        continue;
                }
-
-        log_debug("found %u devices",devices_count_without_parents);
-        ASSERT_OK(devices_count_without_parents > 0);
-
-        /* STEP 2: enumerate again with all_parents() */
-        ASSERT_OK(sd_device_enumerator_add_all_parents(e) >= 0);
-
-        unsigned int not_filtered_parent_count = 0;
-        FOREACH_DEVICE(e, dev) {
-                const char *subsystem;
-                ASSERT_OK(sd_device_get_subsystem(dev, &subsystem) >= 0);
-                if (!device_in_subsystem(dev, "block"))
+                if(strcmp(subsystem,"block"))
                        not_filtered_parent_count++;
-                devices_count_with_parents++;
        }
-        log_debug("found %u devices out of %u that would have been excluded without all_parents()",not_filtered_parent_count,devices_count_with_parents);
-        ASSERT_OK(not_filtered_parent_count > 0);
-        ASSERT_OK(devices_count_with_parents > devices_count_without_parents);
+        log_debug("found %d devices that would have been excluded without all_parents()",not_filtered_parent_count);
+        assert_se(not_filtered_parent_count > 0);
 }

 TEST(sd_device_get_child) {
--- a/src/shared/killall.c
+++ b/src/shared/killall.c
@ -46,17 +46,13 @@ static bool argv_has_at(pid_t pid) {
        return c == '@';
 }

-static bool is_in_survivor_cgroup(const PidRef *pid) {
+static bool is_survivor_cgroup(const PidRef *pid) {
        _cleanup_free_ char *cgroup_path = NULL;
        int r;

        assert(pidref_is_set(pid));

        r = cg_pidref_get_path(/* root= */ NULL, pid, &cgroup_path);
-        if (r == -EUNATCH) {
-                log_warning_errno(r, "Process " PID_FMT " appears to originate in foreign namespace, ignoring.", pid->pid);
-                return true;
-        }
        if (r < 0) {
                log_warning_errno(r, "Failed to get cgroup path of process " PID_FMT ", ignoring: %m", pid->pid);
                return false;
@ -90,7 +86,7 @@ static bool ignore_proc(const PidRef *pid, bool warn_rootfs) {
                return true; /* also ignore processes where we can't determine this */

        /* Ignore processes that are part of a cgroup marked with the user.survive_final_kill_signal xattr */
-        if (is_in_survivor_cgroup(pid))
+        if (is_survivor_cgroup(pid))
                return true;

        r = pidref_get_uid(pid, &uid);
--- a/src/test/test-audit-util.c
+++ b/src/test/test-audit-util.c
@ -7,26 +7,24 @@ TEST(audit_loginuid_from_pid) {
        _cleanup_(pidref_done) PidRef self = PIDREF_NULL, pid1 = PIDREF_NULL;
        int r;

-        ASSERT_OK(pidref_set_self(&self));
-        ASSERT_OK(pidref_set_pid(&pid1, 1));
+        assert_se(pidref_set_self(&self) >= 0);
+        assert_se(pidref_set_pid(&pid1, 1) >= 0);

        uid_t uid;
        r = audit_loginuid_from_pid(&self, &uid);
-        if (r != -ENODATA)
-                ASSERT_OK(r);
+        assert_se(r >= 0 || r == -ENODATA);
        if (r >= 0)
                log_info("self audit login uid: " UID_FMT, uid);

-        ASSERT_ERROR(audit_loginuid_from_pid(&pid1, &uid), ENODATA);
+        assert_se(audit_loginuid_from_pid(&pid1, &uid) == -ENODATA);

        uint32_t sessionid;
        r = audit_session_from_pid(&self, &sessionid);
-        if (r != -ENODATA)
-                ASSERT_OK(r);
+        assert_se(r >= 0 || r == -ENODATA);
        if (r >= 0)
                log_info("self audit session id: %" PRIu32, sessionid);

-        ASSERT_ERROR(audit_session_from_pid(&pid1, &sessionid), ENODATA);
+        assert_se(audit_session_from_pid(&pid1, &sessionid) == -ENODATA);
 }

 static int intro(void) {