convert HostDevices and GPUs to libvirt hostdev for pci and mdevs

This commit converts the allocated HostDevices and GPUs to libvirt's hostdev
for pci devices and mdevs

Signed-off-by: Vladik Romanovsky <[email protected]>

pkg/virt-launcher/virtwrap/api/converter.go

@@ -38,6 +38,7 @@ import (
 	"kubevirt.io/client-go/precond"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	"kubevirt.io/kubevirt/pkg/config"
+
 	containerdisk "kubevirt.io/kubevirt/pkg/container-disk"
 	"kubevirt.io/kubevirt/pkg/emptydisk"
 	ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
@@ -63,23 +64,79 @@ const (
 
 // +k8s:deepcopy-gen=false
 type ConverterContext struct {
-	Architecture          string
-	UseEmulation          bool
-	Secrets               map[string]*k8sv1.Secret
-	VirtualMachine        *v1.VirtualMachineInstance
-	CPUSet                []int
-	IsBlockPVC            map[string]bool
-	IsBlockDV             map[string]bool
-	DiskType              map[string]*containerdisk.DiskInfo
-	SRIOVDevices          map[string][]string
-	SMBios                *cmdv1.SMBios
-	GpuDevices            []string
-	VgpuDevices           []string
-	EmulatorThreadCpu     *int
-	OVMFPath              string
+	Architecture      string
+	UseEmulation      bool
+	Secrets           map[string]*k8sv1.Secret
+	VirtualMachine    *v1.VirtualMachineInstance
+	CPUSet            []int
+	IsBlockPVC        map[string]bool
+	IsBlockDV         map[string]bool
+	DiskType          map[string]*containerdisk.DiskInfo
+	SRIOVDevices      map[string][]string
+	SMBios            *cmdv1.SMBios
+	GpuDevices        []string
+	VgpuDevices       []string
+	PCIDevices        map[string][]string
+	MediatedDevices   map[string][]string
+	EmulatorThreadCpu *int
+	OVMFPath          string
 	MemBalloonStatsPeriod uint
 }
 
+// pop next device ID or address from a list
+// these can either be PCI addresses or UUIDs for MDEVs
+func popDeviceIDFromList(addrList []string) (string, []string) {
+	address := addrList[0]
+	if len(addrList) > 1 {
+		return address, addrList[1:]
+	}
+	return address, []string{}
+}
+
+func getHostDeviceByResourceName(c *ConverterContext, resourceName string, name string) (HostDevice, error) {
+	if addresses, exist := c.PCIDevices[resourceName]; len(addresses) != 0 && exist {
+		addr, remainingAddresses := popDeviceIDFromList(addresses)
+		domainHostDev, err := createHostDevicesFromPCIAddress(addr, name)
+		if err != nil {
+			return hostDevices, err
+		}
+		c.PCIDevices[resourceName] = remainingAddresses
+		return domainHostDev, nil
+	}
+	if addresses, exist := c.MediatedDevices[resourceName]; len(addresses) != 0 && exist {
+		addr, remainingAddresses := popDeviceIDFromList(addresses)
+		domainMDev, err := createHostDevicesFromMdevUUID(addr, name)
+		if err != nil {
+			return hostDevices, err
+		}
+		c.MediatedDevices[resourceName] = remainingAddresses
+		return domainMDev, nil
+	}
+
+	return HostDevice{}, fmt.Errorf("failed to allocated a host device for resource: %s", resourceName)
+}
+
+// Both HostDevices and GPUs can allocate PCI devices or a MDEVs
+func Convert_HostDevices_And_GPU(devices v1.Devices, domain *Domain, c *ConverterContext) error {
+	for _, hostDev := range devices.HostDevices {
+		hostDevice, err := getHostDeviceByResourceName(c, hostDev.DeviceName, hostDev.Name)
+		if err != nil {
+			return err
+		}
+		domain.Spec.Devices.HostDevices = append(domain.Spec.Devices.HostDevices, hostDevice)
+	}
+	for _, gpu := range devices.GPUs {
+		hostDevice, err := getHostDeviceByResourceName(c, gpu.DeviceName, gpu.Name)
+		if err != nil {
+			return err
+		}
+		domain.Spec.Devices.HostDevices = append(domain.Spec.Devices.HostDevices, hostDevice)
+	}
+
+	return nil
+
+}
+
 func Convert_v1_Disk_To_api_Disk(diskDevice *v1.Disk, disk *Disk, devicePerBus map[string]int, numQueues *uint) error {
 
 	if diskDevice.Disk != nil {
@@ -1161,7 +1218,12 @@ func Convert_v1_VirtualMachine_To_api_Domain(vmi *v1.VirtualMachineInstance, dom
 			}
 		}
 	}
+	err := Convert_HostDevices_And_GPU(vmi.Spec.Domain.Devices, domain, c)
+	if err != nil {
+		return err
+	}
 
+	// This is needed to support a legacy approach to device assignment
 	// Append HostDevices to DomXML if GPU is requested
 	if util.IsGPUVMI(vmi) {
 		vgpuMdevUUID := append([]string{}, c.VgpuDevices...)
@@ -1714,6 +1776,42 @@ func decoratePciAddressField(addressField string) (*Address, error) {
 	return decoratedAddrField, nil
 }
 
+func createHostDevicesFromPCIAddress(pciAddr string, name string) (HostDevice, error) {
+	address, err := decoratePciAddressField(pciAddr)
+	if err != nil {
+		return HostDevice{}, err
+	}
+
+	hostDev := HostDevice{
+		Source: HostDeviceSource{
+			Address: address,
+		},
+		Type:    "pci",
+		Managed: "yes",
+	}
+	hostDev.Alias = &Alias{Name: name}
+
+	return hostDev, nil
+}
+
+func createHostDevicesFromMdevUUID(mdevUUID string, name string) (HostDevice, error) {
+	decoratedAddrField := &Address{
+		UUID: mdevUUID,
+	}
+
+	hostDev := HostDevice{
+		Source: HostDeviceSource{
+			Address: decoratedAddrField,
+		},
+		Type:  "mdev",
+		Mode:  "subsystem",
+		Model: "vfio-pci",
+	}
+	hostDev.Alias = &Alias{Name: name}
+
+	return hostDev, nil
+}
+
 func createHostDevicesFromPCIAddresses(pcis []string) ([]HostDevice, error) {
 	var hds []HostDevice
 	for _, pciAddr := range pcis {