From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756950AbbJIOqx (ORCPT ); Fri, 9 Oct 2015 10:46:53 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:52602 "EHLO e37.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752801AbbJIOqv (ORCPT ); Fri, 9 Oct 2015 10:46:51 -0400 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: paulmck@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Date: Fri, 9 Oct 2015 07:46:50 -0700 From: "Paul E. McKenney" To: Christian Borntraeger Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH] locktorture: fix wrong parameter handling Message-ID: <20151009144650.GR3910@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com References: <1444392885-6691-1-git-send-email-borntraeger@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1444392885-6691-1-git-send-email-borntraeger@de.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15100914-0025-0000-0000-00001DC30479 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 09, 2015 at 02:14:45PM +0200, Christian Borntraeger wrote: > Calling locktorture with a wrong parameter makes it > unusable: > > $ modprobe locktorture torture_type=help > modprobe: ERROR: could not insert 'locktorture': Invalid argument > > $ modprobe locktorture torture_type=spin_lock > modprobe: ERROR: could not insert 'locktorture': Device or resource busy > > $ dmesg > [...] > torture_init_begin: refusing spin_lock init: help running > > We can easily do the checking before call into the torture framework. > > Signed-off-by: Christian Borntraeger Good catch, thank you! Could you please port this to rcu/next in the -rcu tree? Also, please capitalize the word following the ":" in the subject line, as in "[PATCH] locktorture: Fix wrong parameter handling". Also, would you be interested in sending a separate patch to fix what looks like a similar issue in kernel/locking/locktorture.c? Thanx, Paul > --- > kernel/locking/locktorture.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c > index 3224418..f5f66a6 100644 > --- a/kernel/locking/locktorture.c > +++ b/kernel/locking/locktorture.c > @@ -645,9 +645,6 @@ static int __init lock_torture_init(void) > &rwsem_lock_ops, > }; > > - if (!torture_init_begin(torture_type, verbose, &torture_runnable)) > - return -EBUSY; > - > /* Process args and tell the world that the torturer is on the job. */ > for (i = 0; i < ARRAY_SIZE(torture_ops); i++) { > cxt.cur_ops = torture_ops[i]; > @@ -661,9 +658,12 @@ static int __init lock_torture_init(void) > for (i = 0; i < ARRAY_SIZE(torture_ops); i++) > pr_alert(" %s", torture_ops[i]->name); > pr_alert("\n"); > - torture_init_end(); > return -EINVAL; > } > + > + if (!torture_init_begin(torture_type, verbose, &torture_runnable)) > + return -EBUSY; > + > if (cxt.cur_ops->init) > cxt.cur_ops->init(); /* no "goto unwind" prior to this point!!! */ > > -- > 2.4.3 >