Merge branches 'doc.2014.09.07a', 'fixes.2014.09.10a', 'nocb-nohz.2014.09.16b'... (e98d06dd) · Commits · 戴 / test

Documentation/kernel-parameters.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -2881,6 +2881,24 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		Lazy RCU callbacks are those which RCU can
		prove do nothing more than free memory.

		rcutorture.cbflood_inter_holdoff= [KNL]
		Set holdoff time (jiffies) between successive
		callback-flood tests.

		rcutorture.cbflood_intra_holdoff= [KNL]
		Set holdoff time (jiffies) between successive
		bursts of callbacks within a given callback-flood
		test.

		rcutorture.cbflood_n_burst= [KNL]
		Set the number of bursts making up a given
		callback-flood test. Set this to zero to
		disable callback-flood testing.

		rcutorture.cbflood_n_per_burst= [KNL]
		Set the number of callbacks to be registered
		in a given burst of a callback-flood test.

		rcutorture.fqs_duration= [KNL]
		Set duration of force_quiescent_state bursts.

include/linux/rcupdate.h

+10 −36

Original line number	Diff line number	Diff line
		@@ -269,6 +269,14 @@ static inline void rcu_user_hooks_switch(struct task_struct *prev,
		struct task_struct *next) { }
		#endif /* CONFIG_RCU_USER_QS */

		#ifdef CONFIG_RCU_NOCB_CPU
		void rcu_init_nohz(void);
		#else /* #ifdef CONFIG_RCU_NOCB_CPU */
		static inline void rcu_init_nohz(void)
		{
		}
		#endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */

		/**
		* RCU_NONIDLE - Indicate idle-loop code that needs RCU readers
		* @a: Code that RCU needs to pay attention to.
		@@ -349,7 +357,7 @@ bool rcu_lockdep_current_cpu_online(void);
		#else /* #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PROVE_RCU) */
		static inline bool rcu_lockdep_current_cpu_online(void)
		{
		return 1;
		return true;
		}
		#endif /* #else #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PROVE_RCU) */

		@@ -371,41 +379,7 @@ extern struct lockdep_map rcu_sched_lock_map;
		extern struct lockdep_map rcu_callback_map;
		int debug_lockdep_rcu_enabled(void);

		/**
		* rcu_read_lock_held() - might we be in RCU read-side critical section?
		*
		* If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an RCU
		* read-side critical section. In absence of CONFIG_DEBUG_LOCK_ALLOC,
		* this assumes we are in an RCU read-side critical section unless it can
		* prove otherwise. This is useful for debug checks in functions that
		* require that they be called within an RCU read-side critical section.
		*
		* Checks debug_lockdep_rcu_enabled() to prevent false positives during boot
		* and while lockdep is disabled.
		*
		* Note that rcu_read_lock() and the matching rcu_read_unlock() must
		* occur in the same context, for example, it is illegal to invoke
		* rcu_read_unlock() in process context if the matching rcu_read_lock()
		* was invoked from within an irq handler.
		*
		* Note that rcu_read_lock() is disallowed if the CPU is either idle or
		* offline from an RCU perspective, so check for those as well.
		*/
		static inline int rcu_read_lock_held(void)
		{
		if (!debug_lockdep_rcu_enabled())
		return 1;
		if (!rcu_is_watching())
		return 0;
		if (!rcu_lockdep_current_cpu_online())
		return 0;
		return lock_is_held(&rcu_lock_map);
		}

		/*
		* rcu_read_lock_bh_held() is defined out of line to avoid #include-file
		* hell.
		*/
		int rcu_read_lock_held(void);
		int rcu_read_lock_bh_held(void);

		/**

include/linux/torture.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@

		/* Definitions for online/offline exerciser. */
		int torture_onoff_init(long ooholdoff, long oointerval);
		char torture_onoff_stats(char page);
		void torture_onoff_stats(void);
		bool torture_onoff_failures(void);

		/* Low-rider random number generator. */

include/trace/events/rcu.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -180,9 +180,12 @@ TRACE_EVENT(rcu_grace_period_init,
		* argument is a string as follows:
		*
		* "WakeEmpty": Wake rcuo kthread, first CB to empty list.
		* "WakeEmptyIsDeferred": Wake rcuo kthread later, first CB to empty list.
		* "WakeOvf": Wake rcuo kthread, CB list is huge.
		* "WakeOvfIsDeferred": Wake rcuo kthread later, CB list is huge.
		* "WakeNot": Don't wake rcuo kthread.
		* "WakeNotPoll": Don't wake rcuo kthread because it is polling.
		* "DeferredWake": Carried out the "IsDeferred" wakeup.
		* "Poll": Start of new polling cycle for rcu_nocb_poll.
		* "Sleep": Sleep waiting for CBs for !rcu_nocb_poll.
		* "WokeEmpty": rcuo kthread woke to find empty list.

init/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -737,7 +737,7 @@ choice

		config RCU_NOCB_CPU_NONE
		bool "No build_forced no-CBs CPUs"
		depends on RCU_NOCB_CPU && !NO_HZ_FULL_ALL
		depends on RCU_NOCB_CPU
		help
		This option does not force any of the CPUs to be no-CBs CPUs.
		Only CPUs designated by the rcu_nocbs= boot parameter will be
		@@ -751,7 +751,7 @@ config RCU_NOCB_CPU_NONE

		config RCU_NOCB_CPU_ZERO
		bool "CPU 0 is a build_forced no-CBs CPU"
		depends on RCU_NOCB_CPU && !NO_HZ_FULL_ALL
		depends on RCU_NOCB_CPU
		help
		This option forces CPU 0 to be a no-CBs CPU, so that its RCU
		callbacks are invoked by a per-CPU kthread whose name begins

Admin message