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 []) by mx.groups.io with SMTP id smtpd.web12.10214.1619783548337545009 for ; Fri, 30 Apr 2021 04:52:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=QNbQycdI; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BT8qYs4T2bc5c+tZ26xI53b1N+B6fa47gokw8niCw6A+4Miuw9QdefqelxeB/lTCAsgGD1RezXPlPgz071OGJIhmIX2KxCXbon2PhWabL6ZuEug12AZZ/2F7fZmMQsgk6uq1AlmtbkGNF07GBRcWd/LKj434z5mB/Fibeax8NJ3FRc/MHNcD4YqeAt4b6M5RK/mOnLAgIU7MLDJ1cHSIWNij1gvCWdepcU2LxC9+egIVJFlS8gvbpS4/UJ21lOGaPkKBEr2ZYHBH4F5Sz6MjdiRB8AGFnDCAihpOfrv3Bwf9lSPURGDFJ9N0C4n4BamCkhw3mg0UHPL+gLiZJuBh+Q== 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-SenderADCheck; bh=+mvpw52pGqbRa5XlKoQ7QSFYm7oVu0wxuD6l5T3NezY=; b=PwuWJR6LWWmAzX2PLCu83Iy0vgb6PvddOYxfS0QHhRvwN16diDENY0emjFvNpR50KGAA0e37WLx2GrGqobXrfJJ9lHbHpnUBragx2Nmyv/6eFjhqsW9f/Lt9VWARS85A5iE3JKJL2Y/jO5W7pd3fuSrBbORivydNhngdXDICPj3WkiUyzVvNBQKjzNC0V86+qGTmmmR2NixGMnr08UvJ+r7hPpoYhhFHGz9drqFwIjjJesJt2AX+bNgFJ6ByuM2pzSJfOW/YOSgyvyzP4qAqXoMX++bCGYp1437JgDUKISmy4f88bNT+uvB5GGrMRifREoFFESxNiz9+VUu5HC9nMQ== 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=+mvpw52pGqbRa5XlKoQ7QSFYm7oVu0wxuD6l5T3NezY=; b=QNbQycdI5z5kf8sPyxgmjxwBi5DjMKWpgYwzVP9HnbsueX4IDh88pUd7Cmo+Kd+4wh/ZGGqcG0E5FSjEEhslc2P9u/BeEX7UlfnDQbGdwqCjoqyu2tiUKQaROstcGiD9zr8aOJUQk4OhGcg2ulJr5BWdh5wZ5c+BoBkXsxfQyBE= 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 SN6PR12MB2783.namprd12.prod.outlook.com (2603:10b6:805:78::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Fri, 30 Apr 2021 11:52:33 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4065.027; Fri, 30 Apr 2021 11:52:32 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io Cc: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [PATCH RFC v2 24/28] OvmfPkg/SecMain: Pre-validate the memory used for decompressing Fv Date: Fri, 30 Apr 2021 06:51:44 -0500 Message-Id: <20210430115148.22267-25-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210430115148.22267-1-brijesh.singh@amd.com> References: <20210430115148.22267-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR12CA0006.namprd12.prod.outlook.com (2603:10b6:806:6f::11) 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 SA0PR12CA0006.namprd12.prod.outlook.com (2603:10b6:806:6f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Fri, 30 Apr 2021 11:52:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 380b128b-b414-42cc-2059-08d90bce6f46 X-MS-TrafficTypeDiagnostic: SN6PR12MB2783: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x6UDiZXRowqu6ruFooZ5yguvzq+AOtn0s+Wud/TWBEvpBC1ItyesWlVg8WJ2rMpvNORdTX8ZSi3ezhzNcUD2QO3Mh+xvHRwKotguqb8PsoENIRXM6uGu7YNMlB9AEM7FWCU/dea447x399meS1czPH8UQsNDxvNDBu4dlXMcZOn0Nu+gbcF7bWnluJftrUI0jSGAEGDPcR18d7aWB3sssrFi4gn94n7zgmRn3IiuPfH2EJyRI0tLIkALIv7dM8Ip4y1srZp8Zl3zJ4gWfsF8mTzo7zFWztUkne7ndyI+21hYYoG2jrIuOePVcrGZeM3luKPkHCsrQ6wgfarPYdllQP4Aw+nt2eb6A1v/NWkdp3pb6i4egQFPo8EQA9MwLhZzzyHhG6SCNjrSdrfl5mAkToZbOXr5TMSijT4mInXicHtEBuRnmnyjaotRgKQ7uyd2U5Dtl4Yid4rSg6wnrDohfewQqMcbsoueBk1slFUoy2rsSME8mhTi0ARF3gg/4yoozLlwjKmsyewBmLjAH4jULYIDKAGC5ndAoUyRb+ptQOe6rF9oPtDjKV1fOt+b6C63Z8WZDPLFB7zKNcSvNJZ4Jcgua/G3gdQMTY72cVDIXD2it9QzuqjrYdb33hqEx5UZj6So83PC9tclyIlcdE3N2TB4n4kMtk6LZWiJ0qdrEnoqqxL85ay8Fcpchp2uFQ1/p67x4qEIHaj4Z1nk7wj/53aaIN5YF9BfP/pGpdToi+E= 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)(396003)(136003)(366004)(376002)(346002)(36756003)(44832011)(16526019)(52116002)(2616005)(956004)(66556008)(26005)(38100700002)(54906003)(966005)(1076003)(66476007)(186003)(7696005)(66946007)(5660300002)(15650500001)(6486002)(38350700002)(6916009)(86362001)(316002)(83380400001)(2906002)(6666004)(8936002)(478600001)(8676002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?+mYdLZMNUjnb4iL9bGgNRpksbenhbSXFRQmdNa6pobHOMiZgWethB/2CahgA?= =?us-ascii?Q?DStYMTEOxCyhaMr5YOU8DnhGZzckv5WDgNNJA5D23oR3NroYPxzGLV51bZXV?= =?us-ascii?Q?S/fhWmlZZ6Q6UpFpbFNceppdIqyTauxUyJ7fHJLQFVojh3k35HjhMSY3ts3s?= =?us-ascii?Q?g3qSOnpBcWrAqlqV52cUKR9NvXpMzITwEmYxkQ9MlqEPRQIMRSjtLadI4SUq?= =?us-ascii?Q?N2CEeszmrSS5+QXVRvZv9GrVxfECDAw2Oo1neFAQQCPfDDxG6BKW2BT7EPlA?= =?us-ascii?Q?TZd6WkYRO4CgYJBblMNxIQYKO/77+r92M9WnEjI6qTTN3r0rTOvXr7LIoIz9?= =?us-ascii?Q?ptj/jNprQyr+Tm7BLnAbcXWN7qnt7WctOZCwu06bJjncVYadEp6dlglFs2h6?= =?us-ascii?Q?c7k9DKZyFN0qcUbV6VQimBGoDLkukvYoCVMHaGBMwC4UYiF4MN1H/9hUtY9T?= =?us-ascii?Q?EGNmDOQSVhHT2w4yj7P/h5USgWk3F5RAVnPhvCFE7SJOwmTG1TgX0mQSRk4W?= =?us-ascii?Q?r+LZDsJ5ltUN9OocmaGAjPcAiDpsZjrBlUS/hWA80iKJo9oIlqvwr9XIsYyZ?= =?us-ascii?Q?wuctg97vZEPInCHDIm1oLwwXjOYBNyKJeKLQezjg5CdqOrs/9fryl27tQNS/?= =?us-ascii?Q?+cGC23c0UbuKag4gN5WBk6LJXKG57r/cIBIQYBBOa9hTi29biJ+/Zc142JJK?= =?us-ascii?Q?xF2+tH9bj3xbSFf2HYZ26ieg8OQus3ahJaQVV+Sp7QWRcX2kajCRT5A+kAsM?= =?us-ascii?Q?pUjK10kAiPqgcJ7I61TTB7l8iHIDsJ3NSJM37YT/fWgdNocNBfyr3qDtW0jp?= =?us-ascii?Q?WDLSfRgYw4MJi5E/0jnusNigeVh/4L/CotM67HUj/9wfLYSMNxbPRUu92x5a?= =?us-ascii?Q?zzeE3B0y4tJLzZL2GUvKdkdIRBHvXpy1vl9OQXentCDC5Wd4ef0cCYKdIXQb?= =?us-ascii?Q?wa+yJpL4n67IqMNvdCU59GJiDSB8bNbV61AIZI4ZBelju1joqcsuOdHkeZ3q?= =?us-ascii?Q?exKfTO+dIgXSXDGtiK3UA6zh3A3+7NNSeakZKtNgOdNwTJr0pCWa4b8bw6RD?= =?us-ascii?Q?8650hvXHKGNbBIfbng0Ff3F+/6IrMymp3dMQ6LC1tHZ05RjyL2gjgsudiD46?= =?us-ascii?Q?1haiJRCNxAAL2dBo5KcIcx+emlhvo/MTUjcUfTKr4JfejV91gjZY//eWcBe8?= =?us-ascii?Q?Ba2WSG7qK6rngxbKgkMc6NsDQAXqWzPH5S4YKyxP/a+ThIemTKQU533n7M+d?= =?us-ascii?Q?q7kekq7IFUpAsBjVjKVjMWRf+CiWHR+O/WqEvSrvtkzjKQpKR0ENCWHQlFzL?= =?us-ascii?Q?lre63yAn3B8jYN3o8KvouWbZ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 380b128b-b414-42cc-2059-08d90bce6f46 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2021 11:52:30.9100 (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: eNWF50Rpvn2/uTkMYvdmI8Q41e1m+/G1dlhQP1FntJnYlCmFLSd2IBMu1NF22zDag8pJsYXH0NyI4wR6UobGrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2783 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3275 The VMM launch sequence should have pre-validated all the data pages used in the Reset vector. The range does not cover the data pages used during the SEC phase (mainly PEI and DXE firmware volume decompression memory). When SEV-SNP is active, the memory must be pre-validated before the access. Add support to pre-validate the memory range from SnpSecPreValidatedStart to SnpSecPreValidatedEnd. This should be sufficent to enter into the PEI phase. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Signed-off-by: Brijesh Singh --- OvmfPkg/FvmainCompactScratchEnd.fdf.inc | 5 ++++ OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf | 2 ++ OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c | 5 ++++ OvmfPkg/OvmfPkg.dec | 5 ++++ OvmfPkg/Sec/SecMain.c | 27 ++++++++++++++++++++ OvmfPkg/Sec/SecMain.inf | 3 +++ 6 files changed, 47 insertions(+) diff --git a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc b/OvmfPkg/FvmainCompactScratchEnd.fdf.inc index 46f5258329..b560fb0b8e 100644 --- a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc +++ b/OvmfPkg/FvmainCompactScratchEnd.fdf.inc @@ -63,3 +63,8 @@ DEFINE DECOMP_SCRATCH_BASE_MASK = 0xFFF00000 DEFINE DECOMP_SCRATCH_BASE = (($(DECOMP_SCRATCH_BASE_UNALIGNED) + $(DECOMP_SCRATCH_BASE_ALIGNMENT)) & $(DECOMP_SCRATCH_BASE_MASK)) SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDecompressionScratchEnd = $(DECOMP_SCRATCH_BASE) + $(DECOMP_SCRATCH_SIZE) + +# +# The range of pages that should be pre-validated during the SEC phase when SEV-SNP is active in the guest VM. +SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedStart = $(MEMFD_BASE_ADDRESS) + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase +SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedEnd = $(DECOMP_SCRATCH_BASE) + $(DECOMP_SCRATCH_SIZE) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf index f4058911e7..2b60920f4b 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf @@ -58,5 +58,7 @@ [FixedPcd] gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedEnd + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedStart gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedEnd gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedStart diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c index ff4c0742ed..7d8e681acd 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiSnpSystemRamValidate.c @@ -27,6 +27,11 @@ STATIC SNP_PRE_VALIDATED_RANGE mPreValidatedRange[] = { { FixedPcdGet32 (PcdOvmfSnpHypervisorPreValidatedStart), FixedPcdGet32 (PcdOvmfSnpHypervisorPreValidatedEnd) + }, + // This range is pre-validated by the Sec/SecMain.c + { + FixedPcdGet32 (PcdOvmfSnpSecPreValidatedStart), + FixedPcdGet32 (PcdOvmfSnpSecPreValidatedEnd) } }; diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 70948ab478..d1bfe49731 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -332,6 +332,11 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedStart|0x0|UINT32|0x49 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpHypervisorPreValidatedEnd|0x0|UINT32|0x50 + ## The range of memory that need to be pre-validated in the SEC phase + # when SEV-SNP is active in the guest VM. + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedStart|0|UINT32|0x51 + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedEnd|0|UINT32|0x52 + [PcdsDynamic, PcdsDynamicEx] gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable|FALSE|BOOLEAN|0x10 diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index 7c9650ba8f..c5467465ab 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -907,6 +907,26 @@ SevEsIsEnabled ( return ((SevEsWorkArea != NULL) && (SevEsWorkArea->SevEsEnabled != 0)); } +/** + Pre-validate System RAM used for decompressing the PEI and DXE firmware volumes + when SEV-SNP is active. The PCDs SecPreValidatedStart and SecPreValidatedEnd are + set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + +**/ +STATIC +VOID +SevSnpSecPreValidateSystemRam ( + VOID + ) +{ + PHYSICAL_ADDRESS Start, End; + + Start = (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSnpSecPreValidatedStart); + End = (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSnpSecPreValidatedEnd); + + MemEncryptSevSnpPreValidateSystemRam (Start, EFI_SIZE_TO_PAGES (End - Start)); +} + VOID EFIAPI SecCoreStartupWithStack ( @@ -1038,6 +1058,13 @@ SecCoreStartupWithStack ( SecCoreData.BootFirmwareVolumeBase = BootFv; SecCoreData.BootFirmwareVolumeSize = (UINTN) BootFv->FvLength; + if (SevSnpIsEnabled ()) { + // + // Pre-validate the System RAM used in the SEC Phase + // + SevSnpSecPreValidateSystemRam (); + } + // // Make sure the 8259 is masked before initializing the Debug Agent and the debug timer is enabled // diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf index 7f78dcee27..8144b1d115 100644 --- a/OvmfPkg/Sec/SecMain.inf +++ b/OvmfPkg/Sec/SecMain.inf @@ -50,6 +50,7 @@ PeCoffExtraActionLib ExtractGuidedSectionLib LocalApicLib + MemEncryptSevLib CpuExceptionHandlerLib [Ppis] @@ -70,6 +71,8 @@ gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDecompressionScratchEnd gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedStart + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecPreValidatedEnd [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire -- 2.17.1