From: Krish Sadhukhan <krish.sadhukhan@oracle.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, jmattson@google.com
Subject: [PATCH 3/4] kvm-unit-test: nVMX: Remove test_sysenter_field() and use test_canonical() instead
Date: Fri, 6 Dec 2019 18:13:01 -0500 [thread overview]
Message-ID: <20191206231302.3466-4-krish.sadhukhan@oracle.com> (raw)
In-Reply-To: <20191206231302.3466-1-krish.sadhukhan@oracle.com>
..as the latter already does what the former does.
Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Reviewed-by: Karl Heubaum <karl.heubaum@oracle.com>
---
x86/vmx_tests.c | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 7905861..5f836d4 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -6620,30 +6620,6 @@ static void virt_x2apic_mode_test(void)
assert_exit_reason(VMX_VMCALL);
}
-/*
- * On processors that support Intel 64 architecture, the IA32_SYSENTER_ESP
- * field and the IA32_SYSENTER_EIP field must each contain a canonical
- * address.
- *
- * [Intel SDM]
- */
-static void test_sysenter_field(u32 field, const char *name)
-{
- u64 addr_saved = vmcs_read(field);
-
- vmcs_write(field, NONCANONICAL);
- report_prefix_pushf("%s non-canonical", name);
- test_vmx_vmlaunch(VMXERR_ENTRY_INVALID_HOST_STATE_FIELD);
- report_prefix_pop();
-
- vmcs_write(field, 0xffffffff);
- report_prefix_pushf("%s canonical", name);
- test_vmx_vmlaunch(0);
- report_prefix_pop();
-
- vmcs_write(field, addr_saved);
-}
-
static void test_ctl_reg(const char *cr_name, u64 cr, u64 fixed0, u64 fixed1)
{
u64 val;
@@ -7432,8 +7408,8 @@ static void vmx_host_state_area_test(void)
test_host_ctl_regs();
- test_sysenter_field(HOST_SYSENTER_ESP, "HOST_SYSENTER_ESP");
- test_sysenter_field(HOST_SYSENTER_EIP, "HOST_SYSENTER_EIP");
+ test_canonical(HOST_SYSENTER_ESP, "HOST_SYSENTER_ESP", true);
+ test_canonical(HOST_SYSENTER_EIP, "HOST_SYSENTER_EIP", true);
test_host_efer();
test_load_host_pat();
--
2.20.1
next prev parent reply other threads:[~2019-12-06 23:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 23:12 [PATCH 0/4] KVM: nVMX: Check GUEST_SYSENTER_ESP and GUEST_SYSENTER_EIP on vmentry of nested guests Krish Sadhukhan
2019-12-06 23:12 ` [PATCH 1/4] " Krish Sadhukhan
2019-12-10 17:30 ` Paolo Bonzini
2019-12-10 17:57 ` Jim Mattson
2019-12-10 19:35 ` Krish Sadhukhan
2019-12-10 19:48 ` Jim Mattson
2019-12-10 20:29 ` Krish Sadhukhan
2019-12-10 20:36 ` Paolo Bonzini
2019-12-06 23:13 ` [PATCH 2/4] kvm-unit-test: nVMX: Modify test_canonical() to process guest fields also Krish Sadhukhan
2019-12-06 23:13 ` Krish Sadhukhan [this message]
2019-12-06 23:13 ` [PATCH 4/4] kvm-unit-test: nVMX: Test GUEST_SYSENTER_ESP and GUEST_SYSENTER_EIP on vmentry of nested guests Krish Sadhukhan
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=20191206231302.3466-4-krish.sadhukhan@oracle.com \
--to=krish.sadhukhan@oracle.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--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).