Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609af1cd authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'expedited.2018.07.12a', 'fixes.2018.07.12a',... 

Merge branches 'expedited.2018.07.12a', 'fixes.2018.07.12a', 'srcu.2018.06.25b' and 'torture.2018.06.25b' into HEAD

expedited.2018.07.12a: Expedited grace-period updates.
fixes.2018.07.12a: Pre-gp_seq miscellaneous fixes.
srcu.2018.06.25b: SRCU updates.
torture.2018.06.25b: Pre-gp_seq torture-test updates.
parents fcc63543 18390aea fd55a281 60500037

include/linux/srcu.h

+17 −0
Original line number Diff line number Diff line
@@ -195,6 +195,16 @@ static inline int srcu_read_lock(struct srcu_struct *sp) __acquires(sp) 
	return retval;

}



/* Used by tracing, cannot be traced and cannot invoke lockdep. */

static inline notrace int

srcu_read_lock_notrace(struct srcu_struct *sp) __acquires(sp)

{

	int retval;



	retval = __srcu_read_lock(sp);

	return retval;

}



/**

 * srcu_read_unlock - unregister a old reader from an SRCU-protected structure.

 * @sp: srcu_struct in which to unregister the old reader.
@@ -209,6 +219,13 @@ static inline void srcu_read_unlock(struct srcu_struct *sp, int idx) 
	__srcu_read_unlock(sp, idx);

}



/* Used by tracing, cannot be traced and cannot call lockdep. */

static inline notrace void

srcu_read_unlock_notrace(struct srcu_struct *sp, int idx) __releases(sp)

{

	__srcu_read_unlock(sp, idx);

}



/**

 * smp_mb__after_srcu_read_unlock - ensure full ordering after srcu_read_unlock

 *

include/linux/torture.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void stutter_wait(const char *title); 
int torture_stutter_init(int s);



/* Initialization and cleanup. */

bool torture_init_begin(char *ttype, bool v);

bool torture_init_begin(char *ttype, int v);

void torture_init_end(void);

bool torture_cleanup_begin(void);

void torture_cleanup_end(void);

kernel/locking/locktorture.c

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
 *          Davidlohr Bueso <dave@stgolabs.net>

 *	Based on kernel/rcu/torture.c.

 */



#define pr_fmt(fmt) fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/kthread.h>
@@ -57,7 +60,7 @@ torture_param(int, shutdown_secs, 0, "Shutdown time (j), <= zero to disable."); 
torture_param(int, stat_interval, 60,

	     "Number of seconds between stats printk()s");

torture_param(int, stutter, 5, "Number of jiffies to run/halt test, 0=disable");

torture_param(bool, verbose, true,

torture_param(int, verbose, 1,

	     "Enable verbose debugging printk()s");



static char *torture_type = "spin_lock";

kernel/rcu/rcuperf.c

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
 *

 * Authors: Paul E. McKenney <paulmck@us.ibm.com>

 */



#define pr_fmt(fmt) fmt



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -88,7 +91,7 @@ torture_param(int, nreaders, -1, "Number of RCU reader threads"); 
torture_param(int, nwriters, -1, "Number of RCU updater threads");

torture_param(bool, shutdown, !IS_ENABLED(MODULE),

	      "Shutdown at end of performance tests.");

torture_param(bool, verbose, true, "Enable verbose debugging printk()s");

torture_param(int, verbose, 1, "Enable verbose debugging printk()s");

torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");



static char *perf_type = "rcu";

kernel/rcu/rcutorture.c

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
 *

 * See also:  Documentation/RCU/torture.txt

 */



#define pr_fmt(fmt) fmt



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -101,7 +104,7 @@ torture_param(int, test_boost_interval, 7, 
	     "Interval between boost tests, seconds.");

torture_param(bool, test_no_idle_hz, true,

	     "Test support for tickless idle CPUs");

torture_param(bool, verbose, true,

torture_param(int, verbose, 1,

	     "Enable verbose debugging printk()s");



static char *torture_type = "rcu";