From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.47]) by mx.groups.io with SMTP id smtpd.web09.15162.1634672412832852946 for ; Tue, 19 Oct 2021 12:40:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=LxI9Om75; 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.243.47, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g5p8b92ll//lFUtOmkd7OCU+r7SPtpnCSHADggCrbJ6eak4Wcv1Q12GHWkhf4mSQqsmx2Qo5vJNx1roSmj0W8ZAF2Ut6YIsrjvJBvVJKmSqeOdNZtJs5Er33n6DuY7F2BEF0dQQaeDzS/J8RReonhusVnD645q19euc6/dqmA9B2SOFgmIwW52TrCFDil5cDP21Apdyzn62ec0/E5lXyY8zn9M7/AsiSntSlbbuPen8L90Ncrzl2YQ8WDGPpqLjpCPZVLOu2ZKcIdnZvqyEnwrJr1aG5Z82JmBM8BL4CvhPM3pmFD5LQj1kRjRbevgqdbd53p5tKqANAqXvDQ2rIKA== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q78Y9dUTMjc1Mm3ohrlMeD11Wx1hYFU9rEyg7kTg4Eg=; b=mqCWoFzu69c8YmgK2NqiZGfmOfTlUVO9ITQlinX9kO4yxQHfCWGcGpTebnfvUOSEDD0AOJ1+6l+Ov4LbPCXoMZqrh4rIvu+IOlFbyy/LfmYtXPDfhHQy+cTK4AJEVa4YSsRdKz5GaQGdAEQnvnU8hpIn9xnLoM5HTBBldAONmOvJ76eMXiuErThSyyVr+ANgL8Drk9DbOchngvq49nzCMMdhcW/duKSFaLYvpDo5Pp/6rq0hZcMl7wVolXN3ejfPlCBDiZ6uSKVRCV3LSv49amqtU6A4omLtD29uGXB9t+60AWh1UoGmeRUlRxo/QnsuV7jsTwY/qeR8E+o5085tmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); 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=Q78Y9dUTMjc1Mm3ohrlMeD11Wx1hYFU9rEyg7kTg4Eg=; b=LxI9Om75RKU75qLTHXjun57LxsoKf59ujt7Y9NLOqvjFHajKzx0Dij92wrGVbzqq+XX2qbtA9VjhmP9k3iwJ1mWt1W9Tmqt9MJxY2JxK88mKc1z05mf37vvtf6/RoZHApY5Apf8CnSvyhHIOwKveYDVED1dtXyDzQ1TrZwtCdGM= Received: from MWHPR02CA0017.namprd02.prod.outlook.com (2603:10b6:300:4b::27) by BYAPR12MB3254.namprd12.prod.outlook.com (2603:10b6:a03:137::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Tue, 19 Oct 2021 19:40:08 +0000 Received: from CO1NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:300:4b:cafe::4e) by MWHPR02CA0017.outlook.office365.com (2603:10b6:300:4b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 19:40:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT054.mail.protection.outlook.com (10.13.174.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 19:40:07 +0000 Received: from sbrijesh-desktop.amd.com (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.2308.15; Tue, 19 Oct 2021 14:40:02 -0500 From: "Brijesh Singh" To: 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 v10 16/32] OvmfPkg/BaseMemEncryptSevLib: skip the pre-validated system RAM Date: Tue, 19 Oct 2021 14:39:18 -0500 Message-ID: <20211019193934.1052465-17-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019193934.1052465-1-brijesh.singh@amd.com> References: <20211019193934.1052465-1-brijesh.singh@amd.com> MIME-Version: 1.0 Return-Path: brijesh.singh@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f20fd5eb-5e03-4fab-af24-08d9933841bf X-MS-TrafficTypeDiagnostic: BYAPR12MB3254: 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: rejd941LRb5m9Z893kicvmbpdFTtJ9hIWnFZjNkNmB66/a8hLhpW8b2JY/kt06b4tfkuCU8OlfBCto/IWHrSB116sFTXUIggva3Vdf0Um2X3WZKX/3UZWqZBDIo4tGuojpsDtHj++KEKfWvtCNN+9VpJzGLUXdt6rN1rnPEgEuWeKHdqQCo8fn3rfLQnjqQoRpQZ4v3ACXJCsAZqZE8z9JYrpjwH4uI9NFtpyq6fyQl5VVUXlynGOQaPozpLQ2GYU1CpSp3dS2+ybMjOK1A34RBvz6XBjB0vQbSk73x6SW3q1Uwm9kt10MCJQpM5lkWflrsKJLc6urshuGbJwM6ht4bR7XQlEWFeIXMYIqKSgii1QxkGmyadhNqsvD75jLadiueZACFi7PKsMe2VrPzT5nt3cuqMFx6oBGFFSGrCMRJJCZJTMg5cVM2sINBTN1Ep2/oTrPOWCZeYeahe/D25yFPivH6PN0L0C8W18wszxyU46/1y8tIUXRZw7wjgFG5nigiw8mCgUe2yS3YurEJhWgkJd2WB/2RrQqEeCEYoeeHkcattggRKtq6mtEIDdMSs0VzbngeF7p/+y36g4hMyM17BI7N59adaoMC6BaUEaQ5ttLaDX9o4b2Tyy8OG9Qs1GJhh+GFFwZj2dYCjU8QBrjZYPgu3ieIMvWU5W9Wjv54ABTBok/Z2dzs3UWZCXrEXzvJy0BclLFgTrUYG7u6/T9C5hAASl3zSJHzG0sf4id1iIDsQuuYmmWvt9tRoCdcLuPaJ3G3bedoy97dZVpPuw9XG3pWrrBHgtbaB6HwdLyyJFZv7Tuyw725lb9o0ajckq935dd4Bj5R+pOR9kJQfMFxTYZvUwL5z390PEH8T5rc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(508600001)(44832011)(966005)(36756003)(36860700001)(8936002)(7696005)(54906003)(19627235002)(1076003)(336012)(6916009)(186003)(81166007)(2616005)(47076005)(356005)(86362001)(4326008)(2906002)(83380400001)(82310400003)(70206006)(16526019)(426003)(8676002)(70586007)(5660300002)(26005)(316002)(15650500001)(6666004)(213903007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 19:40:07.8639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f20fd5eb-5e03-4fab-af24-08d9933841bf 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: CO1NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3254 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 Acked-by: Gerd Hoffmann Signed-off-by: Brijesh Singh --- .../PeiMemEncryptSevLib.inf | 2 + .../X64/PeiSnpSystemRamValidate.c | 66 ++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf b= /OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf index 0402e49a1028..49d5bd1beff1 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf @@ -58,3 +58,5 @@ [FeaturePcd] =20 [FixedPcd] gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValida= te.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c index 64aab7f45b6d..cea7ecf96563 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c @@ -14,6 +14,45 @@ =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 SEV OVMF metadata, and range + // should be pre-validated by the Hypervisor. + { + FixedPcdGet32 (PcdOvmfSecPageTablesBase), + FixedPcdGet32 (PcdOvmfPeiMemFvBase), + }, +}; + +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 +67,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