fix: Ensure that iGPU device nodes includes /dev/nvidia2

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

Author: elezar

internal/platform-support/tegra/filter.go

@@ -77,6 +77,9 @@ type matcherAsFilter struct {
 }
 
 type filterByMountSpecType map[csv.MountSpecType]filter
+type filterByMountSpecPathsByTyper struct {
+	MountSpecPathsByTyper
+}
 
 type pathPatterns []string
 type pathPattern string
@@ -125,6 +128,14 @@ func (p filterByMountSpecType) Apply(input MountSpecPathsByTyper) MountSpecPaths
 	return ms
 }
 
+func (p filterByMountSpecPathsByTyper) Apply(input MountSpecPathsByTyper) MountSpecPathsByTyper {
+	f := make(filterByMountSpecType)
+	for t, p := range p.MountSpecPathsByType() {
+		f[t] = &matcherAsFilter{pathPatterns(p)}
+	}
+	return f.Apply(input)
+}
+
 // apply uses a matcher to filter an input string.
 // Each element in the input that matches is skipped and the remaining elements
 // are returned.

internal/platform-support/tegra/mount_specs.go

@@ -130,6 +130,10 @@ func WithoutDeviceNodes() Transformer {
 	}
 }
 
+func Without(m MountSpecPathsByTyper) Transformer {
+	return filterByMountSpecPathsByTyper{m}
+}
+
 // WithoutRegularDeviceNodes creates a transfomer which removes
 // regular `/dev/nvidia[0-9]+` device nodes from the source.
 func WithoutRegularDeviceNodes() Transformer {

pkg/nvcdi/lib-csv.go

@@ -93,9 +93,6 @@ func (l *csvlib) purecsvDeviceSpecGenerators(ids ...string) (DeviceSpecGenerator
 		csvlib: l,
 		index:  0,
 		uuid:   "",
-		// We set noFilterDeviceNodes to true to ensure that the /dev/nvidia[0-1]
-		// device nodes in the CSV files on the system are consumed as-is.
-		noFilterDeviceNodes: true,
 	}
 	return g, nil
 }
