From: Ankur Arora <ankur.a.arora@oracle•com>
To: linux-kernel@vger•kernel.org, linux-arch@vger•kernel.org,
linux-arm-kernel@lists•infradead.org, linux-pm@vger•kernel.org,
linux-next@vger•kernel.org, bpf@vger•kernel.org
Cc: arnd@arndb•de, catalin.marinas@arm•com, will@kernel•org,
peterz@infradead•org, akpm@linux-foundation•org,
mark.rutland@arm•com, harisokn@amazon•com, cl@gentwo•org,
ast@kernel•org, rafael@kernel•org, daniel.lezcano@linaro•org,
memxor@gmail•com, zhenglifeng1@huawei•com,
xueshuai@linux•alibaba.com, rdunlap@infradead•org,
david.laight.linux@gmail•com, joao.m.martins@oracle•com,
boris.ostrovsky@oracle•com, konrad.wilk@oracle•com,
ashok.bhat@arm•com, Ankur Arora <ankur.a.arora@oracle•com>,
Boqun Feng <boqun.feng@gmail•com>, Boqun Feng <boqun@kernel•org>,
Christoph Lameter <cl@linux•com>, Ingo Molnar <mingo@kernel•org>,
Konrad Dybcio <konradybcio@kernel•org>,
Mark Brown <broonie@kernel•org>
Subject: [PATCH v11 1/2] kunit: add tests for smp_cond_load_*_timeout()
Date: Thu, 21 May 2026 01:30:37 -0700 [thread overview]
Message-ID: <20260521083038.134260-1-ankur.a.arora@oracle.com> (raw)
In-Reply-To: <20260408122538.3610871-15-ankur.a.arora@oracle.com>
Add success and failure case tests for smp_cond_load_*_timeout().
All of the test cases wait on some state in smp_cond_load_*_timeout().
In the success case we spawn a kthread that pokes the bit.
Success or failure cases depend on the expected bit being set (or not).
Additionally in failure cases smp_cond_load_*_timeout() cannot return
before timeout.
Signed-off-by: Ankur Arora <ankur.a.arora@oracle•com>
Cc: Andrew Morton <akpm@linux-foundation•org>
Cc: Arnd Bergmann <arnd@arndb•de>
Cc: Boqun Feng <boqun.feng@gmail•com>
Cc: Boqun Feng <boqun@kernel•org>
Cc: Catalin Marinas <catalin.marinas@arm•com>
Cc: Christoph Lameter <cl@linux•com>
Cc: Haris Okanovic <harisokn@amazon•com>
Cc: Ingo Molnar <mingo@kernel•org>
Cc: Konrad Dybcio <konradybcio@kernel•org>
Cc: Mark Brown <broonie@kernel•org>
Cc: Peter Zijlstra <peterz@infradead•org>
Cc: Will Deacon <will@kernel•org>
---
Note: This fixes an error in the test case reported by Mark Brown
in https://lore.kernel.org/lkml/agr_RxvNtfASfevg@sirena.org.uk/.
There are three changes over the old version:
- One of the test conditions used in the test was much too strict.
The test was treating success as implying that the
smp_cond_load_relaxed_timeout() call has to return before timeout.
(runtime <= timeout_ns).
However, all that we know is that on failure (!success), the
smp_cond_load_relaxed_timeout() *cannot* return before timeout.
(runtime >= timeout_ns).
- The test can run in a wide variety of environments including in
emulation. So to reduce the chance of failure due to timing,
remove the kthreaded case.
- Parametrize the test cases.
---
lib/Kconfig.debug | 10 +++
lib/tests/Makefile | 1 +
lib/tests/barrier-timeout-test.c | 128 +++++++++++++++++++++++++++++++
3 files changed, 139 insertions(+)
create mode 100644 lib/tests/barrier-timeout-test.c
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index ce25724be414..9d54c48d7d98 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2413,6 +2413,16 @@ config FPROBE_SANITY_TEST
Say N if you are unsure.
+config BARRIER_TIMEOUT_TEST
+ tristate "KUnit tests for smp_cond_load_relaxed_timeout()"
+ depends on KUNIT
+ default KUNIT_ALL_TESTS
+ help
+ Builds KUnit tests that validate wake-up and timeout handling paths
+ in smp_cond_load_relaxed_timeout().
+
+ Say N if you are unsure.
+
config BACKTRACE_SELF_TEST
tristate "Self test for the backtrace code"
depends on DEBUG_KERNEL
diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index 7e9c2fa52e35..19c1d6b17856 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -20,6 +20,7 @@ CFLAGS_fortify_kunit.o += $(DISABLE_STRUCTLEAK_PLUGIN)
obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o
CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
+obj-$(CONFIG_BARRIER_TIMEOUT_TEST) += barrier-timeout-test.o
obj-$(CONFIG_GLOB_KUNIT_TEST) += glob_kunit.o
obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
diff --git a/lib/tests/barrier-timeout-test.c b/lib/tests/barrier-timeout-test.c
new file mode 100644
index 000000000000..2160844b27b8
--- /dev/null
+++ b/lib/tests/barrier-timeout-test.c
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit tests exercising smp_cond_load_relaxed_timeout().
+ *
+ * Copyright (c) 2026, Oracle Corp.
+ * Author: Ankur Arora <ankur.a.arora@oracle•com>
+ */
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+#include <linux/sched/clock.h>
+#include <linux/delay.h>
+#include <asm/barrier.h>
+#include <kunit/test.h>
+#include <kunit/visibility.h>
+
+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");
+
+struct clock_state {
+ s64 start_time;
+ s64 end_time;
+};
+
+#define TIMEOUT_MSEC 2
+#define TEST_FLAG_VAL BIT(2)
+static unsigned int flag;
+
+static s64 basic_clock(struct clock_state *clk)
+{
+ clk->end_time = local_clock();
+ return clk->end_time;
+}
+
+static void update_flags(void)
+{
+ WRITE_ONCE(flag, TEST_FLAG_VAL);
+}
+
+static s64 mocked_clock(struct clock_state *clk)
+{
+ s64 clk_mid = clk->start_time + (TIMEOUT_MSEC * NSEC_PER_MSEC)/2;
+
+ clk->end_time = local_clock();
+ if (clk->end_time >= clk_mid)
+ update_flags();
+ return clk->end_time;
+}
+
+typedef s64 (*clkfn_t)(struct clock_state *);
+struct smp_cond_update_params {
+ clkfn_t clock;
+ bool acquire;
+ bool succeeds;
+};
+
+static const struct smp_cond_update_params update_params_list[] = {
+ /* mocked-clock updates flag inline. */
+ { .clock = &mocked_clock, .succeeds=true, .acquire=false, },
+ { .clock = &mocked_clock, .succeeds=true, .acquire=true, },
+
+ /* basic-clock doesn't update flag. */
+ { .clock = &basic_clock, .succeeds=false, .acquire=true, },
+ { .clock = &basic_clock, .succeeds=false, .acquire=false, },
+};
+
+static void param_to_desc(const struct smp_cond_update_params *p, char *desc)
+{
+ char *clk, *update;
+
+ if (p->clock == &mocked_clock) {
+ clk = "mocked";
+ update = "inline";
+ } else if (p->clock == &basic_clock) {
+ clk = "basic";
+ update = "none";
+ }
+
+
+ snprintf(desc, KUNIT_PARAM_DESC_SIZE, "smp_cond_%s_timeout: clock-%s, update=%s",
+ p->acquire ? "acquire": "relaxed", clk, update);
+}
+
+KUNIT_ARRAY_PARAM(smp_cond_update_params, update_params_list, param_to_desc);
+
+
+static void test_smp_cond_timeout(struct kunit *test)
+{
+ const struct smp_cond_update_params *p = test->param_value;
+ struct clock_state clk = {
+ .start_time = local_clock(),
+ .end_time = local_clock(),
+ };
+ s64 runtime, timeout_ns = TIMEOUT_MSEC * NSEC_PER_MSEC;
+ unsigned int result;
+
+ flag = 0;
+ if (p->acquire) {
+ result = smp_cond_load_acquire_timeout(&flag,
+ (VAL & TEST_FLAG_VAL),
+ p->clock(&clk),
+ timeout_ns);
+ } else {
+ result = smp_cond_load_relaxed_timeout(&flag,
+ (VAL & TEST_FLAG_VAL),
+ p->clock(&clk),
+ timeout_ns);
+ }
+
+ runtime = clk.end_time - clk.start_time;
+ KUNIT_EXPECT_EQ(test, (bool)(result & TEST_FLAG_VAL), p->succeeds);
+ if (!p->succeeds)
+ KUNIT_EXPECT_GE(test, runtime, timeout_ns);
+}
+
+static struct kunit_case barrier_timeout_test_cases[] = {
+ KUNIT_CASE_PARAM(test_smp_cond_timeout, smp_cond_update_params_gen_params),
+ {}
+};
+
+static struct kunit_suite barrier_timeout_test_suite = {
+ .name = "smp-cond-load-*-timeout",
+ .test_cases = barrier_timeout_test_cases,
+};
+
+kunit_test_suite(barrier_timeout_test_suite);
+
+MODULE_DESCRIPTION("KUnit tests for smp_cond_load_relaxed_timeout()");
+MODULE_LICENSE("GPL");
--
2.43.7
next parent reply other threads:[~2026-05-21 8:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260408122538.3610871-15-ankur.a.arora@oracle.com>
2026-05-21 8:30 ` Ankur Arora [this message]
2026-05-21 8:30 ` [PATCH v11 2/2] kunit: add clock tests for smp_cond_load_relaxed_timeout() Ankur Arora
2026-05-21 21:46 ` [PATCH v11 1/2] kunit: add tests for smp_cond_load_*_timeout() Andrew Morton
2026-05-21 21:57 ` Mark Brown
2026-05-22 5:10 ` Ankur Arora
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=20260521083038.134260-1-ankur.a.arora@oracle.com \
--to=ankur.a.arora@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=ashok.bhat@arm$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=boqun.feng@gmail$(echo .)com \
--cc=boqun@kernel$(echo .)org \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=bpf@vger$(echo .)kernel.org \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=cl@gentwo$(echo .)org \
--cc=cl@linux$(echo .)com \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=david.laight.linux@gmail$(echo .)com \
--cc=harisokn@amazon$(echo .)com \
--cc=joao.m.martins@oracle$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=konradybcio@kernel$(echo .)org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-pm@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=memxor@gmail$(echo .)com \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=rafael@kernel$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=xueshuai@linux$(echo .)alibaba.com \
--cc=zhenglifeng1@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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