mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 01:55:22 +03:00
Merge pull request #27327 from DaanDeMeyer/hotplug
kmod-setup: Add early loading for virtio_console
This commit is contained in:
commit
18010d394b
@ -81,6 +81,14 @@
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry id='log-ratelimit-kmsg'>
|
||||
<term><varname>$SYSTEMD_LOG_RATELIMIT_KMSG</varname></term>
|
||||
|
||||
<listitem><para id='log-ratelimit-kmsg-body'> Whether to ratelimit kmsg or not. Takes a boolean.
|
||||
Defaults to <literal>true</literal>. If disabled, systemd will not ratelimit messages written to kmsg.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry id='pager'>
|
||||
<term><varname>$SYSTEMD_PAGER</varname></term>
|
||||
|
||||
|
@ -66,6 +66,7 @@
|
||||
<term><varname>systemd.log_level=</varname></term>
|
||||
<term><varname>systemd.log_location=</varname></term>
|
||||
<term><varname>systemd.log_color</varname></term>
|
||||
<term><varname>systemd.log_ratelimit_kmsg</varname></term>
|
||||
<term><varname>systemd.default_standard_output=</varname></term>
|
||||
<term><varname>systemd.default_standard_error=</varname></term>
|
||||
<term><varname>systemd.setenv=</varname></term>
|
||||
|
@ -680,6 +680,11 @@
|
||||
<para>This can be overridden with <option>--log-target=</option>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>$SYSTEMD_LOG_RATELIMIT_KMSG</varname></term>
|
||||
<listitem><xi:include href="common-variables.xml" xpointer="log-ratelimit-kmsg" /></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>$XDG_CONFIG_HOME</varname></term>
|
||||
<term><varname>$XDG_CONFIG_DIRS</varname></term>
|
||||
@ -865,13 +870,16 @@
|
||||
<term><varname>systemd.log_target=</varname></term>
|
||||
<term><varname>systemd.log_time</varname></term>
|
||||
<term><varname>systemd.log_tid</varname></term>
|
||||
<term><varname>systemd.log_ratelimit_kmsg</varname></term>
|
||||
|
||||
<listitem><para>Controls log output, with the same effect as the
|
||||
<varname>$SYSTEMD_LOG_COLOR</varname>, <varname>$SYSTEMD_LOG_LEVEL</varname>,
|
||||
<varname>$SYSTEMD_LOG_LOCATION</varname>, <varname>$SYSTEMD_LOG_TARGET</varname>,
|
||||
<varname>$SYSTEMD_LOG_TIME</varname>, and <varname>$SYSTEMD_LOG_TID</varname> environment variables
|
||||
described above. <varname>systemd.log_color</varname>, <varname>systemd.log_location</varname>,
|
||||
<varname>systemd.log_time</varname>, and <varname>systemd.log_tid=</varname> can be specified without
|
||||
<varname>$SYSTEMD_LOG_TIME</varname>, <varname>$SYSTEMD_LOG_TID</varname> and
|
||||
<varname>$SYSTEMD_LOG_RATELIMIT_KMSG</varname> environment variables described above.
|
||||
<varname>systemd.log_color</varname>, <varname>systemd.log_location</varname>,
|
||||
<varname>systemd.log_time</varname>, <varname>systemd.log_tid</varname> and
|
||||
<varname>systemd.log_ratelimit_kmsg</varname> can be specified without
|
||||
an argument, with the same effect as a positive boolean.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
@ -71,6 +71,7 @@ QemuMem=2G
|
||||
ExtraSearchPaths=build/
|
||||
KernelCommandLineExtra=systemd.crash_shell
|
||||
systemd.log_level=debug
|
||||
systemd.log_ratelimit_kmsg=0
|
||||
systemd.journald.forward_to_console
|
||||
systemd.journald.max_level_console=warning
|
||||
systemd.mask=auditd
|
||||
|
@ -50,6 +50,7 @@ static void *log_syntax_callback_userdata = NULL;
|
||||
static LogTarget log_target = LOG_TARGET_CONSOLE;
|
||||
static int log_max_level = LOG_INFO;
|
||||
static int log_facility = LOG_DAEMON;
|
||||
static bool ratelimit_kmsg = true;
|
||||
|
||||
static int console_fd = STDERR_FILENO;
|
||||
static int syslog_fd = -EBADF;
|
||||
@ -552,8 +553,12 @@ static int write_to_kmsg(
|
||||
if (kmsg_fd < 0)
|
||||
return 0;
|
||||
|
||||
if (!ratelimit_below(&ratelimit))
|
||||
return 0;
|
||||
if (ratelimit_kmsg && !ratelimit_below(&ratelimit)) {
|
||||
if (ratelimit_num_dropped(&ratelimit) > 1)
|
||||
return 0;
|
||||
|
||||
buffer = "Too many messages being logged to kmsg, ignoring";
|
||||
}
|
||||
|
||||
xsprintf(header_priority, "<%i>", level);
|
||||
xsprintf(header_pid, "["PID_FMT"]: ", getpid_cached());
|
||||
@ -1178,6 +1183,17 @@ int log_set_max_level_from_string(const char *e) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int log_set_ratelimit_kmsg_from_string(const char *e) {
|
||||
int r;
|
||||
|
||||
r = parse_boolean(e);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
ratelimit_kmsg = r;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
|
||||
|
||||
/*
|
||||
@ -1228,6 +1244,10 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
|
||||
if (log_show_time_from_string(value ?: "1") < 0)
|
||||
log_warning("Failed to parse log time setting '%s'. Ignoring.", value);
|
||||
|
||||
} else if (proc_cmdline_key_streq(key, "systemd.log_ratelimit_kmsg")) {
|
||||
|
||||
if (log_set_ratelimit_kmsg_from_string(value ?: "1") < 0)
|
||||
log_warning("Failed to parse log ratelimit kmsg boolean '%s'. Ignoring.", value);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -1268,6 +1288,10 @@ void log_parse_environment_variables(void) {
|
||||
e = getenv("SYSTEMD_LOG_TID");
|
||||
if (e && log_show_tid_from_string(e) < 0)
|
||||
log_warning("Failed to parse log tid '%s'. Ignoring.", e);
|
||||
|
||||
e = getenv("SYSTEMD_LOG_RATELIMIT_KMSG");
|
||||
if (e && log_set_ratelimit_kmsg_from_string(e) < 0)
|
||||
log_warning("Failed to parse log ratelimit kmsg boolean '%s'. Ignoring.", e);
|
||||
}
|
||||
|
||||
void log_parse_environment(void) {
|
||||
|
@ -1283,3 +1283,15 @@ char *find_line_startswith(const char *haystack, const char *needle) {
|
||||
|
||||
return p + strlen(needle);
|
||||
}
|
||||
|
||||
char *startswith_strv(const char *string, char **strv) {
|
||||
char *found = NULL;
|
||||
|
||||
STRV_FOREACH(i, strv) {
|
||||
found = startswith(string, *i);
|
||||
if (found)
|
||||
break;
|
||||
}
|
||||
|
||||
return found;
|
||||
}
|
||||
|
@ -267,3 +267,8 @@ char *strdupspn(const char *a, const char *accept);
|
||||
char *strdupcspn(const char *a, const char *reject);
|
||||
|
||||
char *find_line_startswith(const char *haystack, const char *needle);
|
||||
|
||||
char *startswith_strv(const char *string, char **strv);
|
||||
|
||||
#define STARTSWITH_SET(p, ...) \
|
||||
startswith_strv(p, STRV_MAKE(__VA_ARGS__))
|
||||
|
@ -200,18 +200,6 @@ static inline void strv_print(char * const *l) {
|
||||
_x && strv_contains_case(STRV_MAKE(__VA_ARGS__), _x); \
|
||||
})
|
||||
|
||||
#define STARTSWITH_SET(p, ...) \
|
||||
({ \
|
||||
const char *_p = (p); \
|
||||
char *_found = NULL; \
|
||||
STRV_FOREACH(_i, STRV_MAKE(__VA_ARGS__)) { \
|
||||
_found = startswith(_p, *_i); \
|
||||
if (_found) \
|
||||
break; \
|
||||
} \
|
||||
_found; \
|
||||
})
|
||||
|
||||
#define ENDSWITH_SET(p, ...) \
|
||||
({ \
|
||||
const char *_p = (p); \
|
||||
|
@ -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;
|
||||
|
@ -2798,12 +2798,18 @@ int main(int argc, char *argv[]) {
|
||||
error_message = "Failed to mount early API filesystems";
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
|
||||
/* 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();
|
||||
/* 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();
|
||||
|
||||
if (!skip_setup) {
|
||||
disable_printk_ratelimit();
|
||||
|
||||
r = initialize_security(
|
||||
|
Loading…
Reference in New Issue
Block a user