Merge pull request #27327 from DaanDeMeyer/hotplug

kmod-setup: Add early loading for virtio_console

2 files changed, 48 insertions, 16 deletions

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index adf817800f..c09e17f568 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -31,7 +31,7 @@ static void systemd_kmod_log(
         REENABLE_WARNING;
 }
 
-static int has_virtio_rng_recurse_dir_cb(
+static int match_modalias_recurse_dir_cb(
                 RecurseDirEvent event,
                 const char *path,
                 int dir_fd,
@@ -41,6 +41,7 @@ static int has_virtio_rng_recurse_dir_cb(
                 void *userdata) {
 
         _cleanup_free_ char *alias = NULL;
+        char **modaliases = ASSERT_PTR(userdata);
         int r;
 
         if (event != RECURSE_DIR_ENTRY)
@@ -58,7 +59,7 @@ static int has_virtio_rng_recurse_dir_cb(
                 return RECURSE_DIR_LEAVE_DIRECTORY;
         }
 
-        if (STARTSWITH_SET(alias, "pci:v00001AF4d00001005", "pci:v00001AF4d00001044"))
+        if (startswith_strv(alias, modaliases))
                 return 1;
 
         return RECURSE_DIR_LEAVE_DIRECTORY;
@@ -77,14 +78,35 @@ static bool has_virtio_rng(void) {
                         /* statx_mask= */ 0,
                         /* n_depth_max= */ 2,
                         RECURSE_DIR_ENSURE_TYPE,
-                        has_virtio_rng_recurse_dir_cb,
-                        NULL);
+                        match_modalias_recurse_dir_cb,
+                        STRV_MAKE("pci:v00001AF4d00001005", "pci:v00001AF4d00001044"));
         if (r < 0)
                 log_debug_errno(r, "Failed to determine whether host has virtio-rng device, ignoring: %m");
 
         return r > 0;
 }
 
+static bool has_virtio_console(void) {
+        int r;
+
+        /* Directory traversal might be slow, hence let's do a cheap check first if it's even worth it */
+        if (detect_vm() == VIRTUALIZATION_NONE)
+                return false;
+
+        r = recurse_dir_at(
+                        AT_FDCWD,
+                        "/sys/devices/pci0000:00",
+                        /* statx_mask= */ 0,
+                        /* n_depth_max= */ 3,
+                        RECURSE_DIR_ENSURE_TYPE,
+                        match_modalias_recurse_dir_cb,
+                        STRV_MAKE("virtio:d00000003v", "virtio:d0000000Bv"));
+        if (r < 0)
+                log_debug_errno(r, "Failed to determine whether host has virtio-console device, ignoring: %m");
+
+        return r > 0;
+}
+
 static bool in_qemu(void) {
         return IN_SET(detect_vm(), VIRTUALIZATION_KVM, VIRTUALIZATION_QEMU);
 }
@@ -102,31 +124,35 @@ int kmod_setup(void) {
         } kmod_table[] = {
                 /* This one we need to load explicitly, since auto-loading on use doesn't work
                  * before udev created the ghost device nodes, and we need it earlier than that. */
-                { "autofs4",     "/sys/class/misc/autofs",    true,  false, NULL           },
+                { "autofs4",         "/sys/class/misc/autofs",    true,  false, NULL               },
 
                 /* This one we need to load explicitly, since auto-loading of IPv6 is not done when
                  * we try to configure ::1 on the loopback device. */
-                { "ipv6",        "/sys/module/ipv6",          false, true,  NULL           },
+                { "ipv6",            "/sys/module/ipv6",          false, true,  NULL               },
 
                 /* This should never be a module */
-                { "unix",        "/proc/net/unix",            true,  true,  NULL           },
+                { "unix",            "/proc/net/unix",            true,  true,  NULL               },
 
 #if HAVE_LIBIPTC
                 /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */
-                { "ip_tables",   "/proc/net/ip_tables_names", false, false, NULL           },
+                { "ip_tables",       "/proc/net/ip_tables_names", false, false, NULL               },
 #endif
                 /* virtio_rng would be loaded by udev later, but real entropy might be needed very early */
-                { "virtio_rng",  NULL,                        false, false, has_virtio_rng },
+                { "virtio_rng",      NULL,                        false, false, has_virtio_rng     },
+
+                /* we want early logging to hvc consoles if possible, and make sure systemd-getty-generator
+                 * can rely on all consoles being probed already.*/
+                { "virtio_console",  NULL,                        false, false, has_virtio_console },
 
                 /* qemu_fw_cfg would be loaded by udev later, but we want to import credentials from it super early */
-                { "qemu_fw_cfg", "/sys/firmware/qemu_fw_cfg", false, false, in_qemu        },
+                { "qemu_fw_cfg",     "/sys/firmware/qemu_fw_cfg", false, false, in_qemu            },
 
                 /* dmi-sysfs is needed to import credentials from it super early */
-                { "dmi-sysfs",   "/sys/firmware/dmi/entries", false, false, NULL           },
+                { "dmi-sysfs",       "/sys/firmware/dmi/entries", false, false, NULL               },
 
 #if HAVE_TPM2
                 /* Make sure the tpm subsystem is available which ConditionSecurity=tpm2 depends on. */
-                { "tpm",         "/sys/class/tpmrm",          false, false, efi_has_tpm2   },
+                { "tpm",             "/sys/class/tpmrm",          false, false, efi_has_tpm2       },
 #endif
         };
         _cleanup_(kmod_unrefp) struct kmod_ctx *ctx = NULL;
diff --git a/src/core/main.c b/src/core/main.c
index b627916a25..932ea64e45 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2798,12 +2798,18 @@ int main(int argc, char *argv[]) {
                                         error_message = "Failed to mount early API filesystems";
                                         goto finish;
                                 }
+                        }
+
+                        /* We might have just mounted /proc, so let's try to parse the kernel
+                         * command line log arguments immediately. */
+                        log_parse_environment();
 
-                                /* Let's open the log backend a second time, in case the first time didn't
-                                 * work. Quite possibly we have mounted /dev just now, so /dev/kmsg became
-                                 * available, and it previously wasn't. */
-                                log_open();
+                        /* Let's open the log backend a second time, in case the first time didn't
+                         * work. Quite possibly we have mounted /dev just now, so /dev/kmsg became
+                         * available, and it previously wasn't. */
+                        log_open();
 
+                        if (!skip_setup) {
                                 disable_printk_ratelimit();
 
                                 r = initialize_security(