refactor: Use automatic CDI modifier for CSV

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

internal/modifier/cdi.go

@@ -27,6 +27,7 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
+	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 )
 
@@ -180,6 +181,14 @@ func (f *Factory) newAutomaticCDISpecModifier(devices []string) (oci.SpecModifie
 		nvcdiFeatureFlags = append(nvcdiFeatureFlags, nvcdi.FeatureNoAdditionalGIDsForDeviceNodes)
 	}
 
+	csvFiles, err := csv.GetFileList(f.cfg.NVIDIAContainerRuntimeConfig.Modes.CSV.MountSpecPath)
+	if err != nil {
+		f.logger.Warningf("Failed to get the list of CSV files: %v", err)
+	}
+	if f.image.Getenv(image.EnvVarNvidiaRequireJetpack) != "csv-mounts=all" {
+		csvFiles = csv.BaseFilesOnly(csvFiles)
+	}
+
 	cdiModeIdentifiers := cdiModeIdentfiersFromDevices(devices...)
 	f.logger.Debugf("Per-mode identifiers: %v", cdiModeIdentifiers)
 	var modifiers oci.SpecModifiers
@@ -194,6 +203,7 @@ func (f *Factory) newAutomaticCDISpecModifier(devices []string) (oci.SpecModifie
 			nvcdi.WithMode(mode),
 			nvcdi.WithFeatureFlags(nvcdiFeatureFlags...),
 			nvcdi.WithCSVCompatContainerRoot(f.cfg.NVIDIAContainerRuntimeConfig.Modes.CSV.CompatContainerRoot),
+			nvcdi.WithCSVFiles(csvFiles),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to construct CDI library for mode %q: %w", mode, err)

internal/modifier/csv.go

@@ -22,17 +22,14 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/cuda"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
-	"github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
-	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/requirements"
-	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 )
 
 // newCSVModifier creates a modifier that applies modications to an OCI spec if required by the runtime wrapper.
 // The modifications are defined by CSV MountSpecs.
 func (f *Factory) newCSVModifier() (oci.SpecModifier, error) {
-	devices := f.image.VisibleDevices()
+	devices := withUniqueDevices(csvDevices(*f.image)).DeviceRequests()
 	if len(devices) == 0 {
 		f.logger.Infof("No modification required; no devices requested")
 		return nil, nil
@@ -43,37 +40,7 @@ func (f *Factory) newCSVModifier() (oci.SpecModifier, error) {
 		return nil, fmt.Errorf("requirements not met: %v", err)
 	}
 
-	csvFiles, err := csv.GetFileList(f.cfg.NVIDIAContainerRuntimeConfig.Modes.CSV.MountSpecPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get list of CSV files: %v", err)
-	}
-
-	if f.image.Getenv(image.EnvVarNvidiaRequireJetpack) != "csv-mounts=all" {
-		csvFiles = csv.BaseFilesOnly(csvFiles)
-	}
-
-	cdilib, err := nvcdi.New(
-		nvcdi.WithLogger(f.logger),
-		nvcdi.WithDriverRoot(f.driver.Root),
-		nvcdi.WithDevRoot(f.driver.DevRoot),
-		nvcdi.WithNVIDIACDIHookPath(f.cfg.NVIDIACTKConfig.Path),
-		nvcdi.WithMode(nvcdi.ModeCSV),
-		nvcdi.WithCSVFiles(csvFiles),
-		nvcdi.WithCSVCompatContainerRoot(f.cfg.NVIDIAContainerRuntimeConfig.Modes.CSV.CompatContainerRoot),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to construct CDI library: %v", err)
-	}
-
-	spec, err := cdilib.GetSpec(devices...)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get CDI spec: %v", err)
-	}
-
-	return cdi.New(
-		cdi.WithLogger(f.logger),
-		cdi.WithSpec(spec.Raw()),
-	)
+	return f.newAutomaticCDISpecModifier(devices)
 }
 
 func checkRequirements(logger logger.Interface, image *image.CUDA) error {
@@ -107,3 +74,14 @@ func checkRequirements(logger logger.Interface, image *image.CUDA) error {
 
 	return r.Assert()
 }
+
+type csvDevices image.CUDA
+
+func (d csvDevices) DeviceRequests() []string {
+	var devices []string
+	i := (image.CUDA)(d)
+	for _, deviceID := range i.VisibleDevices() {
+		devices = append(devices, "mode=csv,id="+deviceID)
+	}
+	return devices
+}