From nobody Thu Nov 14 18:06:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+99099+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99099+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1674767869; cv=none; d=zohomail.com; s=zohoarc; b=j5lTJEln8DfI0t05PK/ObcQ8NZFBaupEHRHVLdzk/wImpSrUDejpBwXalYyKSeTdopKdwLURrwj3mJG+MgAbtgWH5Dk5aweI0PiWe0CmWoWqrVoHrBZW5PImXdrSumM5XzV4uimIg9Ed09YqIxbxwPvfT89hSmBPiTM/7MNhW9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674767869; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=jCbFKW1vNszTpUhdJH81TnYjpuZfnIdih+4k1tVuvpg=; b=kq9tX65c/k5ewey7o2Q3ixsARWUHR9wJ4rtDzywDlA6SWIhdadoo4Y7wzM6N3/k+SDhJpyikMsbfQ7qbtZgnQ3GD7vUOoXbX0tOpxnBTwdZLRBgoYoDwc0nHrC10S9usU1jA1OCuC0u+AgMBRqpFIS1GxsK3+XD7P08Yh63S8Y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99099+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1674767869054487.2235823028527; Thu, 26 Jan 2023 13:17:49 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id E3QWYY1788612xVfRLXEqdWB; Thu, 26 Jan 2023 13:17:48 -0800 X-Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by mx.groups.io with SMTP id smtpd.web11.86794.1674767868278419502 for ; Thu, 26 Jan 2023 13:17:48 -0800 X-Received: by mail-pf1-f201.google.com with SMTP id c5-20020aa78805000000b0058d983c708aso1467619pfo.22 for ; Thu, 26 Jan 2023 13:17:48 -0800 (PST) X-Gm-Message-State: yk4x4fZOocAGUiYiaLkwDxMOx1787277AA= X-Google-Smtp-Source: AK7set9QiSvyYPDBWUYDTP/x0W6GobPmfM2sTU/O1R1BrVZ9HqCsyrjRBfqEZPdtPC5qpmRwYKC3ewMnCupEdWYPRQ== X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a17:903:2652:b0:196:32fa:6991 with SMTP id je18-20020a170903265200b0019632fa6991mr852817plb.29.1674767867612; Thu, 26 Jan 2023 13:17:47 -0800 (PST) Date: Thu, 26 Jan 2023 21:17:37 +0000 In-Reply-To: <20230126211740.3235408-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20230126211740.3235408-1-dionnaglaze@google.com> Message-ID: <20230126211740.3235408-2-dionnaglaze@google.com> Subject: [edk2-devel] [PATCH v11 1/4] OvmfPkg: Add memory acceptance event in AmdSevDxe From: "Dionna Glaze via groups.io" To: devel@edk2.groups.io Cc: Dionna Glaze , Gerd Hoffmann , James Bottomley , Jiewen Yao , Tom Lendacky , Ard Biesheuvel , "Min M. Xu" , Andrew Fish , "Michael D. Kinney" Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dionnaglaze@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1674767868; bh=p8wKWEPgE8NwOKJX+tWDc1LwrnFwGTq51WlJ7IbLT3I=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ES7ziYoR4PU9dKGoZdb6fQlnOBsfe0pKSGuTCSMb5s/viixXVXf19dHjDYuPbQxdq+8 EpwELrONBwlsGlHJYRWClqu8ETmCMWsrHOhvOS+bgRKc2PvNng7rxidOV4lDls00qyjCt L74oSY+Bi5Xqcsp+If3sIoqMbBSCTaHcMFA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1674767869487100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The added behavior is to accept all unaccepted memory at ExitBootServices if the behavior is not disabled. This allows safe upgrades for OS loaders to affirm their support for the unaccepted memory type. Cc: Gerd Hoffmann Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Ard Biesheuvel Cc: "Min M. Xu" Cc: Andrew Fish Cc: "Michael D. Kinney" Signed-off-by: Dionna Glaze --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 97 ++++++++++++++++++++ OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 1 + 2 files changed, 98 insertions(+) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index f7600c3c81..37d1a3ff55 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -20,6 +20,7 @@ #include #include #include +#include #include =20 STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable =3D { @@ -34,6 +35,10 @@ STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBoo= tDxeTable =3D { =20 STATIC EFI_HANDLE mAmdSevDxeHandle =3D NULL; =20 +STATIC BOOLEAN mAcceptAllMemoryAtEBS =3D TRUE; + +STATIC EFI_EVENT mAcceptAllMemoryEvent =3D NULL; + #define IS_ALIGNED(x, y) ((((x) & ((y) - 1)) =3D=3D 0)) =20 STATIC @@ -62,6 +67,82 @@ AmdSevMemoryAccept ( return EFI_SUCCESS; } =20 +STATIC +EFI_STATUS +AcceptAllMemory ( + VOID + ) +{ + EFI_GCD_MEMORY_SPACE_DESCRIPTOR *AllDescMap; + UINTN NumEntries; + UINTN Index; + EFI_STATUS Status; + + DEBUG ((DEBUG_INFO, "Accepting all memory\n")); + + /* + * Get a copy of the memory space map to iterate over while + * changing the map. + */ + Status =3D gDS->GetMemorySpaceMap (&NumEntries, &AllDescMap); + if (EFI_ERROR (Status)) { + return Status; + } + + for (Index =3D 0; Index < NumEntries; Index++) { + CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc; + + Desc =3D &AllDescMap[Index]; + if (Desc->GcdMemoryType !=3D EFI_GCD_MEMORY_TYPE_UNACCEPTED) { + continue; + } + + Status =3D AmdSevMemoryAccept ( + NULL, + Desc->BaseAddress, + Desc->Length + ); + if (EFI_ERROR (Status)) { + break; + } + + Status =3D gDS->RemoveMemorySpace (Desc->BaseAddress, Desc->Length); + if (EFI_ERROR (Status)) { + break; + } + + Status =3D gDS->AddMemorySpace ( + EfiGcdMemoryTypeSystemMemory, + Desc->BaseAddress, + Desc->Length, + EFI_MEMORY_CPU_CRYPTO | EFI_MEMORY_XP | EFI_MEMORY_RO = | EFI_MEMORY_RP + ); + if (EFI_ERROR (Status)) { + break; + } + } + + gBS->FreePool (AllDescMap); + return Status; +} + +VOID +EFIAPI +ResolveUnacceptedMemory ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + EFI_STATUS Status; + + if (!mAcceptAllMemoryAtEBS) { + return; + } + + Status =3D AcceptAllMemory (); + ASSERT_EFI_ERROR (Status); +} + STATIC EDKII_MEMORY_ACCEPT_PROTOCOL mMemoryAcceptProtocol =3D { AmdSevMemoryAccept }; @@ -195,6 +276,22 @@ AmdSevDxeEntryPoint ( ); ASSERT_EFI_ERROR (Status); =20 + // SEV-SNP support does not automatically imply unaccepted memory supp= ort, + // so make ExitBootServices accept all unaccepted memory if support is + // not communicated. + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + ResolveUnacceptedMemory, + NULL, + &gEfiEventBeforeExitBootServicesGuid, + &mAcceptAllMemoryEvent + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "AllowUnacceptedMemory event creation for Event= BeforeExitBootServices failed.\n")); + } + // // If its SEV-SNP active guest then install the CONFIDENTIAL_COMPUTING= _SEV_SNP_BLOB. // It contains the location for both the Secrets and CPUID page. diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.= inf index cd1b686c53..5b443d45bc 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -52,6 +52,7 @@ =20 [Guids] gConfidentialComputingSevSnpBlobGuid + gEfiEventBeforeExitBootServicesGuid =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId --=20 2.39.1.456.gfc5497dd1b-goog -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99099): https://edk2.groups.io/g/devel/message/99099 Mute This Topic: https://groups.io/mt/96553081/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-