From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org,
Alexandre Chartre <alexandre.chartre@oracle.com>,
Peter Zijlstra <peterz@infradead.org>,
Juergen Gross <jgross@suse.com>
Subject: [patch V2 7/7] x86/kvm/vmx: Use native read/write_cr2()
Date: Wed, 08 Jul 2020 21:52:00 +0200 [thread overview]
Message-ID: <20200708195322.344731916@linutronix.de> (raw)
In-Reply-To: 20200708195153.746357686@linutronix.de
From: Thomas Gleixner <tglx@linutronix.de>
read/write_cr2() go throuh the paravirt XXL indirection, but nested VMX in
a XEN_PV guest is not supported.
Use the native variants.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/kvm/vmx/vmx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6683,13 +6683,13 @@ static noinstr void vmx_vcpu_enter_exit(
else if (static_branch_unlikely(&mds_user_clear))
mds_clear_cpu_buffers();
- if (vcpu->arch.cr2 != read_cr2())
- write_cr2(vcpu->arch.cr2);
+ if (vcpu->arch.cr2 != native_read_cr2())
+ native_write_cr2(vcpu->arch.cr2);
vmx->fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs,
vmx->loaded_vmcs->launched);
- vcpu->arch.cr2 = read_cr2();
+ vcpu->arch.cr2 = native_read_cr2();
/*
* VMEXIT disables interrupts (host state), but tracing and lockdep
next prev parent reply other threads:[~2020-07-08 19:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 19:51 [patch V2 0/7] x86/kvm: RCU/context tracking and instrumentation protections Thomas Gleixner
2020-07-08 19:51 ` [patch V2 1/7] x86/kvm: Move context tracking where it belongs Thomas Gleixner
2020-07-08 19:51 ` [patch V2 2/7] x86/kvm/vmx: Add hardirq tracing to guest enter/exit Thomas Gleixner
2020-07-08 19:51 ` [patch V2 3/7] x86/kvm/svm: Add hardirq tracing on " Thomas Gleixner
2020-07-08 19:51 ` [patch V2 4/7] x86/kvm/vmx: Move guest enter/exit into .noinstr.text Thomas Gleixner
2020-07-08 19:51 ` [patch V2 5/7] x86/kvm/svm: " Thomas Gleixner
2020-07-08 19:51 ` [patch V2 6/7] x86/kvm/svm: Use uninstrumented wrmsrl() to restore GS Thomas Gleixner
2020-07-08 19:52 ` Thomas Gleixner [this message]
2020-07-09 4:13 ` [patch V2 7/7] x86/kvm/vmx: Use native read/write_cr2() Jürgen Groß
2020-07-08 20:28 ` [patch V2 0/7] x86/kvm: RCU/context tracking and instrumentation protections 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=20200708195322.344731916@linutronix.de \
--to=tglx@linutronix.de \
--cc=alexandre.chartre@oracle.com \
--cc=jgross@suse.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=x86@kernel.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).