Skip to content

Commit 14e7f7a

Browse files
lyan3wenlingz
lyan3
authored and
wenlingz
committed
acrn-config: enable CAT for industry scenario on APL-UP2 by default
Tracked-On: #4566 Signed-off-by: Yan, Like <like.yan@intel.com> Signed-off-by: Liu, Wei <weix.w.liu@intel.com>
1 parent 02fea0f commit 14e7f7a

37 files changed

+327
-110
lines changed

‎misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1010
<pcpu_id>3</pcpu_id>
1111
</vcpu_affinity>
12-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
12+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
13+
<vcpu_clos>0</vcpu_clos>
14+
</clos>
1315
<severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
1416
<epc_section desc="epc section">
1517
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -52,7 +54,9 @@
5254
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
5355
<guest_flag>0</guest_flag>
5456
</guest_flags>
55-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
58+
<vcpu_clos>0</vcpu_clos>
59+
</clos>
5660
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
5761
<memory>
5862
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -99,7 +103,9 @@
99103
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
100104
<pcpu_id>2</pcpu_id>
101105
</vcpu_affinity>
102-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
106+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
107+
<vcpu_clos>0</vcpu_clos>
108+
</clos>
103109
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
104110
<epc_section desc="epc section">
105111
<base desc="SGX EPC section base, must be page aligned">0</base>

‎misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77
<guest_flag>0</guest_flag>
88
</guest_flags>
9-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
9+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
10+
<vcpu_clos>0</vcpu_clos>
11+
</clos>
1012
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1113
<memory>
1214
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -53,7 +55,9 @@
5355
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
5456
<pcpu_id>1</pcpu_id>
5557
</vcpu_affinity>
56-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
58+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
59+
<vcpu_clos>0</vcpu_clos>
60+
</clos>
5761
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5862
<epc_section desc="epc section">
5963
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -82,7 +86,9 @@
8286
<pcpu_id>2</pcpu_id>
8387
<pcpu_id>3</pcpu_id>
8488
</vcpu_affinity>
85-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
89+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
90+
<vcpu_clos>0</vcpu_clos>
91+
</clos>
8692
<severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
8793
<epc_section desc="epc section">
8894
<base desc="SGX EPC section base, must be page aligned">0</base>

‎misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<pcpu_id>0</pcpu_id>
1111
<pcpu_id>2</pcpu_id>
1212
</vcpu_affinity>
13-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
13+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">>
14+
<vcpu_clos>0</vcpu_clos>
15+
</clos>
1416
<epc_section desc="epc section">
1517
<base desc="SGX EPC section base, must be page aligned">0</base>
1618
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -59,7 +61,9 @@
5961
<pcpu_id>1</pcpu_id>
6062
<pcpu_id>3</pcpu_id>
6163
</vcpu_affinity>
62-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
64+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
65+
<vcpu_clos>0</vcpu_clos>
66+
</clos>
6367
<epc_section desc="epc section">
6468
<base desc="SGX EPC section base, must be page aligned">0</base>
6569
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

‎misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77
<guest_flag>0</guest_flag>
88
</guest_flags>
9-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
9+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
10+
<vcpu_clos>0</vcpu_clos>
11+
</clos>
1012
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1113
<memory>
1214
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -54,7 +56,9 @@
5456
<pcpu_id>1</pcpu_id>
5557
<pcpu_id>2</pcpu_id>
5658
</vcpu_affinity>
57-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
59+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
60+
<vcpu_clos>0</vcpu_clos>
61+
</clos>
5862
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5963
<epc_section desc="epc section">
6064
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -76,7 +80,9 @@
7680
<vm id="2" configurable="1" desc="specific for Kata">
7781
<load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
7882
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
79-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
83+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
84+
<vcpu_clos>0</vcpu_clos>
85+
</clos>
8086
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
8187
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
8288
<pcpu_id>3</pcpu_id>

‎misc/acrn-config/xmls/config-xmls/apl-mrb/sdc2.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77
<guest_flag>0</guest_flag>
88
</guest_flags>
9-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
9+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
10+
<vcpu_clos>0</vcpu_clos>
11+
</clos>
1012
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1113
<memory>
1214
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -53,7 +55,9 @@
5355
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
5456
<pcpu_id>1</pcpu_id>
5557
</vcpu_affinity>
56-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
58+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
59+
<vcpu_clos>0</vcpu_clos>
60+
</clos>
5761
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5862
<epc_section desc="epc section">
5963
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -81,7 +85,9 @@
8185
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
8286
<pcpu_id>2</pcpu_id>
8387
</vcpu_affinity>
84-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
88+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
89+
<vcpu_clos>0</vcpu_clos>
90+
</clos>
8591
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
8692
<epc_section desc="epc section">
8793
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -109,7 +115,9 @@
109115
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
110116
<pcpu_id>3</pcpu_id>
111117
</vcpu_affinity>
112-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
118+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
119+
<vcpu_clos>0</vcpu_clos>
120+
</clos>
113121
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
114122
<epc_section desc="epc section">
115123
<base desc="SGX EPC section base, must be page aligned">0</base>

