Commit 3dbe43f6 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'doc.2015.07.15a' and 'torture.2015.07.15a' into HEAD 

doc.2015.07.15a: Documentation updates.
torture.2015.07.15a: Torture-test updates.
parents 8ff4fbfd 96d7744e d6a8c6d3

Documentation/RCU/rcu_dereference.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ o You must use one of the rcu_dereference() family of primitives 
o	Avoid cancellation when using the "+" and "-" infix arithmetic

	operators.  For example, for a given variable "x", avoid

	"(x-x)".  There are similar arithmetic pitfalls from other

	arithmetic operatiors, such as "(x*0)", "(x/(x+1))" or "(x%1)".

	arithmetic operators, such as "(x*0)", "(x/(x+1))" or "(x%1)".

	The compiler is within its rights to substitute zero for all of

	these expressions, so that subsequent accesses no longer depend

	on the rcu_dereference(), again possibly resulting in bugs due

Documentation/kernel-parameters.txt

+24 −11
Original line number Diff line number Diff line
@@ -3135,22 +3135,35 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			in a given burst of a callback-flood test.



	rcutorture.fqs_duration= [KNL]

			Set duration of force_quiescent_state bursts.

			Set duration of force_quiescent_state bursts

			in microseconds.



	rcutorture.fqs_holdoff= [KNL]

			Set holdoff time within force_quiescent_state bursts.

			Set holdoff time within force_quiescent_state bursts

			in microseconds.



	rcutorture.fqs_stutter= [KNL]

			Set wait time between force_quiescent_state bursts.

			Set wait time between force_quiescent_state bursts

			in seconds.



	rcutorture.gp_cond= [KNL]

			Use conditional/asynchronous update-side

			primitives, if available.



	rcutorture.gp_exp= [KNL]

			Use expedited update-side primitives.

			Use expedited update-side primitives, if available.



	rcutorture.gp_normal= [KNL]

			Use normal (non-expedited) update-side primitives.

			If both gp_exp and gp_normal are set, do both.

			If neither gp_exp nor gp_normal are set, still

			do both.

			Use normal (non-expedited) asynchronous

			update-side primitives, if available.



	rcutorture.gp_sync= [KNL]

			Use normal (non-expedited) synchronous

			update-side primitives, if available.  If all

			of rcutorture.gp_cond=, rcutorture.gp_exp=,

			rcutorture.gp_normal=, and rcutorture.gp_sync=

			are zero, rcutorture acts as if is interpreted

			they are all non-zero.



	rcutorture.n_barrier_cbs= [KNL]

			Set callbacks/threads for rcu_barrier() testing.
@@ -3177,9 +3190,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Set time (s) between CPU-hotplug operations, or

			zero to disable CPU-hotplug testing.



	rcutorture.torture_runnable= [BOOT]

			Start rcutorture running at boot time.



	rcutorture.shuffle_interval= [KNL]

			Set task-shuffle interval (s).  Shuffling tasks

			allows some CPUs to go into dyntick-idle mode
@@ -3220,6 +3230,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Test RCU's dyntick-idle handling.  See also the

			rcutorture.shuffle_interval parameter.



	rcutorture.torture_runnable= [BOOT]

			Start rcutorture running at boot time.



	rcutorture.torture_type= [KNL]

			Specify the RCU implementation to test.