diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-09-23 19:54:37 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-10-01 14:57:50 +0300 |
| commit | 7b5ff4bb9adc53cfbf7ac9ba7820ccf0cd7c070a (patch) | |
| tree | 9b7c013500409b5e0292b6fd2a6eb8ed8447fd5c /include | |
| parent | 874f670e6088d3bff3972ecd44c1cb00610f9183 (diff) | |
| download | linux-7b5ff4bb9adc53cfbf7ac9ba7820ccf0cd7c070a.tar.xz | |
sched: Make cond_resched_*lock() variants consistent vs. might_sleep()
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 12 |
1 files 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) |