From 5d938e751b6e498a9bdf14077c4237c89b475947 Mon Sep 17 00:00:00 2001 From: hangliu1 Date: Sun, 17 Apr 2022 22:58:35 -0400 Subject: [PATCH] config tool: update schema Update "Borrowed Virtual Time" scheduler description Update "RELOC" and "MULTIBOOT2" parameter name Update xml Tracked-On: #7297 Signed-off-by: hangliu1 --- .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 4 ++-- .../data/cfl-k700-i7/hybrid_rt.xml | 4 ++-- .../data/cfl-k700-i7/partitioned.xml | 4 ++-- .../cfl-k700-i7/shared_launch_6user_vm.xml | 4 ++-- .../generic_board/hybrid_launch_2user_vm.xml | 4 ++-- .../data/generic_board/hybrid_rt.xml | 4 ++-- .../data/generic_board/partitioned.xml | 4 ++-- .../generic_board/shared_launch_6user_vm.xml | 4 ++-- .../data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 4 ++-- .../data/nuc11tnbi5/partitioned.xml | 4 ++-- .../data/nuc11tnbi5/shared_launch_6user_vm.xml | 4 ++-- misc/config_tools/data/qemu/shared.xml | 4 ++-- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 4 ++-- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 4 ++-- .../shared_launch_2user_vm.xml | 4 ++-- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 4 ++-- .../hybrid_rt_launch_1user_vm_waag.xml | 4 ++-- .../data/whl-ipc-i5/partitioned.xml | 4 ++-- .../shared_launch_1user_vm_hardrt.xml | 4 ++-- .../shared_launch_1user_vm_vxworks.xml | 4 ++-- .../whl-ipc-i5/shared_launch_1user_vm_waag.xml | 4 ++-- .../data/whl-ipc-i5/shared_launch_2user_vm.xml | 4 ++-- .../data/whl-ipc-i5/shared_launch_6user_vm.xml | 4 ++-- misc/config_tools/hv_config/hv_item.py | 8 ++++---- .../scenario_config/scenario_cfg_gen.py | 4 ++-- misc/config_tools/schema/config.xsd | 4 ++-- misc/config_tools/schema/types.xsd | 7 ++----- misc/config_tools/xforms/config_common.xsl | 18 ++++++++++-------- 28 files changed, 66 insertions(+), 67 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml index 0955d98a1..2168e8e3e 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 1b4fa9d01..84d5d70f7 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index c738031b3..e043df07b 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml index ece3b39a5..04a9d9de9 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml index 1d71948c4..3931100c1 100644 --- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 850708091..85789c875 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index d81deeb88..b23f5982f 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml index ead9df745..16226a6b5 100644 --- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml index ec6179b6d..387e7a474 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index ae22f9d66..a5b238f10 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml index 32ad31b4e..e577a87ef 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index 7b49b1267..ba6561153 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml index 91cc72489..f88267d1a 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml index 2c63cd003..5d56726cd 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml index ba7da9270..ceb6cde17 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 0fcb9a46a..e66914ddb 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index 52a2d4b94..1d98c4a2e 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index d94df2d79..b95dd75c4 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml index b0822735d..733b9d541 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml index f0a5a56f1..eee307358 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml index b4d5d0fbe..790c7cdc9 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml index a0b3a6aa9..54a500009 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml index 0bb91fc73..efa6a08e7 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml @@ -8,9 +8,9 @@ 3 - y + y SCHED_BVT - y + y y n n diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index fee94b67e..1e9ba22c5 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -86,13 +86,13 @@ class Features: self.ssram_enabled = '' def get_info(self): - self.multiboot2 = common.get_hv_item_tag(self.hv_file, "FEATURES", "MULTIBOOT2") + self.multiboot2 = common.get_hv_item_tag(self.hv_file, "FEATURES", "MULTIBOOT2_ENABLED") self.rdt_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "RDT", "RDT_ENABLED") self.cdp_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "RDT", "CDP_ENABLED") self.cat_max_mask = common.get_hv_item_tag(self.hv_file, "FEATURES", "RDT", "CLOS_MASK") self.mba_delay = common.get_hv_item_tag(self.hv_file, "FEATURES", "RDT", "MBA_DELAY") self.scheduler = common.get_hv_item_tag(self.hv_file, "FEATURES", "SCHEDULER") - self.reloc = common.get_hv_item_tag(self.hv_file, "FEATURES", "RELOC") + self.reloc = common.get_hv_item_tag(self.hv_file, "FEATURES", "RELOC_ENABLED") self.hyperv_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "HYPERV_ENABLED") self.acpi_parse_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "ACPI_PARSE_ENABLED") self.l1d_flush_vmentry_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "L1D_VMENTRY_ENABLED") @@ -101,13 +101,13 @@ class Features: self.ssram_enabled = common.get_hv_item_tag(self.hv_file, "FEATURES", "SSRAM", "SSRAM_ENABLED") def check_item(self): - hv_cfg_lib.ny_support_check(self.multiboot2, "FEATURES", "MULTIBOOT2") + hv_cfg_lib.ny_support_check(self.multiboot2, "FEATURES", "MULTIBOOT2_ENABLED") hv_cfg_lib.ny_support_check(self.rdt_enabled, "FEATURES", "RDT", "RDT_ENABLED") hv_cfg_lib.ny_support_check(self.cdp_enabled, "FEATURES", "RDT", "CDP_ENABLED") hv_cfg_lib.cat_max_mask_check(self.cat_max_mask, "FEATURES", "RDT", "CLOS_MASK") hv_cfg_lib.mba_delay_check(self.mba_delay, "FEATURES", "RDT", "MBA_DELAY") hv_cfg_lib.scheduler_check(self.scheduler, "FEATURES", "SCHEDULER") - hv_cfg_lib.ny_support_check(self.reloc, "FEATURES", "RELOC") + hv_cfg_lib.ny_support_check(self.reloc, "FEATURES", "RELOC_ENABLED") hv_cfg_lib.ny_support_check(self.hyperv_enabled, "FEATURES", "HYPERV_ENABLED") hv_cfg_lib.ny_support_check(self.acpi_parse_enabled, "FEATURES", "ACPI_PARSE_ENABLED") hv_cfg_lib.ny_support_check(self.l1d_flush_vmentry_enabled, "FEATURES", "L1D_VMENTRY_ENABLED") diff --git a/misc/config_tools/scenario_config/scenario_cfg_gen.py b/misc/config_tools/scenario_config/scenario_cfg_gen.py index f7a4d6b2e..050aa251c 100755 --- a/misc/config_tools/scenario_config/scenario_cfg_gen.py +++ b/misc/config_tools/scenario_config/scenario_cfg_gen.py @@ -72,11 +72,11 @@ def get_scenario_item_values(board_info, scenario_info): scenario_item_values["hv,CAPACITIES,MAX_IOAPIC_NUM"] = hv_cfg_lib.get_select_range("CAPACITIES", "IOAPIC_NUM") - scenario_item_values["hv,FEATURES,MULTIBOOT2"] = hv_cfg_lib.N_Y + scenario_item_values["hv,FEATURES,MULTIBOOT2_ENABLED"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,RDT,RDT_ENABLED"] = board_cfg_lib.get_rdt_select_opt() scenario_item_values["hv,FEATURES,RDT,CDP_ENABLED"] = board_cfg_lib.get_rdt_select_opt() scenario_item_values["hv,FEATURES,SCHEDULER"] = hv_cfg_lib.SCHEDULER_TYPE - scenario_item_values["hv,FEATURES,RELOC"] = hv_cfg_lib.N_Y + scenario_item_values["hv,FEATURES,RELOC_ENABLED"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,HYPERV_ENABLED"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,ACPI_PARSE_ENABLED"] = hv_cfg_lib.N_Y scenario_item_values["hv,FEATURES,L1D_VMENTRY_ENABLED"] = hv_cfg_lib.N_Y diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 628d8894f..cf5b29c06 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -53,7 +53,7 @@ These settings can only be changed at build time. - + Enable hypervisor relocation in memory. The bootloader may need to change the location of the hypervisor because of other firmware. @@ -63,7 +63,7 @@ These settings can only be changed at build time. Select the scheduling algorithm for determining the priority of User VMs running on a shared virtual CPU. - + Enable multiboot2 protocol support (with multiboot1 downward compatibility). If multiboot1 meets your requirements, disable this feature to reduce hypervisor code size. diff --git a/misc/config_tools/schema/types.xsd b/misc/config_tools/schema/types.xsd index ec9741fb1..cd333a352 100644 --- a/misc/config_tools/schema/types.xsd +++ b/misc/config_tools/schema/types.xsd @@ -131,11 +131,8 @@ higher value (lower severity) are discarded. - ``No-Operation (NOOP)``: The No-Operation (NOOP) scheduler means there is a strict one-to-one mapping between vCPUs and pCPUs. - ``Borrowed Virtual Time``: The Borrowed Virtual Time (BVT) scheduler is a - virtual time-based - scheduling algorithm. It dispatches the runnable thread with the - earliest effective virtual time. *TODO: BVT scheduler will be built on - top of a prioritized scheduling mechanism, i.e. higher priority threads - get scheduled first, and same priority tasks are scheduled per BVT.* + virtual time-based scheduling algorithm. It dispatches the runnable thread with the + earliest effective virtual time. - ``Priority Based Scheduling``: The priority based scheduler supports vCPU scheduling based on their pre-configured priorities. Read more about the available scheduling options in :ref:`cpu_sharing`. diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index a55655e79..3c951ced3 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -72,14 +72,6 @@ - - - - - - - - @@ -136,6 +128,16 @@ + + + + + + + + + +