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

MdeModulePkg/Variable: Update to consume SpeculationBarrier 

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

Since BaseLib API AsmLfence() is a x86 arch specific API and should be
avoided using in generic codes, this commit replaces the usage of
AsmLfence() with arch-generic API SpeculationBarrier().

Please note that speculation execution barriers are intended to be
asserted for SMM codes, hence, this commit still preserve an empty
implementation of the speculation execution barrier for the DXE codes.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Hao Wu 2018-12-21 10:30:22 +08:00
parent 107775734d
commit 49395ea0bc
7 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdeModulePkg/Universal/Variable/RuntimeDxe/PrivilegePolymorphic.h
View File

@ -85,13 +85,15 @@ SetVariableCheckHandlerMor (
);
/**
This service is consumed by the variable modules to perform a serializing
operation on all load-from-memory instructions that were issued prior to the
call of this function.
This service is consumed by the variable modules to place a barrier to stop
speculative execution.
Ensures that no later instruction will execute speculatively, until all prior
instructions have completed.
**/
VOID
MemoryLoadFence (
VariableSpeculationBarrier (
VOID
);

12
MdeModulePkg/Universal/Variable/RuntimeDxe/LoadFenceDxe.c → MdeModulePkg/Universal/Variable/RuntimeDxe/SpeculationBarrierDxe.c
View File

@ -1,5 +1,5 @@
/** @file
Serialize operation on all load-from-memory instructions (DXE version).
Barrier to stop speculative execution (DXE version).
Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@ -15,13 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "Variable.h"
/**
This service is consumed by the variable modules to perform a serializing
operation on all load-from-memory instructions that were issued prior to the
call of this function.
This service is consumed by the variable modules to place a barrier to stop
speculative execution.
Ensures that no later instruction will execute speculatively, until all prior
instructions have completed.
**/
VOID
MemoryLoadFence (
VariableSpeculationBarrier (
VOID
)
{

14
MdeModulePkg/Universal/Variable/RuntimeDxe/LoadFenceSmm.c → MdeModulePkg/Universal/Variable/RuntimeDxe/SpeculationBarrierSmm.c
View File

@ -1,5 +1,5 @@
/** @file
Serialize operation on all load-from-memory instructions (SMM version).
Barrier to stop speculative execution (SMM version).
Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@ -16,15 +16,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "Variable.h"
/**
This service is consumed by the variable modules to perform a serializing
operation on all load-from-memory instructions that were issued prior to the
call of this function.
This service is consumed by the variable modules to place a barrier to stop
speculative execution.
Ensures that no later instruction will execute speculatively, until all prior
instructions have completed.
**/
VOID
MemoryLoadFence (
VariableSpeculationBarrier (
VOID
)
{
AsmLfence ();
SpeculationBarrier ();
}

6
MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
View File

@ -3201,11 +3201,11 @@ VariableServiceSetVariable (
return EFI_SECURITY_VIOLATION;
}
//
// The MemoryLoadFence() call here is to ensure the above sanity check
// for the EFI_VARIABLE_AUTHENTICATION_2 descriptor has been completed
// The VariableSpeculationBarrier() call here is to ensure the above sanity
// check for the EFI_VARIABLE_AUTHENTICATION_2 descriptor has been completed
// before the execution of subsequent codes.
//
MemoryLoadFence ();
VariableSpeculationBarrier ();
PayloadSize = DataSize - AUTHINFO2_SIZE (Data);
} else {
PayloadSize = DataSize;

2
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
View File

@ -46,7 +46,7 @@
TcgMorLockDxe.c
VarCheck.c
VariableExLib.c
LoadFenceDxe.c
SpeculationBarrierDxe.c
[Packages]
MdePkg/MdePkg.dec

24
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
View File

@ -538,11 +538,11 @@ SmmVariableHandler (
}
//
// The MemoryLoadFence() call here is to ensure the previous range/content
// checks for the CommBuffer have been completed before the subsequent
// consumption of the CommBuffer content.
// The VariableSpeculationBarrier() call here is to ensure the previous
// range/content checks for the CommBuffer have been completed before the
// subsequent consumption of the CommBuffer content.
//
MemoryLoadFence ();
VariableSpeculationBarrier ();
if (SmmVariableHeader->NameSize < sizeof (CHAR16) || SmmVariableHeader->Name[SmmVariableHeader->NameSize/sizeof (CHAR16) - 1] != L'\0') {
//
// Make sure VariableName is A Null-terminated string.
@ -638,11 +638,11 @@ SmmVariableHandler (
}
//
// The MemoryLoadFence() call here is to ensure the previous range/content
// checks for the CommBuffer have been completed before the subsequent
// consumption of the CommBuffer content.
// The VariableSpeculationBarrier() call here is to ensure the previous
// range/content checks for the CommBuffer have been completed before the
// subsequent consumption of the CommBuffer content.
//
MemoryLoadFence ();
VariableSpeculationBarrier ();
if (SmmVariableHeader->NameSize < sizeof (CHAR16) || SmmVariableHeader->Name[SmmVariableHeader->NameSize/sizeof (CHAR16) - 1] != L'\0') {
//
// Make sure VariableName is A Null-terminated string.
@ -779,11 +779,11 @@ SmmVariableHandler (
}
//
// The MemoryLoadFence() call here is to ensure the previous range/content
// checks for the CommBuffer have been completed before the subsequent
// consumption of the CommBuffer content.
// The VariableSpeculationBarrier() call here is to ensure the previous
// range/content checks for the CommBuffer have been completed before the
// subsequent consumption of the CommBuffer content.
//
MemoryLoadFence ();
VariableSpeculationBarrier ();
if (CommVariableProperty->NameSize < sizeof (CHAR16) || CommVariableProperty->Name[CommVariableProperty->NameSize/sizeof (CHAR16) - 1] != L'\0') {
//
// Make sure VariableName is A Null-terminated string.

2
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
View File

@ -54,7 +54,7 @@
PrivilegePolymorphic.h
VariableExLib.c
TcgMorLockSmm.c
LoadFenceSmm.c
SpeculationBarrierSmm.c
[Packages]
MdePkg/MdePkg.dec