| 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: <20240815005520.1192374-13-sboyd@kernel.org>
Date: Wed, 14 Aug 2024 17:55:18 -0700
From: Stephen Boyd <sboyd@...nel.org>
To: Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>
Cc: linux-kernel@...r.kernel.org,
linux-clk@...r.kernel.org,
patches@...ts.linux.dev,
Nuno Sá <nuno.sa@...log.com>
Subject: [PATCH 12/12] WIP: clk: Test behavior of children clks after a parent is unregistered
When a parent clk is unregistered, descendant clks are orphaned and
removed from the clk tree. Test this scenario to make sure clk consumer
APIs with a child clk don't cause problems.
TODO: Fix the crashes
Cc: Nuno Sá <nuno.sa@...log.com>
Signed-off-by: Stephen Boyd <sboyd@...nel.org>
---
drivers/clk/clk_test.c | 60 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk_test.c b/drivers/clk/clk_test.c
index 591897162056..e6479c002023 100644
--- a/drivers/clk/clk_test.c
+++ b/drivers/clk/clk_test.c
@@ -3133,6 +3133,17 @@ static void clk_unregister_consumer_clk_unregister(struct kunit *test)
ctx->unregistered = true;
}
+static void clk_unregister_parent_consumer_clk_unregister(struct kunit *test)
+{
+ struct clk_unregister_consumer_clk_ctx *ctx = test->priv;
+ struct clk_hw *parent_hw = &ctx->parents[0].ctx.hw;
+ struct clk *parent_clk = ctx->parents[0].clk;
+
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, parent_clk);
+ KUNIT_ASSERT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), parent_clk));
+ KUNIT_ASSERT_EQ(test, 0, clk_hw_unregister_kunit(test, parent_hw));
+}
+
/* Test that clk_put() can be called after the clk_hw has been unregistered. */
static void clk_unregister_consumer_clk_put(struct kunit *test)
{
@@ -3143,6 +3154,15 @@ static void clk_unregister_consumer_clk_put(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, clk_put_kunit(test, ctx->clk));
}
+static void clk_unregister_parent_consumer_clk_put(struct kunit *test)
+{
+ struct clk_unregister_consumer_clk_ctx *ctx = test->priv;
+
+ clk_unregister_parent_consumer_clk_unregister(test);
+
+ KUNIT_EXPECT_EQ(test, 0, clk_put_kunit(test, ctx->clk));
+}
+
/* Test that clk_prepare() fails after the clk_hw has been unregistered. */
static void clk_unregister_consumer_clk_prepare_fails(struct kunit *test)
{
@@ -3358,6 +3378,24 @@ static void clk_unregister_consumer_clk_set_parent_fails(struct kunit *test)
KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), ctx->parents[0].clk));
}
+/*
+ * Test that clk_set_parent() doesn't re-parent the clk back to the clk that
+ * was unregistered.
+ */
+static void clk_unregister_parent_consumer_clk_set_parent(struct kunit *test)
+{
+ struct clk_unregister_consumer_clk_ctx *ctx = test->priv;
+
+ kunit_skip(test, "Fix in the core. This blows up spectacularly!");
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx->parents[0].clk);
+ KUNIT_ASSERT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), ctx->parents[0].clk));
+ KUNIT_ASSERT_EQ(test, 0, clk_hw_unregister_kunit(test, &ctx->parents[0].ctx.hw));
+
+ KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), NULL));
+ KUNIT_EXPECT_GT(test, 0, clk_set_parent(ctx->clk, ctx->parents[0].clk));
+ KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), NULL));
+}
+
/*
* Test that clk_get_parent() doesn't call the clk_op after the clk_hw has been
* unregistered and returns original parent.
@@ -3396,6 +3434,8 @@ static void clk_register_params_to_desc(const char *test_name,
* @test_name: Test name
* @_prev: Previous return value from this function
* @desc: Test description (to be filled in)
+ * @must_have_parents: True if struct clk_register_params::num_parents must be
+ * 1 or greater
*
* Use this function in KUNIT_CASE_PARAM to generate struct clk_init_data
* parameters for a test that registers clks. It will return combinations of
@@ -3404,7 +3444,8 @@ static void clk_register_params_to_desc(const char *test_name,
* Return: Test parameters in a struct clk_register_params.
*/
static const void *clk_register_gen_params(const char *test_name,
- const void *_prev, char *desc)
+ const void *_prev, char *desc,
+ bool must_have_parents)
{
const struct clk_register_params *prev = _prev;
struct clk_register_params *next;
@@ -3412,8 +3453,11 @@ static const void *clk_register_gen_params(const char *test_name,
next = krealloc(prev, sizeof(*next), GFP_KERNEL);
if (!next)
return NULL;
- if (!prev)
+ if (!prev) {
memset(next, 0, sizeof(*next));
+ if (must_have_parents)
+ next->num_parents = 1;
+ }
if (prev) {
if (next->clk_flags == 0)
@@ -3433,11 +3477,19 @@ static const void *clk_register_gen_params(const char *test_name,
return next;
}
+static const void *
+clk_unregister_parent_consumer_clk_gen_params(const void *prev,
+ char *desc)
+{
+ return clk_register_gen_params("parent", prev, desc, true);
+}
+
#define CLK_REGISTER_GEN_PARAMS(name) \
static const void *name##_gen_params(const void *prev, \
char *desc) \
{ \
- return clk_register_gen_params(#name, prev, desc); \
+ return clk_register_gen_params(#name, prev, desc, \
+ false); \
}
#define CLK_REGISTER_KUNIT_CASE_PARAM(name) \
@@ -3475,6 +3527,8 @@ static struct kunit_case clk_unregister_consumer_clk_test_cases[] = {
CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_set_parent_fails),
CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_get_parent_skips),
CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_put),
+ KUNIT_CASE_PARAM(clk_unregister_parent_consumer_clk_put, clk_unregister_parent_consumer_clk_gen_params),
+ KUNIT_CASE_PARAM(clk_unregister_parent_consumer_clk_set_parent, clk_unregister_parent_consumer_clk_gen_params),
{}
};
--
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Powered by blists - more mailing lists