github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-01-06 08:04:55 +00:00
Code Issues Projects Releases Wiki Activity

config_tool: add cpu affinity check

Browse Source 
1. ensure cpu affinity in launch xml is subset of its scenario settings.
2. cpu_affinity is a must have parameter for acrn_dm, if the user did not provide cpu affinity in launch xml, load it from scenario settings.

Tracked-On: #6724
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
This commit is contained in:
Weiyi Feng
2021-11-08 13:51:31 +08:00
committed by wenlingz
parent c3c8679afe
commit 1bbfbcc8b3
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
misc/config_tools/library/scenario_cfg_lib.py
View File

@@ -333,10 +333,10 @@ def guest_flag_check(guest_flags, branch_tag, leaf_tag):
ERR_LIST[key] = "Unknow guest flag"
def vm_cpu_affinity_check(config_file, id_cpus_per_vm_dic, item):
def vm_cpu_affinity_check(scenario_file, cpu_affinity):
"""
Check cpu number of per vm
:param item: vm pcpu_id item in xml
:param : vm cpu_affinity item in xml
:return: error informations
"""
err_dic = {}
@@ -347,37 +347,46 @@ def vm_cpu_affinity_check(config_file, id_cpus_per_vm_dic, item):
if cpu_sharing == "SCHED_NOOP":
cpu_sharing_enabled = False
cpu_affinity = common.get_leaf_tag_map(config_file, "cpu_affinity", "pcpu_id")
for vm_i in id_cpus_per_vm_dic.keys():
for cpu in id_cpus_per_vm_dic[vm_i]:
if cpu is not None and cpu in use_cpus and not cpu_sharing_enabled:
key = "vm:id={},{}".format(vm_i, item)
err_dic[key] = "The same pcpu was configurated in <pcpu_id>/<cpu_affinity>, but CPU sharing is disabled by 'SCHED_NOOP'. Please re-configurate them!"
return err_dic
else:
use_cpus.append(cpu)
# validate cpu_affinity config with scenario file
scenario_cpu_aff = common.get_leaf_tag_map(scenario_file, "cpu_affinity", "pcpu_id")
for vm_id, cpu_ids in cpu_affinity.items():
for vm_cpu in cpu_ids:
if vm_cpu not in scenario_cpu_aff[vm_id]:
key = "vm:id={},{}".format(vm_id, 'pcpu_id')
err_dic[key] = "This pcpu is not configured in this vm's scenario file. Please re-configurate them!"
if err_dic:
return err_dic
for vm_i,cpu in cpu_affinity.items():
if cpu is not None and cpu in use_cpus and not cpu_sharing_enabled:
key = "vm:id={},{}".format(vm_i, 'pcpu_id')
err_dic[key] = "The same pcpu was configurated in <pcpu_id>/<cpu_affinity>, but CPU sharing is disabled by 'SCHED_NOOP'. Please re-configurate them!"
return err_dic
else:
use_cpus.append(cpu)
sos_vm_cpus = []
pre_launch_cpus = []
post_launch_cpus = []
for vm_i, vm_type in common.VM_TYPES.items():
if vm_i not in id_cpus_per_vm_dic.keys():
if vm_i not in cpu_affinity.keys():
continue
elif VM_DB[vm_type]['load_type'] == "PRE_LAUNCHED_VM":
cpus = [x for x in id_cpus_per_vm_dic[vm_i] if not None]
cpus = [x for x in cpu_affinity[vm_i] if not None]
pre_launch_cpus.extend(cpus)
elif VM_DB[vm_type]['load_type'] == "POST_LAUNCHED_VM":
cpus = [x for x in id_cpus_per_vm_dic[vm_i] if not None]
cpus = [x for x in cpu_affinity[vm_i] if not None]
post_launch_cpus.extend(cpus)
elif VM_DB[vm_type]['load_type'] == "SERVICE_VM":
cpus = [x for x in id_cpus_per_vm_dic[vm_i] if not None]
cpus = [x for x in cpu_affinity[vm_i] if not None]
sos_vm_cpus.extend(cpus)
# duplicate cpus assign the same VM check
cpus_vm_i = id_cpus_per_vm_dic[vm_i]
cpus_vm_i = cpu_affinity[vm_i]
for cpu_id in cpus_vm_i:
if cpus_vm_i.count(cpu_id) >= 2:
key = "vm:id={},{}".format(vm_i, item)
key = "vm:id={},{}".format(vm_i, 'pcpu_id')
err_dic[key] = "VM should not use the same pcpu id:{}".format(cpu_id)
return err_dic