@@ -108,9 +105,9 @@ func (l *csvlib) mixedDeviceSpecGenerators(ids ...string) (DeviceSpecGenerator,
 // platform-specific CSV files.
 type csvDeviceGenerator struct {
 	*csvlib
-	index               int
-	uuid                string
-	noFilterDeviceNodes bool
+	index int
+	uuid  string
+	mode  string
 }
 
 func (l *csvDeviceGenerator) GetUUID() (string, error) {
@@ -154,31 +151,52 @@ func (l *csvDeviceGenerator) GetDeviceSpecs() ([]specs.Device, error) {
 //   - The device node (i.e. /dev/nvidia{{ .index }}) associated with this
 //     particular device is added to the set of device nodes to be discovered.
 func (l *csvDeviceGenerator) deviceNodeDiscoverer() (discover.Discover, error) {
-	mountSpecs := tegra.Transform(
-		tegra.MountSpecsFromCSVFiles(l.logger, l.csvFiles...),
-		// We remove non-device nodes.
-		tegra.OnlyDeviceNodes(),
-	)
-	if !l.noFilterDeviceNodes {
-		mountSpecs = tegra.Transform(
-			mountSpecs,
-			// We remove the regular (nvidia[0-9]+) device nodes.
-			tegra.WithoutRegularDeviceNodes(),
-		)
-	}
 	return tegra.New(
 		tegra.WithLogger(l.logger),
 		tegra.WithDriverRoot(l.driverRoot),
 		tegra.WithDevRoot(l.devRoot),
 		tegra.WithHookCreator(l.hookCreator),
 		tegra.WithLdconfigPath(l.ldconfigPath),
 		tegra.WithLibrarySearchPaths(l.librarySearchPaths...),
-		tegra.WithMountSpecs(
-			mountSpecs,
+		tegra.WithMountSpecs(l.deviceNodeMountSpecs()),
+	)
+}
+
+func (l *csvDeviceGenerator) deviceNodeMountSpecs() tegra.MountSpecPathsByTyper {
+	mountSpecs := tegra.Transform(
+		tegra.MountSpecsFromCSVFiles(l.logger, l.csvFiles...),
+		// We remove non-device nodes.
+		tegra.OnlyDeviceNodes(),
+	)
+	switch l.mode {
+	// For a dGPU we remove all regular device nodes from the list of device
+	// nodes that we detect and only look for the node associated with the
+	// index.
+	case "dgpu":
+		return tegra.Merge(
+			tegra.Transform(
+				mountSpecs,
+				// We remove the regular (nvidia[0-9]+) device nodes.
+				tegra.WithoutRegularDeviceNodes(),
+			),
 			// We add the specific device node for this device.
 			tegra.DeviceNodes(fmt.Sprintf("/dev/nvidia%d", l.index)),
-		),
-	)
+		)
+	case "igpu":
+		return tegra.Merge(
+			tegra.Transform(
+				mountSpecs,
+				// We remove the /dev/nvidia1 device node.
+				// TODO: This assumes that the dGPU has the index 1 and remove
+				// it from the set of device nodes.
+				tegra.Without(tegra.DeviceNodes("/dev/nvidia1")),
+			),
+			// We add the display device from the iGPU.
+			tegra.DeviceNodes("/dev/nvidia2"),
+		)
+	default:
+		return mountSpecs
+	}
 }
 
 // GetCommonEdits generates a CDI specification that can be used for ANY devices
@@ -272,35 +290,56 @@ func (l *mixedcsvlib) csvDeviceSpecGenerator(index int, uuid string, device nvml
 		return nil, fmt.Errorf("is-integrated check failed for device (index=%v,uuid=%v)", index, uuid)
 	}
 
+	if isIntegrated {
+		return l.iGPUDeviceSpecGenerator(index, uuid)
+	}
+
+	return l.dGPUDeviceSpecGenerator(index, uuid, device)
+}
+
+func (l *mixedcsvlib) dGPUDeviceSpecGenerator(index int, uuid string, device nvml.Device) (DeviceSpecGenerator, error) {
+	if index != 1 {
+		return nil, fmt.Errorf("unexpected device index for dGPU: %d", index)
+	}
 	g := &csvDeviceGenerator{
 		csvlib: (*csvlib)(l),
 		index:  index,
 		uuid:   uuid,
+		mode:   "dgpu",
 	}
 
-	if !isIntegrated {
-		csvDeviceNodeDiscoverer, err := g.deviceNodeDiscoverer()
-		if err != nil {
-			return nil, fmt.Errorf("failed to create discoverer for devices nodes: %w", err)
-		}
+	csvDeviceNodeDiscoverer, err := g.deviceNodeDiscoverer()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create discoverer for devices nodes: %w", err)
+	}
+
+	// If this is not an integrated GPU, we also create a spec generator for
+	// the full GPU.
+	dgpu := (*nvmllib)(l).withInit(&fullGPUDeviceSpecGenerator{
+		nvmllib: (*nvmllib)(l),
+		uuid:    uuid,
+		index:   index,
+		// For the CSV case, we include the control device nodes at a
+		// device level.
+		additionalDiscoverers: []discover.Discover{
+			(*nvmllib)(l).controlDeviceNodeDiscoverer(),
+			csvDeviceNodeDiscoverer,
+		},
+		featureFlags: l.featureFlags,
+	})
+	return dgpu, nil
+}
 
-		// If this is not an integrated GPU, we also create a spec generator for
-		// the full GPU.
-		dgpu := (*nvmllib)(l).withInit(&fullGPUDeviceSpecGenerator{
-			nvmllib: (*nvmllib)(l),
-			uuid:    uuid,
-			index:   index,
-			// For the CSV case, we include the control device nodes at a
-			// device level.
-			additionalDiscoverers: []discover.Discover{
-				(*nvmllib)(l).controlDeviceNodeDiscoverer(),
-				csvDeviceNodeDiscoverer,
-			},
-			featureFlags: l.featureFlags,
-		})
-		return dgpu, nil
+func (l *mixedcsvlib) iGPUDeviceSpecGenerator(index int, uuid string) (DeviceSpecGenerator, error) {
+	if index != 0 {
+		return nil, fmt.Errorf("unexpected device index for iGPU: %d", index)
+	}
+	g := &csvDeviceGenerator{
+		csvlib: (*csvlib)(l),
+		index:  index,
+		uuid:   uuid,
+		mode:   "igpu",
 	}
-
 	return g, nil
 }