From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, Sean Christopherson <seanjc@google.com>,
Michal Luczaj <mhal@rbox.co>
Subject: [kvm-unit-tests PATCH v3 5/7] x86: emulator.c: Use ASM_TRY() for the UD_VECTOR cases
Date: Mon, 8 Aug 2022 16:47:05 +0000 [thread overview]
Message-ID: <20220808164707.537067-6-seanjc@google.com> (raw)
In-Reply-To: <20220808164707.537067-1-seanjc@google.com>
From: Michal Luczaj <mhal@rbox.co>
For #UD handling use ASM_TRY() instead of handle_exception().
Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
x86/emulator.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/x86/emulator.c b/x86/emulator.c
index e1272a6..cc20440 100644
--- a/x86/emulator.c
+++ b/x86/emulator.c
@@ -1094,27 +1094,23 @@ static void test_simplealu(u32 *mem)
report(*mem == 0x8400, "test");
}
-static void illegal_movbe_handler(struct ex_regs *regs)
-{
- extern char bad_movbe_cont;
-
- ++exceptions;
- regs->rip = (ulong)&bad_movbe_cont;
-}
-
static void test_illegal_movbe(void)
{
+ unsigned int vector;
+
if (!this_cpu_has(X86_FEATURE_MOVBE)) {
- report_skip("illegal movbe");
+ report_skip("MOVBE unsupported by CPU");
return;
}
- exceptions = 0;
- handle_exception(UD_VECTOR, illegal_movbe_handler);
- asm volatile(".byte 0x0f; .byte 0x38; .byte 0xf0; .byte 0xc0;\n\t"
- " bad_movbe_cont:" : : : "rax");
- report(exceptions == 1, "illegal movbe");
- handle_exception(UD_VECTOR, 0);
+ asm volatile(ASM_TRY("1f")
+ ".byte 0x0f; .byte 0x38; .byte 0xf0; .byte 0xc0;\n\t"
+ "1:"
+ : : : "memory", "rax");
+
+ vector = exception_vector();
+ report(vector == UD_VECTOR,
+ "Wanted #UD on MOVBE with /reg, got vector = %u", vector);
}
int main(void)
--
2.37.1.559.g78731f0fdb-goog
next prev parent reply other threads:[~2022-08-08 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-08 16:47 [kvm-unit-tests PATCH v3 0/7] x86: Illegal LEA test and FEP cleanups Sean Christopherson
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 1/7] x86: emulator.c: Save and restore exception handlers Sean Christopherson
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 2/7] x86: Dedup 32-bit vs. 64-bit ASM_TRY() by stealing kernel's __ASM_SEL() Sean Christopherson
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 3/7] x86: Introduce ASM_TRY_FEP() to handle exceptions on forced emulation Sean Christopherson
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 4/7] x86: Add helper to detect if forced emulation prefix is available Sean Christopherson
2022-08-08 16:47 ` Sean Christopherson [this message]
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 6/7] x86: Test emulator's handling of LEA with /reg Sean Christopherson
2022-08-08 16:47 ` [kvm-unit-tests PATCH v3 7/7] x86/pmu: Run the "emulation" test iff forced emulation is available Sean Christopherson
2022-08-10 19:06 ` [kvm-unit-tests PATCH v3 0/7] x86: Illegal LEA test and FEP cleanups Paolo Bonzini
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=20220808164707.537067-6-seanjc@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=mhal@rbox.co \
--cc=pbonzini@redhat.com \
/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).