From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8608C432C0 for ; Mon, 2 Dec 2019 14:51:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F35B20833 for ; Mon, 2 Dec 2019 14:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575298270; bh=nltjLLYixOrKRPkRTFLX6Xk/JRIw/DjlSVOlwBIbnHA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Af0wZ4kplOZV1Dnedvcxj6KJ6YJ1T9ZNDGbUnUoTOWRIcGT5GslNnNpZ97VNBDYBi dUHHi69aKegoRhUlnCIUA3mh9aX8uxkMIDbsR8tsC1QKbdFbbj3+KbuRBwRXu5lWKc BpZ3rcpiTU4vuSv6LEE3IMLOqMsXEVASgPlCeXI4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727423AbfLBOvK (ORCPT ); Mon, 2 Dec 2019 09:51:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:39666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727420AbfLBOvJ (ORCPT ); Mon, 2 Dec 2019 09:51:09 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6EAB2073C; Mon, 2 Dec 2019 14:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575298268; bh=nltjLLYixOrKRPkRTFLX6Xk/JRIw/DjlSVOlwBIbnHA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=H5l/+NezE+LKWA0Y/Id4jNPzQT1d/LSLfUcx0AvcLAP7Rzw+78JrzgDO3CxdcCn51 nDt6HcGgFsRWxogXS8CQd3/MfzfMBsX2+V9CgITPfHTCXcqZHWQ21bK7NrekeLU9Ax PJ1lcLxhiou5OaHvpU4wB2kGhP4MCT3mcsx9MR9A= Date: Mon, 2 Dec 2019 15:51:05 +0100 From: Greg Kroah-Hartman To: Jack Wang Cc: linux-kernel@vger.kernel.org, stable , Sean Christopherson , Jim Mattson , Paolo Bonzini , Sasha Levin Subject: Re: [PATCH 4.19 067/306] KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode() Message-ID: <20191202145105.GA571975@kroah.com> References: <20191127203114.766709977@linuxfoundation.org> <20191127203119.676489279@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.12.2 (2019-09-21) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Dec 02, 2019 at 03:40:04PM +0100, Jack Wang wrote: > Greg Kroah-Hartman 于2019年11月27日周三 下午10:30写道： > > > > From: Sean Christopherson > > > > [ Upstream commit 7671ce21b13b9596163a29f4712cb2451a9b97dc ] > > > > In preparation of supporting checkpoint/restore for nested state, > > commit ca0bde28f2ed ("kvm: nVMX: Split VMCS checks from nested_vmx_run()") > > modified check_vmentry_postreqs() to only perform the guest EFER > > consistency checks when nested_run_pending is true. But, in the > > normal nested VMEntry flow, nested_run_pending is only set after > > check_vmentry_postreqs(), i.e. the consistency check is being skipped. > > > > Alternatively, nested_run_pending could be set prior to calling > > check_vmentry_postreqs() in nested_vmx_run(), but placing the > > consistency checks in nested_vmx_enter_non_root_mode() allows us > > to split prepare_vmcs02() and interleave the preparation with > > the consistency checks without having to change the call sites > > of nested_vmx_enter_non_root_mode(). In other words, the rest > > of the consistency check code in nested_vmx_run() will be joining > > the postreqs checks in future patches. > > > > Fixes: ca0bde28f2ed ("kvm: nVMX: Split VMCS checks from nested_vmx_run()") > > Signed-off-by: Sean Christopherson > > Cc: Jim Mattson > > Reviewed-by: Jim Mattson > > Signed-off-by: Paolo Bonzini > > Signed-off-by: Sasha Levin > > --- > > arch/x86/kvm/vmx.c | 10 +++------- > > 1 file changed, 3 insertions(+), 7 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > > index fe7fdd666f091..bdf019f322117 100644 > > --- a/arch/x86/kvm/vmx.c > > +++ b/arch/x86/kvm/vmx.c > > @@ -12694,6 +12694,9 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, u32 *exit_qual) > > if (likely(!evaluate_pending_interrupts) && kvm_vcpu_apicv_active(vcpu)) > > evaluate_pending_interrupts |= vmx_has_apicv_interrupt(vcpu); > > > > + if (from_vmentry && check_vmentry_postreqs(vcpu, vmcs12, exit_qual)) > > + return EXIT_REASON_INVALID_STATE; > > + > > enter_guest_mode(vcpu); > > > > if (!(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS)) > > @@ -12836,13 +12839,6 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) > > */ > > skip_emulated_instruction(vcpu); > > > > - ret = check_vmentry_postreqs(vcpu, vmcs12, &exit_qual); > > - if (ret) { > > - nested_vmx_entry_failure(vcpu, vmcs12, > > - EXIT_REASON_INVALID_STATE, exit_qual); > > - return 1; > > - } > > - > > /* > > * We're finally done with prerequisite checking, and can start with > > * the nested entry. > > -- > > 2.20.1 > > > > > > > Hi all, > > This commit caused many kvm-unit-tests regression, cherry-pick > following commits from 4.20 fix the regression: > d63907dc7dd1 ("KVM: nVMX: rename enter_vmx_non_root_mode to > nested_vmx_enter_non_root_mode") > a633e41e7362 ("KVM: nVMX: assimilate nested_vmx_entry_failure() into > nested_vmx_enter_non_root_mode()") Now queued up, thanks! greg k-h