Commit 3add00be authored by Boqun Feng's avatar Boqun Feng
Browse files

Merge branches 'rcu-doc.2024.02.14a', 'rcu-nocb.2024.02.14a',... 

Merge branches 'rcu-doc.2024.02.14a', 'rcu-nocb.2024.02.14a', 'rcu-exp.2024.02.14a', 'rcu-tasks.2024.02.26a' and 'rcu-misc.2024.02.14a' into rcu.2024.02.26a
parents e15aed42 f3c4c007 23da2ad6 0bb11a37 c90e3ecc

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -5047,6 +5047,11 @@ 
			this kernel boot parameter, forcibly setting it

			to zero.



	rcutree.enable_rcu_lazy= [KNL]

			To save power, batch RCU callbacks and flush after

			delay, memory pressure or callback list growing too

			big.



	rcuscale.gp_async= [KNL]

			Measure performance of asynchronous

			grace-period primitives such as call_rcu().

include/linux/rcu_sync.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static inline bool rcu_sync_is_idle(struct rcu_sync *rsp) 
}



extern void rcu_sync_init(struct rcu_sync *);

extern void rcu_sync_enter_start(struct rcu_sync *);

extern void rcu_sync_enter(struct rcu_sync *);

extern void rcu_sync_exit(struct rcu_sync *);

extern void rcu_sync_dtor(struct rcu_sync *);

include/linux/rcupdate.h

+2 −2
Original line number Diff line number Diff line
@@ -184,9 +184,9 @@ void rcu_tasks_trace_qs_blkd(struct task_struct *t); 
	do {									\

		int ___rttq_nesting = READ_ONCE((t)->trc_reader_nesting);	\

										\

		if (likely(!READ_ONCE((t)->trc_reader_special.b.need_qs)) &&	\

		if (unlikely(READ_ONCE((t)->trc_reader_special.b.need_qs) == TRC_NEED_QS) &&	\

		    likely(!___rttq_nesting)) {					\

			rcu_trc_cmpxchg_need_qs((t), 0,	TRC_NEED_QS_CHECKED);	\

			rcu_trc_cmpxchg_need_qs((t), TRC_NEED_QS, TRC_NEED_QS_CHECKED);	\

		} else if (___rttq_nesting && ___rttq_nesting != INT_MIN &&	\

			   !READ_ONCE((t)->trc_reader_special.b.blocked)) {	\

			rcu_tasks_trace_qs_blkd(t);				\

include/linux/sched.h

+2 −0
Original line number Diff line number Diff line
@@ -858,6 +858,8 @@ struct task_struct { 
	u8				rcu_tasks_idx;

	int				rcu_tasks_idle_cpu;

	struct list_head		rcu_tasks_holdout_list;

	int				rcu_tasks_exit_cpu;

	struct list_head		rcu_tasks_exit_list;

#endif /* #ifdef CONFIG_TASKS_RCU */



#ifdef CONFIG_TASKS_TRACE_RCU

init/init_task.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct task_struct init_task __aligned(L1_CACHE_BYTES) = { 
	.rcu_tasks_holdout = false,

	.rcu_tasks_holdout_list = LIST_HEAD_INIT(init_task.rcu_tasks_holdout_list),

	.rcu_tasks_idle_cpu = -1,

	.rcu_tasks_exit_list = LIST_HEAD_INIT(init_task.rcu_tasks_exit_list),

#endif

#ifdef CONFIG_TASKS_TRACE_RCU

	.trc_reader_nesting = 0,