vfio passthrough support

Signed-off-by: Varun Ramachandra Sekar <[email protected]>

Author: varunrsekar

api/nvidia.com/resource/v1beta1/api.go

@@ -29,6 +29,7 @@ const (
 
 	GpuConfigKind                  = "GpuConfig"
 	MigDeviceConfigKind            = "MigDeviceConfig"
+	VfioDeviceConfigKind           = "VfioDeviceConfig"
 	ComputeDomainChannelConfigKind = "ComputeDomainChannelConfig"
 	ComputeDomainDaemonConfigKind  = "ComputeDomainDaemonConfig"
 	ComputeDomainKind              = "ComputeDomain"
@@ -66,6 +67,7 @@ func init() {
 	scheme.AddKnownTypes(schemeGroupVersion,
 		&GpuConfig{},
 		&MigDeviceConfig{},
+		&VfioDeviceConfig{},
 		&ComputeDomainChannelConfig{},
 		&ComputeDomainDaemonConfig{},
 		&ComputeDomain{},

api/nvidia.com/resource/v1beta1/vfiodeviceconfig.go

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/NVIDIA/k8s-dra-driver-gpu/pkg/featuregates"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// VfioDeviceConfig holds the set of parameters for configuring a VFIO device.
+type VfioDeviceConfig struct {
+	metav1.TypeMeta `json:",inline"`
+}
+
+// DefaultVfioDeviceConfig provides the default configuration of a VFIO device.
+func DefaultVfioDeviceConfig() *VfioDeviceConfig {
+	if !featuregates.Enabled(featuregates.PassthroughSupport) {
+		return nil
+	}
+	return &VfioDeviceConfig{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: GroupName + "/" + Version,
+			Kind:       VfioDeviceConfigKind,
+		},
+	}
+}
+
+// Normalize updates a VfioDeviceConfig config with implied default values based on other settings.
+func (c *VfioDeviceConfig) Normalize() error {
+	return nil
+}
+
+// Validate ensures that VfioDeviceConfig has a valid set of values.
+func (c *VfioDeviceConfig) Validate() error {
+	return nil
+}

api/nvidia.com/resource/v1beta1/zz_generated.deepcopy.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2022-2025, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,22 @@ import (
 
 type AllocatableDevices map[string]*AllocatableDevice
 
+func (d AllocatableDevices) GetGPUByPCIeBusID(pcieBusID string) *AllocatableDevice {
+	for _, device := range d {
+		if device.Type() != GpuDeviceType {
+			continue
+		}
+		if device.Gpu.pcieBusID == pcieBusID {
+			return device
+		}
+	}
+	return nil
+}
+
 type AllocatableDevice struct {
-	Gpu *GpuInfo
-	Mig *MigDeviceInfo
+	Gpu  *GpuInfo
+	Mig  *MigDeviceInfo
+	Vfio *VfioDeviceInfo
 }
 
 func (d AllocatableDevice) Type() string {
@@ -36,6 +49,9 @@ func (d AllocatableDevice) Type() string {
 	if d.Mig != nil {
 		return MigDeviceType
 	}
+	if d.Vfio != nil {
+		return VfioDeviceType
+	}
 	return UnknownDeviceType
 }
 
@@ -45,6 +61,8 @@ func (d *AllocatableDevice) CanonicalName() string {
 		return d.Gpu.CanonicalName()
 	case MigDeviceType:
 		return d.Mig.CanonicalName()
+	case VfioDeviceType:
+		return d.Vfio.CanonicalName()
 	}
 	panic("unexpected type for AllocatableDevice")
 }
@@ -55,6 +73,8 @@ func (d *AllocatableDevice) GetDevice() resourceapi.Device {
 		return d.Gpu.GetDevice()
 	case MigDeviceType:
 		return d.Mig.GetDevice()
+	case VfioDeviceType:
+		return d.Vfio.GetDevice()
 	}
 	panic("unexpected type for AllocatableDevice")
 }
@@ -66,6 +86,9 @@ func (d AllocatableDevice) UUID() string {
 	if d.Mig != nil {
 		return d.Mig.UUID
 	}
+	if d.Vfio != nil {
+		return d.Vfio.UUID
+	}
 	panic("unexpected type for AllocatableDevice")
 }
 
@@ -91,8 +114,20 @@ func (d AllocatableDevices) MigDeviceUUIDs() []string {
 	return uuids
 }
 
+func (d AllocatableDevices) VfioDeviceUUIDs() []string {
+	var uuids []string
+	for _, device := range d {
+		if device.Type() == VfioDeviceType {
+			uuids = append(uuids, device.Vfio.UUID)
+		}
+	}
+	slices.Sort(uuids)
+	return uuids
+}
+
 func (d AllocatableDevices) UUIDs() []string {
 	uuids := append(d.GpuUUIDs(), d.MigDeviceUUIDs()...)
+	uuids = append(uuids, d.VfioDeviceUUIDs()...)
 	slices.Sort(uuids)
 	return uuids
 }

cmd/gpu-kubelet-plugin/allocatable.go

@@ -42,6 +42,7 @@ const (
 	cdiClaimKind   = cdiVendor + "/" + cdiClaimClass
 
 	cdiBaseSpecIdentifier = "base"
+	cdiVfioSpecIdentifier = "vfio"
 
 	defaultCDIRoot = "/var/run/cdi"
 )
@@ -139,7 +140,69 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
 	return h, nil
 }
 
+func (cdi *CDIHandler) writeSpec(spec spec.Interface, specName string) error {
+	// Transform the spec to make it aware that it is running inside a container.
+	err := transformroot.New(
+		transformroot.WithRoot(cdi.driverRoot),
+		transformroot.WithTargetRoot(cdi.targetDriverRoot),
+		transformroot.WithRelativeTo("host"),
+	).Transform(spec.Raw())
+	if err != nil {
+		return fmt.Errorf("failed to transform driver root in CDI spec: %w", err)
+	}
+
+	// Update the spec to include only the minimum version necessary.
+	minVersion, err := cdispec.MinimumRequiredVersion(spec.Raw())
+	if err != nil {
+		return fmt.Errorf("failed to get minimum required CDI spec version: %w", err)
+	}
+	spec.Raw().Version = minVersion
+
+	// Write the spec out to disk.
+	return cdi.cache.WriteSpec(spec.Raw(), specName)
+
+}
+
 func (cdi *CDIHandler) CreateStandardDeviceSpecFile(allocatable AllocatableDevices) error {
+	if err := cdi.createStandardNvidiaDeviceSpecFile(allocatable); err != nil {
+		return err
+	}
+	if err := cdi.createStandardVfioDeviceSpecFile(allocatable); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cdi *CDIHandler) createStandardVfioDeviceSpecFile(allocatable AllocatableDevices) error {
+	commonEdits := GetVfioCommonCDIContainerEdits()
+	var deviceSpecs []cdispec.Device
+	for _, device := range allocatable {
+		if device.Type() != VfioDeviceType {
+			continue
+		}
+		edits := GetVfioCDIContainerEdits(device.Vfio)
+		dspec := cdispec.Device{
+			Name:           device.CanonicalName(),
+			ContainerEdits: *edits.ContainerEdits,
+		}
+		deviceSpecs = append(deviceSpecs, dspec)
+	}
+
+	spec, err := spec.New(
+		spec.WithVendor(cdiVendor),
+		spec.WithClass(cdiDeviceClass),
+		spec.WithDeviceSpecs(deviceSpecs),
+		spec.WithEdits(*commonEdits.ContainerEdits),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to creat CDI spec: %w", err)
+	}
+
+	specName := cdiapi.GenerateTransientSpecName(cdiVendor, cdiDeviceClass, cdiVfioSpecIdentifier)
+	return cdi.writeSpec(spec, specName)
+}
+
+func (cdi *CDIHandler) createStandardNvidiaDeviceSpecFile(allocatable AllocatableDevices) error {
 	// Initialize NVML in order to get the device edits.
 	if r := cdi.nvml.Init(); r != nvml.SUCCESS {
 		return fmt.Errorf("failed to initialize NVML: %v", r)
@@ -166,6 +229,10 @@ func (cdi *CDIHandler) CreateStandardDeviceSpecFile(allocatable AllocatableDevic
 	// Generate device specs for all full GPUs and MIG devices.
 	var deviceSpecs []cdispec.Device
 	for _, device := range allocatable {
+		if device.Type() == VfioDeviceType {
+			continue
+		}
+
 		dspecs, err := cdi.nvcdiDevice.GetDeviceSpecsByID(device.UUID())
 		if err != nil {
 			return fmt.Errorf("unable to get device spec for %s: %w", device.CanonicalName(), err)
@@ -185,26 +252,8 @@ func (cdi *CDIHandler) CreateStandardDeviceSpecFile(allocatable AllocatableDevic
 		return fmt.Errorf("failed to creat CDI spec: %w", err)
 	}
 
-	// Transform the spec to make it aware that it is running inside a container.
-	err = transformroot.New(
-		transformroot.WithRoot(cdi.driverRoot),
-		transformroot.WithTargetRoot(cdi.targetDriverRoot),
-		transformroot.WithRelativeTo("host"),
-	).Transform(spec.Raw())
-	if err != nil {
-		return fmt.Errorf("failed to transform driver root in CDI spec: %w", err)
-	}
-
-	// Update the spec to include only the minimum version necessary.
-	minVersion, err := cdispec.MinimumRequiredVersion(spec.Raw())
-	if err != nil {
-		return fmt.Errorf("failed to get minimum required CDI spec version: %w", err)
-	}
-	spec.Raw().Version = minVersion
-
-	// Write the spec out to disk.
-	specName := cdiapi.GenerateTransientSpecName(cdiVendor, cdiDeviceClass, cdiBaseSpecIdentifier)
-	return cdi.cache.WriteSpec(spec.Raw(), specName)
+	specName := cdiapi.GenerateTransientSpecName(cdiVendor, cdiDeviceClass, cdiVfioSpecIdentifier)
+	return cdi.writeSpec(spec, specName)
 }
 
 func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, preparedDevices PreparedDevices) error {