tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CryptPkg: Enable CryptoPkg BaseCryptLib ParallelHash for PEI and DXE 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4097

The BaseCryptLib in the CryptoPkg currently supports ParallelHash
algorithm for SMM. The MP Services PPI and MP Services Protocol
could be used to enable ParallelHash in PEI and DXE
versions of the BaseCryptLib.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Zhihao Li <zhihao.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Zhihao Li 2022-11-30 22:21:02 +08:00 committed by mergify[bot]
parent 47d988387e
commit 5d5be45bd1
8 changed files with 183 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
View File

@ -35,7 +35,11 @@
Hash/CryptSha256.c
Hash/CryptSha512.c
Hash/CryptSm3.c
Hash/CryptParallelHashNull.c
Hash/CryptSha3.c
Hash/CryptXkcp.c
Hash/CryptCShake256.c
Hash/CryptParallelHash.c
Hash/CryptDispatchApDxe.c
Hmac/CryptHmac.c
Kdf/CryptHkdf.c
Cipher/CryptAes.c
@ -93,6 +97,11 @@
OpensslLib
IntrinsicLib
PrintLib
UefiBootServicesTableLib
SynchronizationLib
[Protocols]
gEfiMpServiceProtocolGuid
#
# Remove these [BuildOptions] after this library is cleaned up

49
CryptoPkg/Library/BaseCryptLib/Hash/CryptDispatchApDxe.c Normal file
View File

@ -0,0 +1,49 @@
/** @file
Dispatch Block to Aps in Dxe phase for parallelhash algorithm.
Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "CryptParallelHash.h"
#include <Library/UefiBootServicesTableLib.h>
#include <Protocol/MpService.h>
/**
Dispatch the block task to each AP in PEI phase.
**/
VOID
EFIAPI
DispatchBlockToAp (
VOID
)
{
EFI_STATUS Status;
EFI_MP_SERVICES_PROTOCOL *MpServices;
Status = gBS->LocateProtocol (
&gEfiMpServiceProtocolGuid,
NULL,
(VOID **)&MpServices
);
if (EFI_ERROR (Status)) {
//
// Failed to locate MpServices Protocol, do parallel hash by one core.
//
DEBUG ((DEBUG_ERROR, "[DispatchBlockToApDxe] Failed to locate MpServices Protocol. Status = %r\n", Status));
return;
}
Status = MpServices->StartupAllAPs (
MpServices,
ParallelHashApExecute,
FALSE,
NULL,
0,
NULL,
NULL
);
return;
}

35
CryptoPkg/Library/BaseCryptLib/Hash/CryptDispatchApMm.c Normal file
View File

@ -0,0 +1,35 @@
/** @file
Dispatch the block task to each AP in Smm mode for parallelhash algorithm.
Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "CryptParallelHash.h"
#include <Library/MmServicesTableLib.h>
/**
Dispatch the block task to each AP in SMM mode.
**/
VOID
EFIAPI
DispatchBlockToAp (
VOID
)
{
UINTN Index;
if (gMmst == NULL) {
return;
}
for (Index = 0; Index < gMmst->NumberOfCpus; Index++) {
if (Index != gMmst->CurrentlyExecutingCpu) {
gMmst->MmStartupThisAp (ParallelHashApExecute, Index, NULL);
}
}
return;
}

54
CryptoPkg/Library/BaseCryptLib/Hash/CryptDispatchApPei.c Normal file
View File

@ -0,0 +1,54 @@
/** @file
Dispatch Block to Aps in Pei phase for parallelhash algorithm.
Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "CryptParallelHash.h"
#include <Library/PeiServicesTablePointerLib.h>
#include <PiPei.h>
#include <Ppi/MpServices.h>
#include <Library/PeiServicesLib.h>
/**
Dispatch the block task to each AP in PEI phase.
**/
VOID
EFIAPI
DispatchBlockToAp (
VOID
)
{
EFI_STATUS Status;
CONST EFI_PEI_SERVICES **PeiServices;
EFI_PEI_MP_SERVICES_PPI *MpServicesPpi;
PeiServices = GetPeiServicesTablePointer ();
Status = (*PeiServices)->LocatePpi (
PeiServices,
&gEfiPeiMpServicesPpiGuid,
0,
NULL,
(VOID **)&MpServicesPpi
);
if (EFI_ERROR (Status)) {
//
// Failed to locate MpServices Ppi, do parallel hash by one core.
//
DEBUG ((DEBUG_ERROR, "[DispatchBlockToApPei] Failed to locate MpServices Ppi. Status = %r\n", Status));
return;
}
Status = MpServicesPpi->StartupAllAPs (
(CONST EFI_PEI_SERVICES **)PeiServices,
MpServicesPpi,
ParallelHashApExecute,
FALSE,
0,
NULL
);
return;
}

26
CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.c
View File

@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "CryptParallelHash.h"
#include <Library/MmServicesTableLib.h>
#include <Library/SynchronizationLib.h>
#define PARALLELHASH_CUSTOMIZATION "ParallelHash"
@ -69,27 +68,6 @@ ParallelHashApExecute (
}
}
/**
Dispatch the block task to each AP in SMM mode.
**/
VOID
EFIAPI
MmDispatchBlockToAP (
VOID
)
{
UINTN Index;
for (Index = 0; Index < gMmst->NumberOfCpus; Index++) {
if (Index != gMmst->CurrentlyExecutingCpu) {
gMmst->MmStartupThisAp (ParallelHashApExecute, Index, NULL);
}
}
return;
}
/**
Parallel hash function ParallelHash256, as defined in NIST's Special Publication 800-185,
published December 2016.
@ -197,9 +175,7 @@ ParallelHash256HashAll (
//
// Dispatch blocklist to each AP.
//
if (gMmst != NULL) {
MmDispatchBlockToAP ();
}
DispatchBlockToAp ();
//
// Wait until all block hash completed.

23
CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
View File

@ -201,3 +201,26 @@ CShake256HashAll (
IN UINTN CustomizationLen,
OUT UINT8 *HashValue
);
/**
Complete computation of digest of each block.
Each AP perform the function called by BSP.
@param[in] ProcedureArgument Argument of the procedure.
**/
VOID
EFIAPI
ParallelHashApExecute (
IN VOID *ProcedureArgument
);
/**
Dispatch the block task to each AP.
**/
VOID
EFIAPI
DispatchBlockToAp (
VOID
);

11
CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
View File

@ -40,7 +40,11 @@
Hash/CryptSha256.c
Hash/CryptSm3.c
Hash/CryptSha512.c
Hash/CryptParallelHashNull.c
Hash/CryptSha3.c
Hash/CryptXkcp.c
Hash/CryptCShake256.c
Hash/CryptParallelHash.c
Hash/CryptDispatchApPei.c
Hmac/CryptHmac.c
Kdf/CryptHkdf.c
Cipher/CryptAesNull.c
@ -80,7 +84,12 @@
OpensslLib
IntrinsicLib
PrintLib
PeiServicesTablePointerLib
PeiServicesLib
SynchronizationLib
[Ppis]
gEfiPeiMpServicesPpiGuid
#
# Remove these [BuildOptions] after this library is cleaned up
#

1
CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
View File

@ -42,6 +42,7 @@
Hash/CryptXkcp.c
Hash/CryptCShake256.c
Hash/CryptParallelHash.c
Hash/CryptDispatchApMm.c
Hmac/CryptHmac.c
Kdf/CryptHkdfNull.c
Cipher/CryptAes.c