From nobody Wed Apr 24 14:44:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1561575817; cv=none; d=zoho.com; s=zohoarc; b=C/DfPk9ySURlKpZD6WELnqUhEM4do8nmNgYhKFBFAEbJ7HrkT5oVsDbJ3T9DFrrmUWyGb/lHvFPf9OjXgJ/+clTvvUvEGxQ2S51xpCiE497LX01WPauHImqGzbKNoGm+1aKCjg7HwjmBHJ54TgMQuDFDj6LX01e2J/k0a3Bg2Js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561575817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=HLNraOqq7AYPJzaSup6m1fjk9aMOPUWj8tSrBaqLoGU=; b=FqvxIxpRuv8MLOZ3Bq7GH4VvyrYHp17hdUtL1kmRip+SlxX08HwQOxcR68TyNpOZIBXj1tISDRrD78ppFxrw2jnAlh9EGKjoBsL92AVCnj6hLXDqzTH/s4B/ijmOIVsWY4ILrcbBqBveUMLp5Kdwt4K0w04ETPzAQSLGbcxEp4k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1561575817008976.337319551085; Wed, 26 Jun 2019 12:03:37 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hgDBa-0000IY-Nd; Wed, 26 Jun 2019 19:02:26 +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.89) (envelope-from ) id 1hgDBZ-0000IS-Vp for xen-devel@lists.xenproject.org; Wed, 26 Jun 2019 19:02:26 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ed9ae9c0-9844-11e9-b8a5-1346b420ee50; Wed, 26 Jun 2019 19:02:22 +0000 (UTC) X-Inumbo-ID: ed9ae9c0-9844-11e9-b8a5-1346b420ee50 Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: qoR3x2ifMBGzOD03s1bLIloyyIW3mb0qm/QL1St/CFo6DDlFY6Mg8k2Anm0BFBwY0UfMwTi+Mp vrgKixH8BZh09o28DR8vbURos1YIMHfKcsk4qEBKQfaTr1ryXNu1JYV8IJjUvfHazX9dvTP7vl p9FxAuKdr9HVb7p8GrQjWd+hJRrf2dM0NoRPJoPFV9VS9eEIqSe5SgX8O0ZmQGrjOEe1u3V0KZ z/6ukSNDaulaN1rLohvhaPpARoZTzt6vhPgQo0Uc7UWy/JmWgfVNCsA75dlHbCwAwvTkDFEGRK NTc= X-SBRS: 2.7 X-MesageID: 2280607 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,420,1557201600"; d="scan'208";a="2280607" From: Andrew Cooper To: Xen-devel Date: Wed, 26 Jun 2019 20:02:12 +0100 Message-ID: <20190626190212.15365-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/vvmx: set CR4 before CR0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Sergey Dyasli , Kevin Tian , Jan Beulich , Wei Liu , Jun Nakajima , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Sergey Dyasli Otherwise hvm_set_cr0() will check the wrong CR4 bits (L1 instead of L2 and vice-versa). Signed-off-by: Sergey Dyasli Reviewed-by: Andrew Cooper Acked-by: Kevin Tian Reviewed-by: Roger Pau Monn=C3=A9 --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monn=C3=A9 CC: Jun Nakajima CC: Kevin Tian I found this patch languishing in the XenServer patchqueue, and Sergey is O= oO so I'm submitting it on his behalf. Without this change, nested virt is broken when L1 and L2 differ in their u= se of PCID. This is only a stopgap solution - it resolves the PCID issue without introducing other issues, but the proper fix needs to consider all control bits at once, rather than considering a vmentry/exit as a sequence of chang= es of discrete registers. --- xen/arch/x86/hvm/vmx/vvmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 7bca572d88..332623d006 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1024,11 +1024,11 @@ static void load_shadow_guest_state(struct vcpu *v) nvcpu->guest_cr[0] =3D get_vvmcs(v, CR0_READ_SHADOW); nvcpu->guest_cr[4] =3D get_vvmcs(v, CR4_READ_SHADOW); =20 - rc =3D hvm_set_cr0(get_vvmcs(v, GUEST_CR0), true); + rc =3D hvm_set_cr4(get_vvmcs(v, GUEST_CR4), true); if ( rc =3D=3D X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); =20 - rc =3D hvm_set_cr4(get_vvmcs(v, GUEST_CR4), true); + rc =3D hvm_set_cr0(get_vvmcs(v, GUEST_CR0), true); if ( rc =3D=3D X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); =20 @@ -1238,11 +1238,11 @@ static void load_vvmcs_host_state(struct vcpu *v) __vmwrite(vmcs_h2g_field[i].guest_field, r); } =20 - rc =3D hvm_set_cr0(get_vvmcs(v, HOST_CR0), true); + rc =3D hvm_set_cr4(get_vvmcs(v, HOST_CR4), true); if ( rc =3D=3D X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); =20 - rc =3D hvm_set_cr4(get_vvmcs(v, HOST_CR4), true); + rc =3D hvm_set_cr0(get_vvmcs(v, HOST_CR0), true); if ( rc =3D=3D X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); =20 --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel