From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756398AbdESDZG (ORCPT ); Thu, 18 May 2017 23:25:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756363AbdESDZB (ORCPT ); Thu, 18 May 2017 23:25:01 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65E43239EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mcgrof@kernel.org From: "Luis R. Rodriguez" To: shuah@kernel.org, jeyu@redhat.com, rusty@rustcorp.com.au, ebiederm@xmission.com, dmitry.torokhov@gmail.com, acme@redhat.com, corbet@lwn.net Cc: martin.wilck@suse.com, mmarek@suse.com, pmladek@suse.com, hare@suse.com, rwright@hpe.com, jeffm@suse.com, DSterba@suse.com, fdmanana@suse.com, neilb@suse.com, linux@roeck-us.net, rgoldwyn@suse.com, subashab@codeaurora.org, xypron.glpk@gmx.de, keescook@chromium.org, atomlin@redhat.com, mbenes@suse.cz, paulmck@linux.vnet.ibm.com, dan.j.williams@intel.com, jpoimboe@redhat.com, davem@davemloft.net, mingo@redhat.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 6/6] kmod: use simplified rate limit printk Date: Thu, 18 May 2017 20:24:44 -0700 Message-Id: <20170519032444.18416-7-mcgrof@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170519032444.18416-1-mcgrof@kernel.org> References: <20170519032444.18416-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Luis R. Rodriguez --- 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