From: David Hildenbrand <david@redhat.com>
To: "Ryan Roberts" <ryan.roberts@arm.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Shuah Khan" <shuah@kernel.org>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Mark Brown" <broonie@kernel.org>,
"John Hubbard" <jhubbard@nvidia.com>,
"Florent Revest" <revest@chromium.org>,
"Peter Xu" <peterx@redhat.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-kselftest@vger.kernel.org
Subject: Re: [PATCH v2 4/8] selftests/mm: Fix thuge-gen test bugs
Date: Mon, 17 Jul 2023 19:22:12 +0200 [thread overview]
Message-ID: <e9207c67-40d9-23c9-3c90-677e0a605566@redhat.com> (raw)
In-Reply-To: <20230717103152.202078-5-ryan.roberts@arm.com>
On 17.07.23 12:31, Ryan Roberts wrote:
> thuge-gen was previously only munmapping part of the mmapped buffer,
> which caused us to run out of 1G huge pages for a later part of the
> test. Fix this by munmapping the whole buffer. Based on the code, it
> looks like a typo rather than an intention to keep some of the buffer
> mapped.
>
> thuge-gen was also calling mmap with SHM_HUGETLB flag (bit 11 set),
> which is actually MAP_DENYWRITE in mmap context. The man page says this
> flag is ignored in modern kernels. I'm pretty sure from the context that
> the author intended to pass the MAP_HUGETLB flag so I've fixed that up
> too.
Makes sense to me.
>
> Signed-off-by: Ryan Roberts <ryan.roberts@arm.com>
> ---
> tools/testing/selftests/mm/thuge-gen.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c
> index 380ab5f0a534..16ed4dfa7359 100644
> --- a/tools/testing/selftests/mm/thuge-gen.c
> +++ b/tools/testing/selftests/mm/thuge-gen.c
> @@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags)
> before, after, before - after, size);
> assert(size == getpagesize() || (before - after) == NUM_PAGES);
> show(size);
> - err = munmap(map, size);
> + err = munmap(map, size * NUM_PAGES);
> assert(!err);
> }
>
> @@ -222,7 +222,7 @@ int main(void)
> test_mmap(ps, MAP_HUGETLB | arg);
> }
> printf("Testing default huge mmap\n");
> - test_mmap(default_hps, SHM_HUGETLB);
> + test_mmap(default_hps, MAP_HUGETLB);
>
> puts("Testing non-huge shmget");
> test_shmget(getpagesize(), 0);
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Cheers,
David / dhildenb
next prev parent reply other threads:[~2023-07-17 17:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 10:31 [PATCH v2 0/8] selftests/mm fixes for arm64 Ryan Roberts
2023-07-17 10:31 ` [PATCH v2 1/8] selftests: Line buffer test program's stdout Ryan Roberts
2023-07-17 17:22 ` Mark Brown
2023-07-17 10:31 ` [PATCH v2 2/8] selftests/mm: Skip soft-dirty tests on arm64 Ryan Roberts
2023-07-17 17:20 ` David Hildenbrand
2023-07-17 10:31 ` [PATCH v2 3/8] selftests/mm: Enable mrelease_test for arm64 Ryan Roberts
2023-07-17 10:31 ` [PATCH v2 4/8] selftests/mm: Fix thuge-gen test bugs Ryan Roberts
2023-07-17 17:22 ` David Hildenbrand [this message]
2023-07-17 10:31 ` [PATCH v2 5/8] selftests/mm: va_high_addr_switch should skip unsupported arm64 configs Ryan Roberts
2023-07-17 10:31 ` [PATCH v2 6/8] selftests/mm: Make migration test robust to failure Ryan Roberts
2023-07-17 17:40 ` David Hildenbrand
2023-07-18 10:49 ` Ryan Roberts
2023-07-18 11:23 ` David Hildenbrand
2023-07-18 11:24 ` David Hildenbrand
2023-07-18 12:42 ` Ryan Roberts
2023-07-18 15:24 ` David Hildenbrand
2023-07-17 10:31 ` [PATCH v2 7/8] selftests/mm: Optionally pass duration to transhuge-stress Ryan Roberts
2023-07-17 17:24 ` David Hildenbrand
2023-07-17 10:31 ` [PATCH v2 8/8] selftests/mm: Run all tests from run_vmtests.sh Ryan Roberts
2023-07-17 17:27 ` David Hildenbrand
2023-07-19 20:45 ` Peter Xu
2023-07-20 8:14 ` Ryan Roberts
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=e9207c67-40d9-23c9-3c90-677e0a605566@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterx@redhat.com \
--cc=revest@chromium.org \
--cc=ryan.roberts@arm.com \
--cc=shuah@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