From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.2468.1657174776261985407 for ; Wed, 06 Jul 2022 23:19:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=AM+vvzF5; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657174776; x=1688710776; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wOUPuYC8M1k5EI9qCUQuCjYpLBvQV1Pb5g2qIevI568=; b=AM+vvzF5jwvc+nD5w7ojn2NAamwnGexeDzwgWxm0khjk1yyogV4K/OgC ZTXSWysq1wmp6d6gk8gjGH9ovTV4qaEA9jMfykF0Lawa9kgdMzngr/xHm LR0DfZtMEj1CuLLOSxVu2U7tv1+HUqCReJpJjjS9qoZkCraJvRd5621ok 2FJUtTirBdF7zJ5ykbaagqjSlbLJGwj+xYadBjTcY8eBoSyFRqzO1gClL 8GJqMO1AAK7fMPVhK7Flc8bx0itpmEF2Wj0C9hz6FGDvoGBncSUwJYMMQ Q9Y9VhOqio3OgOBGx1Q1lMHjr2oYVpfBiK0G6WK2ZndCEkCBxieWYnX01 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10400"; a="264358773" X-IronPort-AV: E=Sophos;i="5.92,252,1650956400"; d="scan'208";a="264358773" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 23:19:14 -0700 X-IronPort-AV: E=Sophos;i="5.92,252,1650956400"; d="scan'208";a="620653873" Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.203]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 23:19:12 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Gerd Hoffmann , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Yuan Yu Subject: [PATCH 2/2] OvmfPkg: Update CcProbeLib Date: Thu, 7 Jul 2022 14:17:46 +0800 Message-Id: X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3974 CcProbeLib once was designed to probe the Confidential Computing guest type by checking the PcdOvmfWorkArea. But this memory is allocated with either EfiACPIMemoryNVS or EfiBootServicesData. It cannot be accessed after ExitBootService. Please see the detailed analysis in BZ#3974. To fix this issue, CcProbeLib is redesigned as 2 implementation: - SecPeiCcProbeLib - CcProbeLib In SecPeiCcProbeLib we still check the CC guest type by reading the PcdOvmfWorkArea. Because it is used in SEC / PEI and we don't worry about the issues in BZ#3974. In CcProbeLib we call TdIsEnabled() to check if it is of Tdx guest. To improve the efficiency the result is cached in a global variable. In current stage only the Tdx related code is added in CcProbeLib. SEV code may be added in the future. The reason why we probe CC guest type in 2 different ways is the global varialbe. Global variable cannot be used in SEC/PEI and CcProbe is called very frequently. Cc: Gerd Hoffmann Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Yuan Yu Signed-off-by: Min Xu --- OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + OvmfPkg/Library/CcProbeLib/CcProbeLib.c | 24 +++++++++++++++++++---- OvmfPkg/Library/CcProbeLib/CcProbeLib.inf | 5 +---- OvmfPkg/OvmfPkgX64.dsc | 3 +++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc index 144d50aa9dba..ca41d9d13e7a 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -234,6 +234,7 @@ HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf PeilessStartupLib|OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf + CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/Library/CcProbeLib/CcProbeLib.c b/OvmfPkg/Library/CcProbeLib/CcProbeLib.c index d698e5c8d7f8..efb929ef8b21 100644 --- a/OvmfPkg/Library/CcProbeLib/CcProbeLib.c +++ b/OvmfPkg/Library/CcProbeLib/CcProbeLib.c @@ -7,8 +7,12 @@ **/ +#include +#include #include -#include + +STATIC UINT8 CcProbeGuestType = 0; +STATIC BOOLEAN CcProbed = FALSE; /** Probe the ConfidentialComputing Guest type. See defition of @@ -23,9 +27,21 @@ CcProbe ( VOID ) { - OVMF_WORK_AREA *WorkArea; + if (CcProbed) { + return CcProbeGuestType; + } - WorkArea = (OVMF_WORK_AREA *)FixedPcdGet32 (PcdOvmfWorkAreaBase); + if (TdIsEnabled ()) { + CcProbeGuestType = CcGuestTypeIntelTdx; + } else { + // + // SEV code should be added here to determine if it is CcGuestTypeAmdSev. + // Now we set CcProbeGuestType to CcGuestTypeNonEncrypted. + // + CcProbeGuestType = CcGuestTypeNonEncrypted; + } - return WorkArea != NULL ? WorkArea->Header.GuestType : CcGuestTypeNonEncrypted; + CcProbed = TRUE; + + return CcProbeGuestType; } diff --git a/OvmfPkg/Library/CcProbeLib/CcProbeLib.inf b/OvmfPkg/Library/CcProbeLib/CcProbeLib.inf index 5300c9ba2644..99b7434d6180 100644 --- a/OvmfPkg/Library/CcProbeLib/CcProbeLib.inf +++ b/OvmfPkg/Library/CcProbeLib/CcProbeLib.inf @@ -12,7 +12,7 @@ FILE_GUID = 05184ec9-abb0-4491-8584-e388639a7c48 MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = CcProbeLib + LIBRARY_CLASS = CcProbeLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION [Sources] CcProbeLib.c @@ -20,6 +20,3 @@ [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - -[Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 8ad04b50f74f..59d47ae272bb 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -287,6 +287,7 @@ !endif VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf + CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -303,6 +304,7 @@ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf !endif PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf + CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf [LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -332,6 +334,7 @@ PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf + CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf -- 2.29.2.windows.2