From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, alex.bennee@linaro.org
Subject: [PATCH v2 24/33] tests/tcg: Remove run-test-mmap-*
Date: Thu, 31 Aug 2023 19:23:22 -0700 [thread overview]
Message-ID: <20230901022331.115247-25-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230901022331.115247-1-richard.henderson@linaro.org>
These tests are confused, because -p does not change
the guest page size, but the host page size.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/tcg/alpha/Makefile.target | 3 ---
tests/tcg/arm/Makefile.target | 3 ---
tests/tcg/hppa/Makefile.target | 3 ---
tests/tcg/i386/Makefile.target | 3 ---
tests/tcg/m68k/Makefile.target | 3 ---
tests/tcg/multiarch/Makefile.target | 9 ---------
tests/tcg/ppc/Makefile.target | 12 ------------
tests/tcg/sh4/Makefile.target | 3 ---
tests/tcg/sparc64/Makefile.target | 6 ------
9 files changed, 45 deletions(-)
delete mode 100644 tests/tcg/ppc/Makefile.target
delete mode 100644 tests/tcg/sparc64/Makefile.target
diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target
index b94500a7d9..fdd7ddf64e 100644
--- a/tests/tcg/alpha/Makefile.target
+++ b/tests/tcg/alpha/Makefile.target
@@ -13,6 +13,3 @@ test-cmov: test-cond.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
run-test-cmov: test-cmov
-
-# On Alpha Linux only supports 8k pages
-EXTRA_RUNS+=run-test-mmap-8192
diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
index 0038cef02c..4b8c9c334e 100644
--- a/tests/tcg/arm/Makefile.target
+++ b/tests/tcg/arm/Makefile.target
@@ -79,6 +79,3 @@ sha512-vector: sha512.c
ARM_TESTS += sha512-vector
TESTS += $(ARM_TESTS)
-
-# On ARM Linux only supports 4k pages
-EXTRA_RUNS+=run-test-mmap-4096
diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target
index cdd0d572a7..ea5ae2186d 100644
--- a/tests/tcg/hppa/Makefile.target
+++ b/tests/tcg/hppa/Makefile.target
@@ -2,9 +2,6 @@
#
# HPPA specific tweaks - specifically masking out broken tests
-# On parisc Linux supports 4K/16K/64K (but currently only 4k works)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-16384 run-test-mmap-65536
-
# This triggers failures for hppa-linux about 1% of the time
# HPPA is the odd target that can't use the sigtramp page;
# it requires the full vdso with dwarf2 unwind info.
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index fdf757c6ce..f64d7bfbf5 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -71,9 +71,6 @@ endif
I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
TESTS=$(MULTIARCH_TESTS) $(I386_TESTS)
-# On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack)
-EXTRA_RUNS+=run-test-mmap-4096
-
sha512-sse: CFLAGS=-msse4.1 -O3
sha512-sse: sha512.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
diff --git a/tests/tcg/m68k/Makefile.target b/tests/tcg/m68k/Makefile.target
index 1163c7ef03..73a16aedd2 100644
--- a/tests/tcg/m68k/Makefile.target
+++ b/tests/tcg/m68k/Makefile.target
@@ -5,6 +5,3 @@
VPATH += $(SRC_PATH)/tests/tcg/m68k
TESTS += trap
-
-# On m68k Linux supports 4k and 8k pages (but 8k is currently broken)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
index 43bddeaf21..fa1ac190f2 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -51,18 +51,9 @@ run-plugin-vma-pthread-with-%: vma-pthread
$(call skip-test, $<, "flaky on CI?")
endif
-# We define the runner for test-mmap after the individual
-# architectures have defined their supported pages sizes. If no
-# additional page sizes are defined we only run the default test.
-
-# default case (host page size)
run-test-mmap: test-mmap
$(call run-test, test-mmap, $(QEMU) $<, $< (default))
-# additional page sizes (defined by each architecture adding to EXTRA_RUNS)
-run-test-mmap-%: test-mmap
- $(call run-test, test-mmap-$*, $(QEMU) -p $* $<, $< ($* byte pages))
-
ifneq ($(HAVE_GDB_BIN),)
ifeq ($(HOST_GDB_SUPPORTS_ARCH),y)
GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
diff --git a/tests/tcg/ppc/Makefile.target b/tests/tcg/ppc/Makefile.target
deleted file mode 100644
index f5e08c7376..0000000000
--- a/tests/tcg/ppc/Makefile.target
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# PPC - included from tests/tcg/Makefile
-#
-
-ifneq (,$(findstring 64,$(TARGET_NAME)))
-# On PPC64 Linux can be configured with 4k (default) or 64k pages (currently broken)
-EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-65536
-else
-# On PPC32 Linux supports 4K/16K/64K/256K (but currently only 4k works)
-EXTRA_RUNS+=run-test-mmap-4096 #run-test-mmap-16384 run-test-mmap-65536 run-test-mmap-262144
-endif
diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target
index 47c39a44b6..16eaa850a8 100644
--- a/tests/tcg/sh4/Makefile.target
+++ b/tests/tcg/sh4/Makefile.target
@@ -3,9 +3,6 @@
# SuperH specific tweaks
#
-# On sh Linux supports 4k, 8k, 16k and 64k pages (but only 4k currently works)
-EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-8192 run-test-mmap-16384 run-test-mmap-65536
-
# This triggers failures for sh4-linux about 10% of the time.
# Random SIGSEGV at unpredictable guest address, cause unknown.
run-signals: signals
diff --git a/tests/tcg/sparc64/Makefile.target b/tests/tcg/sparc64/Makefile.target
deleted file mode 100644
index 408dace783..0000000000
--- a/tests/tcg/sparc64/Makefile.target
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# sparc specific tweaks
-
-# On Sparc64 Linux support 8k pages
-EXTRA_RUNS+=run-test-mmap-8192
--
2.34.1
next prev parent reply other threads:[~2023-09-01 2:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 2:22 [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
2023-09-01 2:22 ` [PATCH v2 01/33] accel/tcg: Remove qemu_host_page_size from page_protect/page_unprotect Richard Henderson
2023-09-01 2:23 ` [PATCH v2 02/33] linux-user: Adjust SVr4 NULL page mapping Richard Henderson
2023-09-01 2:23 ` [PATCH v2 03/33] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Richard Henderson
2023-09-01 2:23 ` [PATCH v2 04/33] linux-user: Remove qemu_host_page_size from create_elf_tables Richard Henderson
2023-09-01 2:23 ` [PATCH v2 05/33] linux-user/hppa: Simplify init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 06/33] linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 07/33] linux-user/arm: " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 08/33] linux-user: Remove qemu_host_page_{size, mask} from mmap.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 09/33] linux-user: Remove REAL_HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 10/33] linux-user: Remove HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 11/33] migration: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 12/33] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Richard Henderson
2023-09-01 2:23 ` [PATCH v2 13/33] softmmu/physmem: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 14/33] softmmu/physmem: Remove HOST_PAGE_ALIGN Richard Henderson
2023-09-01 2:23 ` [PATCH v2 15/33] linux-user: Remove qemu_host_page_size from main Richard Henderson
2023-09-01 2:23 ` [PATCH v2 16/33] linux-user: Split out target_mmap__locked Richard Henderson
2023-09-01 2:23 ` [PATCH v2 17/33] linux-user: Move some mmap checks outside the lock Richard Henderson
2023-09-01 2:23 ` [PATCH v2 18/33] linux-user: Fix sub-host-page mmap Richard Henderson
2023-09-01 2:23 ` [PATCH v2 19/33] linux-user: Split out mmap_end Richard Henderson
2023-09-01 2:23 ` [PATCH v2 20/33] linux-user: Do early mmap placement only for reserved_va Richard Henderson
2023-09-01 2:23 ` [PATCH v2 21/33] linux-user: Split out mmap_h_eq_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 22/33] linux-user: Split out mmap_h_lt_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 23/33] linux-user: Split out mmap_h_gt_g Richard Henderson
2023-09-01 2:23 ` Richard Henderson [this message]
2023-09-01 2:23 ` [PATCH v2 25/33] tests/tcg: Extend file in linux-madvise.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 26/33] *-user: Deprecate and disable -p pagesize Richard Henderson
2023-09-01 2:26 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 27/33] cpu: Remove page_size_init Richard Henderson
2023-09-01 2:31 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 29/33] linux-user: Allow TARGET_PAGE_BITS_VARY Richard Henderson
2023-09-01 2:23 ` [PATCH v2 30/33] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 31/33] linux-user: Bound mmap_min_addr by host page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 32/33] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 33/33] target/alpha: " Richard Henderson
2023-09-29 1:05 ` [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
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=20230901022331.115247-25-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).