From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.64]) by mx.groups.io with SMTP id smtpd.web11.401.1636738825821775824 for ; Fri, 12 Nov 2021 09:40:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=3OuM1dQR; 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.220.64, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WPwChm0FcO9xDevhuR/h9KE8RKXQFRK8TyLvp5cslPG6+1STj+jcyVNI/JtwCu4Rl/2YKqQMNh+0W00bRUNwZ+TV92bHA/Hy/6MTFue/U66frvafGEFrS9s8cPlcka47Iwjx+D9jtt+Xwe8WSf+QbXEhwtSBaHSukcNtCrLvsCwQtncWEls8t5G/QarQWwtET/xf55XDcY4arwhXBzp25uJxCHmBPAEE53yxoZjawBLF+IDp2xGKgpuYdkd75QSz2rG11iK17wLdNx2cS0yd7Erfq1x3M6/x17FRSC//8BWX/ZgvUajta7x19R8Zs7oEyAZ244/2YYX8HkK3Oux5Bg== 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=uZfAVbIA9EkCcp2VP3oV/UoxB+1F6Mw8Kfvwp/RP3ZI=; b=UszRFRTS4EFelsrRvtDWPTD5aB8p7UKWiLpsoozMYqbnwHklfij5geH0PlapQUg1/KoBMHXwv9QiR89WtTKc9qyqTBDCIB3XsvIJM1aT4Aii85oG1EvBi4MXprSR6h8fBXFxa2Gh2EVfE8TM5ZXImS+ML3XwfijaeQ5XKhuWVZI55pXzqOIu7g//BHxmznNCcc6+wGvNPaFALAe5LcKkwmKWfJuI9+vJ8GoaJlbza+J8G8TiNTxy100hS0V1Y3glC4CgLel9dRE059AozTTjoiRETSBNd+hTg1STIT+xSp1Ba6JIldAlSO48fLUTcby7om8hml7ZbwFunRhr8fqJog== 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=uZfAVbIA9EkCcp2VP3oV/UoxB+1F6Mw8Kfvwp/RP3ZI=; b=3OuM1dQRdpDT91BorZqlYU2CZJXFexaR6hD2DkS9Emf6dBRPJVXkVCJubiSOspPVH/4nFhSjBV+fPDKuMZaycgEpbbtC0Y2WL93hFUvcWHHn2RgTxf2nOgk4AEUUfnMEPDOAno0MofAInSwP1ckMNsRibZDr/+HH4vrjCSW0nNU= Received: from BN0PR04CA0183.namprd04.prod.outlook.com (2603:10b6:408:e9::8) by BN6PR12MB1860.namprd12.prod.outlook.com (2603:10b6:404:100::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.17; Fri, 12 Nov 2021 17:40:23 +0000 Received: from BN8NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e9:cafe::8a) by BN0PR04CA0183.outlook.office365.com (2603:10b6:408:e9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend Transport; Fri, 12 Nov 2021 17:40:23 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT014.mail.protection.outlook.com (10.13.177.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 17:40:23 +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.2375.17; Fri, 12 Nov 2021 11:40:19 -0600 From: "Brijesh Singh" To: CC: James Bottomley , Min Xu , "Jiewen Yao" , Tom Lendacky , "Jordan Justen" , Ard Biesheuvel , Erdem Aktas , "Michael Roth" , Gerd Hoffmann , "Michael D Kinney" , Liming Gao , Zhiguang Liu , Ray Ni , Rahul Kumar , Eric Dong , Brijesh Singh , Michael Roth Subject: [PATCH v13 03/32] OvmfPkg/ResetVector: move clearing GHCB in SecMain Date: Fri, 12 Nov 2021 11:39:30 -0600 Message-ID: <20211112173959.2505972-4-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112173959.2505972-1-brijesh.singh@amd.com> References: <20211112173959.2505972-1-brijesh.singh@amd.com> MIME-Version: 1.0 Return-Path: brijesh.singh@amd.com 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-Office365-Filtering-Correlation-Id: 8acf4143-25a4-4ab7-3894-08d9a6038151 X-MS-TrafficTypeDiagnostic: BN6PR12MB1860: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A6xzkDyB4jKTWvF4jUwUkbfAdkfVXEpQabltSND6wtRgALUI4ePYgKrrMiqIsyk8DUQEilyxHq5PP0Z8EV+UvN4tuVx1UHdrN6z7HYjfi9FHe7f+zXKJjfMH3LtExPyS2iAKdwxvSx/q2EdiMn7AvPz2ZYt6JLDNYI2Ezmx6ntas+PRgXDy4cHBGVuz+g8U70nhaUc4BNYmS87lsd9GcLFnx7P/SO2E+izEmx77xISPKb/dI0N8m9xHRYdItJAwSnCbn7TjCxIWmU6LMeIv0frWficAm4hebR97MxeS25k4SP467EGOK1P+KBDGyGEjCYR4ngFskCqQK8+VpyYnzMrCkpNACFn30Wioa9uH+RbaO4i/+t5uaCu4N9LTi4Hhj9Bp9n4oTuPeliDzG37zJlBaJtFMytPjm738kjX5zu7K2XSoN8M6LVG7RK9sZt6/Qh+yXigIpVfLNdKUU/Jqdo2G7WO21JAIbs4dLQMI3PeBCmXuZIb6kZ+MgHmQDgZCz0TymOx5sPoljeMM24nO2OnQon9sNPpFQO6yPqJ5B2YQroefORaSmkHVhbnxXkCcvg1dOD0Crr5nWfXA6si10Uw4NNRXzIOkByYTXiJBKgQVqWYutO19mgAUoPv3hvzYf4nBgoyUUZRoKYdEhEQdxKIh1omrSg6j0Rbd6eFZ7igKWDNyqRqDmjXp48SlRpM6clLBTlIfJwzD2+P5y0Y8Zs+8NAI9GL9B8jlUP1yAiqlEnx255ykX7IfGaiz7CZqSZkKvRwl9ONIN/AcGPWM2m1pzFmzVC46But6G3iWXaT6H2yInzNzmC+M44Qe8K1WjK 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)(1076003)(82310400003)(26005)(70586007)(2616005)(316002)(70206006)(44832011)(83380400001)(508600001)(186003)(16526019)(86362001)(426003)(8676002)(336012)(6666004)(966005)(36860700001)(7696005)(4326008)(2906002)(5660300002)(36756003)(8936002)(81166007)(47076005)(54906003)(19627235002)(6916009)(7416002)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 17:40:23.3862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8acf4143-25a4-4ab7-3894-08d9a6038151 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: BN8NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1860 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 In preparation for SEV-SNP support move clearing of the GHCB memory from the ResetVector/AmdSev.asm to SecMain/AmdSev.c. The GHCB page is not accessed until SevEsProtocolCheck() switch to full GHCB. So, the move does not make any changes in the code flow or logic. The move will simplify the SEV-SNP support. 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: Gerd Hoffmann Signed-off-by: Brijesh Singh --- OvmfPkg/Sec/AmdSev.c | 2 +- OvmfPkg/ResetVector/Ia32/AmdSev.asm | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index 3b4adaae32c7..7f74e8bfe88e 100644 --- a/OvmfPkg/Sec/AmdSev.c +++ b/OvmfPkg/Sec/AmdSev.c @@ -95,7 +95,7 @@ SevEsProtocolCheck ( AsmWriteMsr64 (MSR_SEV_ES_GHCB, Msr.GhcbPhysicalAddress); =20 Ghcb =3D Msr.Ghcb; - SetMem (Ghcb, sizeof (*Ghcb), 0); + SetMem (Ghcb, FixedPcdGet32 (PcdOvmfSecGhcbSize), 0); =20 // // Set the version to the maximum that can be supported diff --git a/OvmfPkg/ResetVector/Ia32/AmdSev.asm b/OvmfPkg/ResetVector/Ia32= /AmdSev.asm index 250ac8d8b180..48d9178168b0 100644 --- a/OvmfPkg/ResetVector/Ia32/AmdSev.asm +++ b/OvmfPkg/ResetVector/Ia32/AmdSev.asm @@ -177,12 +177,6 @@ pageTableEntries4kLoop: mov ecx, (GHCB_BASE & 0x1F_FFFF) >> 12 mov [ecx * 8 + GHCB_PT_ADDR + 4], strict dword 0 =20 - mov ecx, GHCB_SIZE / 4 - xor eax, eax -clearGhcbMemoryLoop: - mov dword[ecx * 4 + GHCB_BASE - 4], eax - loop clearGhcbMemoryLoop - SevClearPageEncMaskForGhcbPageExit: OneTimeCallRet SevClearPageEncMaskForGhcbPage =20 --=20 2.25.1