github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 06:27:39 +00:00
Code Issues Projects Releases Wiki Activity

qemu: support x86 SMP die

Browse Source 
In QEMU 4.1 the CPU topology for x86 will change to:
`socket > die > core > thread`.
Add `die-id` field to `CPUProperties` and include it in CPU hotplugging

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2019-07-15 17:35:07 +00:00
parent 52b2309a55
commit a5c119086a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qemu/qmp.go
View File

@ -149,6 +149,7 @@ type QMPVersion struct {
type CPUProperties struct { type CPUProperties struct {
Node int `json:"node-id"` Node int `json:"node-id"`
Socket int `json:"socket-id"` Socket int `json:"socket-id"`
Die int `json:"die-id"`
Core int `json:"core-id"` Core int `json:"core-id"`
Thread int `json:"thread-id"` Thread int `json:"thread-id"`
} }
@ -1162,7 +1163,7 @@ func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsd
// node/board the CPU belongs to, coreID is the core number within socket the CPU belongs to, threadID is the // node/board the CPU belongs to, coreID is the core number within socket the CPU belongs to, threadID is the
// thread number within core the CPU belongs to. Note that socketID and threadID are not a requirement for // thread number within core the CPU belongs to. Note that socketID and threadID are not a requirement for
// architecures like ppc64le. // architecures like ppc64le.
func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID, coreID, threadID, romfile string) error { func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID, dieID, coreID, threadID, romfile string) error {
args := map[string]interface{}{ args := map[string]interface{}{
"driver": driver, "driver": driver,
"id": cpuID, "id": cpuID,
@ -1177,6 +1178,12 @@ func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID,
args["thread-id"] = threadID args["thread-id"] = threadID
} }
if q.version.Major > 4 || (q.version.Major == 4 && q.version.Minor >= 1) {
if dieID != "" {
args["die-id"] = dieID
}
}
if isVirtioPCI[DeviceDriver(driver)] { if isVirtioPCI[DeviceDriver(driver)] {
args["romfile"] = romfile args["romfile"] = romfile
} }

8
qemu/qmp_test.go
View File

@ -1069,9 +1069,14 @@ func TestQMPCPUDeviceAdd(t *testing.T) {
driver := "qemu64-x86_64-cpu" driver := "qemu64-x86_64-cpu"
cpuID := "cpu-0" cpuID := "cpu-0"
socketID := "0" socketID := "0"
dieID := "0"
coreID := "1" coreID := "1"
threadID := "0" threadID := "0"
err := q.ExecuteCPUDeviceAdd(context.Background(), driver, cpuID, socketID, coreID, threadID, "") q.version = &QMPVersion{
Major: 4,
Minor: 1,
}
err := q.ExecuteCPUDeviceAdd(context.Background(), driver, cpuID, socketID, dieID, coreID, threadID, "")
if err != nil { if err != nil {
t.Fatalf("Unexpected error %v", err) t.Fatalf("Unexpected error %v", err)
} }
@ -1090,6 +1095,7 @@ func TestQMPExecuteQueryHotpluggableCPUs(t *testing.T) {
Properties: CPUProperties{ Properties: CPUProperties{
Node: 1, Node: 1,
Socket: 3, Socket: 3,
Die: 1,
Core: 2, Core: 2,
Thread: 4, Thread: 4,
}, },