From b1fe2029fa2f473922fb830a2e33c5ae0c0ae20d Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Tue, 11 Jul 2017 10:07:36 +0800 Subject: [PATCH] UefiCpuPkg CpuCommonFeaturesLib: Fix smx/vmx enable logic error. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed: Jeff Fan --- .../CpuCommonFeaturesLib/CpuCommonFeatures.h | 47 ++------ .../CpuCommonFeaturesLib.c | 19 +--- .../CpuCommonFeaturesLib/FeatureControl.c | 106 +++++++----------- 3 files changed, 55 insertions(+), 117 deletions(-) diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h index 9a7afed105..9c6e0b4e67 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h @@ -346,7 +346,7 @@ VmxSupport ( ); /** - Initializes VMX inside SMX feature to specific state. + Initializes VMX feature to specific state. @param[in] ProcessorNumber The index of the CPU executing this function. @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION @@ -355,42 +355,16 @@ VmxSupport ( by CPU_FEATURE_GET_CONFIG_DATA. NULL if CPU_FEATURE_GET_CONFIG_DATA was not provided in RegisterCpuFeature(). - @param[in] State If TRUE, then the VMX inside SMX feature must be enabled. - If FALSE, then the VMX inside SMX feature must be disabled. + @param[in] State If TRUE, then the VMX feature must be enabled. + If FALSE, then the VMX feature must be disabled. - @retval RETURN_SUCCESS VMX inside SMX feature is initialized. + @retval RETURN_SUCCESS VMX feature is initialized. @note This service could be called by BSP only. **/ RETURN_STATUS EFIAPI -VmxInsideSmxInitialize ( - IN UINTN ProcessorNumber, - IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, - IN VOID *ConfigData, OPTIONAL - IN BOOLEAN State - ); - -/** - Initializes SENTER feature to specific state. - - @param[in] ProcessorNumber The index of the CPU executing this function. - @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION - structure for the CPU executing this function. - @param[in] ConfigData A pointer to the configuration buffer returned - by CPU_FEATURE_GET_CONFIG_DATA. NULL if - CPU_FEATURE_GET_CONFIG_DATA was not provided in - RegisterCpuFeature(). - @param[in] State If TRUE, then the SENTER feature must be enabled. - If FALSE, then the SENTER feature must be disabled. - - @retval RETURN_SUCCESS SENTER feature is initialized. - - @note This service could be called by BSP only. -**/ -RETURN_STATUS -EFIAPI -SenterInitialize ( +VmxInitialize ( IN UINTN ProcessorNumber, IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, IN VOID *ConfigData, OPTIONAL @@ -472,7 +446,7 @@ SmxSupport ( ); /** - Initializes VMX outside SMX feature to specific state. + Initializes SMX feature to specific state. @param[in] ProcessorNumber The index of the CPU executing this function. @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION @@ -481,16 +455,17 @@ SmxSupport ( by CPU_FEATURE_GET_CONFIG_DATA. NULL if CPU_FEATURE_GET_CONFIG_DATA was not provided in RegisterCpuFeature(). - @param[in] State If TRUE, then the VMX outside SMX feature must be enabled. - If FALSE, then the VMX outside SMX feature must be disabled. + @param[in] State If TRUE, then SMX feature must be enabled. + If FALSE, then SMX feature must be disabled. - @retval RETURN_SUCCESS VMX outside SMX feature is initialized. + @retval RETURN_SUCCESS SMX feature is initialized. + @retval RETURN_UNSUPPORTED VMX not initialized. @note This service could be called by BSP only. **/ RETURN_STATUS EFIAPI -VmxOutsideSmxInitialize ( +SmxInitialize ( IN UINTN ProcessorNumber, IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, IN VOID *ConfigData, OPTIONAL diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c index 793a0956d3..2bd32ab8a6 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c @@ -105,25 +105,12 @@ CpuCommonFeaturesLibConstructor ( ); ASSERT_EFI_ERROR (Status); } - if (IsCpuFeatureSupported (CPU_FEATURE_SENTER)) { - Status = RegisterCpuFeature ( - "SENTER", - FeatureControlGetConfigData, - VmxSupport, - SenterInitialize, - CPU_FEATURE_SENTER, - CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | CPU_FEATURE_BEFORE, - CPU_FEATURE_SMX | CPU_FEATURE_AFTER, - CPU_FEATURE_END - ); - ASSERT_EFI_ERROR (Status); - } if (IsCpuFeatureSupported (CPU_FEATURE_SMX)) { Status = RegisterCpuFeature ( "SMX", FeatureControlGetConfigData, SmxSupport, - VmxInsideSmxInitialize, + SmxInitialize, CPU_FEATURE_SMX, CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | CPU_FEATURE_BEFORE, CPU_FEATURE_END @@ -134,8 +121,8 @@ CpuCommonFeaturesLibConstructor ( Status = RegisterCpuFeature ( "VMX", FeatureControlGetConfigData, - SmxSupport, - VmxOutsideSmxInitialize, + VmxSupport, + VmxInitialize, CPU_FEATURE_VMX, CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | CPU_FEATURE_BEFORE, CPU_FEATURE_END diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c index 0b5c161f87..d28c4ec51a 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/FeatureControl.c @@ -69,7 +69,7 @@ VmxSupport ( } /** - Initializes VMX inside SMX feature to specific state. + Initializes VMX feature to specific state. @param[in] ProcessorNumber The index of the CPU executing this function. @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION @@ -78,16 +78,16 @@ VmxSupport ( by CPU_FEATURE_GET_CONFIG_DATA. NULL if CPU_FEATURE_GET_CONFIG_DATA was not provided in RegisterCpuFeature(). - @param[in] State If TRUE, then the VMX inside SMX feature must be enabled. - If FALSE, then the VMX inside SMX feature must be disabled. + @param[in] State If TRUE, then the VMX feature must be enabled. + If FALSE, then the VMX feature must be disabled. - @retval RETURN_SUCCESS VMX inside SMX feature is initialized. + @retval RETURN_SUCCESS VMX feature is initialized. @note This service could be called by BSP only. **/ RETURN_STATUS EFIAPI -VmxInsideSmxInitialize ( +VmxInitialize ( IN UINTN ProcessorNumber, IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, IN VOID *ConfigData, OPTIONAL @@ -104,59 +104,7 @@ VmxInsideSmxInitialize ( Msr, MSR_IA32_FEATURE_CONTROL, MSR_IA32_FEATURE_CONTROL_REGISTER, - Bits.EnableVmxInsideSmx, - (State) ? 1 : 0 - ); - } - return RETURN_SUCCESS; -} - -/** - Initializes SENTER feature to specific state. - - @param[in] ProcessorNumber The index of the CPU executing this function. - @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION - structure for the CPU executing this function. - @param[in] ConfigData A pointer to the configuration buffer returned - by CPU_FEATURE_GET_CONFIG_DATA. NULL if - CPU_FEATURE_GET_CONFIG_DATA was not provided in - RegisterCpuFeature(). - @param[in] State If TRUE, then the SENTER feature must be enabled. - If FALSE, then the SENTER feature must be disabled. - - @retval RETURN_SUCCESS SENTER feature is initialized. - - @note This service could be called by BSP only. -**/ -RETURN_STATUS -EFIAPI -SenterInitialize ( - IN UINTN ProcessorNumber, - IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, - IN VOID *ConfigData, OPTIONAL - IN BOOLEAN State - ) -{ - MSR_IA32_FEATURE_CONTROL_REGISTER *MsrRegister; - - ASSERT (ConfigData != NULL); - MsrRegister = (MSR_IA32_FEATURE_CONTROL_REGISTER *) ConfigData; - if (MsrRegister[ProcessorNumber].Bits.Lock == 0) { - CPU_REGISTER_TABLE_WRITE_FIELD ( - ProcessorNumber, - Msr, - MSR_IA32_FEATURE_CONTROL, - MSR_IA32_FEATURE_CONTROL_REGISTER, - Bits.SenterLocalFunctionEnables, - (State) ? 0x7F : 0 - ); - - CPU_REGISTER_TABLE_WRITE_FIELD ( - ProcessorNumber, - Msr, - MSR_IA32_FEATURE_CONTROL, - MSR_IA32_FEATURE_CONTROL_REGISTER, - Bits.SenterGlobalEnable, + Bits.EnableVmxOutsideSmx, (State) ? 1 : 0 ); } @@ -271,7 +219,7 @@ SmxSupport ( } /** - Initializes VMX outside SMX feature to specific state. + Initializes SMX feature to specific state. @param[in] ProcessorNumber The index of the CPU executing this function. @param[in] CpuInfo A pointer to the REGISTER_CPU_FEATURE_INFORMATION @@ -280,16 +228,17 @@ SmxSupport ( by CPU_FEATURE_GET_CONFIG_DATA. NULL if CPU_FEATURE_GET_CONFIG_DATA was not provided in RegisterCpuFeature(). - @param[in] State If TRUE, then the VMX outside SMX feature must be enabled. - If FALSE, then the VMX outside SMX feature must be disabled. + @param[in] State If TRUE, then SMX feature must be enabled. + If FALSE, then SMX feature must be disabled. - @retval RETURN_SUCCESS VMX outside SMX feature is initialized. + @retval RETURN_SUCCESS SMX feature is initialized. + @retval RETURN_UNSUPPORTED VMX not initialized. @note This service could be called by BSP only. **/ RETURN_STATUS EFIAPI -VmxOutsideSmxInitialize ( +SmxInitialize ( IN UINTN ProcessorNumber, IN REGISTER_CPU_FEATURE_INFORMATION *CpuInfo, IN VOID *ConfigData, OPTIONAL @@ -297,6 +246,15 @@ VmxOutsideSmxInitialize ( ) { MSR_IA32_FEATURE_CONTROL_REGISTER *MsrRegister; + RETURN_STATUS Status; + + Status = RETURN_SUCCESS; + + if (State && (!IsCpuFeatureInSetting (CPU_FEATURE_VMX))) { + DEBUG ((DEBUG_WARN, "Warning :: Can't enable SMX feature when VMX feature not enabled, disable it.\n")); + State = FALSE; + Status = RETURN_UNSUPPORTED; + } ASSERT (ConfigData != NULL); MsrRegister = (MSR_IA32_FEATURE_CONTROL_REGISTER *) ConfigData; @@ -306,9 +264,27 @@ VmxOutsideSmxInitialize ( Msr, MSR_IA32_FEATURE_CONTROL, MSR_IA32_FEATURE_CONTROL_REGISTER, - Bits.EnableVmxOutsideSmx, + Bits.SenterLocalFunctionEnables, + (State) ? 0x7F : 0 + ); + + CPU_REGISTER_TABLE_WRITE_FIELD ( + ProcessorNumber, + Msr, + MSR_IA32_FEATURE_CONTROL, + MSR_IA32_FEATURE_CONTROL_REGISTER, + Bits.SenterGlobalEnable, + (State) ? 1 : 0 + ); + + CPU_REGISTER_TABLE_WRITE_FIELD ( + ProcessorNumber, + Msr, + MSR_IA32_FEATURE_CONTROL, + MSR_IA32_FEATURE_CONTROL_REGISTER, + Bits.EnableVmxInsideSmx, (State) ? 1 : 0 ); } - return RETURN_SUCCESS; + return Status; } -- 2.39.2