diff options
author | Prarit Bhargava <prarit@redhat.com> | 2019-05-29 07:26:25 -0400 |
---|---|---|
committer | Jessica Yu <jeyu@kernel.org> | 2019-06-05 03:53:24 -0400 |
commit | 6e6de3dee51a439f76eb73c22ae2ffd2c9384712 (patch) | |
tree | 8ab6a8fa8c082d4e981cb7f9572ec7d0f6462640 /kernel | |
parent | cd6c84d8f0cdc911df435bb075ba22ce3c605b07 (diff) |
kernel/module.c: Only return -EEXIST for modules that have finished loading
Microsoft HyperV disables the X86_FEATURE_SMCA bit on AMD systems, and
linux guests boot with repeated errors:
amd64_edac_mod: Unknown symbol amd_unregister_ecc_decoder (err -2)
amd64_edac_mod: Unknown symbol amd_register_ecc_decoder (err -2)
amd64_edac_mod: Unknown symbol amd_report_gart_errors (err -2)
amd64_edac_mod: Unknown symbol amd_unregister_ecc_decoder (err -2)
amd64_edac_mod: Unknown symbol amd_register_ecc_decoder (err -2)
amd64_edac_mod: Unknown symbol amd_report_gart_errors (err -2)
The warnings occur because the module code erroneously returns -EEXIST
for modules that have failed to load and are in the process of being
removed from the module list.
module amd64_edac_mod has a dependency on module edac_mce_amd. Using
modules.dep, systemd will load edac_mce_amd for every request of
amd64_edac_mod. When the edac_mce_amd module loads, the module has
state MODULE_STATE_UNFORMED and once the module load fails and the state
becomes MODULE_STATE_GOING. Another request for edac_mce_amd module
executes and add_unformed_module() will erroneously return -EEXIST even
though the previous instance of edac_mce_amd has MODULE_STATE_GOING.
Upon receiving -EEXIST, systemd attempts to load amd64_edac_mod, which
fails because of unknown symbols from edac_mce_amd.
add_unformed_module() must wait to return for any case other than
MODULE_STATE_LIVE to prevent a race between multiple loads of
dependent modules.
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Barret Rhoden <brho@google.com>
Cc: David Arcari <darcari@redhat.com>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/module.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c index 6e6712b3aaf5..1e7dcbe527af 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -3397,8 +3397,7 @@ static bool finished_loading(const char *name) | |||
3397 | sched_annotate_sleep(); | 3397 | sched_annotate_sleep(); |
3398 | mutex_lock(&module_mutex); | 3398 | mutex_lock(&module_mutex); |
3399 | mod = find_module_all(name, strlen(name), true); | 3399 | mod = find_module_all(name, strlen(name), true); |
3400 | ret = !mod || mod->state == MODULE_STATE_LIVE | 3400 | ret = !mod || mod->state == MODULE_STATE_LIVE; |
3401 | || mod->state == MODULE_STATE_GOING; | ||
3402 | mutex_unlock(&module_mutex); | 3401 | mutex_unlock(&module_mutex); |
3403 | 3402 | ||
3404 | return ret; | 3403 | return ret; |
@@ -3588,8 +3587,7 @@ again: | |||
3588 | mutex_lock(&module_mutex); | 3587 | mutex_lock(&module_mutex); |
3589 | old = find_module_all(mod->name, strlen(mod->name), true); | 3588 | old = find_module_all(mod->name, strlen(mod->name), true); |
3590 | if (old != NULL) { | 3589 | if (old != NULL) { |
3591 | if (old->state == MODULE_STATE_COMING | 3590 | if (old->state != MODULE_STATE_LIVE) { |
3592 | || old->state == MODULE_STATE_UNFORMED) { | ||
3593 | /* Wait in case it fails to load. */ | 3591 | /* Wait in case it fails to load. */ |
3594 | mutex_unlock(&module_mutex); | 3592 | mutex_unlock(&module_mutex); |
3595 | err = wait_event_interruptible(module_wq, | 3593 | err = wait_event_interruptible(module_wq, |