github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: fix the issue that doesn't offline CPU in SCHED_NOOP mode

Browse Source 
Fix the issue that doesn't offline CPU in SCHED_NOOP mode.

Tracked-On: #7172
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Kunhui-Li 2022-03-02 15:17:36 +08:00 committed by acrnsi-robot
parent 08f7c2582c
commit d9a80dc746
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@ -185,7 +185,7 @@ def cpu_id_to_lapic_id(board_etree, vm_name, cpus):
return ret return ret
def generate_for_one_vm(board_etree, vm_scenario_etree, vm_launch_etree, vm_id): def generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_launch_etree, vm_id):
vm_name = eval_xpath(vm_launch_etree, ".//vm_name/text()", f"ACRN Post-Launched VM") vm_name = eval_xpath(vm_launch_etree, ".//vm_name/text()", f"ACRN Post-Launched VM")
script = LaunchScript(board_etree, vm_name, vm_launch_etree) script = LaunchScript(board_etree, vm_name, vm_launch_etree)
@ -198,6 +198,7 @@ def generate_for_one_vm(board_etree, vm_scenario_etree, vm_launch_etree, vm_id):
if eval_xpath(vm_launch_etree, ".//user_vm_type/text()") == "WINDOWS": if eval_xpath(vm_launch_etree, ".//user_vm_type/text()") == "WINDOWS":
script.add_plain_dm_parameter("--windows") script.add_plain_dm_parameter("--windows")
script.add_vm_descriptor("rtos_type", f"'{eval_xpath(vm_launch_etree, './/rtos_type/text()', 'no')}'") script.add_vm_descriptor("rtos_type", f"'{eval_xpath(vm_launch_etree, './/rtos_type/text()', 'no')}'")
script.add_vm_descriptor("scheduler", f"'{eval_xpath(hv_scenario_etree, './/SCHEDULER/text()')}'")
### ###
# CPU and memory resources # CPU and memory resources
@ -315,6 +316,7 @@ def main(board_xml, scenario_xml, launch_xml, user_vm_id, out_dir):
launch_etree = etree.parse(launch_xml) launch_etree = etree.parse(launch_xml)
service_vm_id = eval_xpath(scenario_etree, "//vm[load_order='SERVICE_VM']/@id") service_vm_id = eval_xpath(scenario_etree, "//vm[load_order='SERVICE_VM']/@id")
hv_scenario_etree = eval_xpath(scenario_etree, "//hv")
post_vms = scenario_etree.xpath("//vm[starts-with(load_order, 'POST_')]") post_vms = scenario_etree.xpath("//vm[starts-with(load_order, 'POST_')]")
if service_vm_id is None and len(post_vms) > 0: if service_vm_id is None and len(post_vms) > 0:
logging.error("The scenario does not define a service VM so no launch scripts will be generated for the post-launched VMs in the scenario.") logging.error("The scenario does not define a service VM so no launch scripts will be generated for the post-launched VMs in the scenario.")
@ -347,7 +349,7 @@ def main(board_xml, scenario_xml, launch_xml, user_vm_id, out_dir):
logging.warning(f"Post-launched VM {post_vm_id} is not specified in the launch XML, so no launch script will be generated.") logging.warning(f"Post-launched VM {post_vm_id} is not specified in the launch XML, so no launch script will be generated.")
continue continue
script = generate_for_one_vm(board_etree, vm_scenario_etree, vm_launch_etree, post_vm_id) script = generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_launch_etree, post_vm_id)
script.write_to_file(os.path.join(out_dir, f"launch_user_vm_id{post_vm_id}.sh")) script.write_to_file(os.path.join(out_dir, f"launch_user_vm_id{post_vm_id}.sh"))
return 0 return 0

2
misc/config_tools/launch_config/launch_script_template.sh
View File

@ -90,7 +90,7 @@ function add_cpus() {
# Each parameter of this function is considered the processor ID (as is reported in /proc/cpuinfo) of a CPU assigned # Each parameter of this function is considered the processor ID (as is reported in /proc/cpuinfo) of a CPU assigned
# to a post-launched RTVM. # to a post-launched RTVM.
if [ "${rtos_type}" != "no" ]; then if [ "${rtos_type}" != "no" ] || [ "${scheduler}" = "SCHED_NOOP" ]; then
offline_cpus $* offline_cpus $*
fi fi