From nobody Wed May 15 07:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1677272846; cv=none; d=zohomail.com; s=zohoarc; b=G8aU/NE3Wh1Kz6RcdTL9s3PASbn+Q2LnYU8CIkB7rzIXmDyUJWScZWNZm0okI62TiKeb2rx9bS/exOh6RoKPuVaRzp8rtjQefNMOEK8vS2q/YnlwbHJdzxrYsWW9NyJ0EBXTjXvdG0Izqx5pmJPg4Hta30CL0rZHEeVfGKPc2Jk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677272846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KCHM/EMRKGNxzKN3tW4xHSggpCiSBamt7BCuhw2RYxw=; b=ijU127YXT1LMzo7MQGRjJsVOo28MUV4sVS2AMyPAfXU0nWaCmj1a2k2I4eAEWniRDsC9MGmThHd5fmpEtRrljRNQ5lf0iQPN8U8F3bvS5td14r/G24vIyYMK5d/J/pxxQqtUoPjzZP7jZ5k95YqEgz4RvEOMxFoOpTg3Dry25eA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1677272846234763.0571453986391; Fri, 24 Feb 2023 13:07:26 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.501582.773409 (Exim 4.92) (envelope-from ) id 1pVfHS-00026I-Fa; Fri, 24 Feb 2023 21:07:02 +0000 Received: by outflank-mailman (output) from mailman id 501582.773409; Fri, 24 Feb 2023 21:07:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pVfHS-00026B-Cr; Fri, 24 Feb 2023 21:07:02 +0000 Received: by outflank-mailman (input) for mailman id 501582; Fri, 24 Feb 2023 21:07:01 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pVfHR-000265-8Q for xen-devel@lists.xenproject.org; Fri, 24 Feb 2023 21:07:01 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2af96e2b-b487-11ed-a82a-c9ca1d2f71af; Fri, 24 Feb 2023 22:06:57 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: 2af96e2b-b487-11ed-a82a-c9ca1d2f71af DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1677272817; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EkflLGL5Iq06WiyTlOwBMTCMQw+4i7UVOQ5l5q9ecsg=; b=cs9Saw5aPVPDmDY2ILlrsYYc2h5VZR/WMyfADWId0jRb+aVbJPzfmEy/ N1PecRHTp44NUGR4M5rLjDsfnpZpsu/9XlmugPLuss78P6HZQPujfh2qX l0QgTYmIlNI6QwztN5lLQ96EbyfOGKq4kQKSfxIzWcPZPe+rYLP1lGOQE 4=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 97854733 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:dXTAt6tIWft0F/36kytapTs2wufnVE5eMUV32f8akzHdYApBsoF/q tZmKTuCPfnZMWfyLopyOYiw9x4E6MeEzocxQAc5rSowEyND+JbJXdiXEBz9bniYRiHhoOCLz O1FM4Wdc5pkJpP4jk3wWlQ0hSAkjclkfpKlVKiffHg3HVQ+IMsYoUoLs/YjhYJ1isSODQqIu Nfjy+XSI1bg0DNvWo4uw/vrRChH4bKj51v0gnRkPaoQ5AWEyyFOZH4iDfrZw0XQE9E88tGSH 44v/JnhlkvF8hEkDM+Sk7qTWiXmlZaLYGBiIlIPM0STqkAqSh4ai87XB9JFAatjsB2bnsgZ9 Tl4ncfYpTHFnEH7sL91vxFwS0mSNEDdkVPNCSDXXce7lyUqf5ZwqhnH4Y5f0YAwo45K7W9yG fMwcBQidkvAgOuN+Z2ZDeJPotwDKZTPM9ZK0p1g5Wmx4fcORJnCR+PB5MNC3Sd2jcdLdRrcT 5NHM3w1Nk2GOkARfA5NU/rSn8/x7pX7WxRepEiYuuwc5G/LwRYq+LPsLMDUapqBQsA9ckOw9 z2WojimWUpy2Nq3lxqJqWirovDzjSbwebJPF+SfpvRGjwjGroAUIEJPDgbqyRWjsWauVtQaJ 0EK9y4Gqakp6FftXtT7Rwe/onOPolgbQdU4O88Q5RyJy6HUyx2EHWVCRTlEAPQsqdUkTDgt2 liWlvvmADVutPueTnf1y1uPhWrsY25PdzZEPHJaC1JfuLEPvb3fkDqXavl7S+2yh+bMNhO3y BOutAg72pEc2JtjO7qAwXjLhDelp57sRwEz5xnKUm/N0j6VdLJJdKTztwGFsK8owJKxCwDY4 SNaw5T2APUmV8nlqcCbfAka8FhFDd6hOSaUv1NgFoJJG9+Fqy/6JtA4DN2TyS5U3ic4ld3BO hK7VeB5vsU70J6WgUhfMuqM5zwCl/SIKDgcfqm8giBySpZwbhSb2ypleFSd2Wvg+GB1z/5gY 8nAL5f1UytFYUiC8NZRb71AuYLHOwhknT+DLXwF50nPPUWiiI69Fu5ebQrmghER56KYugTFm +uzxOPToyizpNbWO3GNmaZKdABiEJTOLcyuwyChXrLZc1UO9aBII6O5/I7NjKQ1w/QLxr+Xp yvVt40x4AOXuEAr4D6iMhhLAI4Dl74l9BrX4QRE0Y6U5kUe IronPort-HdrOrdr: A9a23:RISJnKFWga3zzLjWpLqE0MeALOsnbusQ8zAXP0AYc3Jom6uj5q aTdZUgpGfJYVkqOE3I9ertBEDEewK4yXcX2/h3AV7BZniEhILAFugLhuGO/9SjIVybygc079 YYT0EUMrzN5DZB4voSmDPIceod/A== X-IronPort-AV: E=Sophos;i="5.97,325,1669093200"; d="scan'208";a="97854733" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , Xenia Ragiadakou Subject: [PATCH v3 05.5/14] x86/svm: Decouple types in struct nestedsvm Date: Fri, 24 Feb 2023 21:06:16 +0000 Message-ID: <20230224210616.2818727-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230224185010.3692754-6-burzalodowa@gmail.com> References: <20230224185010.3692754-6-burzalodowa@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1677272846923100001 Content-Type: text/plain; charset="utf-8" struct nestedvm uses mostly plain integer types, except for virt_ext_t which is a union wrapping two bitfield names. But the nested virt logic only ever deals with it as full opaque register. Switch it to being a plain uint64_t, allowing us to hide even more of the S= VM internal infrastructure. Signed-off-by: Andrew Cooper Reviewed-by: Xenia Ragiadakou --- CC: Jan Beulich CC: Xenia Ragiadakou This allows virt_ext_t to move out of the public vmcb.h along with all other vmcb types. --- xen/arch/x86/hvm/svm/nestedsvm.c | 4 ++-- xen/arch/x86/include/asm/hvm/svm/nestedsvm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nested= svm.c index 92316c6624ce..153a37f2f227 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -164,7 +164,7 @@ int cf_check nsvm_vcpu_reset(struct vcpu *v) svm->ns_exception_intercepts =3D 0; svm->ns_general1_intercepts =3D 0; svm->ns_general2_intercepts =3D 0; - svm->ns_virt_ext.bytes =3D 0; + svm->ns_virt_ext =3D 0; =20 svm->ns_hap_enabled =3D 0; svm->ns_vmcb_guestcr3 =3D 0; @@ -526,7 +526,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, stru= ct cpu_user_regs *regs) =20 /* LBR and other virtualization */ if ( !clean.lbr ) - svm->ns_virt_ext =3D ns_vmcb->virt_ext; + svm->ns_virt_ext =3D ns_vmcb->virt_ext.bytes; =20 n2vmcb->virt_ext.bytes =3D n1vmcb->virt_ext.bytes | ns_vmcb->virt_ext.bytes; diff --git a/xen/arch/x86/include/asm/hvm/svm/nestedsvm.h b/xen/arch/x86/in= clude/asm/hvm/svm/nestedsvm.h index 94d45d2e8d47..184248bbd7c5 100644 --- a/xen/arch/x86/include/asm/hvm/svm/nestedsvm.h +++ b/xen/arch/x86/include/asm/hvm/svm/nestedsvm.h @@ -44,7 +44,7 @@ struct nestedsvm { uint32_t ns_general2_intercepts; =20 /* Cached real lbr and other virtual extentions of the l2 guest */ - virt_ext_t ns_virt_ext; + uint64_t ns_virt_ext; =20 /* Cached real MSR permission bitmaps of the l2 guest */ unsigned long *ns_cached_msrpm; --=20 2.30.2