From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.42]) by mx.groups.io with SMTP id smtpd.web10.1354.1632163593290461097 for ; Mon, 20 Sep 2021 11:46:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=v18HlUrE; 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.92.42, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m33vontGfzo+EZx8ilj7q2xVWKe0JucVnGho39EF4n+Ev+OTA+/7pQkhbQbn8qkGRfWdqJQ+Qn9PCeH0/LPl5oapd99oRCC+4y6RLO/cVT5R8jGUKBqnAuTUHrljBbBoQMRZcn/U0O/US+QCU/uCzRGXC01Wr0v71wRT3lwUZy3XV9nFvheQv9gGUoxvlTn7lxP35o9Si1xmSEhRXneKkkAQDlA7ABfU4P1w0sfsMjEr4/gzdJ/zKiMMbmPjTR83/rrLxRFPQufqWHdUo5HcwTuQ7OBGoXLKwXPb96wi7KYGakSVn0E/774GhTH6xkxktYYhTYBmDAELwOHbQigUYg== 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=eyhTDV8vdGEl3JzGEoHvli7SswTRvIAFw/vuVCyF/Ew=; b=LDxXQVX3tFFj8tyqq40FRlAeKpdmjus7Kivo1YT8Os71O6cPKCCynks5cndI4/BrOAQpoqFYrcNrRSKeZ/9xTKDkgwWi1saMFEax2umYGiTOqlvBLT5/nEzfGxs4znbrYWrWYkVmuxnIE9mqQJ/vdccalEs18W5h/wEjzfGiSKQ135xnkWnKNUPFNpmTQGR5cPRbmEQes6KJ+vCPWUIWQFcv8E+scC/WX+1VKAEGEVbuf+3LWgzuzD+gyb3aKBeXK/TCLdYDur6t7H0sFxRH2mAxYtkSz91Ms/zHtn3hrC2NsKQ3t2eAGdcDX9bzoQ0PqS20KBu/PSiTdAeF6pgeKw== 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=eyhTDV8vdGEl3JzGEoHvli7SswTRvIAFw/vuVCyF/Ew=; b=v18HlUrEvXH7OeUOWeGk/YXJN2iKESdky3wvxDDQ+XReRIZv4g2K0Cgdg+c1qxX+6lYKWat4MQPcv3ACYVubA5ub6sHWwz8Sbyu7bHwbH2TI3R+yR37wQ91J/wMbccAob2jlL8TR5fA4cMYJpG8X8apnG5x3vrUhQX2CSSUI6oc= 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 SA0PR12MB4575.namprd12.prod.outlook.com (2603:10b6:806:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Mon, 20 Sep 2021 18:46:31 +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.4523.018; Mon, 20 Sep 2021 18:46:31 +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 , Jiewen Yao Subject: [PATCH v8 16/32] OvmfPkg/BaseMemEncryptSevLib: skip the pre-validated system RAM Date: Mon, 20 Sep 2021 13:45:48 -0500 Message-ID: <20210920184604.31590-17-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920184604.31590-1-brijesh.singh@amd.com> References: <20210920184604.31590-1-brijesh.singh@amd.com> X-ClientProxiedBy: SN4PR0201CA0034.namprd02.prod.outlook.com (2603:10b6:803:2e::20) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN4PR0201CA0034.namprd02.prod.outlook.com (2603:10b6:803:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Mon, 20 Sep 2021 18:46:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47103f05-30c2-41a1-89f6-08d97c66f6a7 X-MS-TrafficTypeDiagnostic: SA0PR12MB4575: 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: O5tcGKn5YzoauWV1DlIWYJX3WP0cllIVsCxBZKAEyT8+fT8t3Ul+Gb2ljNBAGNmXRPrywP1S6oiHkutYLy4RMBuf2DLWUYAqA3W/Dmf30ersT9l46hK2IjcQFZhoXWR1Glo8Fo5OUe++VOWSPb/N7nGRAT9hivsyJaZZyP7iFZsaoWC0Ekw7ZFm5UqpUwF/2iNFUsCLofvGKEB3CVZIWKyiV3UDCmgPInNhtVTB5pz2B0BL9hss+GWsEMqT+Bj9+BfNY1rtLavV0mPoUs9e7nZuSUamIr22wDIQJBaCD3bmzezzlfjv2v/sb3nI2VwI9eCrwz4Nni6rKmcHXKVvFjkGqfsomOTPWmsWWMMj24v2sZVpzCO2Ck6p0ZCVQAqNh5dM+Yamp593V5F/fxTZEhO4FNgZkjRl6l/ZKYL2/PCGD/JxC1sbmuozfQaqyEsdd4n0c2A3CU/vckT3XA1yz8czt0qWDc1LzQO6OHCE+Q9Lp9NCFrGw8CyXbl1BtG9BRbehqh2RmeFerbZhLbLQxZBSyX/4mpp8qCsL4RNVwec+jF8/JcVcXXrclmzR2xHo3EoSEahS17nW7/RZRiKPWIWp2QtKx6pqzq2K/YDnYFAp0SFa97DTB8ZxTHAhORvdUqzx6q6mO37hY1qtCT3apeCAYeGaqQg6hdcfwG4UhfFvFW7nPnO7YH9tLuLnFEBxfALGAoOyX8sE3axydcs92lMlr7QU8Fo7v3KsH+JmHCg91E++Vxhtmr9WQAuoBW6Q6E03xzXiAhlrtkymMXQVNnUe+ff3ogM3X7YD0/MJEpI9m1ax1LB4AlqVfjd2m7MEt 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)(366004)(38350700002)(44832011)(5660300002)(15650500001)(36756003)(83380400001)(38100700002)(8936002)(66946007)(508600001)(6916009)(7696005)(52116002)(1076003)(6666004)(956004)(8676002)(186003)(54906003)(2616005)(2906002)(6486002)(26005)(19627235002)(316002)(66556008)(66476007)(966005)(86362001)(4326008)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BnYosZLM7AvPuLqyIojF9bjflTBVlBtop655fyY+uqdkymPoMQ0zabvuv49M?= =?us-ascii?Q?NhOuuSD00X6esiSjOTG5HTDxohkqqAMBpeJ11ds8vH9MUwEn4LNbcTpXpv94?= =?us-ascii?Q?Nz7IhVg4UFTrthsE7c7YoOcL6TowApEH9sZvWA4gbwHdO1jZX6zuiUmwZBtZ?= =?us-ascii?Q?HitDxNdn6WXQXUk2UcsY0FDPgz1CUaeEnuVLJA7PoPAs7NKcv1oA+hsraDLu?= =?us-ascii?Q?BBqIjW3Wvh+A1RVlVbRYT5Jf8JW4ZRbupESjmZK6OoksKUM6Wg/FDS0h0Rtl?= =?us-ascii?Q?sonmWUz8kJl4UPrNe3ku+WViAe5sVswxhdywmmyfr/CBRyMECWwGFpJalwBb?= =?us-ascii?Q?OuAVxPKJBwW6XVmuMJufFIwDnt+pMUzfZsXNkLGPI93dUUimBsk6oBJ2CZkE?= =?us-ascii?Q?froPsoEU2lHSg3E5kL32VBAgNFp/2kz4ySFd4XS89/+T/m9s+mA3NYFztyuK?= =?us-ascii?Q?AI608MCmAvmRMO5N1+2fT2wx+kkIAUjCTFx70O+sCYDMb9mzRBKp952DMXcx?= =?us-ascii?Q?RrHydU3DQeHXKgwX9RP7q7E5DH/+M17qTMSYK5YAcN+8vosFlQFAY2yMFPGF?= =?us-ascii?Q?0qUFlAOd9h8Ce6E639Pp296jGoK8mtZIUzeT2OZltHIO6CgEY7LnHLxACkOr?= =?us-ascii?Q?Dn738gY78Eo9dp1AKsj6EsOC3KdPmfh3ziMd/eTfnk6spbf/pWkxAtrgOIOD?= =?us-ascii?Q?c6E2qVSdruBdeU0RXhGp/gIzthieTRoSlcyg6vTXr2sf+ixOqac2+8ce4N5p?= =?us-ascii?Q?W3LF5KoqJ2daP3G1ec5dmRns6WksAr7yjyR4oyvUhuYs1zyMpDYprAJeGG4d?= =?us-ascii?Q?LVcdcqgWYnfLyBQlQrioAT5iQliOpPdU63BJ91wnVSV1bSh7YyFi3e2ov1VI?= =?us-ascii?Q?4kSvn6ZTw0jv4obXDBCeJF9a3NZ/YnyQoHGOlLUffn53PAt9ajtsSuOVC4zi?= =?us-ascii?Q?SgobHmSMeaP8jAZGX9ExeVeChpSx92mx1QjaflkoGt1SSaE1BXTJGqpo3NOk?= =?us-ascii?Q?SuTqBZMbJ8ogS73A/4I9Y/XrJ7c4cTlHZBM+ExrPqMmYq5Ojh+SAcb39bBJc?= =?us-ascii?Q?0a1d0oUU5wCGoy8ZWJ5JYON3uQh2XO4uR47OliNC2ixFYQ6rUxglYmmp94od?= =?us-ascii?Q?G4ny1jE/wQYfUwp2easusvdqv/6KamIHzOgOLoo7V096lzszyqASeO64vSsk?= =?us-ascii?Q?oppDiZ3oScx54qY6SI3bqETAeX7GZXSrq3CzWtqUD1WXS9ioABe7Q25VkdLl?= =?us-ascii?Q?bYYLDRJ4TGENMMFfDu/t98v/KFBZKUnwb6XFBt4T13G9IaflDiSppuUR/PRj?= =?us-ascii?Q?967KioMjzaeZWaddv8uX+fMM?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47103f05-30c2-41a1-89f6-08d97c66f6a7 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 18:46:31.8008 (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: xuS81G8OHyjAkUOILq7dvYzPv9eqZhJ8+0AAjNxcNFpr3H+wxW2jQ/f2x/sn00m+KJzGrWePoShiGEI2KnxMSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4575 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The MemEncryptSevSnpPreValidateSystemRam() is used for pre-validating the system RAM. As the boot progress, each phase validates a fixed region of the RAM. In the PEI phase, the PlatformPei detects all the available RAM and calls to pre-validate the detected system RAM. While validating the system RAM in PEI phase, we must skip previously validated system RAM to avoid the double validation. Cc: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: Gerd Hoffmann Acked-by: Jiewen Yao Signed-off-by: Brijesh Singh --- .../PeiMemEncryptSevLib.inf | 20 ++++ .../X64/PeiSnpSystemRamValidate.c | 102 +++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf b= /OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf index 0402e49a1028..1cc9dd6691a2 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf @@ -57,4 +57,24 @@ [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire =20 [FixedPcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidSize gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbPageTableSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize + gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress + gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValida= te.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c index 64aab7f45b6d..eae7a31773a4 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c @@ -14,6 +14,81 @@ =20 #include "SnpPageStateChange.h" =20 +typedef struct { + UINT64 StartAddress; + UINT64 EndAddress; +} SNP_PRE_VALIDATED_RANGE; + +STATIC SNP_PRE_VALIDATED_RANGE mPreValidatedRange[] =3D { + // The below address range was part of the OVMF metadata, and range + // should be pre-validated by the Hypervisor. + { + FixedPcdGet32 (PcdOvmfSecPageTablesBase), + FixedPcdGet32 (PcdOvmfSecPageTablesBase) + FixedPcdGet32 (PcdOvmfSecPa= geTablesSize), + }, + { + FixedPcdGet32 (PcdOvmfLockBoxStorageBase), + FixedPcdGet32 (PcdOvmfLockBoxStorageBase) + FixedPcdGet32 (PcdOvmfLock= BoxStorageSize), + }, + { + FixedPcdGet64 (PcdGuidedExtractHandlerTableAddress), + FixedPcdGet64 (PcdGuidedExtractHandlerTableAddress) + FixedPcdGet32 (P= cdGuidedExtractHandlerTableSize) + }, + { + FixedPcdGet32 (PcdOvmfSecGhcbPageTableBase), + FixedPcdGet32 (PcdOvmfSecGhcbPageTableBase) + FixedPcdGet32 (PcdOvmfSe= cGhcbPageTableSize), + }, + { + FixedPcdGet32 (PcdOvmfSecGhcbBase), + FixedPcdGet32 (PcdOvmfSecGhcbBase) + FixedPcdGet32 (PcdOvmfSecGhcbSize= ), + }, + { + FixedPcdGet32 (PcdOvmfWorkAreaBase), + FixedPcdGet32 (PcdOvmfWorkAreaBase) + FixedPcdGet32 (PcdOvmfWorkAreaSi= ze), + }, + { + FixedPcdGet32 (PcdOvmfSecGhcbBackupBase), + FixedPcdGet32 (PcdOvmfSecGhcbBackupBase) + FixedPcdGet32 (PcdOvmfSecGh= cbBackupSize), + }, + { + FixedPcdGet32 (PcdOvmfSnpSecretsBase), + FixedPcdGet32 (PcdOvmfSnpSecretsBase) + FixedPcdGet32 (PcdOvmfSnpSecre= tsSize), + }, + { + FixedPcdGet32 (PcdOvmfCpuidBase), + FixedPcdGet32 (PcdOvmfCpuidBase) + FixedPcdGet32 (PcdOvmfCpuidSize), + }, + { + FixedPcdGet32 (PcdOvmfSecPeiTempRamBase), + FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + FixedPcdGet32 (PcdOvmfSecPe= iTempRamSize), + }, +}; + +STATIC +BOOLEAN +DetectPreValidatedOverLap ( + IN PHYSICAL_ADDRESS StartAddress, + IN PHYSICAL_ADDRESS EndAddress, + OUT SNP_PRE_VALIDATED_RANGE *OverlapRange + ) +{ + UINTN i; + + // + // Check if the specified address range exist in pre-validated array. + // + for (i =3D 0; i < ARRAY_SIZE (mPreValidatedRange); i++) { + if ((mPreValidatedRange[i].StartAddress < EndAddress) && + (StartAddress < mPreValidatedRange[i].EndAddress)) { + OverlapRange->StartAddress =3D mPreValidatedRange[i].StartAddress; + OverlapRange->EndAddress =3D mPreValidatedRange[i].EndAddress; + return TRUE; + } + } + + return FALSE; +} + /** Pre-validate the system RAM when SEV-SNP is enabled in the guest VM. =20 @@ -28,9 +103,34 @@ MemEncryptSevSnpPreValidateSystemRam ( IN UINTN NumPages ) { + PHYSICAL_ADDRESS EndAddress; + SNP_PRE_VALIDATED_RANGE OverlapRange; + if (!MemEncryptSevSnpIsEnabled ()) { return; } =20 - InternalSetPageState (BaseAddress, NumPages, SevSnpPagePrivate, TRUE); + EndAddress =3D BaseAddress + EFI_PAGES_TO_SIZE (NumPages); + + while (BaseAddress < EndAddress) { + // + // Check if the range overlaps with the pre-validated ranges. + // + if (DetectPreValidatedOverLap (BaseAddress, EndAddress, &OverlapRange)= ) { + // Validate the non-overlap regions. + if (BaseAddress < OverlapRange.StartAddress) { + NumPages =3D EFI_SIZE_TO_PAGES (OverlapRange.StartAddress - BaseAd= dress); + + InternalSetPageState (BaseAddress, NumPages, SevSnpPagePrivate, TR= UE); + } + + BaseAddress =3D OverlapRange.EndAddress; + continue; + } + + // Validate the remaining pages. + NumPages =3D EFI_SIZE_TO_PAGES (EndAddress - BaseAddress); + InternalSetPageState (BaseAddress, NumPages, SevSnpPagePrivate, TRUE); + BaseAddress =3D EndAddress; + } } --=20 2.25.1