From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: cfontana@suse.de
Subject: [PATCH 41/50] target/i386: Move invlpg, hlt, monitor, mwait to sysemu
Date: Sun, 28 Feb 2021 15:23:12 -0800 [thread overview]
Message-ID: <20210228232321.322053-42-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210228232321.322053-1-richard.henderson@linaro.org>
These instructions are all privileged.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/helper.h | 8 ++--
target/i386/tcg/helper-tcg.h | 1 +
target/i386/tcg/misc_helper.c | 55 +---------------------------
target/i386/tcg/sysemu/misc_helper.c | 53 +++++++++++++++++++++++++++
target/i386/tcg/translate.c | 4 ++
5 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/target/i386/helper.h b/target/i386/helper.h
index ebfaca66dd..ab72eba52a 100644
--- a/target/i386/helper.h
+++ b/target/i386/helper.h
@@ -51,7 +51,6 @@ DEF_HELPER_FLAGS_3(set_dr, TCG_CALL_NO_WG, void, env, int, tl)
#endif /* !CONFIG_USER_ONLY */
DEF_HELPER_FLAGS_2(get_dr, TCG_CALL_NO_WG, tl, env, int)
-DEF_HELPER_2(invlpg, void, env, tl)
DEF_HELPER_1(sysenter, void, env)
DEF_HELPER_2(sysexit, void, env, int)
@@ -59,9 +58,6 @@ DEF_HELPER_2(sysexit, void, env, int)
DEF_HELPER_2(syscall, void, env, int)
DEF_HELPER_2(sysret, void, env, int)
#endif
-DEF_HELPER_FLAGS_2(hlt, TCG_CALL_NO_WG, noreturn, env, int)
-DEF_HELPER_FLAGS_2(monitor, TCG_CALL_NO_WG, void, env, tl)
-DEF_HELPER_FLAGS_2(mwait, TCG_CALL_NO_WG, noreturn, env, int)
DEF_HELPER_FLAGS_2(pause, TCG_CALL_NO_WG, noreturn, env, int)
DEF_HELPER_FLAGS_1(debug, TCG_CALL_NO_WG, noreturn, env)
DEF_HELPER_1(reset_rf, void, env)
@@ -115,6 +111,10 @@ DEF_HELPER_2(vmsave, void, env, int)
DEF_HELPER_1(stgi, void, env)
DEF_HELPER_1(clgi, void, env)
DEF_HELPER_2(invlpga, void, env, int)
+DEF_HELPER_2(invlpg, void, env, tl)
+DEF_HELPER_FLAGS_2(hlt, TCG_CALL_NO_WG, noreturn, env, int)
+DEF_HELPER_FLAGS_2(monitor, TCG_CALL_NO_WG, void, env, tl)
+DEF_HELPER_FLAGS_2(mwait, TCG_CALL_NO_WG, noreturn, env, int)
#endif /* !CONFIG_USER_ONLY */
/* x86 FPU */
diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h
index e848c3b4b9..cce350aa0b 100644
--- a/target/i386/tcg/helper-tcg.h
+++ b/target/i386/tcg/helper-tcg.h
@@ -80,6 +80,7 @@ extern const uint8_t parity_table[256];
/* misc_helper.c */
void cpu_load_eflags(CPUX86State *env, int eflags, int update_mask);
+void do_pause(CPUX86State *env) QEMU_NORETURN;
/* sysemu/svm_helper.c */
#ifndef CONFIG_USER_ONLY
diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c
index 20bf4771e7..180bed9021 100644
--- a/target/i386/tcg/misc_helper.c
+++ b/target/i386/tcg/misc_helper.c
@@ -60,14 +60,6 @@ void helper_cpuid(CPUX86State *env)
env->regs[R_EDX] = edx;
}
-void helper_invlpg(CPUX86State *env, target_ulong addr)
-{
- X86CPU *cpu = env_archcpu(env);
-
- cpu_svm_check_intercept_param(env, SVM_EXIT_INVLPG, 0, GETPC());
- tlb_flush_page(CPU(cpu), addr);
-}
-
void helper_rdtsc(CPUX86State *env)
{
uint64_t val;
@@ -100,7 +92,7 @@ void QEMU_NORETURN helper_rdpmc(CPUX86State *env)
raise_exception_err(env, EXCP06_ILLOP, 0);
}
-static void QEMU_NORETURN do_pause(CPUX86State *env)
+void QEMU_NORETURN do_pause(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
@@ -109,51 +101,6 @@ static void QEMU_NORETURN do_pause(CPUX86State *env)
cpu_loop_exit(cs);
}
-static void QEMU_NORETURN do_hlt(CPUX86State *env)
-{
- CPUState *cs = env_cpu(env);
-
- env->hflags &= ~HF_INHIBIT_IRQ_MASK; /* needed if sti is just before */
- cs->halted = 1;
- cs->exception_index = EXCP_HLT;
- cpu_loop_exit(cs);
-}
-
-void QEMU_NORETURN helper_hlt(CPUX86State *env, int next_eip_addend)
-{
- cpu_svm_check_intercept_param(env, SVM_EXIT_HLT, 0, GETPC());
- env->eip += next_eip_addend;
-
- do_hlt(env);
-}
-
-void helper_monitor(CPUX86State *env, target_ulong ptr)
-{
- if ((uint32_t)env->regs[R_ECX] != 0) {
- raise_exception_ra(env, EXCP0D_GPF, GETPC());
- }
- /* XXX: store address? */
- cpu_svm_check_intercept_param(env, SVM_EXIT_MONITOR, 0, GETPC());
-}
-
-void QEMU_NORETURN helper_mwait(CPUX86State *env, int next_eip_addend)
-{
- CPUState *cs = env_cpu(env);
-
- if ((uint32_t)env->regs[R_ECX] != 0) {
- raise_exception_ra(env, EXCP0D_GPF, GETPC());
- }
- cpu_svm_check_intercept_param(env, SVM_EXIT_MWAIT, 0, GETPC());
- env->eip += next_eip_addend;
-
- /* XXX: not complete but not completely erroneous */
- if (cs->cpu_index != 0 || CPU_NEXT(cs) != NULL) {
- do_pause(env);
- } else {
- do_hlt(env);
- }
-}
-
void QEMU_NORETURN helper_pause(CPUX86State *env, int next_eip_addend)
{
cpu_svm_check_intercept_param(env, SVM_EXIT_PAUSE, 0, GETPC());
diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/misc_helper.c
index ebf15e3dde..1d8b651212 100644
--- a/target/i386/tcg/sysemu/misc_helper.c
+++ b/target/i386/tcg/sysemu/misc_helper.c
@@ -434,3 +434,56 @@ void helper_rdmsr(CPUX86State *env)
env->regs[R_EAX] = (uint32_t)(val);
env->regs[R_EDX] = (uint32_t)(val >> 32);
}
+
+void helper_invlpg(CPUX86State *env, target_ulong addr)
+{
+ X86CPU *cpu = env_archcpu(env);
+
+ cpu_svm_check_intercept_param(env, SVM_EXIT_INVLPG, 0, GETPC());
+ tlb_flush_page(CPU(cpu), addr);
+}
+
+static void QEMU_NORETURN do_hlt(CPUX86State *env)
+{
+ CPUState *cs = env_cpu(env);
+
+ env->hflags &= ~HF_INHIBIT_IRQ_MASK; /* needed if sti is just before */
+ cs->halted = 1;
+ cs->exception_index = EXCP_HLT;
+ cpu_loop_exit(cs);
+}
+
+void QEMU_NORETURN helper_hlt(CPUX86State *env, int next_eip_addend)
+{
+ cpu_svm_check_intercept_param(env, SVM_EXIT_HLT, 0, GETPC());
+ env->eip += next_eip_addend;
+
+ do_hlt(env);
+}
+
+void helper_monitor(CPUX86State *env, target_ulong ptr)
+{
+ if ((uint32_t)env->regs[R_ECX] != 0) {
+ raise_exception_ra(env, EXCP0D_GPF, GETPC());
+ }
+ /* XXX: store address? */
+ cpu_svm_check_intercept_param(env, SVM_EXIT_MONITOR, 0, GETPC());
+}
+
+void QEMU_NORETURN helper_mwait(CPUX86State *env, int next_eip_addend)
+{
+ CPUState *cs = env_cpu(env);
+
+ if ((uint32_t)env->regs[R_ECX] != 0) {
+ raise_exception_ra(env, EXCP0D_GPF, GETPC());
+ }
+ cpu_svm_check_intercept_param(env, SVM_EXIT_MWAIT, 0, GETPC());
+ env->eip += next_eip_addend;
+
+ /* XXX: not complete but not completely erroneous */
+ if (cs->cpu_index != 0 || CPU_NEXT(cs) != NULL) {
+ do_pause(env);
+ } else {
+ do_hlt(env);
+ }
+}
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 708059ac15..aa6a8c4813 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -194,7 +194,11 @@ typedef struct DisasContext {
#ifdef CONFIG_USER_ONLY
STUB_HELPER(clgi, TCGv_env env)
+STUB_HELPER(hlt, TCGv_env env, TCGv_i32 pc_ofs)
STUB_HELPER(invlpga, TCGv_env env, TCGv_i32 aflag)
+STUB_HELPER(invlpg, TCGv_env env, TCGv addr)
+STUB_HELPER(monitor, TCGv_env env, TCGv addr)
+STUB_HELPER(mwait, TCGv_env env, TCGv_i32 pc_ofs)
STUB_HELPER(set_dr, TCGv_env env, TCGv_i32 reg, TCGv val)
STUB_HELPER(stgi, TCGv_env env)
STUB_HELPER(svm_check_intercept, TCGv_env env, TCGv_i32 type)
--
2.25.1
next prev parent reply other threads:[~2021-02-28 23:41 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 23:22 [PATCH 00/50] i386 cleanup part 3 Richard Henderson
2021-02-28 23:22 ` [PATCH 01/50] target/i386: Split out gen_exception_gpf Richard Henderson
2021-02-28 23:22 ` [PATCH 02/50] target/i386: Split out check_cpl0 Richard Henderson
2021-02-28 23:22 ` [PATCH 03/50] target/i386: Unify code paths for IRET Richard Henderson
2021-02-28 23:22 ` [PATCH 04/50] target/i386: Split out check_vm86_iopl Richard Henderson
2021-02-28 23:22 ` [PATCH 05/50] target/i386: Split out check_iopl Richard Henderson
2021-02-28 23:22 ` [PATCH 06/50] target/i386: Assert PE is set for user-only Richard Henderson
2021-02-28 23:22 ` [PATCH 07/50] target/i386: Assert CPL is 3 " Richard Henderson
2021-02-28 23:22 ` [PATCH 08/50] target/i386: Assert IOPL is 0 " Richard Henderson
2021-02-28 23:22 ` [PATCH 09/50] target/i386: Assert !VM86 for x86_64 user-only Richard Henderson
2021-02-28 23:22 ` [PATCH 10/50] target/i386: Assert CODE32 " Richard Henderson
2021-02-28 23:22 ` [PATCH 11/50] target/i386: Assert SS32 " Richard Henderson
2021-02-28 23:22 ` [PATCH 12/50] target/i386: Assert CODE64 " Richard Henderson
2021-02-28 23:22 ` [PATCH 13/50] target/i386: Assert LMA " Richard Henderson
2021-02-28 23:22 ` [PATCH 14/50] target/i386: Assert !ADDSEG " Richard Henderson
2021-02-28 23:22 ` [PATCH 15/50] target/i386: Introduce REX_PREFIX Richard Henderson
2021-02-28 23:22 ` [PATCH 16/50] target/i386: Tidy REX_B, REX_X definition Richard Henderson
2021-02-28 23:22 ` [PATCH 17/50] target/i386: Move rex_r into DisasContext Richard Henderson
2021-02-28 23:22 ` [PATCH 18/50] target/i386: Move rex_w " Richard Henderson
2021-02-28 23:22 ` [PATCH 19/50] target/i386: Remove DisasContext.f_st as unused Richard Henderson
2021-02-28 23:22 ` [PATCH 20/50] target/i386: Reduce DisasContext.flags to uint32_t Richard Henderson
2021-02-28 23:22 ` [PATCH 21/50] target/i386: Reduce DisasContext.override to int8_t Richard Henderson
2021-02-28 23:22 ` [PATCH 22/50] target/i386: Reduce DisasContext.prefix to uint8_t Richard Henderson
2021-02-28 23:22 ` [PATCH 23/50] target/i386: Reduce DisasContext.vex_[lv] " Richard Henderson
2021-03-01 7:51 ` Philippe Mathieu-Daudé
2021-02-28 23:22 ` [PATCH 24/50] target/i386: Reduce DisasContext popl_esp_hack and rip_offset " Richard Henderson
2021-02-28 23:22 ` [PATCH 25/50] target/i386: Leave TF in DisasContext.flags Richard Henderson
2021-02-28 23:22 ` [PATCH 26/50] target/i386: Reduce DisasContext jmp_opt, repz_opt to bool Richard Henderson
2021-02-28 23:22 ` [PATCH 27/50] target/i386: Fix the comment for repz_opt Richard Henderson
2021-02-28 23:22 ` [PATCH 28/50] target/i386: Reorder DisasContext members Richard Henderson
2021-02-28 23:23 ` [PATCH 29/50] target/i386: Add stub generator for helper_set_dr Richard Henderson
2021-02-28 23:23 ` [PATCH 30/50] target/i386: Assert !SVME for user-only Richard Henderson
2021-02-28 23:23 ` [PATCH 31/50] target/i386: Assert !GUEST " Richard Henderson
2021-02-28 23:23 ` [PATCH 32/50] target/i386: Implement skinit in translate.c Richard Henderson
2021-02-28 23:23 ` [PATCH 33/50] target/i386: Eliminate SVM helpers for user-only Richard Henderson
2021-02-28 23:23 ` [PATCH 34/50] target/i386: Mark some helpers as noreturn Richard Henderson
2021-02-28 23:23 ` [PATCH 35/50] target/i386: Simplify gen_debug usage Richard Henderson
2021-02-28 23:23 ` [PATCH 36/50] target/i386: Tidy svm_check_intercept from tcg Richard Henderson
2021-02-28 23:23 ` [PATCH 37/50] target/i386: Remove pc_start argument to gen_svm_check_intercept Richard Henderson
2021-02-28 23:23 ` [PATCH 38/50] target/i386: Remove user stub for cpu_vmexit Richard Henderson
2021-02-28 23:23 ` [PATCH 39/50] target/i386: Cleanup read_crN, write_crN, lmsw Richard Henderson
2021-02-28 23:23 ` [PATCH 40/50] target/i386: Pass env to do_pause and do_hlt Richard Henderson
2021-02-28 23:23 ` Richard Henderson [this message]
2021-02-28 23:23 ` [PATCH 42/50] target/i386: Unify invlpg, invlpga Richard Henderson
2021-02-28 23:23 ` [PATCH 43/50] target/i386: Inline user cpu_svm_check_intercept_param Richard Henderson
2021-02-28 23:23 ` [PATCH 44/50] target/i386: Eliminate user stubs for read/write_crN, rd/wrmsr Richard Henderson
2021-02-28 23:23 ` [PATCH 45/50] target/i386: Exit tb after wrmsr Richard Henderson
2021-02-28 23:23 ` [PATCH 46/50] target/i386: Tidy gen_check_io Richard Henderson
2021-02-28 23:23 ` [PATCH 47/50] target/i386: Pass in port to gen_check_io Richard Henderson
2021-02-28 23:23 ` [PATCH 48/50] target/i386: Create helper_check_io Richard Henderson
2021-03-01 7:57 ` Philippe Mathieu-Daudé
2021-02-28 23:23 ` [PATCH 49/50] target/i386: Move helper_check_io to sysemu Richard Henderson
2021-03-01 7:55 ` Philippe Mathieu-Daudé
2021-02-28 23:23 ` [PATCH 50/50] target/i386: Remove user-only i/o stubs Richard Henderson
2021-03-01 7:54 ` Philippe Mathieu-Daudé
2021-03-01 0:31 ` [PATCH 00/50] i386 cleanup part 3 no-reply
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=20210228232321.322053-42-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=cfontana@suse.de \
--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).