The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: Danish Khateeb <danishkhateeb03@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	 Gregory Price <gourry@gourry.net>,
	"Liam R . Howlett" <liam@infradead.org>,
	 Vlastimil Babka <vbabka@kernel.org>,
	Jann Horn <jannh@google.com>, Pedro Falcato <pfalcato@suse.de>,
	 David Hildenbrand <david@kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	 Suren Baghdasaryan <surenb@google.com>,
	Michal Hocko <mhocko@suse.com>, Shuah Khan <shuah@kernel.org>,
	 linux-mm@kvack.org, linux-kselftest@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] selftests/mm: merge: keep the far mremap() targets in the carveout
Date: Thu, 22 Oct 2026 09:36:22 +0100	[thread overview]
Message-ID: <atnKsrZ752uBR6QT@gremlin> (raw)
In-Reply-To: <20261021164810.45846-1-danishkhateeb03@gmail.com>

On Wed, Oct 21, 2026 at 11:48:10AM -0500, Danish Khateeb wrote:
> The merge tests map their areas at fixed addresses within a 30-page
> PROT_NONE carveout. Several mremap() tests move an area 1000 or 2000
> pages away to separate it from the others, but those targets are outside
> the carveout, and MREMAP_FIXED unmaps whatever is mapped there.
>
> Under virtme-ng, the shared libraries are packed right above the
> carveout and the dynamic linker starts about 4 MiB above it. The moves
> then replace part of its text with an anonymous mapping, and the test
> crashes in its next lazily bound call:
>
>   merge[6980]: segfault at 7f7ebb3c1e60 ip 00007f7ebb3c1e60 sp 00007ffd35fbaec8 error 14
>
> Two to four of the mremap() tests then fail with "Test terminated
> unexpectedly by signal 11", depending on the exact layout. On a host
> where libc is mapped at a 2 MiB aligned address, the targets happen to
> land above the dynamic linker and the tests pass.
>
> Since the areas are all within the first 30 pages, moving one by 30
> pages is enough to keep it apart from the others. Add FAR_PAGES for
> that distance, move areas by FAR_PAGES or 2 * FAR_PAGES pages, and make
> the carveout 3 * FAR_PAGES pages so that it covers every target.
>
> Fixes: 4e25f85b9f85 ("tools/testing/selftests: add mremap() unfaulted/faulted test cases")
> Signed-off-by: Danish Khateeb <danishkhateeb03@gmail.com>

Hmm I don't know why I did it this way :))

With the comment dropped as mentioned below, LGTM and:

Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>

> ---
>
> Notes:
>     v2:
>     - Replace the 1000 and 2000 page offsets in the tests with FAR_PAGES
>       and 2 * FAR_PAGES, and derive the carveout size from FAR_PAGES,
>       instead of only enlarging the carveout (Gregory Price).
>     v1: https://lore.kernel.org/all/20261021011929.89150-1-danishkhateeb03@gmail.com/
>
>     Tested under virtme-ng (9p root, glibc 2.44) on next-20261020 with a
>     KASAN/lockdep kernel, three runs of each binary:
>
>       merge before:  pass:22 fail:4 skip:1 (SIGSEGV in ld-linux-x86-64.so.2)
>       merge after:   pass:26 fail:0 skip:1
>
>     On the host (glibc 2.44, libc mapped 2 MiB aligned) the results are the
>     same with and without the patch.
>
>     An LLM was used to help with this patch.
>
>  tools/testing/selftests/mm/merge.c | 39 ++++++++++++++++++------------
>  1 file changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c
> index 7dd2933417c1..208ad7e340fa 100644
> --- a/tools/testing/selftests/mm/merge.c
> +++ b/tools/testing/selftests/mm/merge.c
> @@ -22,9 +22,18 @@ FIXTURE(merge)
>  	struct procmap_fd procmap;
>  };
>
> +/*
> + * The tests map their areas within the first FAR_PAGES pages of the carveout,
> + * and some move an area FAR_PAGES or 2 * FAR_PAGES pages up to separate it
> + * from the others. MREMAP_FIXED unmaps whatever is mapped at the target, so
> + * the carveout must cover those targets too.
> + */

Please drop this comment, it's pretty self-explanatory what you're doing here.

