* [PATCH v3 0/2] target/arm: allow DC CVA[D]P in user mode emulation @ 2023-05-19 20:43 Zhuojia Shen 2023-05-19 21:38 ` [PATCH v3 1/2] " Zhuojia Shen 2023-05-19 21:56 ` [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests Zhuojia Shen 0 siblings, 2 replies; 6+ messages in thread From: Zhuojia Shen @ 2023-05-19 20:43 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Richard Henderson, qemu-arm, Zhuojia Shen This patch series enables executing DC CVAP and DC CVADP instructions in AArch64 Linux user mode emulation and adds proper TCG tests. Changes in v3: - Fix typo of HWCAP2_DCPODP - Split tests into a separate patch - Remove unnecessary handling of SIGILL in tests - Merge 4 tests into 2 Changes in v2: - Fix code to deal with unmapped address - Add tests for DC'ing unmapped address Zhuojia Shen (2): target/arm: allow DC CVA[D]P in user mode emulation tests/tcg/aarch64: add DC CVA[D]P tests target/arm/helper.c | 6 ++-- tests/tcg/aarch64/Makefile.target | 11 ++++++ tests/tcg/aarch64/dcpodp.c | 58 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/dcpop.c | 58 +++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 tests/tcg/aarch64/dcpodp.c create mode 100644 tests/tcg/aarch64/dcpop.c -- 2.40.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] target/arm: allow DC CVA[D]P in user mode emulation 2023-05-19 20:43 [PATCH v3 0/2] target/arm: allow DC CVA[D]P in user mode emulation Zhuojia Shen @ 2023-05-19 21:38 ` Zhuojia Shen 2023-05-30 12:26 ` Peter Maydell 2023-05-19 21:56 ` [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests Zhuojia Shen 1 sibling, 1 reply; 6+ messages in thread From: Zhuojia Shen @ 2023-05-19 21:38 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Richard Henderson, qemu-arm, Zhuojia Shen DC CVAP and DC CVADP instructions can be executed in EL0 on Linux, either directly when SCTLR_EL1.UCI == 1 or emulated by the kernel (see user_cache_maint_handler() in arch/arm64/kernel/traps.c). This patch enables execution of the two instructions in user mode emulation. Signed-off-by: Zhuojia Shen <chaosdefinition@hotmail.com> --- target/arm/helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 0b7fd2e7e6..d4bee43bd0 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7405,7 +7405,6 @@ static const ARMCPRegInfo rndr_reginfo[] = { .access = PL0_R, .readfn = rndr_readfn }, }; -#ifndef CONFIG_USER_ONLY static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque, uint64_t value) { @@ -7420,6 +7419,7 @@ static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque, /* This won't be crossing page boundaries */ haddr = probe_read(env, vaddr, dline_size, mem_idx, GETPC()); if (haddr) { +#ifndef CONFIG_USER_ONLY ram_addr_t offset; MemoryRegion *mr; @@ -7430,6 +7430,7 @@ static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque, if (mr) { memory_region_writeback(mr, offset, dline_size); } +#endif /*CONFIG_USER_ONLY*/ } } @@ -7448,7 +7449,6 @@ static const ARMCPRegInfo dcpodp_reg[] = { .fgt = FGT_DCCVADP, .accessfn = aa64_cacheop_poc_access, .writefn = dccvap_writefn }, }; -#endif /*CONFIG_USER_ONLY*/ static CPAccessResult access_aa64_tid5(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) @@ -9092,7 +9092,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (cpu_isar_feature(aa64_tlbios, cpu)) { define_arm_cp_regs(cpu, tlbios_reginfo); } -#ifndef CONFIG_USER_ONLY /* Data Cache clean instructions up to PoP */ if (cpu_isar_feature(aa64_dcpop, cpu)) { define_one_arm_cp_reg(cpu, dcpop_reg); @@ -9101,7 +9100,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_one_arm_cp_reg(cpu, dcpodp_reg); } } -#endif /*CONFIG_USER_ONLY*/ /* * If full MTE is enabled, add all of the system registers. -- 2.40.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] target/arm: allow DC CVA[D]P in user mode emulation 2023-05-19 21:38 ` [PATCH v3 1/2] " Zhuojia Shen @ 2023-05-30 12:26 ` Peter Maydell 0 siblings, 0 replies; 6+ messages in thread From: Peter Maydell @ 2023-05-30 12:26 UTC (permalink / raw) To: Zhuojia Shen; +Cc: qemu-devel, Richard Henderson, qemu-arm On Fri, 19 May 2023 at 22:55, Zhuojia Shen <chaosdefinition@hotmail.com> wrote: > > DC CVAP and DC CVADP instructions can be executed in EL0 on Linux, > either directly when SCTLR_EL1.UCI == 1 or emulated by the kernel (see > user_cache_maint_handler() in arch/arm64/kernel/traps.c). > > This patch enables execution of the two instructions in user mode > emulation. > > Signed-off-by: Zhuojia Shen <chaosdefinition@hotmail.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests 2023-05-19 20:43 [PATCH v3 0/2] target/arm: allow DC CVA[D]P in user mode emulation Zhuojia Shen 2023-05-19 21:38 ` [PATCH v3 1/2] " Zhuojia Shen @ 2023-05-19 21:56 ` Zhuojia Shen 2023-05-30 12:28 ` Peter Maydell 1 sibling, 1 reply; 6+ messages in thread From: Zhuojia Shen @ 2023-05-19 21:56 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Richard Henderson, qemu-arm, Zhuojia Shen Test execution of DC CVAP and DC CVADP instructions under user mode emulation. Signed-off-by: Zhuojia Shen <chaosdefinition@hotmail.com> --- tests/tcg/aarch64/Makefile.target | 11 ++++++ tests/tcg/aarch64/dcpodp.c | 58 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/dcpop.c | 58 +++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 tests/tcg/aarch64/dcpodp.c create mode 100644 tests/tcg/aarch64/dcpop.c diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 0315795487..3430fd3cd8 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -21,12 +21,23 @@ config-cc.mak: Makefile $(quiet-@)( \ $(call cc-option,-march=armv8.1-a+sve, CROSS_CC_HAS_SVE); \ $(call cc-option,-march=armv8.1-a+sve2, CROSS_CC_HAS_SVE2); \ + $(call cc-option,-march=armv8.2-a, CROSS_CC_HAS_ARMV8_2); \ $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3); \ + $(call cc-option,-march=armv8.5-a, CROSS_CC_HAS_ARMV8_5); \ $(call cc-option,-mbranch-protection=standard, CROSS_CC_HAS_ARMV8_BTI); \ $(call cc-option,-march=armv8.5-a+memtag, CROSS_CC_HAS_ARMV8_MTE); \ $(call cc-option,-march=armv9-a+sme, CROSS_CC_HAS_ARMV9_SME)) 3> config-cc.mak -include config-cc.mak +ifneq ($(CROSS_CC_HAS_ARMV8_2),) +AARCH64_TESTS += dcpop +dcpop: CFLAGS += -march=armv8.2-a +endif +ifneq ($(CROSS_CC_HAS_ARMV8_5),) +AARCH64_TESTS += dcpodp +dcpodp: CFLAGS += -march=armv8.5-a +endif + # Pauth Tests ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS += pauth-1 pauth-2 pauth-4 pauth-5 diff --git a/tests/tcg/aarch64/dcpodp.c b/tests/tcg/aarch64/dcpodp.c new file mode 100644 index 0000000000..6f6301ac86 --- /dev/null +++ b/tests/tcg/aarch64/dcpodp.c @@ -0,0 +1,58 @@ +/* Test execution of DC CVADP instruction */ + +#include <asm/hwcap.h> +#include <sys/auxv.h> + +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> + +#ifndef HWCAP2_DCPODP +#define HWCAP2_DCPODP (1 << 0) +#endif + +bool should_fail = false; + +static void signal_handler(int sig, siginfo_t *si, void *data) +{ + ucontext_t *uc = (ucontext_t *)data; + + if (should_fail) { + uc->uc_mcontext.pc += 4; + } else { + exit(EXIT_FAILURE); + } +} + +static int do_dc_cvadp(void) +{ + struct sigaction sa = { + .sa_flags = SA_SIGINFO, + .sa_sigaction = signal_handler, + }; + + sigemptyset(&sa.sa_mask); + if (sigaction(SIGSEGV, &sa, NULL) < 0) { + perror("sigaction"); + return EXIT_FAILURE; + } + + asm volatile("dc cvadp, %0\n\t" :: "r"(&sa)); + + should_fail = true; + asm volatile("dc cvadp, %0\n\t" :: "r"(NULL)); + should_fail = false; + + return EXIT_SUCCESS; +} + +int main(void) +{ + if (getauxval(AT_HWCAP2) & HWCAP2_DCPODP) { + return do_dc_cvadp(); + } else { + printf("SKIP: no HWCAP2_DCPODP on this system\n"); + return EXIT_SUCCESS; + } +} diff --git a/tests/tcg/aarch64/dcpop.c b/tests/tcg/aarch64/dcpop.c new file mode 100644 index 0000000000..0c4d32cfe7 --- /dev/null +++ b/tests/tcg/aarch64/dcpop.c @@ -0,0 +1,58 @@ +/* Test execution of DC CVAP instruction */ + +#include <asm/hwcap.h> +#include <sys/auxv.h> + +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> + +#ifndef HWCAP_DCPOP +#define HWCAP_DCPOP (1 << 16) +#endif + +bool should_fail = false; + +static void signal_handler(int sig, siginfo_t *si, void *data) +{ + ucontext_t *uc = (ucontext_t *)data; + + if (should_fail) { + uc->uc_mcontext.pc += 4; + } else { + exit(EXIT_FAILURE); + } +} + +static int do_dc_cvap(void) +{ + struct sigaction sa = { + .sa_flags = SA_SIGINFO, + .sa_sigaction = signal_handler, + }; + + sigemptyset(&sa.sa_mask); + if (sigaction(SIGSEGV, &sa, NULL) < 0) { + perror("sigaction"); + return EXIT_FAILURE; + } + + asm volatile("dc cvap, %0\n\t" :: "r"(&sa)); + + should_fail = true; + asm volatile("dc cvap, %0\n\t" :: "r"(NULL)); + should_fail = false; + + return EXIT_SUCCESS; +} + +int main(void) +{ + if (getauxval(AT_HWCAP) & HWCAP_DCPOP) { + return do_dc_cvap(); + } else { + printf("SKIP: no HWCAP_DCPOP on this system\n"); + return EXIT_SUCCESS; + } +} -- 2.40.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests 2023-05-19 21:56 ` [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests Zhuojia Shen @ 2023-05-30 12:28 ` Peter Maydell 0 siblings, 0 replies; 6+ messages in thread From: Peter Maydell @ 2023-05-30 12:28 UTC (permalink / raw) To: Zhuojia Shen; +Cc: qemu-devel, Richard Henderson, qemu-arm On Fri, 19 May 2023 at 23:12, Zhuojia Shen <chaosdefinition@hotmail.com> wrote: > > Test execution of DC CVAP and DC CVADP instructions under user mode > emulation. > > Signed-off-by: Zhuojia Shen <chaosdefinition@hotmail.com> > --- > tests/tcg/aarch64/Makefile.target | 11 ++++++ > tests/tcg/aarch64/dcpodp.c | 58 +++++++++++++++++++++++++++++++ > tests/tcg/aarch64/dcpop.c | 58 +++++++++++++++++++++++++++++++ > 3 files changed, 127 insertions(+) > create mode 100644 tests/tcg/aarch64/dcpodp.c > create mode 100644 tests/tcg/aarch64/dcpop.c > diff --git a/tests/tcg/aarch64/dcpodp.c b/tests/tcg/aarch64/dcpodp.c > new file mode 100644 > index 0000000000..6f6301ac86 > --- /dev/null > +++ b/tests/tcg/aarch64/dcpodp.c > @@ -0,0 +1,58 @@ > +/* Test execution of DC CVADP instruction */ All new files should start with the standard brief comment stating the copyright and license. Otherwise Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20230518234605.276443-1-chaosdefinition@hotmail.com>]
* [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests [not found] <20230518234605.276443-1-chaosdefinition@hotmail.com> @ 2023-05-18 23:46 ` Zhuojia Shen 0 siblings, 0 replies; 6+ messages in thread From: Zhuojia Shen @ 2023-05-18 23:46 UTC (permalink / raw) To: qemu-devel Cc: Peter Maydell, Richard Henderson, Beata Michalska, qemu-arm, Zhuojia Shen Test execution of DC CVAP and DC CVADP instructions under user mode emulation. Signed-off-by: Zhuojia Shen <chaosdefinition@hotmail.com> --- tests/tcg/aarch64/Makefile.target | 11 ++++++ tests/tcg/aarch64/dcpodp.c | 58 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/dcpop.c | 58 +++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 tests/tcg/aarch64/dcpodp.c create mode 100644 tests/tcg/aarch64/dcpop.c diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 0315795487..3430fd3cd8 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -21,12 +21,23 @@ config-cc.mak: Makefile $(quiet-@)( \ $(call cc-option,-march=armv8.1-a+sve, CROSS_CC_HAS_SVE); \ $(call cc-option,-march=armv8.1-a+sve2, CROSS_CC_HAS_SVE2); \ + $(call cc-option,-march=armv8.2-a, CROSS_CC_HAS_ARMV8_2); \ $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3); \ + $(call cc-option,-march=armv8.5-a, CROSS_CC_HAS_ARMV8_5); \ $(call cc-option,-mbranch-protection=standard, CROSS_CC_HAS_ARMV8_BTI); \ $(call cc-option,-march=armv8.5-a+memtag, CROSS_CC_HAS_ARMV8_MTE); \ $(call cc-option,-march=armv9-a+sme, CROSS_CC_HAS_ARMV9_SME)) 3> config-cc.mak -include config-cc.mak +ifneq ($(CROSS_CC_HAS_ARMV8_2),) +AARCH64_TESTS += dcpop +dcpop: CFLAGS += -march=armv8.2-a +endif +ifneq ($(CROSS_CC_HAS_ARMV8_5),) +AARCH64_TESTS += dcpodp +dcpodp: CFLAGS += -march=armv8.5-a +endif + # Pauth Tests ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS += pauth-1 pauth-2 pauth-4 pauth-5 diff --git a/tests/tcg/aarch64/dcpodp.c b/tests/tcg/aarch64/dcpodp.c new file mode 100644 index 0000000000..6f6301ac86 --- /dev/null +++ b/tests/tcg/aarch64/dcpodp.c @@ -0,0 +1,58 @@ +/* Test execution of DC CVADP instruction */ + +#include <asm/hwcap.h> +#include <sys/auxv.h> + +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> + +#ifndef HWCAP2_DCPODP +#define HWCAP2_DCPODP (1 << 0) +#endif + +bool should_fail = false; + +static void signal_handler(int sig, siginfo_t *si, void *data) +{ + ucontext_t *uc = (ucontext_t *)data; + + if (should_fail) { + uc->uc_mcontext.pc += 4; + } else { + exit(EXIT_FAILURE); + } +} + +static int do_dc_cvadp(void) +{ + struct sigaction sa = { + .sa_flags = SA_SIGINFO, + .sa_sigaction = signal_handler, + }; + + sigemptyset(&sa.sa_mask); + if (sigaction(SIGSEGV, &sa, NULL) < 0) { + perror("sigaction"); + return EXIT_FAILURE; + } + + asm volatile("dc cvadp, %0\n\t" :: "r"(&sa)); + + should_fail = true; + asm volatile("dc cvadp, %0\n\t" :: "r"(NULL)); + should_fail = false; + + return EXIT_SUCCESS; +} + +int main(void) +{ + if (getauxval(AT_HWCAP2) & HWCAP2_DCPODP) { + return do_dc_cvadp(); + } else { + printf("SKIP: no HWCAP2_DCPODP on this system\n"); + return EXIT_SUCCESS; + } +} diff --git a/tests/tcg/aarch64/dcpop.c b/tests/tcg/aarch64/dcpop.c new file mode 100644 index 0000000000..0c4d32cfe7 --- /dev/null +++ b/tests/tcg/aarch64/dcpop.c @@ -0,0 +1,58 @@ +/* Test execution of DC CVAP instruction */ + +#include <asm/hwcap.h> +#include <sys/auxv.h> + +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> + +#ifndef HWCAP_DCPOP +#define HWCAP_DCPOP (1 << 16) +#endif + +bool should_fail = false; + +static void signal_handler(int sig, siginfo_t *si, void *data) +{ + ucontext_t *uc = (ucontext_t *)data; + + if (should_fail) { + uc->uc_mcontext.pc += 4; + } else { + exit(EXIT_FAILURE); + } +} + +static int do_dc_cvap(void) +{ + struct sigaction sa = { + .sa_flags = SA_SIGINFO, + .sa_sigaction = signal_handler, + }; + + sigemptyset(&sa.sa_mask); + if (sigaction(SIGSEGV, &sa, NULL) < 0) { + perror("sigaction"); + return EXIT_FAILURE; + } + + asm volatile("dc cvap, %0\n\t" :: "r"(&sa)); + + should_fail = true; + asm volatile("dc cvap, %0\n\t" :: "r"(NULL)); + should_fail = false; + + return EXIT_SUCCESS; +} + +int main(void) +{ + if (getauxval(AT_HWCAP) & HWCAP_DCPOP) { + return do_dc_cvap(); + } else { + printf("SKIP: no HWCAP_DCPOP on this system\n"); + return EXIT_SUCCESS; + } +} -- 2.40.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-30 12:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-19 20:43 [PATCH v3 0/2] target/arm: allow DC CVA[D]P in user mode emulation Zhuojia Shen
2023-05-19 21:38 ` [PATCH v3 1/2] " Zhuojia Shen
2023-05-30 12:26 ` Peter Maydell
2023-05-19 21:56 ` [PATCH v3 2/2] tests/tcg/aarch64: add DC CVA[D]P tests Zhuojia Shen
2023-05-30 12:28 ` Peter Maydell
[not found] <20230518234605.276443-1-chaosdefinition@hotmail.com>
2023-05-18 23:46 ` Zhuojia Shen
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).