From 21d10af9d543fade2bcdc40afd2ccff47fb4e6bb Mon Sep 17 00:00:00 2001 From: Wu Zhou Date: Wed, 3 Aug 2022 23:50:03 -0700 Subject: [PATCH] config-tools: change 'DISABLED' settings to 'ENABLED' Some configurator settings are defined as 'feature DISABLED' style, which could cause confusion to developers. This patch is to change them into straightforward 'ENABLED' style. Including: - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> SPLIT_LOCK_DETECTION_ENABLED - ENFORCE_TURNOFF_GP -> UC_LOCK_DETECTION_ENABLED Tracked-On: #7661 Signed-off-by: Wu Zhou --- misc/config_tools/scenario_config/upgrader.py | 3 +++ misc/config_tools/schema/config.xsd | 18 +++++++++--------- misc/config_tools/xforms/config_common.xsl | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/misc/config_tools/scenario_config/upgrader.py b/misc/config_tools/scenario_config/upgrader.py index c062577c5..f9cd84d7c 100755 --- a/misc/config_tools/scenario_config/upgrader.py +++ b/misc/config_tools/scenario_config/upgrader.py @@ -764,6 +764,9 @@ class ScenarioUpgrader(ScenarioTransformer): # Feature enabling or disabling "vuart0": partialmethod(move_enablement, ".//vuart0"), "vbootloader": partialmethod(move_enablement, ".//vbootloader", values_as_enabled = ["ovmf", "Enable"], values_as_disabled = ["no", "Disable"]), + "MCE_ON_PSC_ENABLED": partialmethod(move_enablement, ".//MCE_ON_PSC_DISABLED", values_as_enabled = ["n"], values_as_disabled = ["y"]), + "SPLIT_LOCK_DETECTION_ENABLED": partialmethod(move_enablement, ".//ENFORCE_TURNOFF_AC", values_as_enabled = ["n"], values_as_disabled = ["y"]), + "UC_LOCK_DETECTION_ENABLED": partialmethod(move_enablement, ".//ENFORCE_TURNOFF_GP", values_as_enabled = ["n"], values_as_disabled = ["y"]), # Intermediate nodes "pci_devs": partialmethod(create_node_if, ".//pci_devs", ".//passthrough_devices/*[text() != ''] | .//sriov/*[text() != '']"), diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 62cd2d740..6f55779c3 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -58,14 +58,14 @@ Enable multiboot2 protocol support (with multiboot1 downward compatibility). If multiboot1 meets your requirements, disable this feature to reduce hypervisor code size. - - - Disable detection of split locks. A split lock can negatively affect an application's real-time performance. If a lock is detected, an alignment check exception #AC occurs. + + + Enable detection of split locks. A split lock can negatively affect an application's real-time performance. If a lock is detected, an alignment check exception #AC occurs. - - - Disable detection of uncacheable-memory (UC) locks. A UC lock can negatively affect an application's real-time performance. If a lock is detected, a general-protection exception #GP occurs. + + + Enable detection of uncacheable-memory (UC) locks. A UC lock can negatively affect an application's real-time performance. If a lock is detected, a general-protection exception #GP occurs. @@ -109,9 +109,9 @@ If your VM is not a security VM, leave this option unchecked. Enable L1 cache flush before VM entry to prevent L1 terminal fault. L1 terminal fault is a hardware vulnerability that could allow unauthorized disclosure of information residing in the L1 data cache. - - - Disable the software workaround for Machine Check Error on Page Size Change (erratum in some processor families). For more information about this workaround and affected processors, see this `MCE Avoidance on Page Size Change White Paper <https://www.intel.com/content/www/us/en/developer/articles/troubleshooting/software-security-guidance/technical-documentation/machine-check-error-avoidance-page-size-change.html>`_. + + + Enable the software workaround for Machine Check Error on Page Size Change (erratum in some processor families). For more information about this workaround and affected processors, see this `MCE Avoidance on Page Size Change White Paper <https://www.intel.com/content/www/us/en/developer/articles/troubleshooting/software-security-guidance/technical-documentation/machine-check-error-avoidance-page-size-change.html>`_. diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 626bc10b7..8d633df4e 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -73,11 +73,11 @@ - + - + @@ -124,8 +124,8 @@ - - + +