FAILED: patch "[PATCH] mm/damon/tests/core-kunit: handle alloc failures on" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x eded254cb69044bd4abde87394ea44909708d7c0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010533-uncounted-stuffing-5fb6@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From eded254cb69044bd4abde87394ea44909708d7c0 Mon Sep 17 00:00:00 2001
From: SeongJae Park <[email protected]>
Date: Sat, 1 Nov 2025 11:20:02 -0700
Subject: [PATCH] mm/damon/tests/core-kunit: handle alloc failures on
damon_test_split_regions_of()
damon_test_split_regions_of() is assuming all dynamic memory allocation in it will succeed. Those are indeed likely in the real use cases since those allocations are too small to fail, but theoretically those could fail. In the case, inappropriate memory access can happen. Fix it by appropriately cleanup pre-allocated memory and skip the execution of the remaining tests in the failure cases.
mm/damon/tests/core-kunit.h +20 -0
@@ -278,15 +278,35 @@ static void damon_test_split_regions_of(struct kunit *test)struct damon_target *t;struct damon_region *r; +if (!c) +kunit_skip ("ctx alloc fail" ); t =damon_new_target (); +if (!t) { +damon_destroy_ctx (c); +kunit_skip (test,"target alloc fail" ); + } r =damon_new_region (0 ,22 ); +if (!r) { +damon_destroy_ctx (c); +damon_free_target (t); +kunit_skip (test,"region alloc fail" ); + }damon_add_region (r, t);damon_split_regions_of (t,2 ,DAMON_MIN_REGION );KUNIT_EXPECT_LE (test,damon_nr_regions (t),2u );damon_free_target (t); t =damon_new_target (); +if (!t) { +damon_destroy_ctx (c); +kunit_skip (test,"second target alloc fail" ); + } r =damon_new_region (0 ,220 ); +if (!r) { +damon_destroy_ctx (c); +damon_free_target (t); +kunit_skip (test,"second region alloc fail" ); + }damon_add_region (r, t);damon_split_regions_of (t,4 ,DAMON_MIN_REGION );KUNIT_EXPECT_LE (test,damon_nr_regions (t),4u );
SeongJae Park
maintainerPATCH 1/1 mm/damon/tests/core-kunit: handle alloc failures on damon_test_split_regions_of()
damon_test_split_regions_of() is assuming all dynamic memory allocation in it will succeed. Those are indeed likely in the real use cases since those allocations are too small to fail, but theoretically those could fail. In the case, inappropriate memory access can happen. Fix it by appropriately cleanup pre-allocated memory and skip the execution of the remaining tests in the failure cases.
--- mm/damon/core-test.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
mm/damon/core-test.h +20 -0
@@ -216,15 +216,35 @@ static void damon_test_split_regions_of(struct kunit *test)struct damon_target *t;struct damon_region *r; +if (!c) +kunit_skip (test,"ctx alloc fail" ); t =damon_new_target (); +if (!t) { +damon_destroy_ctx (c); +kunit_skip (test,"target alloc fail" ); + } r =damon_new_region (0 ,22 ); +if (!r) { +damon_destroy_ctx (c); +damon_free_target (t); +kunit_skip (test,"region alloc fail" ); + }damon_add_region (r, t);damon_split_regions_of (t,2 );KUNIT_EXPECT_LE (test,damon_nr_regions (t),2u );damon_free_target (t); t =damon_new_target (); +if (!t) { +damon_destroy_ctx (c); +kunit_skip (test,"second target alloc fail" ); + } r =damon_new_region (0 ,220 ); +if (!r) { +damon_destroy_ctx (c); +damon_free_target (t); +kunit_skip (test,"second region alloc fail" ); + }damon_add_region (r, t);damon_split_regions_of (t,4 );KUNIT_EXPECT_LE (test,damon_nr_regions (t),4u );
Signature · 1 line
2.47.3
SeongJae Park
maintainerQuoted 2 lines · On Mon, 05 Jan 2026 12:05:33 +0100 <[email protected]> wrote:
The patch below does not apply to the 6.6-stable tree.
[...]
Quoted 29 lines
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
eded254cb69044bd4abde87394ea44909708d7c0Mon Sep 17 00:00:00 2001From: SeongJae Park <[email protected]>
Date: Sat, 1 Nov 2025 11:20:02 -0700
Subject: [PATCH]mm/damon/tests/core-kunit: handle alloc failures on
damon_test_split_regions_of()
damon_test_split_regions_of()is assuming all dynamic memory allocation in it will succeed. Those are indeed likely in the real use cases since those allocations are too small to fail, but theoretically those could fail. In the case, inappropriate memory access can happen. Fix it by appropriately cleanup pre-allocated memory and skip the execution of the remaining tests in the failure cases.Fixes 17ccae8bb5c9 ("mm/damon: add kunit tests")Signed-off-by SeongJae Park <[email protected]>Cc Brendan Higgins <[email protected]>Cc David Gow <[email protected]>Cc Kefeng Wang <[email protected]>Cc <[email protected]> [5.15+]Signed-off-by Andrew Morton <[email protected]>mm/damon/tests/core-kunit.h +0
-0
mm/damon/tests/core-kunit.h static void damon_test_split_regions_of(struct kunit *test) · line 282
Quoted 5 lines
mm/damon/tests/core-kunit.h +2
-0@@ -278,15 +278,35 @@ static void damon_test_split_regions_of(struct kunit *test)struct damon_target *t;struct damon_region *r; +if (!c) +kunit_skip ("ctx alloc fail" );
FYI, the above diff breaks build because kunit_skip() receives two arguments. Yes, the upstreamed patch is broken. But, it was not noticed because a patch
[1] silently fixing the issue has merged into the mainline together, as a part of the same patch series.
My ported patch that just sent as a reply to this mail fixes this together.
[1] 80d725f96c44 ("mm/damon/tests/core-kunit: remove unused ctx in damon_test_split_regions_of()")
Thanks,
SJ
[...]