> +#define FAR_PAGES	30
> +#define CARVEOUT_PAGES	(3 * FAR_PAGES)
> +
>  static char *map_carveout(unsigned int page_size)
>  {
> -	return mmap(NULL, 30 * page_size, PROT_NONE,
> +	return mmap(NULL, CARVEOUT_PAGES * page_size, PROT_NONE,
>  		    MAP_ANON | MAP_PRIVATE, -1, 0);
>  }
>
> @@ -73,7 +82,7 @@ FIXTURE_SETUP(merge)
>
>  FIXTURE_TEARDOWN(merge)
>  {
> -	ASSERT_EQ(munmap(self->carveout, 30 * self->page_size), 0);
> +	ASSERT_EQ(munmap(self->carveout, CARVEOUT_PAGES * self->page_size), 0);
>  	/* May fail for parent of forked process. */
>  	close_procmap(&self->procmap);
>  	/*
> @@ -115,7 +124,7 @@ FIXTURE_SETUP(merge_with_fork)
>
>  FIXTURE_TEARDOWN(merge_with_fork)
>  {
> -	ASSERT_EQ(munmap(self->carveout, 30 * self->page_size), 0);
> +	ASSERT_EQ(munmap(self->carveout, CARVEOUT_PAGES * self->page_size), 0);
>  	ASSERT_EQ(close_procmap(&self->procmap), 0);
>  	/* See above. */
>  	prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0);
> @@ -660,7 +669,7 @@ TEST_F(merge, mremap_unfaulted_to_faulted)
>
>  	/* Offset ptr2 further away. */
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -721,7 +730,7 @@ TEST_F(merge, mremap_unfaulted_behind_faulted)
>
>  	/* Offset ptr2 further away. */
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -785,12 +794,12 @@ TEST_F(merge, mremap_unfaulted_between_faulted)
>
>  	/* Offset ptr3 further away. */
>  	ptr3 = sys_mremap(ptr3, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + 2 * FAR_PAGES * page_size);
>  	ASSERT_NE(ptr3, MAP_FAILED);
>
>  	/* Offset ptr2 further away. */
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -870,13 +879,13 @@ TEST_F(merge, mremap_unfaulted_between_faulted_unfaulted)
>
>  	/* Offset ptr3 further away. */
>  	ptr3 = sys_mremap(ptr3, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + 2 * FAR_PAGES * page_size);
>  	ASSERT_NE(ptr3, MAP_FAILED);
>
>
>  	/* Offset ptr2 further away. */
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -1035,11 +1044,11 @@ TEST_F(merge, mremap_correct_placed_faulted)
>  	 */
>  	ptr3 = &ptr[10 * page_size];
>  	ptr3 = sys_mremap(ptr3, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + 2 * FAR_PAGES * page_size);
>  	ASSERT_NE(ptr3, MAP_FAILED);
>  	ptr2 = &ptr[5 * page_size];
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -1075,7 +1084,7 @@ TEST_F(merge, mremap_correct_placed_faulted)
>  	 *                  ptr2      \       ptr       \       ptr3
>  	 */
>  	ptr = sys_mremap(ptr, 5 * page_size, 5 * page_size,
> -			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr + page_size * 1000);
> +			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr, MAP_FAILED);
>
>  	/*
> @@ -1110,7 +1119,7 @@ TEST_F(merge, mremap_correct_placed_faulted)
>  	 *                  ptr2      \       ptr       \       ptr3
>  	 */
>  	ptr = sys_mremap(ptr, 5 * page_size, 5 * page_size,
> -			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr + page_size * 1000);
> +			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr, MAP_FAILED);
>
>  	/*
> @@ -1168,7 +1177,7 @@ TEST_F(merge, mremap_correct_placed_faulted)
>  	 *      ptr                     ptr3      \       ptr2
>  	 */
>  	ptr2 = sys_mremap(ptr2, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr2, MAP_FAILED);
>
>  	/*
> @@ -1203,7 +1212,7 @@ TEST_F(merge, mremap_correct_placed_faulted)
>  	 *            ptr                         \       ptr3
>  	 */
>  	ptr3 = sys_mremap(ptr3, 5 * page_size, 5 * page_size,
> -			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 1000);
> +			  MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + FAR_PAGES * page_size);
>  	ASSERT_NE(ptr3, MAP_FAILED);
>
>  	/*
>
> base-commit: fcec4f4bcc1101dbd7e3aff267856b3bbfe128c6
> --
> 2.56.0
>

--
Cheers, Lorenzo

      reply	other threads:[~2026-10-22  8:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-21 16:48 [PATCH v2] selftests/mm: merge: keep the far mremap() targets in the carveout Danish Khateeb
2026-10-22  8:36 ` Lorenzo Stoakes (ARM) [this message]

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=atnKsrZ752uBR6QT@gremlin \
    --to=ljs@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=danishkhateeb03@gmail.com \
    --cc=david@kernel.org \
    --cc=gourry@gourry.net \
    --cc=jannh@google.com \
    --cc=liam@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.com \
    --cc=pfalcato@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