feat: Add supports for vDPA interface

Signed-off-by: Ziteng Liu <[email protected]>
smartxworks · Jan 9, 2024 · 0f3d995 · 0f3d995
1 parent 30780fe
commit 0f3d995
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 2 deletions.
diff --git a/cmd/virt-prerunner/main.go b/cmd/virt-prerunner/main.go
@@ -252,6 +252,18 @@ func buildVMConfig(ctx context.Context, vm *virtv1alpha1.VirtualMachine) (*cloud
  vmConfig.Devices = append(vmConfig.Devices, &sriovDeviceConfig)
  }
  }
+ case iface.VDPA != nil:
+ for _, networkStatus := range networkStatusList {
+ if networkStatus.Interface == linkName && networkStatus.DeviceInfo != nil && networkStatus.DeviceInfo.Vdpa != nil {
+ vdpaDeviceConfig := cloudhypervisor.VdpaConfig{
+ Id: iface.Name,
+ NumQueues: iface.VDPA.NumQueues,
+ Iommu: iface.VDPA.Iommu,
+ Path: networkStatus.DeviceInfo.Vdpa.Path,
+ }
+ vmConfig.Vdpa = append(vmConfig.Vdpa, &vdpaDeviceConfig)
+ }
+ }
  case iface.VhostUser != nil:
  netConfig := cloudhypervisor.NetConfig{
  Id: iface.Name,

diff --git a/deploy/crd/virt.virtink.smartx.com_virtualmachines.yaml b/deploy/crd/virt.virtink.smartx.com_virtualmachines.yaml
@@ -910,6 +910,13 @@ spec:
  type: string
  sriov:
  type: object
+ vdpa:
+ properties:
+ iommu:
+ type: boolean
+ numQueues:
+ type: integer
+ type: object
  vhostUser:
  type: object
  required:

diff --git a/pkg/apis/virt/v1alpha1/types.go b/pkg/apis/virt/v1alpha1/types.go
@@ -102,6 +102,7 @@ type InterfaceBindingMethod struct {
  Bridge *InterfaceBridge `json:"bridge,omitempty"`
  Masquerade *InterfaceMasquerade `json:"masquerade,omitempty"`
  SRIOV *InterfaceSRIOV `json:"sriov,omitempty"`
+ VDPA *InterfaceVDPA `json:"vdpa,omitempty"`
  VhostUser *InterfaceVhostUser `json:"vhostUser,omitempty"`
 }
 
@@ -115,6 +116,11 @@ type InterfaceMasquerade struct {
 type InterfaceSRIOV struct {
 }
 
+type InterfaceVDPA struct {
+ NumQueues int `json:"numQueues,omitempty"`
+ Iommu bool `json:"iommu,omitempty"`
+}
+
 type InterfaceVhostUser struct {
 }
 

diff --git a/pkg/apis/virt/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/virt/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/vm_webhook.go b/pkg/controller/vm_webhook.go
@@ -165,7 +165,7 @@ func MutateVM(ctx context.Context, vm *virtv1alpha1.VirtualMachine, oldVM *virtv
  vm.Spec.Instance.Interfaces[i].MAC = macStr
  }
 
- if vm.Spec.Instance.Interfaces[i].Bridge == nil && vm.Spec.Instance.Interfaces[i].Masquerade == nil && vm.Spec.Instance.Interfaces[i].SRIOV == nil && vm.Spec.Instance.Interfaces[i].VhostUser == nil {
+ if vm.Spec.Instance.Interfaces[i].Bridge == nil && vm.Spec.Instance.Interfaces[i].Masquerade == nil && vm.Spec.Instance.Interfaces[i].SRIOV == nil && vm.Spec.Instance.Interfaces[i].VDPA == nil && vm.Spec.Instance.Interfaces[i].VhostUser == nil {
  vm.Spec.Instance.Interfaces[i].InterfaceBindingMethod = virtv1alpha1.InterfaceBindingMethod{
  Bridge: &virtv1alpha1.InterfaceBridge{},
  }
@@ -504,6 +504,12 @@ func ValidateInterfaceBindingMethod(ctx context.Context, bindingMethod *virtv1al
  errs = append(errs, field.Forbidden(fieldPath.Child("sriov"), "may not specify more than 1 binding method"))
  }
  }
+ if bindingMethod.VDPA != nil {
+ cnt++
+ if cnt > 1 {
+ errs = append(errs, field.Forbidden(fieldPath.Child("vdpa"), "may not specify more than 1 binding method"))
+ }
+ }
  if bindingMethod.VhostUser != nil {
  cnt++
  if cnt > 1 {

diff --git a/pkg/controller/vm_webhook_test.go b/pkg/controller/vm_webhook_test.go
@@ -365,6 +365,17 @@ func TestValidateVM(t *testing.T) {
  return vm
  }(),
  invalidFields: []string{"spec.instance.interfaces[0].sriov"},
+ }, {
+ vm: func() *virtv1alpha1.VirtualMachine {
+ vm := validVM.DeepCopy()
+ vm.Spec.Instance.Interfaces[0].InterfaceBindingMethod.Bridge = nil
+ vm.Spec.Instance.Interfaces[0].InterfaceBindingMethod.VDPA = &virtv1alpha1.InterfaceVDPA{
+ NumQueues: 9,
+ Iommu: false,
+ }
+ return vm
+ }(),
+ invalidFields: []string{"spec.instance.interfaces[0].vdpa.numQueues", "spec.instance.interfaces[0].vdpa.iommu"},
  }, {
  vm: func() *virtv1alpha1.VirtualMachine {
  vm := validVM.DeepCopy()

diff --git a/pkg/daemon/vm_controller.go b/pkg/daemon/vm_controller.go
@@ -145,7 +145,7 @@ func (r *VMReconciler) reconcile(ctx context.Context, vm *virtv1alpha1.VirtualMa
  return err
  }
 
- if len(vmConfig.Devices) > 0 {
+ if len(vmConfig.Devices) > 0 || len(vmConfig.Vdpa) > 0 {
  cloudHypervisorPID, err := pid.GetPIDBySocket(filepath.Join(getVMDataDirPath(vm), "ch.sock"))
  if err != nil {
  return fmt.Errorf("get cloud-hypervisor process pid: %s", err)