lkml.org 
[lkml]   [2017]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/6] kmod: use simplified rate limit printk
    Date
    Just use the simplified rate limit printk when the max modprobe
    limit is reached, while at it throw out a bone should the error
    be triggered.

    Reviewed-by: Petr Mladek <pmladek@suse.com>
    Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
    ---
    kernel/kmod.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    diff --git a/kernel/kmod.c b/kernel/kmod.c
    index 7ea11dbc7564..56cd2a16e7ac 100644
    --- a/kernel/kmod.c
    +++ b/kernel/kmod.c
    @@ -166,7 +166,6 @@ int __request_module(bool wait, const char *fmt, ...)
    va_list args;
    char module_name[MODULE_NAME_LEN];
    int ret;
    - static int kmod_loop_msg;

    /*
    * We don't allow synchronous module loading from async. Module
    @@ -191,13 +190,8 @@ int __request_module(bool wait, const char *fmt, ...)

    ret = kmod_umh_threads_get();
    if (ret) {
    - /* We may be blaming an innocent here, but unlikely */
    - if (kmod_loop_msg < 5) {
    - printk(KERN_ERR
    - "request_module: runaway loop modprobe %s\n",
    - module_name);
    - kmod_loop_msg++;
    - }
    + pr_err_ratelimited("%s: module \"%s\" reached limit (%u) of concurrent modprobe calls\n",
    + __func__, module_name, max_modprobes);
    return ret;
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-05-19 05:26    [W:4.685 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site