Commit 1ec5d581 authored by Mehdi Ben Hadj Khelifa's avatar Mehdi Ben Hadj Khelifa Committed by Andrew Morton
Browse files

selftests/mm/uffd: remove static address usage in shmem_allocate_area() 

The current shmem_allocate_area() implementation uses a hardcoded virtual
base address (BASE_PMD_ADDR) as a hint for mmap() when creating
shmem-backed test areas.  This approach is fragile and may fail on systems
with ASLR or different virtual memory layouts, where the chosen address is
unavailable.

Replace the static base address with a dynamically reserved address range
obtained via mmap(NULL, ..., PROT_NONE).  The memfd-backed areas and their
alias are then mapped into that reserved region using MAP_FIXED,
preserving the original layout and aliasing semantics while avoiding
collisions with unrelated mappings.

This change improves robustness and portability of the test suite without
altering its behavior or coverage.

[mehdi.benhadjkhelifa@gmail.com: make cleanup code more clear, per Mike]
  Link: https://lkml.kernel.org/r/20251113142050.108638-1-mehdi.benhadjkhelifa@gmail.com
Link: https://lkml.kernel.org/r/20251111205739.420009-1-mehdi.benhadjkhelifa@gmail.com


Signed-off-by: default avatarMehdi Ben Hadj Khelifa <mehdi.benhadjkhelifa@gmail.com>
Suggested-by: default avatarMike Rapoport <rppt@kernel.org>
Reviewed-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Hunter <david.hunter.linux@gmail.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 603f67eb

tools/testing/selftests/mm/uffd-common.c

+15 −9
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
uffd_test_ops_t *uffd_test_ops;

uffd_test_case_ops_t *uffd_test_case_ops;



#define BASE_PMD_ADDR ((void *)(1UL << 30))



/* pthread_mutex_t starts at page offset 0 */

pthread_mutex_t *area_mutex(char *area, unsigned long nr, uffd_global_test_opts_t *gopts)
@@ -142,30 +141,37 @@ static int shmem_allocate_area(uffd_global_test_opts_t *gopts, void **alloc_area 
	unsigned long offset = is_src ? 0 : bytes;

	char *p = NULL, *p_alias = NULL;

	int mem_fd = uffd_mem_fd_create(bytes * 2, false);

	size_t region_size = bytes * 2 + hpage_size;



	/* TODO: clean this up.  Use a static addr is ugly */

	p = BASE_PMD_ADDR;

	if (!is_src)

		/* src map + alias + interleaved hpages */

		p += 2 * (bytes + hpage_size);

	void *reserve = mmap(NULL, region_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS,

			-1, 0);

	if (reserve == MAP_FAILED) {

		close(mem_fd);

		return -errno;

	}



	p = reserve;

	p_alias = p;

	p_alias += bytes;

	p_alias += hpage_size;  /* Prevent src/dst VMA merge */



	*alloc_area = mmap(p, bytes, PROT_READ | PROT_WRITE, MAP_SHARED,

	*alloc_area = mmap(p, bytes, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,

			   mem_fd, offset);

	if (*alloc_area == MAP_FAILED) {

		*alloc_area = NULL;

		munmap(reserve, region_size);

		close(mem_fd);

		return -errno;

	}

	if (*alloc_area != p)

		err("mmap of memfd failed at %p", p);



	area_alias = mmap(p_alias, bytes, PROT_READ | PROT_WRITE, MAP_SHARED,

	area_alias = mmap(p_alias, bytes, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,

			  mem_fd, offset);

	if (area_alias == MAP_FAILED) {

		munmap(*alloc_area, bytes);

		*alloc_area = NULL;

		munmap(reserve, region_size);

		close(mem_fd);

		return -errno;

	}

	if (area_alias != p_alias)