module: add debugging auto-load duplicate module support
The finit_module() system call can in the worst case use up to more than twice of a module's size in virtual memory. Duplicate finit_module() system calls are non fatal, however they unnecessarily strain virtual memory during bootup and in the worst case can cause a system to fail to boot. This is only known to currently be an issue on systems with larger number of CPUs. To help debug this situation we need to consider the different sources for finit_module(). Requests from the kernel that rely on module auto-loading, ie, the kernel's *request_module() API, are one source of calls. Although modprobe checks to see if a module is already loaded prior to calling finit_module() there is a small race possible allowing userspace to trigger multiple modprobe calls racing against modprobe and this not seeing the module yet loaded. This adds debugging support to the kernel module auto-loader (*request_module() calls) to easily detect duplicate module requests. To aid with possible bootup failure issues incurred by this, it will converge duplicates requests to a single request. This avoids any possible strain on virtual memory during bootup which could be incurred by duplicate module autoloading requests. Folks debugging virtual memory abuse on bootup can and should enable this to see what pr_warn()s come on, to see if module auto-loading is to blame for their wores. If they see duplicates they can further debug this by enabling the module.enable_dups_trace kernel parameter or by enabling CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS_TRACE. Current evidence seems to point to only a few duplicates for module auto-loading. And so the source for other duplicates creating heavy virtual memory pressure due to larger number of CPUs should becoming from another place (likely udev). Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
parent
a81b1fc8ea
commit
8660484ed1
|
@ -3332,6 +3332,12 @@
|
||||||
specified, <module>.async_probe takes precedence for
|
specified, <module>.async_probe takes precedence for
|
||||||
the specific module.
|
the specific module.
|
||||||
|
|
||||||
|
module.enable_dups_trace
|
||||||
|
[KNL] When CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS is set,
|
||||||
|
this means that duplicate request_module() calls will
|
||||||
|
trigger a WARN_ON() instead of a pr_warn(). Note that
|
||||||
|
if MODULE_DEBUG_AUTOLOAD_DUPS_TRACE is set, WARN_ON()s
|
||||||
|
will always be issued and this option does nothing.
|
||||||
module.sig_enforce
|
module.sig_enforce
|
||||||
[KNL] When CONFIG_MODULE_SIG is set, this means that
|
[KNL] When CONFIG_MODULE_SIG is set, this means that
|
||||||
modules without (valid) signatures will fail to load.
|
modules without (valid) signatures will fail to load.
|
||||||
|
|
|
@ -59,6 +59,65 @@ config MODULE_STATS
|
||||||
|
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
|
config MODULE_DEBUG_AUTOLOAD_DUPS
|
||||||
|
bool "Debug duplicate modules with auto-loading"
|
||||||
|
help
|
||||||
|
Module autoloading allows in-kernel code to request modules through
|
||||||
|
the *request_module*() API calls. This in turn just calls userspace
|
||||||
|
modprobe. Although modprobe checks to see if a module is already
|
||||||
|
loaded before trying to load a module there is a small time window in
|
||||||
|
which multiple duplicate requests can end up in userspace and multiple
|
||||||
|
modprobe calls race calling finit_module() around the same time for
|
||||||
|
duplicate modules. The finit_module() system call can consume in the
|
||||||
|
worst case more than twice the respective module size in virtual
|
||||||
|
memory for each duplicate module requests. Although duplicate module
|
||||||
|
requests are non-fatal virtual memory is a limited resource and each
|
||||||
|
duplicate module request ends up just unnecessarily straining virtual
|
||||||
|
memory.
|
||||||
|
|
||||||
|
This debugging facility will create pr_warn() splats for duplicate
|
||||||
|
module requests to help identify if module auto-loading may be the
|
||||||
|
culprit to your early boot virtual memory pressure. Since virtual
|
||||||
|
memory abuse caused by duplicate module requests could render a
|
||||||
|
system unusable this functionality will also converge races in
|
||||||
|
requests for the same module to a single request. You can boot with
|
||||||
|
the module.enable_dups_trace=1 kernel parameter to use WARN_ON()
|
||||||
|
instead of the pr_warn().
|
||||||
|
|
||||||
|
If the first module request used request_module_nowait() we cannot
|
||||||
|
use that as the anchor to wait for duplicate module requests, since
|
||||||
|
users of request_module() do want a proper return value. If a call
|
||||||
|
for the same module happened earlier with request_module() though,
|
||||||
|
then a duplicate request_module_nowait() would be detected. The
|
||||||
|
non-wait request_module() call is synchronous and waits until modprobe
|
||||||
|
completes. Subsequent auto-loading requests for the same module do
|
||||||
|
not trigger a new finit_module() calls and do not strain virtual
|
||||||
|
memory, and so as soon as modprobe successfully completes we remove
|
||||||
|
tracking for duplicates for that module.
|
||||||
|
|
||||||
|
Enable this functionality to try to debug virtual memory abuse during
|
||||||
|
boot on systems which are failing to boot or if you suspect you may be
|
||||||
|
straining virtual memory during boot, and you want to identify if the
|
||||||
|
abuse was due to module auto-loading. These issues are currently only
|
||||||
|
known to occur on systems with many CPUs (over 400) and is likely the
|
||||||
|
result of udev issuing duplicate module requests for each CPU, and so
|
||||||
|
module auto-loading is not the culprit. There may very well still be
|
||||||
|
many duplicate module auto-loading requests which could be optimized
|
||||||
|
for and this debugging facility can be used to help identify them.
|
||||||
|
|
||||||
|
Only enable this for debugging system functionality, never have it
|
||||||
|
enabled on real systems.
|
||||||
|
|
||||||
|
config MODULE_DEBUG_AUTOLOAD_DUPS_TRACE
|
||||||
|
bool "Force full stack trace when duplicates are found"
|
||||||
|
depends on MODULE_DEBUG_AUTOLOAD_DUPS
|
||||||
|
help
|
||||||
|
Enabling this will force a full stack trace for duplicate module
|
||||||
|
auto-loading requests using WARN_ON() instead of pr_warn(). You
|
||||||
|
should keep this disabled at all times unless you are a developer
|
||||||
|
and are doing a manual inspection and want to debug exactly why
|
||||||
|
these duplicates occur.
|
||||||
|
|
||||||
endif # MODULE_DEBUG
|
endif # MODULE_DEBUG
|
||||||
|
|
||||||
config MODULE_FORCE_LOAD
|
config MODULE_FORCE_LOAD
|
||||||
|
|
|
@ -10,6 +10,7 @@ KCOV_INSTRUMENT_module.o := n
|
||||||
obj-y += main.o
|
obj-y += main.o
|
||||||
obj-y += strict_rwx.o
|
obj-y += strict_rwx.o
|
||||||
obj-y += kmod.o
|
obj-y += kmod.o
|
||||||
|
obj-$(CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS) += dups.o
|
||||||
obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
|
obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
|
||||||
obj-$(CONFIG_MODULE_SIG) += signing.o
|
obj-$(CONFIG_MODULE_SIG) += signing.o
|
||||||
obj-$(CONFIG_LIVEPATCH) += livepatch.o
|
obj-$(CONFIG_LIVEPATCH) += livepatch.o
|
||||||
|
|
|
@ -0,0 +1,246 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||||
|
/*
|
||||||
|
* kmod dups - the kernel module autoloader duplicate suppressor
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Luis Chamberlain <mcgrof@kernel.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define pr_fmt(fmt) "module: " fmt
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/sched.h>
|
||||||
|
#include <linux/sched/task.h>
|
||||||
|
#include <linux/binfmts.h>
|
||||||
|
#include <linux/syscalls.h>
|
||||||
|
#include <linux/unistd.h>
|
||||||
|
#include <linux/kmod.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/completion.h>
|
||||||
|
#include <linux/cred.h>
|
||||||
|
#include <linux/file.h>
|
||||||
|
#include <linux/fdtable.h>
|
||||||
|
#include <linux/workqueue.h>
|
||||||
|
#include <linux/security.h>
|
||||||
|
#include <linux/mount.h>
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/resource.h>
|
||||||
|
#include <linux/notifier.h>
|
||||||
|
#include <linux/suspend.h>
|
||||||
|
#include <linux/rwsem.h>
|
||||||
|
#include <linux/ptrace.h>
|
||||||
|
#include <linux/async.h>
|
||||||
|
#include <linux/uaccess.h>
|
||||||
|
|
||||||
|
#undef MODULE_PARAM_PREFIX
|
||||||
|
#define MODULE_PARAM_PREFIX "module."
|
||||||
|
static bool enable_dups_trace = IS_ENABLED(CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS_TRACE);
|
||||||
|
module_param(enable_dups_trace, bool_enable_only, 0644);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Protects dup_kmod_reqs list, adds / removals with RCU.
|
||||||
|
*/
|
||||||
|
static DEFINE_MUTEX(kmod_dup_mutex);
|
||||||
|
static LIST_HEAD(dup_kmod_reqs);
|
||||||
|
|
||||||
|
struct kmod_dup_req {
|
||||||
|
struct list_head list;
|
||||||
|
char name[MODULE_NAME_LEN];
|
||||||
|
struct completion first_req_done;
|
||||||
|
struct work_struct complete_work;
|
||||||
|
struct delayed_work delete_work;
|
||||||
|
int dup_ret;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct kmod_dup_req *kmod_dup_request_lookup(char *module_name)
|
||||||
|
{
|
||||||
|
struct kmod_dup_req *kmod_req;
|
||||||
|
|
||||||
|
list_for_each_entry_rcu(kmod_req, &dup_kmod_reqs, list,
|
||||||
|
lockdep_is_held(&kmod_dup_mutex)) {
|
||||||
|
if (strlen(kmod_req->name) == strlen(module_name) &&
|
||||||
|
!memcmp(kmod_req->name, module_name, strlen(module_name))) {
|
||||||
|
return kmod_req;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void kmod_dup_request_delete(struct work_struct *work)
|
||||||
|
{
|
||||||
|
struct kmod_dup_req *kmod_req;
|
||||||
|
kmod_req = container_of(to_delayed_work(work), struct kmod_dup_req, delete_work);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The typical situation is a module successully loaded. In that
|
||||||
|
* situation the module will be present already in userspace. If
|
||||||
|
* new requests come in after that, userspace will already know the
|
||||||
|
* module is loaded so will just return 0 right away. There is still
|
||||||
|
* a small chance right after we delete this entry new request_module()
|
||||||
|
* calls may happen after that, they can happen. These heuristics
|
||||||
|
* are to protect finit_module() abuse for auto-loading, if modules
|
||||||
|
* are still tryign to auto-load even if a module is already loaded,
|
||||||
|
* that's on them, and those inneficiencies should not be fixed by
|
||||||
|
* kmod. The inneficies there are a call to modprobe and modprobe
|
||||||
|
* just returning 0.
|
||||||
|
*/
|
||||||
|
mutex_lock(&kmod_dup_mutex);
|
||||||
|
list_del_rcu(&kmod_req->list);
|
||||||
|
synchronize_rcu();
|
||||||
|
mutex_unlock(&kmod_dup_mutex);
|
||||||
|
kfree(kmod_req);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void kmod_dup_request_complete(struct work_struct *work)
|
||||||
|
{
|
||||||
|
struct kmod_dup_req *kmod_req;
|
||||||
|
|
||||||
|
kmod_req = container_of(work, struct kmod_dup_req, complete_work);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This will ensure that the kernel will let all the waiters get
|
||||||
|
* informed its time to check the return value. It's time to
|
||||||
|
* go home.
|
||||||
|
*/
|
||||||
|
complete_all(&kmod_req->first_req_done);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now that we have allowed prior request_module() calls to go on
|
||||||
|
* with life, let's schedule deleting this entry. We don't have
|
||||||
|
* to do it right away, but we *eventually* want to do it so to not
|
||||||
|
* let this linger forever as this is just a boot optimization for
|
||||||
|
* possible abuses of vmalloc() incurred by finit_module() thrashing.
|
||||||
|
*/
|
||||||
|
queue_delayed_work(system_wq, &kmod_req->delete_work, 60 * HZ);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret)
|
||||||
|
{
|
||||||
|
struct kmod_dup_req *kmod_req, *new_kmod_req;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Pre-allocate the entry in case we have to use it later
|
||||||
|
* to avoid contention with the mutex.
|
||||||
|
*/
|
||||||
|
new_kmod_req = kzalloc(sizeof(*new_kmod_req), GFP_KERNEL);
|
||||||
|
if (!new_kmod_req)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
memcpy(new_kmod_req->name, module_name, strlen(module_name));
|
||||||
|
INIT_WORK(&new_kmod_req->complete_work, kmod_dup_request_complete);
|
||||||
|
INIT_DELAYED_WORK(&new_kmod_req->delete_work, kmod_dup_request_delete);
|
||||||
|
init_completion(&new_kmod_req->first_req_done);
|
||||||
|
|
||||||
|
mutex_lock(&kmod_dup_mutex);
|
||||||
|
|
||||||
|
kmod_req = kmod_dup_request_lookup(module_name);
|
||||||
|
if (!kmod_req) {
|
||||||
|
/*
|
||||||
|
* If the first request that came through for a module
|
||||||
|
* was with request_module_nowait() we cannot wait for it
|
||||||
|
* and share its return value with other users which may
|
||||||
|
* have used request_module() and need a proper return value
|
||||||
|
* so just skip using them as an anchor.
|
||||||
|
*
|
||||||
|
* If a prior request to this one came through with
|
||||||
|
* request_module() though, then a request_module_nowait()
|
||||||
|
* would benefit from duplicate detection.
|
||||||
|
*/
|
||||||
|
if (!wait) {
|
||||||
|
kfree(new_kmod_req);
|
||||||
|
pr_debug("New request_module_nowait() for %s -- cannot track duplicates for this request\n", module_name);
|
||||||
|
mutex_unlock(&kmod_dup_mutex);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* There was no duplicate, just add the request so we can
|
||||||
|
* keep tab on duplicates later.
|
||||||
|
*/
|
||||||
|
pr_debug("New request_module() for %s\n", module_name);
|
||||||
|
list_add_rcu(&new_kmod_req->list, &dup_kmod_reqs);
|
||||||
|
mutex_unlock(&kmod_dup_mutex);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
mutex_unlock(&kmod_dup_mutex);
|
||||||
|
|
||||||
|
/* We are dealing with a duplicate request now */
|
||||||
|
kfree(new_kmod_req);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* To fix these try to use try_then_request_module() instead as that
|
||||||
|
* will check if the component you are looking for is present or not.
|
||||||
|
* You could also just queue a single request to load the module once,
|
||||||
|
* instead of having each and everything you need try to request for
|
||||||
|
* the module.
|
||||||
|
*
|
||||||
|
* Duplicate request_module() calls can cause quite a bit of wasted
|
||||||
|
* vmalloc() space when racing with userspace.
|
||||||
|
*/
|
||||||
|
if (enable_dups_trace)
|
||||||
|
WARN(1, "module-autoload: duplicate request for module %s\n", module_name);
|
||||||
|
else
|
||||||
|
pr_warn("module-autoload: duplicate request for module %s\n", module_name);
|
||||||
|
|
||||||
|
if (!wait) {
|
||||||
|
/*
|
||||||
|
* If request_module_nowait() was used then the user just
|
||||||
|
* wanted to issue the request and if another module request
|
||||||
|
* was already its way with the same name we don't care for
|
||||||
|
* the return value either. Let duplicate request_module_nowait()
|
||||||
|
* calls bail out right away.
|
||||||
|
*/
|
||||||
|
*dup_ret = 0;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If a duplicate request_module() was used they *may* care for
|
||||||
|
* the return value, so we have no other option but to wait for
|
||||||
|
* the first caller to complete. If the first caller used
|
||||||
|
* the request_module_nowait() call, subsquent callers will
|
||||||
|
* deal with the comprmise of getting a successful call with this
|
||||||
|
* optimization enabled ...
|
||||||
|
*/
|
||||||
|
ret = wait_for_completion_state(&kmod_req->first_req_done,
|
||||||
|
TASK_UNINTERRUPTIBLE | TASK_KILLABLE);
|
||||||
|
if (ret) {
|
||||||
|
*dup_ret = ret;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now the duplicate request has the same exact return value as the first request */
|
||||||
|
*dup_ret = kmod_req->dup_ret;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void kmod_dup_request_announce(char *module_name, int ret)
|
||||||
|
{
|
||||||
|
struct kmod_dup_req *kmod_req;
|
||||||
|
|
||||||
|
mutex_lock(&kmod_dup_mutex);
|
||||||
|
|
||||||
|
kmod_req = kmod_dup_request_lookup(module_name);
|
||||||
|
if (!kmod_req)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
kmod_req->dup_ret = ret;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If we complete() here we may allow duplicate threads
|
||||||
|
* to continue before the first one that submitted the
|
||||||
|
* request. We're in no rush also, given that each and
|
||||||
|
* every bounce back to userspace is slow we avoid that
|
||||||
|
* with a slight delay here. So queueue up the completion
|
||||||
|
* and let duplicates suffer, just wait a tad bit longer.
|
||||||
|
* There is no rush. But we also don't want to hold the
|
||||||
|
* caller up forever or introduce any boot delays.
|
||||||
|
*/
|
||||||
|
queue_work(system_wq, &kmod_req->complete_work);
|
||||||
|
|
||||||
|
out:
|
||||||
|
mutex_unlock(&kmod_dup_mutex);
|
||||||
|
}
|
|
@ -3,6 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
|
* Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
|
||||||
* Written by David Howells (dhowells@redhat.com)
|
* Written by David Howells (dhowells@redhat.com)
|
||||||
|
* Copyright (C) 2023 Luis Chamberlain <mcgrof@kernel.org>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/elf.h>
|
#include <linux/elf.h>
|
||||||
|
@ -221,6 +222,20 @@ static inline void mod_stat_bump_becoming(struct load_info *info, int flags)
|
||||||
|
|
||||||
#endif /* CONFIG_MODULE_STATS */
|
#endif /* CONFIG_MODULE_STATS */
|
||||||
|
|
||||||
|
#ifdef CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS
|
||||||
|
bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret);
|
||||||
|
void kmod_dup_request_announce(char *module_name, int ret);
|
||||||
|
#else
|
||||||
|
static inline bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void kmod_dup_request_announce(char *module_name, int ret)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_MODULE_UNLOAD_TAINT_TRACKING
|
#ifdef CONFIG_MODULE_UNLOAD_TAINT_TRACKING
|
||||||
struct mod_unload_taint {
|
struct mod_unload_taint {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* kmod - the kernel module loader
|
* kmod - the kernel module loader
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Luis Chamberlain <mcgrof@kernel.org>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/sched/task.h>
|
#include <linux/sched/task.h>
|
||||||
|
@ -27,6 +30,7 @@
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
|
|
||||||
#include <trace/events/module.h>
|
#include <trace/events/module.h>
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Assuming:
|
* Assuming:
|
||||||
|
@ -65,7 +69,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
|
||||||
kfree(info->argv);
|
kfree(info->argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int call_modprobe(char *module_name, int wait)
|
static int call_modprobe(char *orig_module_name, int wait)
|
||||||
{
|
{
|
||||||
struct subprocess_info *info;
|
struct subprocess_info *info;
|
||||||
static char *envp[] = {
|
static char *envp[] = {
|
||||||
|
@ -74,12 +78,14 @@ static int call_modprobe(char *module_name, int wait)
|
||||||
"PATH=/sbin:/usr/sbin:/bin:/usr/bin",
|
"PATH=/sbin:/usr/sbin:/bin:/usr/bin",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
char *module_name;
|
||||||
|
int ret;
|
||||||
|
|
||||||
char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
|
char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
|
||||||
if (!argv)
|
if (!argv)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
module_name = kstrdup(module_name, GFP_KERNEL);
|
module_name = kstrdup(orig_module_name, GFP_KERNEL);
|
||||||
if (!module_name)
|
if (!module_name)
|
||||||
goto free_argv;
|
goto free_argv;
|
||||||
|
|
||||||
|
@ -94,13 +100,16 @@ static int call_modprobe(char *module_name, int wait)
|
||||||
if (!info)
|
if (!info)
|
||||||
goto free_module_name;
|
goto free_module_name;
|
||||||
|
|
||||||
return call_usermodehelper_exec(info, wait | UMH_KILLABLE);
|
ret = call_usermodehelper_exec(info, wait | UMH_KILLABLE);
|
||||||
|
kmod_dup_request_announce(orig_module_name, ret);
|
||||||
|
return ret;
|
||||||
|
|
||||||
free_module_name:
|
free_module_name:
|
||||||
kfree(module_name);
|
kfree(module_name);
|
||||||
free_argv:
|
free_argv:
|
||||||
kfree(argv);
|
kfree(argv);
|
||||||
out:
|
out:
|
||||||
|
kmod_dup_request_announce(orig_module_name, -ENOMEM);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,7 +133,7 @@ int __request_module(bool wait, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
char module_name[MODULE_NAME_LEN];
|
char module_name[MODULE_NAME_LEN];
|
||||||
int ret;
|
int ret, dup_ret;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We don't allow synchronous module loading from async. Module
|
* We don't allow synchronous module loading from async. Module
|
||||||
|
@ -156,8 +165,14 @@ int __request_module(bool wait, const char *fmt, ...)
|
||||||
|
|
||||||
trace_module_request(module_name, wait, _RET_IP_);
|
trace_module_request(module_name, wait, _RET_IP_);
|
||||||
|
|
||||||
|
if (kmod_dup_request_exists_wait(module_name, wait, &dup_ret)) {
|
||||||
|
ret = dup_ret;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
|
ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
|
||||||
|
|
||||||
|
out:
|
||||||
up(&kmod_concurrent_max);
|
up(&kmod_concurrent_max);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue