From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.79]) by mx.groups.io with SMTP id smtpd.web10.874.1631557202199811456 for ; Mon, 13 Sep 2021 11:20:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=Uxkm0YFa; 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.94.79, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjSf6oR5oq8+73vXWXp3Bn+3rl8tQ1L0HJTnj4/bAbfoX8he7YQIkDf7O55b1fN6nkOUoqBiVCydv4wnYtp3UZWbkQmuAlDzAVRAQweytn0JU5Z/rI6mTsISlurQ4oNx4/mMIChTFgTEpzEHX8asoPNct+8iU730pvVx37lnLIa2+D4W6YHnVFXtGFWCxwAI7S9H6I67zHJcW6NusTbjKIb1aThKy/bSsqFVa+86GZNRYyNVlB9edZR/6CYAVIdBhsJTPVJqxqBfcJGcRLxid+KUe2bg9QhR89SZsu+QZR6FVRXQORUPl2qx8fuKiD77N0e+Qu80kiEA05VkGb3zcA== 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=DCEYceYwqAFO1rCw3X6ZakFAAVqTMjKJYTSGXGJEPAo=; b=j7afLRBPciE7Db2vwdCswP/glYZl0Swwke+ntznqoYrUcaWiAfMtvvaO/TYEPWslPEjVT8JqKF3ma8EgpUMRLg0ZCnm5K2WAlcDU8YHR3OOFmZ1JwS5f5C0xHDmrO1S4uTxzt+oRT4XEPv4ZxnJdmG3LeyJZB6W+FtBbAinOvUPIQdawo81TEuKhMJ/PSWGWHoWVEe3KAgQ/VFnsnXp5XZtf5xGhHFaROZ02QvdTxKRWt2pK0y/09Fqlzrdy58eDlP0NrkYRHFwNX7DpXU9IbaOot3mPw1xfMsDCxl3UkhJ3Cm2DdvzbL0egkwUiPOZS7He8STb8OUqxUEbFxKYYlw== 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=DCEYceYwqAFO1rCw3X6ZakFAAVqTMjKJYTSGXGJEPAo=; b=Uxkm0YFaiuV+hF2cx5moVcacjmkX6G7WR7qj/nnLCUKCbSjUIa8zzjoZ/R7depn/V0lWwxoZr3Bc5VVL0CEdGC5AeGblcllvoeQAGwXtAQjMrRLlbYK0fArUND7slzEQlUxf6jnF9iJT7AqynR4zuKjV9kuHy10zwKPsxG170zo= 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 SN1PR12MB2512.namprd12.prod.outlook.com (2603:10b6:802:31::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Mon, 13 Sep 2021 18:20:00 +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.4500.019; Mon, 13 Sep 2021 18:20:00 +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 v7 02/31] OvmfPkg/ResetVector: move clearing GHCB in SecMain Date: Mon, 13 Sep 2021 13:19:12 -0500 Message-ID: <20210913181941.23405-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210913181941.23405-1-brijesh.singh@amd.com> References: <20210913181941.23405-1-brijesh.singh@amd.com> X-ClientProxiedBy: SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) 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 SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 18:19:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5beb2a1c-9db0-4eaa-3a25-08d976e318e7 X-MS-TrafficTypeDiagnostic: SN1PR12MB2512: X-MS-Exchange-Transport-Forked: True 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: hyced+hy9bH/TQEI2FPBDMyun25WUYFQJWe+/vzb+jwMh9KMF7YhVPAAsOjjyD0FbPYt+SJDgBBodSK+xyolMUTuNBU3lZbtxdl2/uBRCfmSNWhA1UevvNaxjfhuyspyTixvqSpFQFnz2zXcfVOvhOD3MFd3jOzORGQDxnHklTcPEoWv4jlgFAGNoBFQOCrG+JF9xSsBtVWlGgaf+5i1iPvW6glOdl0BvqdXOCH+NDCzrkPP/NBA1Ph2QaORMqY144Ea/p9ftggSTtsjbMSsdy7YQvvFM9REOs3JTDEplDKI35ifgWgHQ3TllCSMRLfNNipmxwS6R3fWXAq8ww7CU1AOE3llRXsdZjswfDVXRtgukR53pHSHvHQm09byHztiCInAGTXWBcl9LtqAWMqhumGc67MhYiXlFbfa97ElAjONp3yw26XSW2D65dLUpQaA3BAIVdHptnUX8ihVGshEd6SiN56kg72b2qbAlc9HeqCrJaDTLoCNlI3yNiX9Argzm8hW2cp+K9T1OyqjbEIQAv/+k0kafL12881z9ZioLQUXk+9Qil7iZwW6V7H88Ddbcjoax9FKscXcMEJ9T+m4+zCELYYHTksZGyOSIHstrKKXWwixMK+EvH80LphZZP/ASzoCuXNCl64q58WDhCPx07XyOo5qYLGTwB2vEJoisXs8gNQfSOCJ8nJA3wz3qobcLBhpG5si/8DhIQNhxX19fOm69C4DBhohzGlbutR2Vy4yRNuNe4IH9M0WPfqV9Euj9KpopIxFqMG06JUXMFBdF22T0rbBg2NfRDEzWarirm0= 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)(396003)(346002)(39860400002)(366004)(376002)(136003)(83380400001)(478600001)(86362001)(8936002)(966005)(6486002)(8676002)(186003)(6916009)(2906002)(38350700002)(38100700002)(26005)(36756003)(19627235002)(956004)(2616005)(66946007)(6666004)(66556008)(54906003)(5660300002)(52116002)(44832011)(66476007)(316002)(4326008)(1076003)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XWaPft50XVWiwVGYIbDv0Oo3C2WuF0FV/sSI38WXFYmOQ1tSimYUu67IDWqA?= =?us-ascii?Q?gzEyA9+/FNxB22nE0jsxF8HI01QN+y2EsVcwRCFegbsLBTeHIYNt15XHezvl?= =?us-ascii?Q?D5SSHvznDTPNUqqOCGsGcLQ2S+gUp4yN7w+7aGxxm+BS1L1J7DxppvQAOM2O?= =?us-ascii?Q?yVa8YPrGVvQhP5x5SEhf/ouQfIsPx1NkZoIDfHLPmrExa3oEnLOhUea+CabZ?= =?us-ascii?Q?hoLb5+Z+rsPCKXfPHdrDZYRcZHzlsIhuQzESSw0wV1cind3qniCJOU+mdegp?= =?us-ascii?Q?EKY/kyza4Ntao1VoizsSKg5Rr7nc78hYIXFSA3TZCTFPwe41+JUYe1bGFfsi?= =?us-ascii?Q?DKhopN3aMFcF7UZgHc8FmRelij6XtzGqt0cL8Y6fmnxH9Ck5DSsK+Src0FSp?= =?us-ascii?Q?Kt1gZTXtp+PraBp6QPb32WcKZ9aK4m/NGzMf0OXN9LJ4TJn0mYy3bSnI5PWt?= =?us-ascii?Q?I09VRy+KzTIO654TXunJKG3uhembQOaHJ/f/lr4RR8gKNzZr/O4xGc2V1bVZ?= =?us-ascii?Q?4k4bnTGjIHbQUpqP1AJOSuLqgraJpRbs+fbZfP1yk3mQt8iprr9ZBaUR+wKK?= =?us-ascii?Q?aozcFzOprJzF/k+GlYzuZYVXPPMzvWKPyQf9em+idhJ5J1LkUITIRyzpwNjR?= =?us-ascii?Q?HcUeVO892UbecpRMAv7IfgKLDZ2oljUjEvMfOSAb/ywWcpuOEBraTBnw0wwz?= =?us-ascii?Q?Pblnjos4LxxNRzczZYh9EPZD545vKaWKgBvKV54SHeB0m8txIxX3GCp4kyJm?= =?us-ascii?Q?KHqmv4Hfh4P7cwETjo+rmowLfxo3Gh1KoCw4a0sTui/D+t6/2kr2qYjjJeyy?= =?us-ascii?Q?OYNc1VoxRtQfQ1hBfiMERpoH8boonakLf6D1FnVmzOP96wINEtRhYnNwMZAp?= =?us-ascii?Q?q/baV3Yn79EGgn41ALEJTSZhOatLzMSM2UUcYX3/FyDFXs5bCBh+mAE6X7Zz?= =?us-ascii?Q?A5tVruNKrYJRt/4eBMDCxVhtSqcnIjpuYYD/eupJWxzAgChT5EhEMqCy35cz?= =?us-ascii?Q?2aWedb3gBZB13cz14EVNkqObh+qzNBDEheWnjOm5XMXkDEgWhqQU0dA8VoAJ?= =?us-ascii?Q?2dGa6q6WPU83aVmOZBCu+Pwn5y9cHMVrAml5juNZr9KpLmoajybNZSKM/L+/?= =?us-ascii?Q?JIJ0lKFpyP7thbnHZ6nvSbWYlJUEPac0VIoouuwZ/LvLGPxs19j67whajK2k?= =?us-ascii?Q?kV1eDKv+Tx5mydgmC52dm0kH47Ns/MOhQ315Uh0VvdnZf7xVVMHtjzKAl8Y3?= =?us-ascii?Q?hOQmy7sm/uliyhJB06ZR3HIM0NOhkwFs3z07UIn/+aJBOwVXAy8A/BZMJzXU?= =?us-ascii?Q?BSt+RgZLtg5VRZtD8NKpytxO?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5beb2a1c-9db0-4eaa-3a25-08d976e318e7 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 18:19:59.8945 (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: Xhf59thfgXGv6P5LckXB7CslEb+A5WQLDxpUw08mgSdGSOLednusq6WeVwvFS+UEokWS25qPyOsaLNm/P3y9fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2512 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 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.17.1