From patchwork Tue Sep 18 23:03:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Hao X-Patchwork-Id: 10604977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69D581508 for ; Tue, 18 Sep 2018 23:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 564122B2B1 for ; Tue, 18 Sep 2018 23:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46CD62B2CA; Tue, 18 Sep 2018 23:04:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 833352B2B1 for ; Tue, 18 Sep 2018 23:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726079AbeISEjk (ORCPT ); Wed, 19 Sep 2018 00:39:40 -0400 Received: from mail115-95.sinamail.sina.com.cn ([218.30.115.95]:34909 "HELO mail115-95.sinamail.sina.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1725875AbeISEjk (ORCPT ); Wed, 19 Sep 2018 00:39:40 -0400 X-Greylist: delayed 25775 seconds by postgrey-1.27 at vger.kernel.org; Wed, 19 Sep 2018 00:39:39 EDT Received: from unknown (HELO localhost.localdomain.localdomain)([110.184.36.9]) by sina.com with ESMTP id 5BA1846200000F8B; Tue, 19 Sep 2018 07:04:11 +0800 (CST) X-Sender: penghao122@sina.com.cn X-Auth-ID: penghao122@sina.com.cn X-SMAIL-MID: 460227132372 From: Peng Hao To: pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org, peng.hao2@zte.com, Peng Hao Subject: [PATCH RESEND] kvm/x86: propagate fetch fault into guest Date: Tue, 18 Sep 2018 19:03:48 -0400 Message-Id: <1537311828-4547-1-git-send-email-penghao122@sina.com.cn> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Peng Hao When handling ept misconfig exit, it will call emulate instruction with insn_len = 0. The decode instruction function may return a fetch fault and should propagate to guest. The problem will result to emulation fail. KVM internal error. Suberror: 1 emulation failure EAX=f81a0024 EBX=f6a07000 ECX=f6a0737c EDX=f8be0118 ESI=f6a0737c EDI=00000021 EBP=f6929f98 ESP=f6929f98 EIP=f8bdd141 EFL=00010086 [--S--P-] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =007b 00000000 ffffffff 00c0f300 DPL=3 DS [-WA] CS =0060 00000000 ffffffff 00c09b00 DPL=0 CS32 [-RA] SS =0068 00000000 ffffffff 00c09300 DPL=0 DS [-WA] DS =007b 00000000 ffffffff 00c0f300 DPL=3 DS [-WA] FS =00d8 2c044000 ffffffff 00809300 DPL=0 DS16 [-WA] GS =0033 081a44c8 01000fff 00d0f300 DPL=3 DS [-WA] LDT=0000 00000000 ffffffff 00000000 TR =0080 f6ea0c80 0000206b 00008b00 DPL=0 TSS32-busy GDT= f6e99000 000000ff IDT= fffbb000 000007ff CR0=80050033 CR2=b757d000 CR3=35d31000 CR4=001406d0 Signed-off-by: Peng Hao Reviewed-by: Jiang Biao --- arch/x86/kvm/emulate.c | 5 ++++- arch/x86/kvm/x86.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 106482d..aecf9a72 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -5105,8 +5105,11 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) memcpy(ctxt->fetch.data, insn, insn_len); else { rc = __do_insn_fetch_bytes(ctxt, 1); - if (rc != X86EMUL_CONTINUE) + if (rc != X86EMUL_CONTINUE) { + if (rc == X86EMUL_PROPAGATE_FAULT) + ctxt->have_exception = true; return rc; + } } switch (mode) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 542f631..27072e1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6188,8 +6188,10 @@ 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) { + inject_emulated_exception(vcpu); return EMULATE_DONE; + } if (emulation_type & EMULTYPE_SKIP) return EMULATE_FAIL; return handle_emulation_failure(vcpu, emulation_type);