From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: cfontana@suse.de
Subject: [PATCH 31/50] target/i386: Assert !GUEST for user-only
Date: Sun, 28 Feb 2021 15:23:02 -0800 [thread overview]
Message-ID: <20210228232321.322053-32-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210228232321.322053-1-richard.henderson@linaro.org>
For user-only, we do not need to check for VMM intercept.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/tcg/translate.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 3779da9042..cd376a2c07 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -139,11 +139,13 @@ typedef struct DisasContext {
#define CPL(S) 3
#define IOPL(S) 0
#define SVME(S) false
+#define GUEST(S) false
#else
#define PE(S) (((S)->flags & HF_PE_MASK) != 0)
#define CPL(S) ((S)->cpl)
#define IOPL(S) ((S)->iopl)
#define SVME(S) (((S)->flags & HF_SVME_MASK) != 0)
+#define GUEST(S) (((S)->flags & HF_GUEST_MASK) != 0)
#endif
#if defined(CONFIG_USER_ONLY) && defined(TARGET_X86_64)
#define VM86(S) false
@@ -677,7 +679,7 @@ static void gen_check_io(DisasContext *s, MemOp ot, target_ulong cur_eip,
tcg_abort();
}
}
- if(s->flags & HF_GUEST_MASK) {
+ if (GUEST(s)) {
gen_update_cc_op(s);
gen_jmp_im(s, cur_eip);
svm_flags |= (1 << (4 + ot));
@@ -2417,8 +2419,9 @@ gen_svm_check_intercept_param(DisasContext *s, target_ulong pc_start,
uint32_t type, uint64_t param)
{
/* no SVM activated; fast case */
- if (likely(!(s->flags & HF_GUEST_MASK)))
+ if (likely(!GUEST(s))) {
return;
+ }
gen_update_cc_op(s);
gen_jmp_im(s, pc_start - s->cs_base);
gen_helper_svm_check_intercept_param(cpu_env, tcg_const_i32(type),
@@ -8511,6 +8514,7 @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
g_assert(LMA(dc) == ((flags & HF_LMA_MASK) != 0));
g_assert(ADDSEG(dc) == ((flags & HF_ADDSEG_MASK) != 0));
g_assert(SVME(dc) == ((flags & HF_SVME_MASK) != 0));
+ g_assert(GUEST(dc) == ((flags & HF_GUEST_MASK) != 0));
dc->cc_op = CC_OP_DYNAMIC;
dc->cc_op_dirty = false;
--
2.25.1
next prev parent reply other threads:[~2021-02-28 23:34 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 ` Richard Henderson [this message]
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 ` [PATCH 41/50] target/i386: Move invlpg, hlt, monitor, mwait to sysemu Richard Henderson
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-32-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).