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

Commit 22df7316 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'exp.2018.05.15a', 'fixes.2018.05.15a', 'lock.2018.05.15a' and... 

Merge branches 'exp.2018.05.15a', 'fixes.2018.05.15a', 'lock.2018.05.15a' and 'torture.2018.05.15a' into HEAD

exp.2018.05.15a: Parallelize expedited grace-period initialization.
fixes.2018.05.15a: Miscellaneous fixes.
lock.2018.05.15a: Decrease lock contention on root rcu_node structure,
	which is a step towards merging RCU flavors.
torture.2018.05.15a: Torture-test updates.
parents 55ebfce0 628c0842 c21b8b3e da1a1e19

Documentation/RCU/whatisRCU.txt

+2 −0
Original line number Diff line number Diff line 
What is RCU?  --  "Read, Copy, Update"



Please note that the "What is RCU?" LWN series is an excellent place

to start learning about RCU:

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static void nvme_free_ns_head(struct kref *ref) 
	nvme_mpath_remove_disk(head);

	ida_simple_remove(&head->subsys->ns_ida, head->instance);

	list_del_init(&head->entry);

	cleanup_srcu_struct(&head->srcu);

	cleanup_srcu_struct_quiesced(&head->srcu);

	kfree(head);

}

include/linux/rcupdate.h

+2 −2
Original line number Diff line number Diff line
@@ -188,13 +188,13 @@ static inline void exit_tasks_rcu_finish(void) { } 
#endif /* #else #ifdef CONFIG_TASKS_RCU */



/**

 * cond_resched_rcu_qs - Report potential quiescent states to RCU

 * cond_resched_tasks_rcu_qs - Report potential quiescent states to RCU

 *

 * This macro resembles cond_resched(), except that it is defined to

 * report potential quiescent states to RCU-tasks even if the cond_resched()

 * machinery were to be shut off, as some advocate for PREEMPT kernels.

 */

#define cond_resched_rcu_qs() \

#define cond_resched_tasks_rcu_qs() \

do { \

	if (!cond_resched()) \

		rcu_note_voluntary_context_switch_lite(current); \

include/linux/rcutree.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static inline void synchronize_rcu_bh_expedited(void) 
void rcu_barrier(void);

void rcu_barrier_bh(void);

void rcu_barrier_sched(void);

bool rcu_eqs_special_set(int cpu);

unsigned long get_state_synchronize_rcu(void);

void cond_synchronize_rcu(unsigned long oldstate);

unsigned long get_state_synchronize_sched(void);

include/linux/sched.h

+0 −8
Original line number Diff line number Diff line
@@ -1613,7 +1613,6 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) 
 * explicit rescheduling in places that are safe. The return

 * value indicates whether a reschedule was done in fact.

 * cond_resched_lock() will drop the spinlock before scheduling,

 * cond_resched_softirq() will enable bhs before scheduling.

 */

#ifndef CONFIG_PREEMPT

extern int _cond_resched(void);
@@ -1633,13 +1632,6 @@ extern int __cond_resched_lock(spinlock_t *lock); 
	__cond_resched_lock(lock);				\

})



extern int __cond_resched_softirq(void);



#define cond_resched_softirq() ({					\

	___might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET);	\

	__cond_resched_softirq();					\

})



static inline void cond_resched_rcu(void)

{

#if defined(CONFIG_DEBUG_ATOMIC_SLEEP) || !defined(CONFIG_PREEMPT_RCU)