Skip to content

Commit c7c8cb0

Browse files
committed
fix: update CPU template baselines
KVM now exposes leaf 0x80000020 and 0x80000021 to AMD guests on 5.10 host kernels. First one relates to QoS features for shared CPU resources (all 0s at the moment) while the second one communicates a few CPU features to the guest. Update CPU templates for related instance types. (cherry picked from commit 283e574) Signed-off-by: Babis Chalios <[email protected]>
1 parent 09a8da6 commit c7c8cb0

File tree

2 files changed

+97
-4
lines changed

2 files changed

+97
-4
lines changed

tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@
635635
"modifiers": [
636636
{
637637
"register": "eax",
638-
"bitmap": "0b10000000000000000000000000011111"
638+
"bitmap": "0b10000000000000000000000000100001"
639639
},
640640
{
641641
"register": "ebx",
@@ -1455,7 +1455,54 @@
14551455
"bitmap": "0b00000000000000000000001111101111"
14561456
}
14571457
]
1458+
},
1459+
{
1460+
"leaf": "0x80000020",
1461+
"subleaf": "0x0",
1462+
"flags": 0,
1463+
"modifiers": [
1464+
{
1465+
"register": "eax",
1466+
"bitmap": "0b00000000000000000000000000000000"
1467+
},
1468+
{
1469+
"register": "ebx",
1470+
"bitmap": "0b00000000000000000000000000000000"
1471+
},
1472+
{
1473+
"register": "ecx",
1474+
"bitmap": "0b00000000000000000000000000000000"
1475+
},
1476+
{
1477+
"register": "edx",
1478+
"bitmap": "0b00000000000000000000000000000000"
1479+
}
1480+
]
1481+
},
1482+
{
1483+
"leaf": "0x80000021",
1484+
"subleaf": "0x0",
1485+
"flags": 0,
1486+
"modifiers": [
1487+
{
1488+
"register": "eax",
1489+
"bitmap": "0b00000000000000000000000001100101"
1490+
},
1491+
{
1492+
"register": "ebx",
1493+
"bitmap": "0b00000000000000000000000000000000"
1494+
},
1495+
{
1496+
"register": "ecx",
1497+
"bitmap": "0b00000000000000000010000000000000"
1498+
},
1499+
{
1500+
"register": "edx",
1501+
"bitmap": "0b00000000000000000000000000000000"
1502+
}
1503+
]
14581504
}
1505+
14591506
],
14601507
"msr_modifiers": [
14611508
{
@@ -1588,4 +1635,4 @@
15881635
}
15891636
]
15901637
}
1591-
}
1638+
}

tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@
543543
"modifiers": [
544544
{
545545
"register": "eax",
546-
"bitmap": "0b10000000000000000000000000011111"
546+
"bitmap": "0b10000000000000000000000000100001"
547547
},
548548
{
549549
"register": "ebx",
@@ -1363,6 +1363,52 @@
13631363
"bitmap": "0b00000000000000000000000111111110"
13641364
}
13651365
]
1366+
},
1367+
{
1368+
"leaf": "0x80000020",
1369+
"subleaf": "0x0",
1370+
"flags": 0,
1371+
"modifiers": [
1372+
{
1373+
"register": "eax",
1374+
"bitmap": "0b00000000000000000000000000000000"
1375+
},
1376+
{
1377+
"register": "ebx",
1378+
"bitmap": "0b00000000000000000000000000000000"
1379+
},
1380+
{
1381+
"register": "ecx",
1382+
"bitmap": "0b00000000000000000000000000000000"
1383+
},
1384+
{
1385+
"register": "edx",
1386+
"bitmap": "0b00000000000000000000000000000000"
1387+
}
1388+
]
1389+
},
1390+
{
1391+
"leaf": "0x80000021",
1392+
"subleaf": "0x0",
1393+
"flags": 0,
1394+
"modifiers": [
1395+
{
1396+
"register": "eax",
1397+
"bitmap": "0b00000000000000000000000001100101"
1398+
},
1399+
{
1400+
"register": "ebx",
1401+
"bitmap": "0b00000000000000000000000000000000"
1402+
},
1403+
{
1404+
"register": "ecx",
1405+
"bitmap": "0b00000000000000000010000000000000"
1406+
},
1407+
{
1408+
"register": "edx",
1409+
"bitmap": "0b00000000000000000000000000000000"
1410+
}
1411+
]
13661412
}
13671413
],
13681414
"msr_modifiers": [
@@ -1496,4 +1542,4 @@
14961542
}
14971543
]
14981544
}
1499-
}
1545+
}

0 commit comments

Comments
 (0)