‎misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1111
<pcpu_id>0</pcpu_id>
1212
</vcpu_affinity>
13-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
13+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
14+
<vcpu_clos>0</vcpu_clos>
15+
</clos>
1416
<epc_section desc="epc section">
1517
<base desc="SGX EPC section base, must be page aligned">0</base>
1618
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -58,7 +60,9 @@
5860
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
5961
<pcpu_id>1</pcpu_id>
6062
</vcpu_affinity>
61-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
63+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
64+
<vcpu_clos>0</vcpu_clos>
65+
</clos>
6266
<epc_section desc="epc section">
6367
<base desc="SGX EPC section base, must be page aligned">0</base>
6468
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

‎misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
1010
<pcpu_id>3</pcpu_id>
1111
</vcpu_affinity>
12-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
12+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
13+
<vcpu_clos>0</vcpu_clos>
14+
</clos>
1315
<severity desc="severity of the guest VM">SEVERITY_SAFETY_VM</severity>
1416
<epc_section desc="epc section">
1517
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -52,7 +54,9 @@
5254
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
5355
<guest_flag>0</guest_flag>
5456
</guest_flags>
55-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
57+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
58+
<vcpu_clos>0</vcpu_clos>
59+
</clos>
5660
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
5761
<memory>
5862
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -99,7 +103,9 @@
99103
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
100104
<pcpu_id>2</pcpu_id>
101105
</vcpu_affinity>
102-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
106+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
107+
<vcpu_clos>0</vcpu_clos>
108+
</clos>
103109
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
104110
<epc_section desc="epc section">
105111
<base desc="SGX EPC section base, must be page aligned">0</base>

‎misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77
<guest_flag>0</guest_flag>
88
</guest_flags>
9-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
9+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
10+
<vcpu_clos>3</vcpu_clos>
11+
</clos>
1012
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1113
<memory>
1214
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -53,7 +55,9 @@
5355
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
5456
<pcpu_id>1</pcpu_id>
5557
</vcpu_affinity>
56-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
58+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
59+
<vcpu_clos>3</vcpu_clos>
60+
</clos>
5761
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5862
<epc_section desc="epc section">
5963
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -82,7 +86,10 @@
8286
<pcpu_id>2</pcpu_id>
8387
<pcpu_id>3</pcpu_id>
8488
</vcpu_affinity>
85-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
89+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
90+
<vcpu_clos>1</vcpu_clos>
91+
<vcpu_clos>0</vcpu_clos>
92+
</clos>
8693
<severity desc="severity of the guest VM">SEVERITY_RTVM</severity>
8794
<epc_section desc="epc section">
8895
<base desc="SGX EPC section base, must be page aligned">0</base>

‎misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<pcpu_id>0</pcpu_id>
1212
<pcpu_id>2</pcpu_id>
1313
</vcpu_affinity>
14-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
14+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
15+
<vcpu_clos>0</vcpu_clos>
16+
</clos>
1517
<epc_section desc="epc section">
1618
<base desc="SGX EPC section base, must be page aligned">0</base>
1719
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
@@ -60,7 +62,9 @@
6062
<pcpu_id>1</pcpu_id>
6163
<pcpu_id>3</pcpu_id>
6264
</vcpu_affinity>
63-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
65+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
66+
<vcpu_clos>0</vcpu_clos>
67+
</clos>
6468
<epc_section desc="epc section">
6569
<base desc="SGX EPC section base, must be page aligned">0</base>
6670
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>

‎misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<guest_flags desc="Select all applicable flags for the VM" multiselect="true">
77
<guest_flag>0</guest_flag>
88
</guest_flags>
9-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
9+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
10+
<vcpu_clos>0</vcpu_clos>
11+
</clos>
1012
<severity desc="severity of the guest VM">SEVERITY_SOS</severity>
1113
<memory>
1214
<start_hpa configurable="0" desc="The start physical address in host for the VM">0</start_hpa>
@@ -54,7 +56,9 @@
5456
<pcpu_id>1</pcpu_id>
5557
<pcpu_id>2</pcpu_id>
5658
</vcpu_affinity>
57-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
59+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
60+
<vcpu_clos>0</vcpu_clos>
61+
</clos>
5862
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
5963
<epc_section desc="epc section">
6064
<base desc="SGX EPC section base, must be page aligned">0</base>
@@ -76,7 +80,9 @@
7680
<vm id="2" configurable="1" desc="specific for Kata">
7781
<load_order readonly="true" desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM.">POST_LAUNCHED_VM</load_order>
7882
<uuid configurable="0" desc="vm uuid">a7ada506-1ab0-4b6b-a0da-e513ca9b8c2f</uuid>
79-
<clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">0</clos>
83+
<clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
84+
<vcpu_clos>0</vcpu_clos>
85+
</clos>
8086
<severity desc="severity of the guest VM">SEVERITY_STANDARD_VM</severity>
8187
<vcpu_affinity desc="vCPU affinity map. Each vCPU will pin to the selected pCPU ID. Please make sure each vCPU pin to different pCPU.">
8288
<pcpu_id>3</pcpu_id>

0 commit comments

Comments
 (0)