diff mbox series

rcuwait: Add might_sleep() annotations

Message ID 20230724160337.20851-1-dave@stgolabs.net
State New
Headers
Series rcuwait: Add might_sleep() annotations |

Commit Message

Davidlohr Bueso July 24, 2023, 4:03 p.m. UTC 
  ... as with regular waitqueues.

Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
---
 include/linux/rcuwait.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Peter Zijlstra July 25, 2023, 12:03 p.m. UTC | #1 
On Mon, Jul 24, 2023 at 09:03:36AM -0700, Davidlohr Bueso wrote:
> ... as with regular waitqueues.

No immediate objection, but please, tell us more. What made you get up
this fine morning and write this patch?

> Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
> ---
>  include/linux/rcuwait.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/rcuwait.h b/include/linux/rcuwait.h
> index 27343424225c..c0fcac903d03 100644
> --- a/include/linux/rcuwait.h
> +++ b/include/linux/rcuwait.h
> @@ -74,7 +74,10 @@ extern void finish_rcuwait(struct rcuwait *w);
>  })
>  
>  #define rcuwait_wait_event(w, condition, state)				\
> -	___rcuwait_wait_event(w, condition, state, 0, schedule())
> +do {									\
> +	might_sleep();							\
> +	___rcuwait_wait_event(w, condition, state, 0, schedule());	\
> +} while (0)
>  
>  #define __rcuwait_wait_event_timeout(w, condition, state, timeout)	\
>  	___rcuwait_wait_event(w, ___wait_cond_timeout(condition),	\
> @@ -84,6 +87,7 @@ extern void finish_rcuwait(struct rcuwait *w);
>  #define rcuwait_wait_event_timeout(w, condition, state, timeout)	\
>  ({									\
>  	long __ret = timeout;						\
> +	might_sleep();							\
>  	if (!___wait_cond_timeout(condition))				\
>  		__ret = __rcuwait_wait_event_timeout(w, condition,	\
>  						     state, timeout);	\
> -- 
> 2.41.0
>
Davidlohr Bueso July 25, 2023, 2:27 p.m. UTC | #2 
On Tue, 25 Jul 2023, Peter Zijlstra wrote:

>On Mon, Jul 24, 2023 at 09:03:36AM -0700, Davidlohr Bueso wrote:
>> ... as with regular waitqueues.
>
>No immediate objection, but please, tell us more. What made you get up
>this fine morning and write this patch?

So this was just something I had noticed missing while adding the
timeout support.

Thanks,
Davidlohr
diff mbox series

Patch

diff --git a/include/linux/rcuwait.h b/include/linux/rcuwait.h
index 27343424225c..c0fcac903d03 100644
--- a/include/linux/rcuwait.h
+++ b/include/linux/rcuwait.h
@@ -74,7 +74,10 @@  extern void finish_rcuwait(struct rcuwait *w);
 })
 
 #define rcuwait_wait_event(w, condition, state)				\
-	___rcuwait_wait_event(w, condition, state, 0, schedule())
+do {									\
+	might_sleep();							\
+	___rcuwait_wait_event(w, condition, state, 0, schedule());	\
+} while (0)
 
 #define __rcuwait_wait_event_timeout(w, condition, state, timeout)	\
 	___rcuwait_wait_event(w, ___wait_cond_timeout(condition),	\
@@ -84,6 +87,7 @@  extern void finish_rcuwait(struct rcuwait *w);
 #define rcuwait_wait_event_timeout(w, condition, state, timeout)	\
 ({									\
 	long __ret = timeout;						\
+	might_sleep();							\
 	if (!___wait_cond_timeout(condition))				\
 		__ret = __rcuwait_wait_event_timeout(w, condition,	\
 						     state, timeout);	\