From: Song Hu <husong@kylinos.cn>
To: linux-mm@kvack.org
Cc: akpm@linux-foundation.org, muchun.song@linux.dev,
osalvador@suse.de, david@kernel.org, ljs@kernel.org,
liam@infradead.org, vbabka@kernel.org, rppt@kernel.org,
surenb@google.com, mhocko@suse.com, shuah@kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Song Hu <husong@kylinos.cn>
Subject: [PATCH 2/2] selftests/mm: restore hidden hugetlb reservation scenarios
Date: Tue, 14 Jul 2026 10:16:30 +0800 [thread overview]
Message-ID: <20260714021630.1063823-1-husong@kylinos.cn> (raw)
A stray 'continue' in the main loop of charge_reserved_hugetlb.sh made
the "more than reservation", "more than cgroup limit", and "multiple
cgroups" scenarios unreachable, so they never ran.
Remove it so the first two run again. The third,
run_multiple_cgroup_test(), is separately broken -- a backslash
line-continuation breaks its local declarations and its hugetlb
reservation accounting does not charge as expected -- and has never run
in CI; skip it explicitly with a comment until fixed. Also correct two
`[[ "$method" == 2"" ]]` typos (harmless empty-string concatenation)
to plain `2`.
Signed-off-by: Song Hu <husong@kylinos.cn>
---
.../selftests/mm/charge_reserved_hugetlb.sh | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
index a1cfd3a349db..18b2f2060c61 100755
--- a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
+++ b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
@@ -439,11 +439,11 @@ for populate in "" "-o"; do
fi
# Skip populated shmem tests. Doesn't seem to be supported.
- if [[ "$method" == 2"" ]] && [[ "$populate" == "-o" ]]; then
+ if [[ "$method" == 2 ]] && [[ "$populate" == "-o" ]]; then
continue
fi
- if [[ "$method" == 2"" ]] && [[ "$reserve" == "-n" ]]; then
+ if [[ "$method" == 2 ]] && [[ "$reserve" == "-n" ]]; then
continue
fi
@@ -496,7 +496,6 @@ for populate in "" "-o"; do
echo 'PASS'
cleanup
- continue
echo
echo
echo
@@ -530,6 +529,15 @@ for populate in "" "-o"; do
cleanup
+ # The "multiple cgroups" scenario (run_multiple_cgroup_test) is
+ # multiply broken and has never run in CI: a backslash
+ # line-continuation breaks its local declarations, it passes
+ # reservation sizes in bytes rather than pages (unlike
+ # run_test), and its assertions compare page counts to byte
+ # values. Skip it until properly rewritten; the two scenarios
+ # above are restored by this change.
+ continue
+
echo
echo
echo
--
2.43.0
reply other threads:[~2026-07-14 2:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260714021630.1063823-1-husong@kylinos.cn \
--to=husong@kylinos.cn \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=liam@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=mhocko@suse.com \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=rppt@kernel.org \
--cc=shuah@kernel.org \
--cc=surenb@google.com \
--cc=vbabka@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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