From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by mx.groups.io with SMTP id smtpd.web10.63533.1674694615382100831 for ; Wed, 25 Jan 2023 16:56:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20210112 header.b=MQNJHo9u; spf=pass (domain: flex--dionnaglaze.bounces.google.com, ip: 209.85.210.201, mailfrom: 31s_rywskbeeglrqqdjodchjrrjoh.frpghyhohgnf.jurxsv.lr@flex--dionnaglaze.bounces.google.com) Received: by mail-pf1-f201.google.com with SMTP id s4-20020a056a00194400b0058d9b9fecb6so161092pfk.1 for ; Wed, 25 Jan 2023 16:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=to4ddqk/5DCpjbL2lGGHzdeOzRD6SmbOrig1wX+whMc=; b=MQNJHo9uGw5UFRm8SpnJjhylDfgAUbGqq2HknwV6+9z4i8OogBQA/jXjufpwGiIBSm czb/eN8oUcoG4uUSsua7UB7ssdzuDJppePLnSVXzFaHg/x0ignn9o7Blu0SKU95wtjQk nBX7fhLwtr4h2Ec9bEvloMPBrQCoCXlTEvc4clQHcXzAaVzFEn0oK7B2IH1XTuD3X+HA 4T49I6kRaPyKez4UuPY4lbhtVswJUuuz+gIAkbBQxk1KTOSlwYpcwAWWLn8xYZcFD9Vn XZOTAUAKUykrLLv6tHj7tHwZGzpOffc81s7hmMDXyM0DEj/W+fnAFRyw0WS19lbtsyRE wdVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=to4ddqk/5DCpjbL2lGGHzdeOzRD6SmbOrig1wX+whMc=; b=eef4+QSKcgBY4zXK+bGCbTXRkeRnsefYsawIHEo+GnKoDmM7+XGN8I/dYnXzzxinG2 WkWpwZ6sX7Sh6tstxrhVdeNybrMyhgGKfeZDYB5XvVtnRamswogp+zo7yYu3CGL7WyYp 22s00RsHrgZA5SW7T6Vg+nsXYcpntNgacr23fpLtiaTSFPUM9VC3YqSBJoJsrJ9tK/9g WfcJUb9r9qC6RgegBgV/HRrY5areKj80wERiMZ5ufx9udu05mKO/OzfEoybVWekLJqun CxByQSCUIYHzVEoluP1XbMyLC2idMRaAPrT6jQyV6Xe2E6Y5WFoRItMM4YimJsYf1v8s A7WA== X-Gm-Message-State: AFqh2kpLvlmJ85MStNow01+0b06Z0xIumKaQUrnIL3xyNg6cctxP2LDs 5juPGOi+6uMDcBlGFyD23djEbkR7/p1V9LjJktLECZ6Xd0EHRE7Ti3xSALp/ZX5zAMnw66t73q6 lmm4xVD9bYCVKJx+gVkcZFc1K26WFfMqjrZgPUx9fHw2iwPHjpTxeH8uP3pZvPlQhojdsHxuv X-Google-Smtp-Source: AMrXdXuc9VBssLdY5fSnaLDJdEgtQH6eVmXFXCxp2nVtMyjZcgz5cxUu82/C2NoFnUNITxnkMcvhXsxp0RaeHlIuyw== X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a63:5753:0:b0:499:7f08:40c3 with SMTP id h19-20020a635753000000b004997f0840c3mr3762633pgm.80.1674694614600; Wed, 25 Jan 2023 16:56:54 -0800 (PST) Date: Thu, 26 Jan 2023 00:56:44 +0000 In-Reply-To: <20230126005647.3019225-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20230126005647.3019225-1-dionnaglaze@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230126005647.3019225-2-dionnaglaze@google.com> Subject: [PATCH v10 1/4] OvmfPkg: Add memory acceptance event in AmdSevDxe From: "Dionna Glaze" 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" 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 | 109 ++++++++++++++++++++ OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 1 + 2 files changed, 110 insertions(+) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index f7600c3c81..5eec76fea2 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -20,6 +20,7 @@ #include #include #include +#include #include STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable = { @@ -34,6 +35,10 @@ STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBootDxeTable = { STATIC EFI_HANDLE mAmdSevDxeHandle = NULL; +STATIC BOOLEAN mAcceptAllMemoryAtEBS = TRUE; + +STATIC EFI_EVENT mAcceptAllMemoryEvent = NULL; + #define IS_ALIGNED(x, y) ((((x) & ((y) - 1)) == 0)) STATIC @@ -62,6 +67,94 @@ AmdSevMemoryAccept ( return EFI_SUCCESS; } +STATIC +EFI_STATUS +AcceptAllMemory ( + IN EDKII_MEMORY_ACCEPT_PROTOCOL *AcceptMemory + ) +{ + 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 = gDS->GetMemorySpaceMap (&NumEntries, &AllDescMap); + if (EFI_ERROR (Status)) { + return Status; + } + + for (Index = 0; Index < NumEntries; Index++) { + CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc; + + Desc = &AllDescMap[Index]; + if (Desc->GcdMemoryType != EFI_GCD_MEMORY_TYPE_UNACCEPTED) { + continue; + } + + Status = AcceptMemory->AcceptMemory ( + AcceptMemory, + Desc->BaseAddress, + Desc->Length + ); + if (EFI_ERROR (Status)) { + break; + } + + Status = gDS->RemoveMemorySpace (Desc->BaseAddress, Desc->Length); + if (EFI_ERROR (Status)) { + break; + } + + Status = 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 + ) +{ + EDKII_MEMORY_ACCEPT_PROTOCOL *AcceptMemory; + EFI_STATUS Status; + + if (!mAcceptAllMemoryAtEBS) { + return; + } + + Status = gBS->LocateProtocol ( + &gEdkiiMemoryAcceptProtocolGuid, + NULL, + (VOID **)&AcceptMemory + ); + if (Status == EFI_NOT_FOUND) { + return; + } + + ASSERT_EFI_ERROR (Status); + + Status = AcceptAllMemory (AcceptMemory); + ASSERT_EFI_ERROR (Status); +} + STATIC EDKII_MEMORY_ACCEPT_PROTOCOL mMemoryAcceptProtocol = { AmdSevMemoryAccept }; @@ -195,6 +288,22 @@ AmdSevDxeEntryPoint ( ); ASSERT_EFI_ERROR (Status); + // SEV-SNP support does not automatically imply unaccepted memory support, + // so make ExitBootServices accept all unaccepted memory if support is + // not communicated. + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + ResolveUnacceptedMemory, + NULL, + &gEfiEventBeforeExitBootServicesGuid, + &mAcceptAllMemoryEvent + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "AllowUnacceptedMemory event creation for EventBeforeExitBootServices 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 @@ [Guids] gConfidentialComputingSevSnpBlobGuid + gEfiEventBeforeExitBootServicesGuid [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId -- 2.39.1.456.gfc5497dd1b-goog