Pass thread information to virt-launcher for pinning decisions

Take the dom capability sibling information and make it available to
virt-launcher which can use it to do more sophisticated pinning
decisions.

Signed-off-by: Roman Mohr <[email protected]>

pkg/handler-launcher-com/cmd/v1/cmd.proto

@@ -33,6 +33,7 @@ message VMI {
 
 message CPU {
   uint32 id = 1;
+  repeated uint32 siblings = 2;
 }
 
 message Sibling {

pkg/virt-handler/node-labeller/api/capabilities.go

@@ -3,10 +3,14 @@ package api
 import (
 	"encoding/xml"
 	"fmt"
+	"strconv"
+	"strings"
 )
 
 type yesnobool bool
 
+type CPUSiblings []uint32
+
 type Capabilities struct {
 	XMLName xml.Name `xml:"capabilities"`
 	Host    Host     `xml:"host"`
@@ -32,11 +36,11 @@ type Counter struct {
 }
 
 type CPU struct {
-	ID       uint32 `xml:"id,attr"`
-	SocketID uint32 `xml:"socket_id,attr"`
-	DieID    uint32 `xml:"die_id,attr"`
-	CoreID   uint32 `xml:"core_id,attr"`
-	Siblings string `xml:"siblings,attr"`
+	ID       uint32      `xml:"id,attr"`
+	SocketID uint32      `xml:"socket_id,attr"`
+	DieID    uint32      `xml:"die_id,attr"`
+	CoreID   uint32      `xml:"core_id,attr"`
+	Siblings CPUSiblings `xml:"siblings,attr"`
 }
 
 type CPUs struct {
@@ -100,3 +104,16 @@ func (b *yesnobool) UnmarshalXMLAttr(attr xml.Attr) error {
 	}
 	return fmt.Errorf("value %v of %v is not (yes|no)", attr.Value, attr.Name)
 }
+
+func (b *CPUSiblings) UnmarshalXMLAttr(attr xml.Attr) error {
+	if attr.Value != "" {
+		for _, cpuStr := range strings.Split(attr.Value, ",") {
+			val, err := strconv.ParseInt(cpuStr, 10, 32)
+			if err != nil {
+				return fmt.Errorf("failed to parse %v to int from %v: %v", cpuStr, attr.Value, err)
+			}
+			*b = append(*b, uint32(val))
+		}
+	}
+	return nil
+}

pkg/virt-handler/node-labeller/capabilities_test.go

@@ -28,6 +28,17 @@ var _ = Describe("Capabilities", func() {
 		Expect(bool(counter.Scaling)).To(BeFalse())
 	})
 
+	It("should properly read cpu siblings", func() {
+		f, err := os.Open("testdata/capabilities.xml")
+		Expect(err).ToNot(HaveOccurred())
+		defer f.Close()
+		capabilities := &api.Capabilities{}
+		Expect(xml.NewDecoder(f).Decode(capabilities)).To(Succeed())
+		Expect(capabilities.Host.Topology.Cells.Cell).To(HaveLen(1))
+		Expect(capabilities.Host.Topology.Cells.Cell[0].Cpus.CPU).To(HaveLen(8))
+		Expect(capabilities.Host.Topology.Cells.Cell[0].Cpus.CPU[0].Siblings).To(ConsistOf(uint32(0), uint32(4)))
+	})
+
 	It("should read the numa topology from the host", func() {
 
 		expectedCell := api.Cell{
@@ -81,42 +92,42 @@ var _ = Describe("Capabilities", func() {
 						SocketID: 0,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "0",
+						Siblings: []uint32{0},
 					},
 					{
 						ID:       1,
 						SocketID: 1,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "1",
+						Siblings: []uint32{1},
 					},
 					{
 						ID:       2,
 						SocketID: 2,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "2",
+						Siblings: []uint32{2},
 					},
 					{
 						ID:       3,
 						SocketID: 3,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "3",
+						Siblings: []uint32{3},
 					},
 					{
 						ID:       4,
 						SocketID: 4,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "4",
+						Siblings: []uint32{4},
 					},
 					{
 						ID:       5,
 						SocketID: 5,
 						DieID:    0,
 						CoreID:   0,
-						Siblings: "5",
+						Siblings: []uint32{5},
 					},
 				},
 			},

pkg/virt-handler/options.go

@@ -73,8 +73,9 @@ func distanceToDistance(distance api.Sibling) *cmdv1.Sibling {
 	}
 }
 
-func cpuToCPU(distance api.CPU) *cmdv1.CPU {
+func cpuToCPU(cpu api.CPU) *cmdv1.CPU {
 	return &cmdv1.CPU{
-		Id: distance.ID,
+		Id:       cpu.ID,
+		Siblings: cpu.Siblings,
 	}
 }