All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH for-next] futex: deduplicate resched in futex_wake_op()
@ 2021-05-17 13:30 Pavel Begunkov
  2021-05-20 18:16 ` Davidlohr Bueso
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2021-05-17 13:30 UTC (permalink / raw)
  To: linux-kernel
  Cc: Thomas Gleixner, Ingo Molnar, Peter Zijlstra, Darren Hart,
	Davidlohr Bueso

After pagefaulting in futex_wake_op() both branches do cond_resched()
before retry. Help to deduplicate it as many compilers can't cope with
it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 kernel/futex.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index c98b825da9cf..54ed232b2553 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1728,12 +1728,9 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,
 				return ret;
 		}
 
-		if (!(flags & FLAGS_SHARED)) {
-			cond_resched();
-			goto retry_private;
-		}
-
 		cond_resched();
+		if (!(flags & FLAGS_SHARED))
+			goto retry_private;
 		goto retry;
 	}
 
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH for-next] futex: deduplicate resched in futex_wake_op()
  2021-05-17 13:30 [PATCH for-next] futex: deduplicate resched in futex_wake_op() Pavel Begunkov
@ 2021-05-20 18:16 ` Davidlohr Bueso
  0 siblings, 0 replies; 2+ messages in thread
From: Davidlohr Bueso @ 2021-05-20 18:16 UTC (permalink / raw)
  To: Pavel Begunkov
  Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, Peter Zijlstra, Darren Hart

On Mon, 17 May 2021, Pavel Begunkov wrote:

>After pagefaulting in futex_wake_op() both branches do cond_resched()
>before retry. Help to deduplicate it as many compilers can't cope with
>it.
>

LGTM:

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

>Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
>---
> kernel/futex.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/kernel/futex.c b/kernel/futex.c
>index c98b825da9cf..54ed232b2553 100644
>--- a/kernel/futex.c
>+++ b/kernel/futex.c
>@@ -1728,12 +1728,9 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,
> 				return ret;
> 		}
>
>-		if (!(flags & FLAGS_SHARED)) {
>-			cond_resched();
>-			goto retry_private;
>-		}
>-
> 		cond_resched();
>+		if (!(flags & FLAGS_SHARED))
>+			goto retry_private;
> 		goto retry;
> 	}
>
>-- 
>2.31.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-20 18:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 13:30 [PATCH for-next] futex: deduplicate resched in futex_wake_op() Pavel Begunkov
2021-05-20 18:16 ` Davidlohr Bueso

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.