From patchwork Wed May 30 23:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10440065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A5A4A60327 for ; Wed, 30 May 2018 23:00:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97DF8296BB for ; Wed, 30 May 2018 23:00:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96665296B8; Wed, 30 May 2018 23:00:21 +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=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL 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 7C63F296C2 for ; Wed, 30 May 2018 23:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932471AbeE3XAS (ORCPT ); Wed, 30 May 2018 19:00:18 -0400 Received: from mail-vk0-f74.google.com ([209.85.213.74]:52697 "EHLO mail-vk0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753734AbeE3XAR (ORCPT ); Wed, 30 May 2018 19:00:17 -0400 Received: by mail-vk0-f74.google.com with SMTP id t3-v6so1365082vkb.19 for ; Wed, 30 May 2018 16:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=0CVNdNPg00cWmOvy5/18WHCNRX/E6CEJa16CPNRmVWk=; b=gnf1nr1TlYYP0Nzv/d87+XbcFL3nl495n5gD7u2OeuJozIYt41TgVUGodOoRPKz6kD bSM/r0/Wnv/Ky+UycwZ7O6IJhHvCT5McbIIO7UNGIApHYTc+rDf9+GM7zsJmtSw30b2j S0rjp8g0skOwvsEobUe5ymx7N5zk1qtaryKvFrMZrp93TZthPE1MFGRQlUy/2yssS1Ex XOKdNkkDJ1M1qqfOYY81YLkN4f9iCylLrRnrKiu/Y1oAOgzzTlZfWNiBd9fJUT196cfG Z5IY7CC2q0BrB8a1V4bQJ4N+6eG7+y+/Sb8EQGeJ16hYFDkjt+b05YWUob6tijCMCPVC 3cig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=0CVNdNPg00cWmOvy5/18WHCNRX/E6CEJa16CPNRmVWk=; b=gSNaQ3MSZi+eFuqT88vbeAm7tfsuZF5mehtKIt7vSQiZjazzaVW99I2NPEwqHuT5vi OxivFLxvmdnliiUDffIS5ox0Rtg2r9aeHRoFkYAP52t9NhZ0P4RgT+KzxdNw97sti1Z8 BaN2K32dcYzkkERP372B0tI9xffNSo6CjLt8sb0MhiL49vvpX50b+wy2ecigDzyhkiTR XE0/Vk0f0m5ETAZPSCn9Qi8JL2BvzgmW+Pb0uGzCVgb/fETZg/EJR3SKwnXW89uByLHa 8rQYC5xh0W/SKsPAgm+sAx6A2EUOJIcmTNE0oNSohzu+ylI1sYyV1PY5f54eg0GjQwN7 sYLw== X-Gm-Message-State: ALKqPwdqxoxWvtTxeDo60yJj5EvL6MnXHYA1W6DOyuGYa32l5lrRbxI7 efE4iTOeijAgNIufJfu+SOyODzEJdeAkMsIYAMi6F3cdU6CzIHwrh+Jrv8v139lOxXyoL8b8oY/ dWpamVdOY/Y7cecaCzi7TyJLNLDiXUhi7+xRxAOSHtrIP53XwNCLYzonvhYfAVSo= X-Google-Smtp-Source: ADUXVKKZmEvHQUhU7mlMAWFdeiGy+OVi4LKDafFo3LpMtIVjpp7XBmj4ia7ELNGpU4k/n6dhsb0LMU4ErNxwBA== MIME-Version: 1.0 X-Received: by 2002:a1f:6083:: with SMTP id u125-v6mr1976837vkb.20.1527721216458; Wed, 30 May 2018 16:00:16 -0700 (PDT) Date: Wed, 30 May 2018 16:00:02 -0700 Message-Id: <20180530230002.123712-1-jmattson@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog Subject: [PATCH] kvm: nVMX: Restore exit qual for VM-entry failure due to MSR loading From: Jim Mattson To: kvm@vger.kernel.org, KarimAllah Ahmed Cc: Jim Mattson Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This exit qualification was inadvertently dropped when the two VM-entry failure blocks were coalesced. Fixes: e79f245ddec1 ("X86/KVM: Properly update 'tsc_offset' to represent the running guest") Signed-off-by: Jim Mattson Reviewed-by: Krish Sadhukhan Reviewed-by: David Hildenbrand --- arch/x86/kvm/vmx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index e50beb76d846e..fe5fe5787ea8b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -11612,7 +11612,6 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); struct vmcs12 *vmcs12 = get_vmcs12(vcpu); - u32 msr_entry_idx; u32 exit_qual; int r; @@ -11634,10 +11633,10 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu) nested_get_vmcs12_pages(vcpu, vmcs12); r = EXIT_REASON_MSR_LOAD_FAIL; - msr_entry_idx = nested_vmx_load_msr(vcpu, - vmcs12->vm_entry_msr_load_addr, - vmcs12->vm_entry_msr_load_count); - if (msr_entry_idx) + exit_qual = nested_vmx_load_msr(vcpu, + vmcs12->vm_entry_msr_load_addr, + vmcs12->vm_entry_msr_load_count); + if (exit_qual) goto fail; /*