rcuwait: Add @state argument to rcuwait_wait_event() (80fbaf1c) · Commits · 戴 / test

include/linux/rcuwait.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		#define _LINUX_RCUWAIT_H_

		#include <linux/rcupdate.h>
		#include <linux/sched/signal.h>

		/*
		* rcuwait provides a way of blocking and waking up a single
		@@ -30,23 +31,30 @@ extern void rcuwait_wake_up(struct rcuwait *w);
		* The caller is responsible for locking around rcuwait_wait_event(),
		* such that writes to @task are properly serialized.
		*/
		#define rcuwait_wait_event(w, condition) \
		#define rcuwait_wait_event(w, condition, state) \
		({ \
		int __ret = 0; \
		rcu_assign_pointer((w)->task, current); \
		for (;;) { \
		/* \
		* Implicit barrier (A) pairs with (B) in \
		* rcuwait_wake_up(). \
		*/ \
		set_current_state(TASK_UNINTERRUPTIBLE); \
		set_current_state(state); \
		if (condition) \
		break; \
		\
		if (signal_pending_state(state, current)) { \
		__ret = -EINTR; \
		break; \
		} \
		\
		schedule(); \
		} \
		\
		WRITE_ONCE((w)->task, NULL); \
		__set_current_state(TASK_RUNNING); \
		__ret; \
		})

		#endif /* _LINUX_RCUWAIT_H_ */

+1 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ void percpu_down_write(struct percpu_rw_semaphore *sem)
		*/

		/* Wait for all active readers to complete. */
		rcuwait_wait_event(&sem->writer, readers_active_check(sem));
		rcuwait_wait_event(&sem->writer, readers_active_check(sem), TASK_UNINTERRUPTIBLE);
		}
		EXPORT_SYMBOL_GPL(percpu_down_write);