]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
samples/damon/prcl: avoid starting DAMON before initialization
authorSeongJae Park <sj@kernel.org>
Tue, 9 Sep 2025 02:22:37 +0000 (19:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:16:54 +0000 (11:16 +0200)
commit e6b733ca2f99e968d696c2e812c8eb8e090bf37b upstream.

Commit 2780505ec2b4 ("samples/damon/prcl: fix boot time enable crash") is
somehow incompletely applying the origin patch [1].  It is missing the
part that avoids starting DAMON before module initialization.  Probably a
mistake during a merge has happened.  Fix it by applying the missed part
again.

Link: https://lkml.kernel.org/r/20250909022238.2989-3-sj@kernel.org
Link: https://lore.kernel.org/20250706193207.39810-3-sj@kernel.org
Fixes: 2780505ec2b4 ("samples/damon/prcl: fix boot time enable crash")
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
samples/damon/prcl.c

index 223f13a5a4ad432404726306c6c615bd08fb08a6..f971e61e6c5c008310adc21a611de832850abd4a 100644 (file)
@@ -124,6 +124,9 @@ static int damon_sample_prcl_enable_store(
        if (enabled == is_enabled)
                return 0;
 
+       if (!init_called)
+               return 0;
+
        if (enabled) {
                err = damon_sample_prcl_start();
                if (err)