Add explicitLibs list to libs discovery

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

pkg/nvcdi/driver-nvml.go

@@ -76,32 +76,31 @@ func (l *nvcdilib) newDriverVersionDiscoverer() (discover.Discover, error) {
 
 // NewDriverLibraryDiscoverer creates a discoverer for the libraries associated with the specified driver version.
 func (l *nvcdilib) NewDriverLibraryDiscoverer(version string, libcudaSoParentDirPath string) (discover.Discover, error) {
-	libraryPaths, err := getVersionLibs(l.logger, l.driver, version)
+	versionSuffixLibraryMounts, err := l.getVersionSuffixDriverLibraryMounts(version)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get libraries for driver version: %v", err)
+		return nil, err
+	}
+	explicitLibraryMounts, err := l.getExplicitDriverLibraryMounts()
+	if err != nil {
+		return nil, err
 	}
 
-	libraries := discover.NewMounts(
-		l.logger,
-		lookup.NewFileLocator(
-			lookup.WithLogger(l.logger),
-			lookup.WithRoot(l.driver.Root),
-		),
-		l.driver.Root,
-		libraryPaths,
+	libraries := discover.Merge(
+		versionSuffixLibraryMounts,
+		explicitLibraryMounts,
 	)
 
 	var discoverers []discover.Discover
 
 	driverDotSoSymlinksDiscoverer := discover.WithDriverDotSoSymlinks(
 		l.logger,
 		libraries,
-		version,
+		// Since we don't only match version suffixes, we now need to match on wildcards.
+		"",
 		l.hookCreator,
 	)
 	discoverers = append(discoverers, driverDotSoSymlinksDiscoverer)
 
-	// TODO: The following should use the version directly.
 	cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(l.logger, l.hookCreator, version)
 	discoverers = append(discoverers, cudaCompatLibHookDiscoverer)
 
@@ -126,6 +125,59 @@ func (l *nvcdilib) NewDriverLibraryDiscoverer(version string, libcudaSoParentDir
 	return d, nil
 }
 
+func (l *nvcdilib) getVersionSuffixDriverLibraryMounts(version string) (discover.Discover, error) {
+	versionSuffixLibraryPaths, err := getVersionLibs(l.logger, l.driver, version)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get libraries for driver version: %v", err)
+	}
+
+	mounts := discover.NewMounts(
+		l.logger,
+		lookup.NewFileLocator(
+			lookup.WithLogger(l.logger),
+			lookup.WithRoot(l.driver.Root),
+		),
+		l.driver.Root,
+		versionSuffixLibraryPaths,
+	)
+
+	return mounts, nil
+}
+
+func (l *nvcdilib) getExplicitDriverLibraryMounts() (discover.Discover, error) {
+	// List of explicit libraries to locate
+	// TODO(ArangoGutierrez): we should load the version of the libraries from
+	// the sandboxutils-filelist or have a way to allow users to specify the
+	// libraries to mount from the config file.
+	explicitLibraries := []string{
+		"libEGL.so.1.1.0",
+		"libGL.so.1.7.0",
+		"libGLESv1_CM.so.1.2.0",
+		"libGLESv2.so.2.1.0",
+		"libGLX.so.0",
+		"libGLdispatch.so.0",
+		"libOpenCL.so.1.0.0",
+		"libOpenGL.so.0",
+		"libnvidia-api.so.1",
+		"libnvidia-egl-xcb.so.1.0.0",
+		"libnvidia-egl-xlib.so.1.0.0",
+	}
+
+	driverLibraryLocator, err := l.driver.DriverLibraryLocator()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get driver library locator: %w", err)
+	}
+	mounts := discover.NewMounts(
+		l.logger,
+		driverLibraryLocator,
+		l.driver.Root,
+		explicitLibraries,
+	)
+
+	return mounts, nil
+
+}
+
 func getUTSRelease() (string, error) {
 	utsname := &unix.Utsname{}
 	if err := unix.Uname(utsname); err != nil {

tests/e2e/nvidia-container-toolkit_test.go

@@ -325,23 +325,20 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() {
 				}
 			}
 
-			// The symlink chains have the pattern:
-			// [A.so, A.so.1, A.so.1, A.so.driverVersion, A.so.driverVersion]
+			// The RM_VERSION symlink chains have the pattern:
+			// [A.so -> A.so.1 -> A.so.driverVersion]
 			// A has the suffix .so.
 			Expect(symlinks).ToNot(BeEmpty())
 			for soSymlink, chain := range symlinks {
 				if soSymlink == "" {
 					continue
 				}
-				Expect(chain).To(HaveLen(5))
 				for _, c := range chain {
 					Expect(c).To(HavePrefix(soSymlink))
 				}
 				Expect(chain[0]).To(HaveSuffix(".so"))
-				Expect(chain[1]).To(Equal(chain[2]))
-				Expect(chain[3]).To(Equal(chain[4]))
-				Expect(chain[3]).To(HaveSuffix(hostDriverVersion))
-				Expect(chain[4]).To(HaveSuffix(hostDriverVersion))
+				Expect(chain[1]).ToNot(Equal(soSymlink))
+				Expect(chain[len(chain)-1]).ToNot(Equal(soSymlink))
 			}
 			Expect(symlinks).To(And(
 				HaveKey("libcuda.so"),