From 7b5ff4bb9adc53cfbf7ac9ba7820ccf0cd7c070a Mon Sep 17 00:00:00 2001

From: Thomas Gleixner <tglx@linutronix.de>

Date: Thu, 23 Sep 2021 18:54:37 +0200

Subject: [PATCH] sched: Make cond_resched_*lock() variants consistent vs. might_sleep()

Git-commit: 7b5ff4bb9adc53cfbf7ac9ba7820ccf0cd7c070a

Patch-mainline: v5.16-rc1

References: bsc#1190137 bsc#1189998

Commit 3427445afd26 ("sched: Exclude cond_resched() from nested sleep

test") removed the task state check of __might_sleep() for

cond_resched_lock() because cond_resched_lock() is not a voluntary

scheduling point which blocks. It's a preemption point which requires the

lock holder to release the spin lock.

The same rationale applies to cond_resched_rwlock_read/write(), but those

were not touched.

Make it consistent and use the non-state checking __might_resched() there

as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Link: https://lkml.kernel.org/r/20210923165357.991262778@linutronix.de

Signed-off-by: Davidlohr Bueso <dbueso@suse.de> 

---

 include/linux/sched.h | 12 ++++++------

 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h

index b38f002334d5..7a989f2487f8 100644

--- a/include/linux/sched.h

+++ b/include/linux/sched.h

@@ -2051,14 +2051,14 @@ extern int __cond_resched_rwlock_write(rwlock_t *lock);

 	__cond_resched_lock(lock);					\

 })

-#define cond_resched_rwlock_read(lock) ({			\

-	__might_sleep(__FILE__, __LINE__, PREEMPT_LOCK_OFFSET);	\

-	__cond_resched_rwlock_read(lock);			\

+#define cond_resched_rwlock_read(lock) ({				\

+	__might_resched(__FILE__, __LINE__, PREEMPT_LOCK_OFFSET);	\

+	__cond_resched_rwlock_read(lock);				\

 })

-#define cond_resched_rwlock_write(lock) ({			\

-	__might_sleep(__FILE__, __LINE__, PREEMPT_LOCK_OFFSET);	\

-	__cond_resched_rwlock_write(lock);			\

+#define cond_resched_rwlock_write(lock) ({				\

+	__might_resched(__FILE__, __LINE__, PREEMPT_LOCK_OFFSET);	\

+	__cond_resched_rwlock_write(lock);				\

 })

 static inline void cond_resched_rcu(void)

-- 

2.26.2