Add allow-cuda-compat-libs-from-container feature flag

elezar · elezar · commit 2310ed76d8b6 · 2025-01-23T10:59:52.000+01:00
This change adds an allow-cuda-compat-libs-from-container feature flag
to the NVIDIA Container Toolkit config. This allows a user to opt-in
to the previous default behaviour of overriding certain driver
libraries with CUDA compat libraries from the container.

Signed-off-by: Evan Lezar &lt;elezar@nvidia.com&gt;
diff --git a/cmd/nvidia-container-runtime-hook/main.go b/cmd/nvidia-container-runtime-hook/main.go
@@ -114,8 +114,9 @@ func doPrestart() {
 	}
 	args = append(args, "configure")
 
-	args = append(args, "--no-cntlibs")
-
+	if !hook.Features.AllowCUDACompatLibsFromContainer.IsEnabled() {
+		args = append(args, "--no-cntlibs")
+	}
 	if ldconfigPath := cli.NormalizeLDConfigPath(); ldconfigPath != "" {
 		args = append(args, fmt.Sprintf("--ldconfig=%s", ldconfigPath))
 	}
diff --git a/internal/config/features.go b/internal/config/features.go
@@ -18,6 +18,9 @@ package config
 
 // features specifies a set of named features.
 type features struct {
+	// AllowCUDACompatLibsFromContainer allows CUDA compat libs from a container
+	// to override certain driver library mounts from the host.
+	AllowCUDACompatLibsFromContainer *feature `toml:"allow-cuda-compat-libs-from-container,omitempty"`
 	// AllowLDConfigFromContainer allows non-host ldconfig paths to be used.
 	// If this feature flag is not set to 'true' only host-rooted config paths
 	// (i.e. paths starting with an '@' are considered valid)

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,9 @@ func doPrestart() {`
`114`	`114`	`}`
`115`	`115`	`args = append(args, "configure")`
`116`	`116`
`117`		`- args = append(args, "--no-cntlibs")`
`118`		`-`
	`117`	`+ if !hook.Features.AllowCUDACompatLibsFromContainer.IsEnabled() {`
	`118`	`+ args = append(args, "--no-cntlibs")`
	`119`	`+ }`
`119`	`120`	`if ldconfigPath := cli.NormalizeLDConfigPath(); ldconfigPath != "" {`
`120`	`121`	`args = append(args, fmt.Sprintf("--ldconfig=%s", ldconfigPath))`
`121`	`122`	`}`