From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.61]) by mx.groups.io with SMTP id smtpd.web10.176.1630513061970038126 for ; Wed, 01 Sep 2021 09:17:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=zqdwYMDx; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.237.61, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ifNfKsNNQeRARjHBG6BVIUGsS9UQ0S3DVuJT7IAzTQw0NWTtjj3WCJxE59qaT+/PcOoe0nAtln/rVjmDJ910E1EB87FX2nQzzaOcGy54qqCa09WbYcbrpqwAKRGyx7ZT8LG6pMJtsSidnTzj0dqLvt2LhgmFHpyOr3Ipwge2hMuK2KOwQlYq4qKpafK2BIWOhXCRIMpMuXRKjoQ16PzdY7R1BhDHI2bYxyrNZcax1iLgX/ssjaeP3aSiXn6xyz4d3kw9lQWmVkk+bEewjQGGQb/5SSNcFGmnt/dfbO3pU0hev4TyDueK99nIqG2EOfCjSHf0l6M8QI8Fpb883CqN+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tqFjpv3EqIiYgb9HAQgo0BiNmLi2aqPfAG/4VqlPhgo=; b=ajdu3RHraZHchP/AytH27yH7kN8m5lNHn2ftsjaIU4CCLt3vDzxqcnHRZue/DerJJstPkKE1PlNpgQMEPhQtvPkZjeY0AAYpta7yHLYLF7s+lf3htyDhpx+VByuwFXd7E4ckDjoIfNQamoneVVhag3oCWU3m9tIGBriUmjugE6DJygJMAhifHK8lJqkpS0v+vGLA/ExizYD5Aitf1ppnFekqr01j/+8/TTvUUJGwIaUIWgNhNhz7tubyTfmYc4dsu1KuPlwzwrVqLrAK0LoONC07xg21j5LJuednZ1PEs4asNpb1BR8yABJ2MaYvZ6+Ac7mRMlg5ir/A4l50v0GZgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tqFjpv3EqIiYgb9HAQgo0BiNmLi2aqPfAG/4VqlPhgo=; b=zqdwYMDxYaMLEOXKZ6SalXrj2I1TyP2UwzXYRi8XeOsTeB1hZiQnyi5P/Evjt/n6BcVNbzRfR5wr8xqJsi6C0N28wKqZLimlGHrThOumehIWZG+eiKBZu3pD615mVkk+9zgJxjiEdQsMpc57S4dDFqNbke/wVor/RQ5Bw0i9z4U= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SA0PR12MB4415.namprd12.prod.outlook.com (2603:10b6:806:70::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Wed, 1 Sep 2021 16:17:38 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3%6]) with mapi id 15.20.4457.025; Wed, 1 Sep 2021 16:17:38 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Michael Roth , Gerd Hoffmann , Brijesh Singh , Michael Roth Subject: [PATCH v6 06/29] OvmfPkg/ResetVector: pre-validate the data pages used in SEC phase Date: Wed, 1 Sep 2021 11:16:23 -0500 Message-ID: <20210901161646.24763-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210901161646.24763-1-brijesh.singh@amd.com> References: <20210901161646.24763-1-brijesh.singh@amd.com> X-ClientProxiedBy: SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.12 via Frontend Transport; Wed, 1 Sep 2021 16:17:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ca59fb6-95f4-4a3a-1e65-08d96d64041e X-MS-TrafficTypeDiagnostic: SA0PR12MB4415: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 96bez8MegT4CDUgkWkOR/Jc0ZKV5b0956T0FG/bqGigIAPfWCXkGKVUcdi+5+hbR0sCIi+BKkDb9a2qIscT+ksybjbpyGYuN1zAQB8DSXqbfhCYO6nR/XNzb1dw8rH1udBaKCXgfAD/V0B5cEZme/G8nkgxZ++puvrJv/Q22lp2IFeyv9W8UTgvSEd74SBQyYkl8KAcbxfWJ+n9SDwrafUpe1cIJbv2MRRtA1Wj5c/aACOV4pzGCdTQ4drGRmKmZOv1b6oQjBzI5rONX4L1PexH7GBWDtZdts168FUwkCSONuTw2WpS3tuWaXh2MmES47O8JEIGvICGIgs5u+yoYtiyCqGQEzBqvOMrJcwdiHyJWsuYPRNgY/+HRDhCDNZ2SOyOcJ7ODTC66nNxA/a4xWCM8IvrWiNZGLjJ6E1Zh57DTbTUzKfx/ojARhSTjd1JS/zhDN2dcZBM1ITWmKXi9bHTH7x7D4/l2lHjs6a2WF4M3qmGR7gzaqt/31UaBrc8L5J7Ut8iZhlCugio70wm0VRlsDkTi3xK+L3lcVZA5xA4ar/6UFis1KjQ5nTqzTitR+/t6OOJkym3U1OmjXUOMTNm8VVA0KocdPGzbSbYMahh2ykN+n73CYd21mkTRqR47mWFI4+NyEzAdKOT6dd5fHhaogLYkwFPuIvOK76QsBges4jg5EfeJEiaJ/h2NvlCRvhpPlHX6Rd2jd36ci8EZlYBlQAVMY1aJtgW/cJ3Y8LwRaAjGZ6N2lKRODrWOq7E3/5mJEnN5exUh34dGR4Svz61FtqqaRJwvPoCzcL4hKoA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(376002)(136003)(396003)(346002)(366004)(66476007)(1076003)(83380400001)(6916009)(2906002)(8936002)(8676002)(186003)(26005)(15650500001)(66946007)(86362001)(19627235002)(66556008)(316002)(478600001)(966005)(44832011)(2616005)(54906003)(6486002)(5660300002)(36756003)(956004)(4326008)(6666004)(7696005)(52116002)(38350700002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eJS95wqFH1Y6wkJG3O8Gb7xL13L8/IJKPOr8ieDrHgmqLDcR60Ev7H7LIadl?= =?us-ascii?Q?xf/wS55WaBtb2mHrDOmawPHHRb0Upnf9MZXQi9Ri1Zgso22vR12zFEa5rPrs?= =?us-ascii?Q?8oNT8l6ryPkatVgj5Owm2ecxmWVx7mexWqQKGOrnSN7QKWClD90IbJ6EO6Jz?= =?us-ascii?Q?DQvPCGxwuszNaaVsqdenDefYlI6+hcW+UqIgT6/ktisTJmWpHQEGZMcE3CUh?= =?us-ascii?Q?o/WUC80DC//szXA+ELXR852aUKBmqKvaMCLXKb2d37mT9aoS14JdADjiXcLF?= =?us-ascii?Q?nxmOswXTfhJ8JUC6rU+cYbYDRTdsDm1V933wPQ0dyaYhP6Pbrm7Eyqk60DYy?= =?us-ascii?Q?OEMOipA6O77udKd+ufoiBzBOnR2fmdvvlYiesldEwuIIRX4TZ+JLjFUk3OLC?= =?us-ascii?Q?4ltM7xtk4QdENuHB55ruKClGqQQIhoM3nXsx2SDlTUSRngjmzP5unskbliop?= =?us-ascii?Q?L4SwCNOokvwVhJnLbIwX0GJDImeyfxSSNThYIQiMUI4/QRqA2UD+hw/xzWQJ?= =?us-ascii?Q?qSahGDL9U237dJRoc7EoG1Qm3w1KPirYceqMF/ymguvnTgDKm71lUjWOIslt?= =?us-ascii?Q?xC7JFIk85QzDtvE1O+gz6h4+usGs9B6CP79JDXxMpleHkvPsZVNRGn5AAbYn?= =?us-ascii?Q?vqmEzffbge9FpzLGifbRKyrJulr787TxrqX+OhaTQgLD7T1P/wY5VchiTzfe?= =?us-ascii?Q?INCkngC+Mns55CIiGVZKsAK1M4D1yI09yzG6cdECUJqI4MATMltIlcKAbygX?= =?us-ascii?Q?3fhBC00ryUVKLUvIZ9uEllkWxhCcK9edAxKN1QAHgeSf4uZT4cC+Ja/jzIP+?= =?us-ascii?Q?9Ux3Tsz5x9f3nXw6So/WJ4YfhQqvkbsFEg2phombtQKNDSarAP1nOAcppOGM?= =?us-ascii?Q?C1i7BlHRKxxioH3+QQ57EgQeRu1yJpo47ZIpdMaAk+DRVMaahdzEeXlLlRat?= =?us-ascii?Q?zs7EBzL2lxosnZ/rmkIUisrarj70BR5Bm/MDSQ/hQXb9BciaIwXm2zkAt1Po?= =?us-ascii?Q?vq09IIJNC2Kl9FAFCzexLhUkJU0AnG3ws42EyC/KNM1tiRZc0WMn0UuL/2b3?= =?us-ascii?Q?AHBb67MVH2jRhDa2Y3T3NT3Kfgxtbg0Ph+BthXf/ZiIbSX/w5MWIaca2b32h?= =?us-ascii?Q?iEcp2PlYhi0/AE1FAvhSF3e6d0XQ3HvekedEZgsfc8QVgkbsFPYsJ+1bETNb?= =?us-ascii?Q?9Bm33MabUUdHnzhnYtJAX3IBCqP0qVcepYKDkVNZN5gGFeB3WhKXqxOHsM+O?= =?us-ascii?Q?lu3JTiJxRegB0Ybzg8veRwLU//lDP1PnEvGImbtsmjDzfJ7ooGqcSksre90j?= =?us-ascii?Q?mliZgnR6m7r5ZtCOgtWUTU7I?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ca59fb6-95f4-4a3a-1e65-08d96d64041e X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2021 16:17:38.4095 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FKUZWTGCJ1v00XFSYocYBg04b8l6X3/qFTDXChm6yM4qSRuyP+RABEpnPSyW+PYuW/0xgY+pzmnrSwWZEzJX8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4415 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 An SEV-SNP guest requires that private memory (aka pages mapped encrypted) must be validated before being accessed. The validation process consist of the following sequence: 1) Set the memory encryption attribute in the page table (aka C-bit). Note: If the processor is in non-PAE mode, then all the memory accesses are considered private. 2) Add the memory range as private in the RMP table. This can be performed using the Page State Change VMGEXIT defined in the GHCB specification. 3) Use the PVALIDATE instruction to set the Validated Bit in the RMP table. During the guest creation time, the VMM encrypts the OVMF_CODE.fd using the SEV-SNP firmware provided LAUNCH_UPDATE_DATA command. In addition to encrypting the content, the command also validates the memory region. This allows us to execute the code without going through the validation sequence. During execution, the reset vector need to access some data pages (such as page tables, SevESWorkarea, Sec stack). The data pages are accessed as private memory. The data pages are not part of the OVMF_CODE.fd, so they were not validated during the guest creation. There are two approaches we can take to validate the data pages before the access: a) Enhance the OVMF reset vector code to validate the pages as described above (go through step 2 - 3). OR b) Validate the pages during the guest creation time. The SEV firmware provides a command which can be used by the VMM to validate the pages without affecting the measurement of the launch. Approach #b seems much simpler; it does not require any changes to the OVMF reset vector code. Cc: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Erdem Aktas Signed-off-by: Brijesh Singh --- OvmfPkg/OvmfPkg.dec | 5 +++++ OvmfPkg/OvmfPkgX64.fdf | 6 ++++-- OvmfPkg/ResetVector/ResetVector.inf | 2 ++ OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm | 5 +++++ OvmfPkg/ResetVector/ResetVector.nasmb | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index afe9b7135560..41fffd6d3bd9 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -353,6 +353,11 @@ [PcdsFixedAtBuild] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidBase|0|UINT32|0x54 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidSize|0|UINT32|0x55 =20 + ## The start and end of pre-validated memory region by the hypervisor + # through the SEV-SNP firmware. + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedStart|0x0|UIN= T32|0x56 + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedEnd|0x0|UINT3= 2|0x57 + [PcdsDynamic, PcdsDynamicEx] gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable|FALSE|BOOLEAN|0x1= 0 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 1e292d11ace3..10e8ba758a29 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -110,9 +110,11 @@ [FD.MEMFD] # SET gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase =3D $(MEMFD_BASE_ADDRES= S) + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase + gUefiOvmfPkgTokenSpa= ceGuid.PcdOvmfConfidentialComputingWorkAreaHeader SET gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaSize =3D gUefiOvmfPkgTokenSp= aceGuid.PcdOvmfWorkAreaSize - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentia= lComputingWorkAreaHeader -##########################################################################= ################ =20 -##########################################################################= ###### +# The range of the pages pre-validated through the SEV-SNP firmware. +SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedStart =3D $= (MEMFD_BASE_ADDRESS) + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase +SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedEnd =3D $(M= EMFD_BASE_ADDRESS) + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase +##########################################################################= ################ =20 [FV.SECFV] FvNameGuid =3D 763BED0D-DE9F-48F5-81F1-3E90E1B1A015 diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/ResetVector/Rese= tVector.inf index 34d843de62c4..307699d8bf22 100644 --- a/OvmfPkg/ResetVector/ResetVector.inf +++ b/OvmfPkg/ResetVector/ResetVector.inf @@ -54,3 +54,5 @@ [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedStart + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedEnd diff --git a/OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm b/OvmfPkg/ResetVe= ctor/Ia16/ResetVectorVtf0.asm index 71e1484cf4e4..a45e828a04a5 100644 --- a/OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm +++ b/OvmfPkg/ResetVector/Ia16/ResetVectorVtf0.asm @@ -57,9 +57,14 @@ guidedStructureStart: ; SEV-SNP boot block GUID and provide the GPA to the PSP to populate ; the memory area with the required information.. ; +; In order to boot the SEV-SNP guest the hypervisor must pre-validated t= he +; memory range from SNP_HV_VALIDATED_START to SNP_HV_VALIDATED_END. +; ; GUID (SEV-SNP boot block): bd39c0c2-2f8e-4243-83e8-1b74cebcb7d9 ; sevSnpBootBlockStart: + DD SNP_HV_VALIDATED_START + DD SNP_HV_VALIDATED_END DD SNP_SECRETS_BASE DD SNP_SECRETS_SIZE DD SNP_CPUID_BASE diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/Re= setVector.nasmb index 9be963206989..75a38697d5d8 100644 --- a/OvmfPkg/ResetVector/ResetVector.nasmb +++ b/OvmfPkg/ResetVector/ResetVector.nasmb @@ -81,6 +81,8 @@ %define SNP_CPUID_SIZE FixedPcdGet32 (PcdOvmfSnpCpuidSize) %define SNP_SECRETS_BASE FixedPcdGet32 (PcdOvmfSnpSecretsBase) %define SNP_SECRETS_SIZE FixedPcdGet32 (PcdOvmfSnpSecretsSize) + %define SNP_HV_VALIDATED_START FixedPcdGet32 (PcdOvmfSnpHypervisorPreVal= idatedStart) + %define SNP_HV_VALIDATED_END FixedPcdGet32 (PcdOvmfSnpHypervisorPreValid= atedEnd) %include "Ia32/Flat32ToFlat64.asm" %include "Ia32/AmdSev.asm" %include "Ia32/PageTables64.asm" --=20 2.17.1