All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Nicolai Hähnle" <nhaehnle@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: "Nicolai Hähnle" <Nicolai.Haehnle@amd.com>,
	"Peter Zijlstra" <peterz@infradead.org>,
	"Ingo Molnar" <mingo@redhat.com>,
	"Maarten Lankhorst" <dev@mblankhorst.nl>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Chris Wilson" <chris@chris-wilson.co.uk>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH v2 03/11] locking/ww_mutex: Extract stamp comparison to __ww_mutex_stamp_after
Date: Thu,  1 Dec 2016 15:06:46 +0100	[thread overview]
Message-ID: <1480601214-26583-4-git-send-email-nhaehnle@gmail.com> (raw)
In-Reply-To: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com>

From: Nicolai Hähnle <Nicolai.Haehnle@amd.com>

The function will be re-used in subsequent patches.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Maarten Lankhorst <dev@mblankhorst.nl>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle@amd.com>
---
 kernel/locking/mutex.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index 0afa998..200629a 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -277,6 +277,13 @@ static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
 	ww_ctx->acquired++;
 }
 
+static inline bool __sched
+__ww_mutex_stamp_after(struct ww_acquire_ctx *a, struct ww_acquire_ctx *b)
+{
+	return a->stamp - b->stamp <= LONG_MAX &&
+	       (a->stamp != b->stamp || a > b);
+}
+
 /*
  * After acquiring lock with fastpath or when we lost out in contested
  * slowpath, set ctx and wake up any waiters so they can recheck.
@@ -610,8 +617,7 @@ __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx)
 	if (!hold_ctx)
 		return 0;
 
-	if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
-	    (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
+	if (__ww_mutex_stamp_after(ctx, hold_ctx)) {
 #ifdef CONFIG_DEBUG_MUTEXES
 		DEBUG_LOCKS_WARN_ON(ctx->contending_lock);
 		ctx->contending_lock = ww;
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: "Nicolai Hähnle" <nhaehnle@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: "Maarten Lankhorst" <dev@mblankhorst.nl>,
	"Nicolai Hähnle" <Nicolai.Haehnle@amd.com>,
	"Peter Zijlstra" <peterz@infradead.org>,
	dri-devel@lists.freedesktop.org, "Ingo Molnar" <mingo@redhat.com>
Subject: [PATCH v2 03/11] locking/ww_mutex: Extract stamp comparison to __ww_mutex_stamp_after
Date: Thu,  1 Dec 2016 15:06:46 +0100	[thread overview]
Message-ID: <1480601214-26583-4-git-send-email-nhaehnle@gmail.com> (raw)
In-Reply-To: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com>

From: Nicolai Hähnle <Nicolai.Haehnle@amd.com>

The function will be re-used in subsequent patches.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Maarten Lankhorst <dev@mblankhorst.nl>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle@amd.com>
---
 kernel/locking/mutex.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index 0afa998..200629a 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -277,6 +277,13 @@ static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
 	ww_ctx->acquired++;
 }
 
+static inline bool __sched
+__ww_mutex_stamp_after(struct ww_acquire_ctx *a, struct ww_acquire_ctx *b)
+{
+	return a->stamp - b->stamp <= LONG_MAX &&
+	       (a->stamp != b->stamp || a > b);
+}
+
 /*
  * After acquiring lock with fastpath or when we lost out in contested
  * slowpath, set ctx and wake up any waiters so they can recheck.
@@ -610,8 +617,7 @@ __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx)
 	if (!hold_ctx)
 		return 0;
 
-	if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
-	    (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
+	if (__ww_mutex_stamp_after(ctx, hold_ctx)) {
 #ifdef CONFIG_DEBUG_MUTEXES
 		DEBUG_LOCKS_WARN_ON(ctx->contending_lock);
 		ctx->contending_lock = ww;
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2016-12-01 14:09 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-01 14:06 [PATCH v2 00/11] locking/ww_mutex: Keep sorted wait list to avoid stampedes Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 01/11] drm/vgem: Use ww_mutex_(un)lock even with a NULL context Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:18   ` Chris Wilson
2016-12-01 14:18     ` Chris Wilson
2016-12-01 15:14     ` Daniel Vetter
2016-12-01 16:24   ` Peter Zijlstra
2016-12-01 16:24     ` Peter Zijlstra
2016-12-01 14:06 ` [PATCH v2 02/11] locking/ww_mutex: Re-check ww->ctx in the inner optimistic spin loop Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:36   ` Chris Wilson
2016-12-01 14:36     ` Chris Wilson
2016-12-06 15:06   ` Peter Zijlstra
2016-12-06 15:06     ` Peter Zijlstra
2016-12-06 16:03     ` Waiman Long
2016-12-06 18:29       ` Peter Zijlstra
2016-12-06 18:29         ` Peter Zijlstra
2016-12-06 18:46         ` Waiman Long
2016-12-01 14:06 ` Nicolai Hähnle [this message]
2016-12-01 14:06   ` [PATCH v2 03/11] locking/ww_mutex: Extract stamp comparison to __ww_mutex_stamp_after Nicolai Hähnle
2016-12-01 14:42   ` Chris Wilson
2016-12-01 14:42     ` Chris Wilson
2016-12-01 14:06 ` [PATCH v2 04/11] locking/ww_mutex: Set use_ww_ctx even when locking without a context Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-06 15:14   ` Peter Zijlstra
2016-12-06 15:14     ` Peter Zijlstra
2016-12-06 15:25   ` Peter Zijlstra
2016-12-06 15:25     ` Peter Zijlstra
2016-12-16 13:17     ` Nicolai Hähnle
2016-12-16 13:17       ` Nicolai Hähnle
2016-12-17  7:53       ` Maarten Lankhorst
2016-12-17  7:53         ` Maarten Lankhorst
2016-12-17 13:49       ` Peter Zijlstra
2016-12-17 13:49         ` Peter Zijlstra
2016-12-01 14:06 ` [PATCH v2 05/11] locking/ww_mutex: Add waiters in stamp order Nicolai Hähnle
2016-12-01 15:59   ` Chris Wilson
2016-12-01 15:59     ` Chris Wilson
2016-12-16 14:21     ` Nicolai Hähnle
2016-12-16 14:21       ` Nicolai Hähnle
2016-12-06 15:36   ` Peter Zijlstra
2016-12-06 15:36     ` Peter Zijlstra
2016-12-16 13:34     ` Nicolai Hähnle
2016-12-16 13:34       ` Nicolai Hähnle
2016-12-06 16:55   ` Peter Zijlstra
2016-12-06 16:55     ` Peter Zijlstra
2016-12-16 14:19     ` Nicolai Hähnle
2016-12-16 14:19       ` Nicolai Hähnle
2016-12-16 14:46       ` Peter Zijlstra
2016-12-16 14:46         ` Peter Zijlstra
2016-12-16 17:15       ` Peter Zijlstra
2016-12-16 17:15         ` Peter Zijlstra
2016-12-16 18:11         ` Nicolai Hähnle
2016-12-16 20:00           ` Peter Zijlstra
2016-12-16 20:00             ` Peter Zijlstra
2016-12-16 22:35             ` Nicolai Hähnle
2016-12-16 17:20       ` Peter Zijlstra
2016-12-16 17:20         ` Peter Zijlstra
2016-12-16 18:12         ` Nicolai Hähnle
2016-12-16 18:12           ` Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 06/11] locking/ww_mutex: Notify waiters that have to back off while adding tasks to wait list Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 07/11] locking/ww_mutex: Wake at most one waiter for back off when acquiring the lock Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 08/11] locking/ww_mutex: Yield to other waiters from optimistic spin Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 09/11] locking/mutex: Initialize mutex_waiter::ww_ctx with poison when debugging Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 10/11] Documentation/locking/ww_mutex: Update the design document Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle
2016-12-01 14:06 ` [PATCH v2 11/11] [rfc] locking/ww_mutex: Always spin optimistically for the first waiter Nicolai Hähnle
2016-12-01 14:06   ` Nicolai Hähnle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480601214-26583-4-git-send-email-nhaehnle@gmail.com \
    --to=nhaehnle@gmail.com \
    --cc=Nicolai.Haehnle@amd.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel@ffwll.ch \
    --cc=dev@mblankhorst.nl \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.