From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id CC5F8740035 for ; Wed, 5 Jun 2024 02:12:56 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=kjdvsNbgAvzzJ2wSrauLYp9TzCL7Kt5iJviSatrEkBI=; c=relaxed/simple; d=groups.io; h=Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20240206; t=1717553576; v=1; b=a/DLeZBIyXhtRHio013BapJu6ka61EKrRivLvRHjcwf+Ie6nCmmZm/BvF37bWJ20C19Y8KP1 BugBP8U62ejbKYHL8UfDkhF+rObqBKTqOJFFEv5AUKdmY0JFqIcf+LCgPWkWB3y6C5DMWDdUxUp +TLcTgk9KFk0sng50nO6TJYyOgU9AATRtNO5dH/Ij6M87cSk7oLBoEUoHbzgIzjylFEOi7FWVOK f6R5/wWuQ2SJS3kNJjUVI2l/yZS35LpXdB0UE2Nb0mN6y/oC6ORrpdpq9rBypw7FKLeShIC4pwT TXeDsaFA1xi808hNJq2+2L0coQXa54ZHRaGvDabFrpgCw== X-Received: by 127.0.0.2 with SMTP id QlZJYY7687511xMGVtQA1iQW; Tue, 04 Jun 2024 19:12:55 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.80]) by mx.groups.io with SMTP id smtpd.web11.5312.1717553574762373032 for ; Tue, 04 Jun 2024 19:12:54 -0700 X-Received: from MN2PR12CA0030.namprd12.prod.outlook.com (2603:10b6:208:a8::43) by DS7PR12MB6022.namprd12.prod.outlook.com (2603:10b6:8:86::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.19; Wed, 5 Jun 2024 02:12:51 +0000 X-Received: from BL6PEPF00020E5F.namprd04.prod.outlook.com (2603:10b6:208:a8:cafe::18) by MN2PR12CA0030.outlook.office365.com (2603:10b6:208:a8::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.29 via Frontend Transport; Wed, 5 Jun 2024 02:12:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF00020E5F.mail.protection.outlook.com (10.167.249.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7633.15 via Frontend Transport; Wed, 5 Jun 2024 02:12:51 +0000 X-Received: from aiemdee.2.ozlabs.ru (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 4 Jun 2024 21:12:47 -0500 From: "Alexey Kardashevskiy via groups.io" To: CC: Tom Lendacky , Liming Gao , Michael D Kinney , Zhiguang Liu , Ard Biesheuvel , Erdem Aktas , "Gerd Hoffmann" , Jiewen Yao , Michael Roth , Min Xu , Alexey Kardashevskiy Subject: [edk2-devel] [PATCH ovmf v4 5/5] OvmfPkf: Enable AMD SEV-ES DebugVirtualization Date: Wed, 5 Jun 2024 12:09:46 +1000 Message-ID: <20240605020946.1224515-6-aik@amd.com> In-Reply-To: <20240605020946.1224515-1-aik@amd.com> References: <20240605020946.1224515-1-aik@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00020E5F:EE_|DS7PR12MB6022:EE_ X-MS-Office365-Filtering-Correlation-Id: 66126ba0-58fc-4d4b-9a25-08dc85050109 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qF4HQQM7T3RLV9WXogbTEkZbT3EMaLXd+yr+TkW9eSJ1plZmL4f9IFP2KKa2?= =?us-ascii?Q?0LL7gS3lroxsCu5g2vHz5d+snnqxb/fWr2DvfSo5Za5uNDN6mOK+zd5BtkQv?= =?us-ascii?Q?T413CvfqYhXejZQ1I+QEXaJdu1DmdMdOfiF3eqluKHjXdi0dw3PZ82wARCDW?= =?us-ascii?Q?qu7dVakttf9UY0ImWbhMMkkSdFR5b5zI5lkAxbX39JE24kJ4sL63PPdSpBSs?= =?us-ascii?Q?wZYypJwaChJFZBayMHU+IlXQ8cT775kzB7bCG0fk/HwXQag/MQrOi1ybdmkN?= =?us-ascii?Q?qjfB6fZuWhto37ruMe89dVVqr+V+Et5Kr18fMgG7ETmGTjSLajJKdpYl2wpt?= =?us-ascii?Q?GuSAT2+cWVae+4Swyw2lihq09doqJhM0REeOBFsX/MHxWAomvfu04uHSCmqK?= =?us-ascii?Q?WZ4GOcYP5rcgA84pR0gg0Kvd+8gAGwbm4TZW9iOhGzHhtt3v4EIJViCN3rnf?= =?us-ascii?Q?eC9uB2OZ+31bSM0TXiPJiBFAK/bO3reNcFszFOtEPadR9lu0qzZpbC9WWCCp?= =?us-ascii?Q?bMPkWDBX4fC6zxFODP8DQKOBrGJS+yFVLp/gxkSxKKvFjT8xbFpbvkhLr5VB?= =?us-ascii?Q?Ut1dks8y+xQ5aTsT1MwT9NQ66scll00F2/z9/eAMf7t4RjaBt1eRzZYBg/Ge?= =?us-ascii?Q?S/M4WXEzEcIJe+9oJv1jdwJcsIz+2k3bzRJXbPaVcYygxUy426XWZ3WA90ID?= =?us-ascii?Q?fE71j3JKVuvWKSJT9/Ds30oFRIgyFE0WI9k3714eIqp4M+s8aOMPagcFm0xT?= =?us-ascii?Q?nyYkdYWQk6Bj1fPH76dExkDP5ApGYQvwvAaaYAR7Qc6yf9DZsL1dyBnHNd8K?= =?us-ascii?Q?rdnNx/IQFWx6pLuN1qGjFW+9p87muuoLfQMiYxf0dC6vqSvnEmt1m/ofNzy9?= =?us-ascii?Q?SWBJUdlyvfnECfUd7LVJ7gmh/UtwxRDJ95qTpD7kXSiWnUiR+xHPcRpqpSNO?= =?us-ascii?Q?VPwIWjorqw0kneIaWPLS0frlg8Xo1o76fJrKv0PV0RRySwCUJQ+gbuuu+yfM?= =?us-ascii?Q?opW5tDCGu9gnhdQeHSHyLaUAtk/Ci0G5QdR6JQ2/bBnYftuY81U7hDjI7Q1W?= =?us-ascii?Q?PJJCyHjdBqRW4eYLNuLhS2qN4necLskPMgCGca2iHB5VN9gy0SieLat9rNRw?= =?us-ascii?Q?lCueSbKdfunIziUP1Woxe7G4HzmiPi4fzH4drMmfvkUhsHbv2nzisz9ztgF2?= =?us-ascii?Q?/Rvu7h+Ntfyx2+CpHj8LwOspc65KYB/i/suIXiPs8VoyHIYR5KCeIIKlNnIM?= =?us-ascii?Q?frJeJ5H3oMMGFf5t8+fvvI9905e5Q2+p+jlyKn2URo70bgrZGiFIeWpVwTAm?= =?us-ascii?Q?OVGGMQ8SBactAQVTHFVW1Hk0K8TmPb6EZqMsh3qxdRv2FE925jLbZT79X17o?= =?us-ascii?Q?0aTRw8M5sT2jwbJYqNM6X9cuqKH/?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 02:12:51.7879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66126ba0-58fc-4d4b-9a25-08dc85050109 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00020E5F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6022 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Tue, 04 Jun 2024 19:12:54 -0700 Resent-From: aik@amd.com Reply-To: devel@edk2.groups.io,aik@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: LzSgBZ2lP4q4MYglMzFXbK9kx7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b="a/DLeZBI"; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Write the feature bit into PcdConfidentialComputingGuestAttr and enable DebugVirtualization in PEI, SEC, DXE. Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: Gerd Hoffmann Cc: Jiewen Yao Cc: Michael Roth Cc: Min Xu Cc: Tom Lendacky Signed-off-by: Alexey Kardashevskiy --- Changes: v4: * s/DebugSwap/DebugVirtualization/g * the feature is enabled here for all modes --- OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c | 6 ++= +++- OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c | 6 ++= +++- OvmfPkg/PlatformPei/AmdSev.c | 13 ++= ++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibIntern= al.c b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c index 7d823ad639f4..f381b9255bb7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c @@ -154,5 +154,9 @@ MemEncryptSevEsDebugVirtualizationIsEnabled ( VOID ) { - return FALSE; + MSR_SEV_STATUS_REGISTER Msr; + + Msr.Uint32 =3D InternalMemEncryptSevStatus (); + + return Msr.Bits.DebugVirtualization ? TRUE : FALSE; } diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibIntern= al.c b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c index 33a326ac1571..946bed2ada13 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c @@ -154,7 +154,11 @@ MemEncryptSevEsDebugVirtualizationIsEnabled ( VOID ) { - return FALSE; + MSR_SEV_STATUS_REGISTER Msr; + + Msr.Uint32 =3D InternalMemEncryptSevStatus (); + + return Msr.Bits.DebugVirtualization ? TRUE : FALSE; } =20 /** diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 88ca14507f5e..8562787035db 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -434,6 +434,7 @@ AmdSevInitialize ( ) { UINT64 EncryptionMask; + UINT64 CCGuestAttr; RETURN_STATUS PcdStatus; =20 // @@ -517,13 +518,19 @@ AmdSevInitialize ( // technology is active. // if (MemEncryptSevSnpIsEnabled ()) { - PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdS= evSnp); + CCGuestAttr =3D CCAttrAmdSevSnp; } else if (MemEncryptSevEsIsEnabled ()) { - PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdS= evEs); + CCGuestAttr =3D CCAttrAmdSevEs; } else { - PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdS= ev); + CCGuestAttr =3D CCAttrAmdSev; } =20 + if (MemEncryptSevEsDebugVirtualizationIsEnabled ()) { + CCGuestAttr |=3D CCAttrFeatureAmdSevEsDebugVirtualization; + } + + PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCGuestAttr)= ; + ASSERT_RETURN_ERROR (PcdStatus); } =20 --=20 2.44.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119463): https://edk2.groups.io/g/devel/message/119463 Mute This Topic: https://groups.io/mt/106496092/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-