mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Håkon Bugge" <haakon.bugge@oracle.com>
To: linux-kernel@vger.kernel.org,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>, Will Deacon <will@kernel.org>,
	Boqun Feng <boqun@kernel.org>, Waiman Long <longman@redhat.com>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Guenter Roeck <linux@roeck-us.net>
Cc: "Håkon Bugge" <haakon.bugge@oracle.com>,
	"Ingo Molnar" <mingo@kernel.org>
Subject: [PATCH 3/4] test-ww_mutex: Handle transient -EDEADLK in test_cycle_work
Date: Wed, 17 Jun 2026 14:13:32 +0200	[thread overview]
Message-ID: <20260617121335.2036954-4-haakon.bugge@oracle.com> (raw)
In-Reply-To: <20260617121335.2036954-1-haakon.bugge@oracle.com>

There is a timing issue in test_cycle_work(), in the sense that
acquiring *a_mutex* after deadlock has been detected on the *b_mutex*,
may not succeed immediately. This may lead to false negatives, which
shows up in the log as:

   cyclic deadlock not resolved, ret[77/93] = -35

We fix that by re-trying until the lock is acquired.

Fixes: d1b42b800e5d ("locking/ww_mutex: Add kselftests for resolving ww_mutex cyclic deadlocks")
Fixes: e4a02ed2aaf4 ("locking/ww_mutex: Fix runtime warning in the WW mutex selftest")
Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com>
---
 kernel/locking/test-ww_mutex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 5a4c92801bdfb..6b29a7a8f5fba 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -306,7 +306,9 @@ static void test_cycle_work(struct work_struct *work)
 		err = 0;
 		ww_mutex_unlock(&cycle->a_mutex);
 		ww_mutex_lock_slow(cycle->b_mutex, &ctx);
-		erra = ww_mutex_lock(&cycle->a_mutex, &ctx);
+		do {
+			erra = ww_mutex_lock(&cycle->a_mutex, &ctx);
+		} while (erra == -EDEADLK);
 	}
 
 	if (!err)
-- 
2.43.5


  parent reply	other threads:[~2026-06-17 12:14 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-17 12:13 [PATCH 0/4] test-ww_mutex: Miscellaneous fixes Håkon Bugge
2026-06-17 12:13 ` [PATCH 1/4] test-ww_mutex: Fix module cleanup Håkon Bugge
2026-06-18 17:49   ` John Stultz
2026-06-17 12:13 ` [PATCH 2/4] test-ww_mutex: Report errors from stress workers Håkon Bugge
2026-06-18 17:52   ` John Stultz
2026-07-09  0:03     ` John Stultz
2026-07-09 16:51       ` Haakon Bugge
2026-06-17 12:13 ` Håkon Bugge [this message]
2026-06-18 19:04   ` [PATCH 3/4] test-ww_mutex: Handle transient -EDEADLK in test_cycle_work John Stultz
2026-06-22 13:21     ` Haakon Bugge
2026-07-08 19:55       ` John Stultz
2026-07-09 17:05         ` Haakon Bugge
2026-06-17 12:13 ` [PATCH 4/4] test-ww_mutex: Retry lock acquisition after timeout if deadlocked Håkon Bugge
2026-06-18 18:55   ` John Stultz
2026-06-22 13:47     ` Haakon Bugge
2026-07-06  9:01       ` Haakon Bugge
2026-07-06  9:02         ` Haakon Bugge
2026-07-08 20:01       ` John Stultz
2026-07-09 16:56         ` Haakon Bugge

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=20260617121335.2036954-4-haakon.bugge@oracle.com \
    --to=haakon.bugge@oracle.com \
    --cc=boqun@kernel.org \
    --cc=chris@chris-wilson.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=longman@redhat.com \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=will@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®