Commit 2f4db286 authored by Jinjiang Tu's avatar Jinjiang Tu Committed by Andrew Morton
Browse files

selftests/mm: remove unnecessary ia64 code and comment 

IA64 has gone with commit cf8e8658 ("arch: Remove Itanium (IA-64)
architecture"), so remove unnecessary ia64 special mm code and comment in
selftests too.

Link: https://lkml.kernel.org/r/20240819130609.3386195-1-tujinjiang@huawei.com


Signed-off-by: default avatarJinjiang Tu <tujinjiang@huawei.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nanyong Sun <sunnanyong@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 489a744e

tools/testing/selftests/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ endif 


endif



ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 powerpc riscv64 s390x sparc64 x86_64 s390))

ifneq (,$(filter $(ARCH),arm64 mips64 parisc64 powerpc riscv64 s390x sparc64 x86_64 s390))

TEST_GEN_FILES += va_high_addr_switch

TEST_GEN_FILES += virtual_address_range

TEST_GEN_FILES += write_to_hugetlbfs

tools/testing/selftests/mm/hugepage-mmap.c

+1 −17
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
 * like /mnt) using the command mount -t hugetlbfs nodev /mnt. In this

 * example, the app is requesting memory of size 256MB that is backed by

 * huge pages.

 *

 * For the ia64 architecture, the Linux kernel reserves Region number 4 for

 * huge pages.  That means that if one requires a fixed address, a huge page

 * aligned address starting with 0x800000... will be required.  If a fixed

 * address is not required, the kernel will select an address in the proper

 * range.

 * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.

 */

#define _GNU_SOURCE

#include <stdlib.h>
@@ -27,15 +20,6 @@ 
#define LENGTH (256UL*1024*1024)

#define PROTECTION (PROT_READ | PROT_WRITE)



/* Only ia64 requires this */

#ifdef __ia64__

#define ADDR (void *)(0x8000000000000000UL)

#define FLAGS (MAP_SHARED | MAP_FIXED)

#else

#define ADDR (void *)(0x0UL)

#define FLAGS (MAP_SHARED)

#endif



static void check_bytes(char *addr)

{

	ksft_print_msg("First hex is %x\n", *((unsigned int *)addr));
@@ -74,7 +58,7 @@ int main(void) 
	if (fd < 0)

		ksft_exit_fail_msg("memfd_create() failed: %s\n", strerror(errno));



	addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, fd, 0);

	addr = mmap(NULL, LENGTH, PROTECTION, MAP_SHARED, fd, 0);

	if (addr == MAP_FAILED) {

		close(fd);

		ksft_exit_fail_msg("mmap(): %s\n", strerror(errno));

tools/testing/selftests/mm/hugepage-shm.c

+1 −17
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
 * SHM_HUGETLB in the shmget system call to inform the kernel that it is

 * requesting huge pages.

 *

 * For the ia64 architecture, the Linux kernel reserves Region number 4 for

 * huge pages.  That means that if one requires a fixed address, a huge page

 * aligned address starting with 0x800000... will be required.  If a fixed

 * address is not required, the kernel will select an address in the proper

 * range.

 * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.

 *

 * Note: The default shared memory limit is quite low on many kernels,

 * you may need to increase it via:

 *
@@ -39,15 +32,6 @@ 


#define dprintf(x)  printf(x)



/* Only ia64 requires this */

#ifdef __ia64__

#define ADDR (void *)(0x8000000000000000UL)

#define SHMAT_FLAGS (SHM_RND)

#else

#define ADDR (void *)(0x0UL)

#define SHMAT_FLAGS (0)

#endif



int main(void)

{

	int shmid;
@@ -61,7 +45,7 @@ int main(void) 
	}

	printf("shmid: 0x%x\n", shmid);



	shmaddr = shmat(shmid, ADDR, SHMAT_FLAGS);

	shmaddr = shmat(shmid, NULL, 0);

	if (shmaddr == (char *)-1) {

		perror("Shared memory attach failure");

		shmctl(shmid, IPC_RMID, NULL);

tools/testing/selftests/mm/hugepage-vmemmap.c

+2 −15
Original line number Diff line number Diff line
@@ -22,20 +22,6 @@ 
#define PM_PFRAME_BITS		55

#define PM_PFRAME_MASK		~((1UL << PM_PFRAME_BITS) - 1)



/*

 * For ia64 architecture, Linux kernel reserves Region number 4 for hugepages.

 * That means the addresses starting with 0x800000... will need to be

 * specified.  Specifying a fixed address is not required on ppc64, i386

 * or x86_64.

 */

#ifdef __ia64__

#define MAP_ADDR		(void *)(0x8000000000000000UL)

#define MAP_FLAGS		(MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_FIXED)

#else

#define MAP_ADDR		NULL

#define MAP_FLAGS		(MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB)

#endif



static size_t pagesize;

static size_t maplength;
@@ -113,7 +99,8 @@ int main(int argc, char **argv) 
		exit(1);

	}



	addr = mmap(MAP_ADDR, maplength, PROT_READ | PROT_WRITE, MAP_FLAGS, -1, 0);

	addr = mmap(NULL, maplength, PROT_READ | PROT_WRITE,

			MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);

	if (addr == MAP_FAILED) {

		perror("mmap");

		exit(1);

tools/testing/selftests/mm/map_hugetlb.c

+2 −16
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ 
 * system call with MAP_HUGETLB flag.  Before running this program make

 * sure the administrator has allocated enough default sized huge pages

 * to cover the 256 MB allocation.

 *

 * For ia64 architecture, Linux kernel reserves Region number 4 for hugepages.

 * That means the addresses starting with 0x800000... will need to be

 * specified.  Specifying a fixed address is not required on ppc64, i386

 * or x86_64.

 */

#include <stdlib.h>

#include <stdio.h>
@@ -21,15 +16,6 @@ 
#define LENGTH (256UL*1024*1024)

#define PROTECTION (PROT_READ | PROT_WRITE)



/* Only ia64 requires this */

#ifdef __ia64__

#define ADDR (void *)(0x8000000000000000UL)

#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_FIXED)

#else

#define ADDR (void *)(0x0UL)

#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB)

#endif



static void check_bytes(char *addr)

{

	ksft_print_msg("First hex is %x\n", *((unsigned int *)addr));
@@ -60,7 +46,7 @@ int main(int argc, char **argv) 
	void *addr;

	size_t hugepage_size;

	size_t length = LENGTH;

	int flags = FLAGS;

	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB;

	int shift = 0;



	hugepage_size = default_huge_page_size();
@@ -85,7 +71,7 @@ int main(int argc, char **argv) 
		ksft_print_msg("Default size hugepages\n");

	ksft_print_msg("Mapping %lu Mbytes\n", (unsigned long)length >> 20);



	addr = mmap(ADDR, length, PROTECTION, flags, -1, 0);

	addr = mmap(NULL, length, PROTECTION, flags, -1, 0);

	if (addr == MAP_FAILED)

		ksft_exit_fail_msg("mmap: %s\n", strerror(errno));