From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbbJFRcU (ORCPT ); Tue, 6 Oct 2015 13:32:20 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:41777 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752787AbbJFRcT (ORCPT ); Tue, 6 Oct 2015 13:32:19 -0400 Date: Tue, 6 Oct 2015 10:32:12 -0700 From: Josh Triplett To: "Paul E. McKenney" Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com, bobby.prani@gmail.com Subject: Re: [PATCH tip/core/rcu 1/4] rcutorture: Fix module unwind when bad torture_type specified Message-ID: <20151006173212.GG9600@cloud> References: <20151006164855.GA17055@linux.vnet.ibm.com> <1444150153-17463-1-git-send-email-paulmck@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1444150153-17463-1-git-send-email-paulmck@linux.vnet.ibm.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 06, 2015 at 09:49:10AM -0700, Paul E. McKenney wrote: > The rcutorture module has a list of torture types, and specifying a > type not on this list is supposed to cleanly fail the module load. > Unfortunately, the "fail" happens without the "cleanly". This commit > therefore adds the needed clean-up after an incorrect torture_type. > > Reported-by: David Miller > Signed-off-by: Paul E. McKenney > Acked-by: David Miller After a careful review of rcu_torture_cleanup and the cur_ops->init() functions to verify that the dire comment about not using "goto unwind" doesn't actually apply (rcu_torture_cleanup *seems* to handle lack of init), this seems fine. Reviewed-by: Josh Triplett > kernel/rcu/rcutorture.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c > index 77192953dee5..b74b56474e17 100644 > --- a/kernel/rcu/rcutorture.c > +++ b/kernel/rcu/rcutorture.c > @@ -1742,15 +1742,15 @@ rcu_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; > + firsterr = -EINVAL; > + goto unwind; > } > if (cur_ops->fqs == NULL && fqs_duration != 0) { > pr_alert("rcu-torture: ->fqs NULL and non-zero fqs_duration, fqs disabled.\n"); > fqs_duration = 0; > } > if (cur_ops->init) > - cur_ops->init(); /* no "goto unwind" prior to this point!!! */ > + cur_ops->init(); > > if (nreaders >= 0) { > nrealreaders = nreaders; > -- > 2.5.2 >