github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

configurator does not consider L3 CAT config when opening an exiting configuration

Browse Source 
1. rewrite function to match xml data structure  to fix the bug
2. fix inconsistency in one function ( data push order change accordingly)

Tracked-On: #7927
Signed-off-by: Chuang-Ke <chuangx.ke@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Chuang Ke 2022-07-28 10:54:32 +08:00 committed by acrnsi-robot
parent 92034e9f7d
commit 815d9b45c6
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
misc/config_tools/configurator/packages/configurator/src/lib/acrn.ts
View File

@ -392,7 +392,7 @@ class CAT {
return preLaunchedVMCPUs; return preLaunchedVMCPUs;
} }
newPolicy(CACHE_LEVEL, CACHE_ID, vmConfig, VCPU, TYPE: PolicyType, maxLength): Policy { newPolicy(CACHE_ID, CACHE_LEVEL, vmConfig, VCPU, TYPE: PolicyType, maxLength): Policy {
let originPolicy = { let originPolicy = {
VM: vmConfig.name, VM: vmConfig.name,
VCPU, TYPE, VCPU, TYPE,
@ -441,13 +441,13 @@ class CAT {
getCLOSMask(CACHE_ID, CACHE_LEVEL, vmID, vmName, VCPU, TYPE: PolicyType, maxLength: number) { getCLOSMask(CACHE_ID, CACHE_LEVEL, vmID, vmName, VCPU, TYPE: PolicyType, maxLength: number) {
let CATData = this.selectCATData(CACHE_ID, CACHE_LEVEL, vmID, vmName, VCPU, TYPE); let CATData = this.selectCATData(CACHE_ID, CACHE_LEVEL, vmID, vmName, VCPU, TYPE);
let CLOS_MASK
if (CATData !== false) { if (CATData !== false) {
let CLOS_MASK = CATData.CLOS_MASK; CLOS_MASK = CATData.CLOS_MASK;
// ensure CLOS_MASK length is shorter or equal to maxLength // ensure CLOS_MASK length is shorter or equal to maxLength
CLOS_MASK = this.rangeToHex(this.hexToRange(CLOS_MASK, maxLength), maxLength); CLOS_MASK = this.rangeToHex(this.hexToRange(CLOS_MASK, maxLength), maxLength);
return CLOS_MASK; return CLOS_MASK;
} } else CLOS_MASK = "0x" + parseInt('1'.repeat(maxLength), 2).toString(16)
let CLOS_MASK = "0x" + parseInt('1'.repeat(maxLength), 2).toString(16)
this.CATDB.push({ this.CATDB.push({
META: {vmid: vmID}, META: {vmid: vmID},
CACHE_ID, CACHE_LEVEL, CACHE_ID, CACHE_LEVEL,
@ -469,10 +469,10 @@ class CAT {
pcpu.real_time_vcpu === 'y' pcpu.real_time_vcpu === 'y'
) { ) {
if (!this.switches.CDP_ENABLED) { if (!this.switches.CDP_ENABLED) {
RTCoreData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length)) RTCoreData.push(this.newPolicy(regionData.id, regionData.level, vmConfig, index, 'Unified', regionData.capacity_mask_length))
} else { } else {
RTCoreData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Code', regionData.capacity_mask_length)) RTCoreData.push(this.newPolicy(regionData.id, regionData.level, vmConfig, index, 'Code', regionData.capacity_mask_length))
RTCoreData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Data', regionData.capacity_mask_length)) RTCoreData.push(this.newPolicy(regionData.id, regionData.level, vmConfig, index, 'Data', regionData.capacity_mask_length))
} }
} }
} }
@ -498,10 +498,10 @@ class CAT {
(pcpu.real_time_vcpu === 'y' && vmConfig.vm_type !== 'RTVM') (pcpu.real_time_vcpu === 'y' && vmConfig.vm_type !== 'RTVM')
) { ) {
if (!this.switches.CDP_ENABLED) { if (!this.switches.CDP_ENABLED) {
StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, 'Unified', regionData.capacity_mask_length)) StandardData.push(this.newPolicy( regionData.id, regionData.level,vmConfig, index, 'Unified', regionData.capacity_mask_length))
} else { } else {
StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Code", regionData.capacity_mask_length)) StandardData.push(this.newPolicy(regionData.id, regionData.level, vmConfig, index, "Code", regionData.capacity_mask_length))
StandardData.push(this.newPolicy(regionData.level, regionData.id, vmConfig, index, "Data", regionData.capacity_mask_length)) StandardData.push(this.newPolicy( regionData.id, regionData.level,vmConfig, index, "Data", regionData.capacity_mask_length))
} }
} }
} }
@ -524,10 +524,10 @@ class CAT {
this.serviceVMCPUs.map((pcpuID, index) => { this.serviceVMCPUs.map((pcpuID, index) => {
if (regionData.processors.indexOf(pcpuID) !== -1) { if (regionData.processors.indexOf(pcpuID) !== -1) {
if (!this.switches.CDP_ENABLED) { if (!this.switches.CDP_ENABLED) {
ServiceData.push(this.newPolicy(regionData.level, regionData.id, this.serviceVM, index, "Unified", regionData.capacity_mask_length)) ServiceData.push(this.newPolicy(regionData.id, regionData.level, this.serviceVM, index, "Unified", regionData.capacity_mask_length))
} else { } else {
ServiceData.push(this.newPolicy(regionData.level, regionData.id, this.serviceVM, index, "Code", regionData.capacity_mask_length)) ServiceData.push(this.newPolicy(regionData.id, regionData.level, this.serviceVM, index, "Code", regionData.capacity_mask_length))
ServiceData.push(this.newPolicy(regionData.level, regionData.id, this.serviceVM, index, "Data", regionData.capacity_mask_length)) ServiceData.push(this.newPolicy(regionData.id, regionData.level, this.serviceVM, index, "Data", regionData.capacity_mask_length))
} }
} }
}) })
@ -545,7 +545,7 @@ class CAT {
vmConfig.virtual_cat_support === "y" vmConfig.virtual_cat_support === "y"
) { ) {
VCATData.push( VCATData.push(
this.newPolicy(regionData.level, regionData.id, vmConfig, 0, "Unified", vmConfig.virtual_cat_number) this.newPolicy(regionData.id, regionData.level, vmConfig, 0, "Unified", vmConfig.virtual_cat_number)
) )
} }
}) })
@ -582,37 +582,40 @@ class CAT {
private getCATDataFromScenario() { private getCATDataFromScenario() {
let hv = this.scenario.hv; let hv = this.scenario.hv;
let scenarioCATData: CATDBRecord[] = []
// noinspection JSUnresolvedVariable let scenarioCATData: CATDBRecord[] = []
// noinspection JSUnresolvedVariable
if ( if (
hv !== null && hv !== null &&
hv.hasOwnProperty('CACHE_REGION') && hv.hasOwnProperty('CACHE_REGION')
hv.CACHE_REGION.hasOwnProperty('CACHE_ALLOCATION') &&
_.isArray(hv.CACHE_REGION.CACHE_ALLOCATION)
) { ) {
// noinspection JSUnresolvedVariable let cacheRegion = hv.CACHE_REGION
hv.CACHE_REGION.CACHE_ALLOCATION.map((cache_region) => { if (cacheRegion !== null && cacheRegion.hasOwnProperty('CACHE_ALLOCATION') &&
if ( _.isArray(cacheRegion.CACHE_ALLOCATION)) {
cache_region.hasOwnProperty('POLICY') && // noinspection JSUnresolvedVariable
cache_region.POLICY.length > 0
) { cacheRegion.CACHE_ALLOCATION.map((cache_allocation) => {
cache_region.POLICY.map(policy => { if (
scenarioCATData.push({ cache_allocation.hasOwnProperty('POLICY') &&
CACHE_ID: cache_region.CACHE_ID, cache_allocation.POLICY.length > 0
CACHE_LEVEL: cache_region.CACHE_LEVEL, ) {
CLOS_MASK: policy.CLOS_MASK, cache_allocation.POLICY.map(policy => {
META: {vmid: this.vmIDs[policy.VM]}, scenarioCATData.push({
TYPE: policy.TYPE, CACHE_ID: cache_allocation.CACHE_ID,
VCPU: policy.VCPU, CACHE_LEVEL: cache_allocation.CACHE_LEVEL,
VM: policy.VM CLOS_MASK: policy.CLOS_MASK,
META: {vmid: this.vmIDs[policy.VM]},
TYPE: policy.TYPE,
VCPU: policy.VCPU,
VM: policy.VM
})
}) })
}) }
}
}) })
}
} }
return scenarioCATData return scenarioCATData
} }