| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aAerQXIz8Aebqm8c@pathway.suse.cz>
Date: Tue, 22 Apr 2025 16:44:17 +0200
From: Petr Mladek <pmladek@...e.com>
To: "Paul E. McKenney" <paulmck@...nel.org>
Cc: linux-kernel@...r.kernel.org, kernel-team@...a.com,
Andrew Morton <akpm@...ux-foundation.org>,
Kuniyuki Iwashima <kuniyu@...zon.com>,
Mateusz Guzik <mjguzik@...il.com>,
Steven Rostedt <rostedt@...dmis.org>,
John Ogness <john.ogness@...utronix.de>,
Sergey Senozhatsky <senozhatsky@...omium.org>,
Jon Pan-Doh <pandoh@...gle.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Karolina Stolarek <karolina.stolarek@...cle.com>
Subject: Re: [PATCH v2 ratelimit 01/14] lib: Add trivial kunit test for
ratelimit
Hi,
I have been recently involved in a conversion of printf/scanf
selftests to KUnit. And I seem that there are some naming
conventions. Adding Kees into Cc.
On Fri 2025-04-18 10:13:46, Paul E. McKenney wrote:
> Add a simple single-threaded smoke test for lib/ratelimit.c
>
> To run on x86:
>
> make ARCH=x86_64 mrproper
> ./tools/testing/kunit/kunit.py run --arch x86_64 --kconfig_add CONFIG_TEST_RATELIMIT=y --kconfig_add CONFIG_SMP=y lib_ratelimit
>
> [ paulmck: Apply timeout feedback from Petr Mladek. ]
>
> Signed-off-by: Paul E. McKenney <paulmck@...nel.org>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Kuniyuki Iwashima <kuniyu@...zon.com>
> Cc: Mateusz Guzik <mjguzik@...il.com>
> Cc: Petr Mladek <pmladek@...e.com>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: John Ogness <john.ogness@...utronix.de>
> Cc: Sergey Senozhatsky <senozhatsky@...omium.org>
> Cc: Jon Pan-Doh <pandoh@...gle.com>
> Cc: Bjorn Helgaas <bhelgaas@...gle.com>
> Cc: Karolina Stolarek <karolina.stolarek@...cle.com>
> ---
> lib/Kconfig.debug | 11 ++++++
> lib/Makefile | 1 +
> lib/test_ratelimit.c | 79 ++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 91 insertions(+)
> create mode 100644 lib/test_ratelimit.c
>
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index 9fe4d8dfe5782..581d6a8489670 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -3232,6 +3232,17 @@ config TEST_OBJPOOL
>
> If unsure, say N.
>
> +config TEST_RATELIMIT
Most KUnit tests seems to follow the pattern <ITEM>_KUNIT_TEST.
You might want to use:
config RATELIMIT_KUNIT_TEST
> + tristate "Test module for correctness and stress of ratelimit" if !KUNIT_ALL_TESTS
tristate "KUnit Test for correctness and stress of ratelimit" if !KUNIT_ALL_TESTS
> + depends on KUNIT
> + default KUNIT_ALL_TESTS
> + help
> + This builds the "test_ratelimit" module that should be used
> + for correctness verification and concurrent testings of rate
> + limiting.
> +
> + If unsure, say N.
> +
> config INT_POW_KUNIT_TEST
> tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS
> depends on KUNIT
> --- /dev/null
> +++ b/lib/test_ratelimit.c
The commit db6fe4d61ece241 ("lib: Move KUnit tests into tests/ subdirectory")
moved many kunit test modules to lib/tests.
Also they renamed the printf/scanf test modules to <item>_kunit.c,
so this probably should be:
lib/tests/ratelimit_kunit.c
> @@ -0,0 +1,79 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
> +#include <kunit/test.h>
> +
> +#include <linux/ratelimit.h>
> +#include <linux/module.h>
> +
> +/* a simple boot-time regression test */
> +
> +#define TESTRL_INTERVAL (5 * HZ)
> +static DEFINE_RATELIMIT_STATE(testrl, TESTRL_INTERVAL, 3);
> +
> +#define test_ratelimited(test, expected) \
> + KUNIT_ASSERT_EQ(test, ___ratelimit(&testrl, "test_ratelimit_smoke"), (expected));
> +
> +static void test_ratelimit_smoke(struct kunit *test)
> +{
> + // Check settings.
> + KUNIT_ASSERT_GE(test, TESTRL_INTERVAL, 100);
> +
> + // Test normal operation.
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, false);
> +
> + schedule_timeout_idle(TESTRL_INTERVAL - 40);
> + test_ratelimited(test, false);
> +
> + schedule_timeout_idle(50);
> + test_ratelimited(test, true);
> +
> + schedule_timeout_idle(2 * TESTRL_INTERVAL);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> +
> + schedule_timeout_idle(TESTRL_INTERVAL - 40);
> + test_ratelimited(test, true);
> + schedule_timeout_idle(50);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, false);
> +
> + // Test disabling.
> + testrl.burst = 0;
> + test_ratelimited(test, false);
> + testrl.burst = 2;
> + testrl.interval = 0;
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> +
> + // Testing re-enabling.
BTW: I had to add the following sleep to make sure that the next call
was past the interval. Otherwise, the test failed.
schedule_timeout_idle(TESTRL_INTERVAL);
That said, this was needed when testing the original ___ratelimit()
implementation. It is not needed with the entire patchset applied.
I guess that it was solved by the 11th patch "[PATCH 11/14] ratelimit:
Force re-initialization when rate-limiting re-enabled".
> + testrl.interval = TESTRL_INTERVAL;
> + test_ratelimited(test, true);
> + test_ratelimited(test, true);
> + test_ratelimited(test, false);
> + test_ratelimited(test, false);
> +}
> +
> +static struct kunit_case sort_test_cases[] = {
> + KUNIT_CASE(test_ratelimit_smoke),
The test printed:
[ 75.479585] # test_ratelimit_smoke: Test should be marked slow (runtime: 25.326793644s)
The warning has gone when using:
KUNIT_CASE_SLOW(test_ratelimit_smoke),
> + {}
> +};
> +
> +static struct kunit_suite ratelimit_test_suite = {
> + .name = "lib_ratelimit",
> + .test_cases = sort_test_cases,
> +};
Best Regards,
Petr
Powered by blists - more mailing lists