From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jan Dakinevich <jan.dakinevich@virtuozzo.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Denis Lunev" <den@virtuozzo.com>,
"Roman Kagan" <rkagan@virtuozzo.com>,
"Denis Plotnikov" <dplotnikov@virtuozzo.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Vitaly Kuznetsov" <vkuznets@redhat.com>,
"Wanpeng Li" <wanpengli@tencent.com>,
"Jim Mattson" <jmattson@google.com>,
"Joerg Roedel" <joro@8bytes.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"x86@kernel.org" <x86@kernel.org>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Subject: Re: [PATCH v3 1/2] KVM: x86: always stop emulation on page fault
Date: Thu, 29 Aug 2019 18:06:15 -0700 [thread overview]
Message-ID: <20190830010615.GC27970@linux.intel.com> (raw)
In-Reply-To: <1567066988-23376-2-git-send-email-jan.dakinevich@virtuozzo.com>
On Thu, Aug 29, 2019 at 08:23:18AM +0000, Jan Dakinevich wrote:
> inject_emulated_exception() returns true if and only if nested page
> fault happens. However, page fault can come from guest page tables
> walk, either nested or not nested. In both cases we should stop an
> attempt to read under RIP and give guest to step over its own page
> fault handler.
>
> Fixes: 6ea6e84 ("KVM: x86: inject exceptions produced by x86_decode_insn")
Commit ids should be at least 12 chars, the full tag should be
Fixes: 6ea6e84309ca ("KVM: x86: inject exceptions produced by x86_decode_insn")
You can force this in your git config, e.g.
git config --global core.abbrev 12
Both patches in this series should probably have
Cc: <stable@vger.kernel.org>
Reviewed-and-tested-by: Sean Christopherson <sean.j.christopherson@intel.com>
> Cc: Denis Lunev <den@virtuozzo.com>
> Cc: Roman Kagan <rkagan@virtuozzo.com>
> Cc: Denis Plotnikov <dplotnikov@virtuozzo.com>
> Signed-off-by: Jan Dakinevich <jan.dakinevich@virtuozzo.com>
> ---
> arch/x86/kvm/x86.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index b4cfd78..6bf7b55 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -6537,8 +6537,13 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
> if (reexecute_instruction(vcpu, cr2, write_fault_to_spt,
> emulation_type))
> return EMULATE_DONE;
> - if (ctxt->have_exception && inject_emulated_exception(vcpu))
> + if (ctxt->have_exception) {
> + WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR);
> + WARN_ON_ONCE(exception_type(ctxt->exception.vector)
> + == EXCPT_TRAP);
> + inject_emulated_exception(vcpu);
> return EMULATE_DONE;
> + }
> if (emulation_type & EMULTYPE_SKIP)
> return EMULATE_FAIL;
> return handle_emulation_failure(vcpu, emulation_type);
> --
> 2.1.4
>
next prev parent reply other threads:[~2019-08-30 1:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 8:23 [PATCH v3 0/2] fix emulation error on Windows bootup Jan Dakinevich
2019-08-29 8:23 ` [PATCH v3 1/2] KVM: x86: always stop emulation on page fault Jan Dakinevich
2019-08-30 1:06 ` Sean Christopherson [this message]
2019-08-29 8:23 ` [PATCH v3 2/2] KVM: x86: set ctxt->have_exception in x86_decode_insn() Jan Dakinevich
2019-08-30 1:08 ` Sean Christopherson
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=20190830010615.GC27970@linux.intel.com \
--to=sean.j.christopherson@intel.com \
--cc=bp@alien8.de \
--cc=den@virtuozzo.com \
--cc=dplotnikov@virtuozzo.com \
--cc=hpa@zytor.com \
--cc=jan.dakinevich@virtuozzo.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkagan@virtuozzo.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--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).