Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240850

Re: [PATCH tip/core/rcu 1/4] rcutorture: Fix module unwind when bad torture_type specified

Show all headers | View raw

On Tue, Oct 06, 2015 at 10:32:12AM -0700, Josh Triplett wrote:
> 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 <davem@davemloft.net>
> > Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> > Acked-by: David Miller <davem@davemloft.net>
> 
> 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.

I was indeed a bit nervous about removing that comment, so thank you for
checking up on it!  (Can't be bothered to go back and figure out if it
ever really was relevant...)

								Thanx, Paul

> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> 
> >  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
> > 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH tip/core/rcu 1/4] rcutorture: Fix module unwind when bad torture_type specified "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-10-06 18:50 +0200
  [PATCH tip/core/rcu 3/4] torture: Forgive non-plural arguments "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-10-06 18:50 +0200
  [PATCH tip/core/rcu 4/4] locktorture: Fix module unwind when bad torture_type specified "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-10-06 18:50 +0200
  [PATCH tip/core/rcu 2/4] rcutorture: Fix unused-function warning for torturing_tasks() "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-10-06 19:00 +0200
  Re: [PATCH tip/core/rcu 1/4] rcutorture: Fix module unwind when bad  torture_type specified Josh Triplett <josh@joshtriplett.org> - 2015-10-06 19:40 +0200
    Re: [PATCH tip/core/rcu 1/4] rcutorture: Fix module unwind when bad  torture_type specified "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-10-06 20:40 +0200

csiph-web