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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 11756C4727F for ; Thu, 1 Oct 2020 11:00:34 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7903920678 for ; Thu, 1 Oct 2020 11:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="SC4TjOHX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7903920678 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.1204.4041 (Exim 4.92) (envelope-from ) id 1kNwJs-0002Ct-7O; Thu, 01 Oct 2020 11:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1204.4041; Thu, 01 Oct 2020 11:00:16 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kNwJs-0002Cm-2r; Thu, 01 Oct 2020 11:00:16 +0000 Received: by outflank-mailman (input) for mailman id 1204; Thu, 01 Oct 2020 11:00:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kNwJq-0002Cg-DI for xen-devel@lists.xenproject.org; Thu, 01 Oct 2020 11:00:14 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0f4a098c-e0bb-43b8-b6bc-4835b20eba53; Thu, 01 Oct 2020 11:00:11 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kNwJq-0002Cg-DI for xen-devel@lists.xenproject.org; Thu, 01 Oct 2020 11:00:14 +0000 X-Inumbo-ID: 0f4a098c-e0bb-43b8-b6bc-4835b20eba53 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0f4a098c-e0bb-43b8-b6bc-4835b20eba53; Thu, 01 Oct 2020 11:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1601550011; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=g8PD7aAPS14JnU9fXeNLGO0c4542Mu0jtMFj9/IPPQo=; b=SC4TjOHXOZ1qQRafNmKAi5QOCUMI3gTv0ax2IYJ9pdx3nTkqbtWbkxw2 QKqjPfBsQdC3y+NaaafHN5SN3iiI/nOsefGWXOc2IhF8RCgC5kTS6UkVo NXF8LmEr6kYAl637f0d7vVNXQ7XNr/YdcbpOWFgmIltYJLKDN4/PCnbXi w=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 2+LqwWxtJVIFsOQGy1B7LY2+XDm41mI5i0AdsvFcWqh11SCL+vgw6vWgWu/VFF42uIjLkrAzIY x8RmoSQz0Q2tIUqFzMw2Xb8CuOcKRF6ts9GUYqEOx4NJGKj8HMb+44/nwFaKoU+VQEJkcmLgRN uM9T8bn7Yb+nfAqxPjvIAiXYgYh31D3rUXk5/eepxM0L6y/wI4+ruWQkvKQxahjQr3zhkiZElO +8Z0dxuwOoeoHqYHuD2Af7N8wqM9bwfsm4u7gnDzgoyWsOAulVzaYOHlSH5aN8Pw6FYbjfziDh Iow= X-SBRS: None X-MesageID: 29069257 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,323,1596513600"; d="scan'208";a="29069257" Date: Thu, 1 Oct 2020 13:00:03 +0200 From: Roger Pau =?utf-8?B?TW9ubsOp?= To: Andrew Cooper CC: Xen-devel , Jan Beulich , Wei Liu , Jun Nakajima , Kevin Tian Subject: Re: [PATCH 7/8] x86/hvm: Drop restore boolean from hvm_cr4_guest_valid_bits() Message-ID: <20201001110003.GE19254@Air-de-Roger> References: <20200930134248.4918-1-andrew.cooper3@citrix.com> <20200930134248.4918-8-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200930134248.4918-8-andrew.cooper3@citrix.com> X-ClientProxiedBy: AMSPEX02CAS02.citrite.net (10.69.22.113) To FTLPEX02CL06.citrite.net (10.13.108.179) On Wed, Sep 30, 2020 at 02:42:47PM +0100, Andrew Cooper wrote: > Previously, migration was reordered so the CPUID data was available before > register state. nestedhvm_enabled() has recently been made accurate for the > entire lifetime of the domain. > > Therefore, we can drop the bodge in hvm_cr4_guest_valid_bits() which existed > previously to tolerate a guests' CR4 being set/restored before > HVM_PARAM_NESTEDHVM. > > Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Thanks, just one nit below. > --- > CC: Jan Beulich > CC: Roger Pau Monné > CC: Wei Liu > CC: Jun Nakajima > CC: Kevin Tian > --- > xen/arch/x86/hvm/domain.c | 2 +- > xen/arch/x86/hvm/hvm.c | 8 ++++---- > xen/arch/x86/hvm/svm/svmdebug.c | 6 ++++-- > xen/arch/x86/hvm/vmx/vmx.c | 2 +- > xen/arch/x86/hvm/vmx/vvmx.c | 2 +- > xen/include/asm-x86/hvm/hvm.h | 2 +- > 6 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/xen/arch/x86/hvm/domain.c b/xen/arch/x86/hvm/domain.c > index 8e3375265c..0ce132b308 100644 > --- a/xen/arch/x86/hvm/domain.c > +++ b/xen/arch/x86/hvm/domain.c > @@ -275,7 +275,7 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) > if ( v->arch.hvm.guest_efer & EFER_LME ) > v->arch.hvm.guest_efer |= EFER_LMA; > > - if ( v->arch.hvm.guest_cr[4] & ~hvm_cr4_guest_valid_bits(d, false) ) > + if ( v->arch.hvm.guest_cr[4] & ~hvm_cr4_guest_valid_bits(d) ) > { > gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx\n", > v->arch.hvm.guest_cr[4]); > diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c > index 101a739952..54e32e4fe8 100644 > --- a/xen/arch/x86/hvm/hvm.c > +++ b/xen/arch/x86/hvm/hvm.c > @@ -972,14 +972,14 @@ const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, > X86_CR0_CD | X86_CR0_PG))) > > /* These bits in CR4 can be set by the guest. */ > -unsigned long hvm_cr4_guest_valid_bits(const struct domain *d, bool restore) > +unsigned long hvm_cr4_guest_valid_bits(const struct domain *d) > { > const struct cpuid_policy *p = d->arch.cpuid; > bool mce, vmxe; > > /* Logic broken out simply to aid readability below. */ > mce = p->basic.mce || p->basic.mca; > - vmxe = p->basic.vmx && (restore || nestedhvm_enabled(d)); > + vmxe = p->basic.vmx && nestedhvm_enabled(d); > > return ((p->basic.vme ? X86_CR4_VME | X86_CR4_PVI : 0) | > (p->basic.tsc ? X86_CR4_TSD : 0) | > @@ -1033,7 +1033,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) > return -EINVAL; > } > > - if ( ctxt.cr4 & ~hvm_cr4_guest_valid_bits(d, true) ) > + if ( ctxt.cr4 & ~hvm_cr4_guest_valid_bits(d) ) > { > printk(XENLOG_G_ERR "HVM%d restore: bad CR4 %#" PRIx64 "\n", > d->domain_id, ctxt.cr4); > @@ -2425,7 +2425,7 @@ int hvm_set_cr4(unsigned long value, bool may_defer) > struct vcpu *v = current; > unsigned long old_cr; > > - if ( value & ~hvm_cr4_guest_valid_bits(v->domain, false) ) > + if ( value & ~hvm_cr4_guest_valid_bits(v->domain) ) > { > HVM_DBG_LOG(DBG_LEVEL_1, > "Guest attempts to set reserved bit in CR4: %lx", > diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c > index ba26b6a80b..f450391df4 100644 > --- a/xen/arch/x86/hvm/svm/svmdebug.c > +++ b/xen/arch/x86/hvm/svm/svmdebug.c > @@ -106,6 +106,7 @@ bool svm_vmcb_isvalid(const char *from, const struct vmcb_struct *vmcb, > unsigned long cr0 = vmcb_get_cr0(vmcb); > unsigned long cr3 = vmcb_get_cr3(vmcb); > unsigned long cr4 = vmcb_get_cr4(vmcb); > + unsigned long valid; Could you init valid here at definition time? Also cr4_valid might be a better name since the sacope of the variable is quite wide. Thanks, Roger.