Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932706AbcLHTtN (ORCPT ); Thu, 8 Dec 2016 14:49:13 -0500 Received: from mail.kernel.org ([198.145.29.136]:45878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932230AbcLHTtK (ORCPT ); Thu, 8 Dec 2016 14:49:10 -0500 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, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [RFC 07/10] kmod: use simplified rate limit printk Date: Thu, 8 Dec 2016 11:49:01 -0800 Message-Id: <20161208194901.2672-1-mcgrof@kernel.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161208184801.1689-1-mcgrof@kernel.org> References: <20161208184801.1689-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1135 Lines: 39 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. 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 09cf35a2075a..ef65f4c3578a 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -158,7 +158,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 @@ -183,13 +182,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("request_module: modprobe limit (%u) reached with module %s\n", + max_modprobes, module_name); return ret; } -- 2.10.1