diff --git a/cmd/nvidia-ctk/cdi/generate/generate.go b/cmd/nvidia-ctk/cdi/generate/generate.go index b187335b..569cd133 100644 --- a/cmd/nvidia-ctk/cdi/generate/generate.go +++ b/cmd/nvidia-ctk/cdi/generate/generate.go @@ -57,6 +57,7 @@ type options struct { configSearchPaths cli.StringSlice librarySearchPaths cli.StringSlice + disabledHooks cli.StringSlice csv struct { files cli.StringSlice @@ -176,6 +177,13 @@ func (m command) build() *cli.Command { Usage: "Specify a pattern the CSV mount specifications.", Destination: &opts.csv.ignorePatterns, }, + &cli.StringSliceFlag{ + Name: "disable-hook", + Aliases: []string{"disable-hooks"}, + Usage: "Hook to skip when generating the CDI specification. Can be specified multiple times. Can be a comma-separated list of hooks or a single hook name.", + Value: cli.NewStringSlice(), + Destination: &opts.disabledHooks, + }, } return &c @@ -262,7 +270,7 @@ func (m command) generateSpec(opts *options) (spec.Interface, error) { deviceNamers = append(deviceNamers, deviceNamer) } - cdilib, err := nvcdi.New( + initOpts := []nvcdi.Option{ nvcdi.WithLogger(m.logger), nvcdi.WithDriverRoot(opts.driverRoot), nvcdi.WithDevRoot(opts.devRoot), @@ -276,7 +284,13 @@ func (m command) generateSpec(opts *options) (spec.Interface, error) { nvcdi.WithCSVIgnorePatterns(opts.csv.ignorePatterns.Value()), // We set the following to allow for dependency injection: nvcdi.WithNvmlLib(opts.nvmllib), - ) + } + + for _, hook := range opts.disabledHooks.Value() { + initOpts = append(initOpts, nvcdi.WithDisabledHook(hook)) + } + + cdilib, err := nvcdi.New(initOpts...) if err != nil { return nil, fmt.Errorf("failed to create CDI library: %v", err) } diff --git a/cmd/nvidia-ctk/cdi/generate/generate_test.go b/cmd/nvidia-ctk/cdi/generate/generate_test.go index d6aae4d7..67bf9d23 100644 --- a/cmd/nvidia-ctk/cdi/generate/generate_test.go +++ b/cmd/nvidia-ctk/cdi/generate/generate_test.go @@ -26,6 +26,7 @@ import ( "github.com/NVIDIA/go-nvml/pkg/nvml/mock/dgxa100" testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" + "github.com/urfave/cli/v2" "github.com/NVIDIA/nvidia-container-toolkit/internal/test" ) @@ -36,6 +37,9 @@ func TestGenerateSpec(t *testing.T) { require.NoError(t, err) driverRoot := filepath.Join(moduleRoot, "testdata", "lookup", "rootfs-1") + disableHook1 := cli.NewStringSlice("enable-cuda-compat") + disableHook2 := cli.NewStringSlice("enable-cuda-compat", "update-ldcache") + disableHook3 := cli.NewStringSlice("all") logger, _ := testlog.NewNullLogger() testCases := []struct { @@ -113,6 +117,179 @@ containerEdits: - nodev - rbind - rprivate +`, + }, + { + description: "disableHooks1", + options: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + driverRoot: driverRoot, + disabledHooks: *disableHook1, + }, + expectedOptions: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + nvidiaCDIHookPath: "/usr/bin/nvidia-cdi-hook", + driverRoot: driverRoot, + disabledHooks: *disableHook1, + }, + expectedSpec: `--- +cdiVersion: 0.5.0 +kind: example.com/device +devices: + - name: "0" + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 + - name: all + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 +containerEdits: + env: + - NVIDIA_VISIBLE_DEVICES=void + deviceNodes: + - path: /dev/nvidiactl + hostPath: {{ .driverRoot }}/dev/nvidiactl + hooks: + - hookName: createContainer + path: /usr/bin/nvidia-cdi-hook + args: + - nvidia-cdi-hook + - create-symlinks + - --link + - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so + - hookName: createContainer + path: /usr/bin/nvidia-cdi-hook + args: + - nvidia-cdi-hook + - update-ldcache + - --folder + - /lib/x86_64-linux-gnu + mounts: + - hostPath: {{ .driverRoot }}/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 + options: + - ro + - nosuid + - nodev + - rbind + - rprivate +`, + }, + { + description: "disableHooks2", + options: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + driverRoot: driverRoot, + disabledHooks: *disableHook2, + }, + expectedOptions: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + nvidiaCDIHookPath: "/usr/bin/nvidia-cdi-hook", + driverRoot: driverRoot, + disabledHooks: *disableHook2, + }, + expectedSpec: `--- +cdiVersion: 0.5.0 +kind: example.com/device +devices: + - name: "0" + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 + - name: all + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 +containerEdits: + env: + - NVIDIA_VISIBLE_DEVICES=void + deviceNodes: + - path: /dev/nvidiactl + hostPath: {{ .driverRoot }}/dev/nvidiactl + hooks: + - hookName: createContainer + path: /usr/bin/nvidia-cdi-hook + args: + - nvidia-cdi-hook + - create-symlinks + - --link + - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so + mounts: + - hostPath: {{ .driverRoot }}/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 + options: + - ro + - nosuid + - nodev + - rbind + - rprivate +`, + }, + { + description: "disableHooksAll", + options: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + driverRoot: driverRoot, + disabledHooks: *disableHook3, + }, + expectedOptions: options{ + format: "yaml", + mode: "nvml", + vendor: "example.com", + class: "device", + nvidiaCDIHookPath: "/usr/bin/nvidia-cdi-hook", + driverRoot: driverRoot, + disabledHooks: *disableHook3, + }, + expectedSpec: `--- +cdiVersion: 0.5.0 +kind: example.com/device +devices: + - name: "0" + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 + - name: all + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 +containerEdits: + env: + - NVIDIA_VISIBLE_DEVICES=void + deviceNodes: + - path: /dev/nvidiactl + hostPath: {{ .driverRoot }}/dev/nvidiactl + mounts: + - hostPath: {{ .driverRoot }}/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 + options: + - ro + - nosuid + - nodev + - rbind + - rprivate `, }, } diff --git a/internal/discover/graphics_test.go b/internal/discover/graphics_test.go index 3aea93cb..335ddb35 100644 --- a/internal/discover/graphics_test.go +++ b/internal/discover/graphics_test.go @@ -25,7 +25,7 @@ import ( func TestGraphicsLibrariesDiscoverer(t *testing.T) { logger, _ := testlog.NewNullLogger() - hookCreator := NewHookCreator("/usr/bin/nvidia-cdi-hook") + hookCreator := NewHookCreator("/usr/bin/nvidia-cdi-hook", make(DisabledHooks)) testCases := []struct { description string diff --git a/internal/discover/hooks.go b/internal/discover/hooks.go index c47c9399..f340572e 100644 --- a/internal/discover/hooks.go +++ b/internal/discover/hooks.go @@ -49,6 +49,17 @@ type HookName string // DisabledHooks allows individual hooks to be disabled. type DisabledHooks map[HookName]bool +func (d DisabledHooks) Set(value HookName) { + if value == "all" { + for _, hook := range AllHooks { + d[hook] = true + } + return + } + + d[value] = true +} + const ( // HookEnableCudaCompat refers to the hook used to enable CUDA Forward Compatibility. // This was added with v1.17.5 of the NVIDIA Container Toolkit. @@ -72,21 +83,27 @@ type Option func(*CDIHook) type CDIHook struct { nvidiaCDIHookPath string + disabledHooks DisabledHooks } type HookCreator interface { Create(HookName, ...string) *Hook } -func NewHookCreator(nvidiaCDIHookPath string) HookCreator { +func NewHookCreator(nvidiaCDIHookPath string, disabledHooks DisabledHooks) HookCreator { CDIHook := &CDIHook{ nvidiaCDIHookPath: nvidiaCDIHookPath, + disabledHooks: disabledHooks, } return CDIHook } func (c CDIHook) Create(name HookName, args ...string) *Hook { + if c.disabledHooks[name] { + return nil + } + if name == "create-symlinks" { if len(args) == 0 { return nil diff --git a/internal/discover/ldconfig_test.go b/internal/discover/ldconfig_test.go index ddbda4cc..15f27391 100644 --- a/internal/discover/ldconfig_test.go +++ b/internal/discover/ldconfig_test.go @@ -31,7 +31,7 @@ const ( func TestLDCacheUpdateHook(t *testing.T) { logger, _ := testlog.NewNullLogger() - hookCreator := NewHookCreator(testNvidiaCDIHookPath) + hookCreator := NewHookCreator(testNvidiaCDIHookPath, make(DisabledHooks)) testCases := []struct { description string diff --git a/internal/discover/symlinks_test.go b/internal/discover/symlinks_test.go index 2a6c9812..b9ee4f34 100644 --- a/internal/discover/symlinks_test.go +++ b/internal/discover/symlinks_test.go @@ -306,7 +306,7 @@ func TestWithWithDriverDotSoSymlinks(t *testing.T) { }, } - hookCreator := NewHookCreator("/path/to/nvidia-cdi-hook") + hookCreator := NewHookCreator("/path/to/nvidia-cdi-hook", make(DisabledHooks)) for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { d := WithDriverDotSoSymlinks( diff --git a/internal/platform-support/tegra/csv_test.go b/internal/platform-support/tegra/csv_test.go index 129bf00c..eb0270c2 100644 --- a/internal/platform-support/tegra/csv_test.go +++ b/internal/platform-support/tegra/csv_test.go @@ -181,7 +181,7 @@ func TestDiscovererFromCSVFiles(t *testing.T) { }, } - hookCreator := discover.NewHookCreator("/usr/bin/nvidia-cdi-hook") + hookCreator := discover.NewHookCreator("/usr/bin/nvidia-cdi-hook", make(discover.DisabledHooks)) for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { defer setGetTargetsFromCSVFiles(tc.moutSpecs)() diff --git a/internal/runtime/runtime_factory.go b/internal/runtime/runtime_factory.go index c1a82ac9..f9ca2dc0 100644 --- a/internal/runtime/runtime_factory.go +++ b/internal/runtime/runtime_factory.go @@ -75,7 +75,7 @@ func newSpecModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Sp return nil, err } - hookCreator := discover.NewHookCreator(cfg.NVIDIACTKConfig.Path) + hookCreator := discover.NewHookCreator(cfg.NVIDIACTKConfig.Path, make(discover.DisabledHooks)) mode := info.ResolveAutoMode(logger, cfg.NVIDIAContainerRuntimeConfig.Mode, image) // We update the mode here so that we can continue passing just the config to other functions. diff --git a/pkg/nvcdi/driver-nvml.go b/pkg/nvcdi/driver-nvml.go index 3fbc0e94..ff02ac72 100644 --- a/pkg/nvcdi/driver-nvml.go +++ b/pkg/nvcdi/driver-nvml.go @@ -106,11 +106,9 @@ func (l *nvcdilib) NewDriverLibraryDiscoverer(version string) (discover.Discover ) discoverers = append(discoverers, driverDotSoSymlinksDiscoverer) - if l.HookIsSupported(HookEnableCudaCompat) { - // TODO: The following should use the version directly. - cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(l.logger, l.hookCreator, l.driver) - discoverers = append(discoverers, cudaCompatLibHookDiscoverer) - } + // TODO: The following should use the version directly. + cudaCompatLibHookDiscoverer := discover.NewCUDACompatHookDiscoverer(l.logger, l.hookCreator, l.driver) + discoverers = append(discoverers, cudaCompatLibHookDiscoverer) updateLDCache, _ := discover.NewLDCacheUpdateHook(l.logger, libraries, l.hookCreator, l.ldconfigPath) discoverers = append(discoverers, updateLDCache) diff --git a/pkg/nvcdi/driver-wsl_test.go b/pkg/nvcdi/driver-wsl_test.go index 27247cc6..a0f8c7eb 100644 --- a/pkg/nvcdi/driver-wsl_test.go +++ b/pkg/nvcdi/driver-wsl_test.go @@ -29,7 +29,7 @@ import ( func TestNvidiaSMISymlinkHook(t *testing.T) { logger, _ := testlog.NewNullLogger() - hookCreator := discover.NewHookCreator("nvidia-cdi-hook") + hookCreator := discover.NewHookCreator("nvidia-cdi-hook", make(discover.DisabledHooks)) errMounts := errors.New("mounts error") diff --git a/pkg/nvcdi/hooks.go b/pkg/nvcdi/hooks.go deleted file mode 100644 index 20ef59a4..00000000 --- a/pkg/nvcdi/hooks.go +++ /dev/null @@ -1,27 +0,0 @@ -/** -# 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 nvcdi - -// HookIsSupported checks whether a hook of the specified name is supported. -// Hooks must be explicitly disabled, meaning that if no disabled hooks are -// all hooks are supported. -func (l *nvcdilib) HookIsSupported(h HookName) bool { - if len(l.disabledHooks) == 0 { - return true - } - return !l.disabledHooks[h] -} diff --git a/pkg/nvcdi/lib.go b/pkg/nvcdi/lib.go index 6527498d..fcff93df 100644 --- a/pkg/nvcdi/lib.go +++ b/pkg/nvcdi/lib.go @@ -81,8 +81,6 @@ func New(opts ...Option) (Interface, error) { if l.nvidiaCDIHookPath == "" { l.nvidiaCDIHookPath = "/usr/bin/nvidia-cdi-hook" } - // create hookCreator - l.hookCreator = discover.NewHookCreator(l.nvidiaCDIHookPath) if l.driverRoot == "" { l.driverRoot = "/" @@ -175,6 +173,9 @@ func New(opts ...Option) (Interface, error) { return nil, fmt.Errorf("unknown mode %q", l.mode) } + // create hookCreator + l.hookCreator = discover.NewHookCreator(l.nvidiaCDIHookPath, l.disabledHooks) + w := wrapper{ Interface: lib, vendor: l.vendor, diff --git a/pkg/nvcdi/options.go b/pkg/nvcdi/options.go index f38f2b4a..514391e3 100644 --- a/pkg/nvcdi/options.go +++ b/pkg/nvcdi/options.go @@ -158,11 +158,11 @@ func WithLibrarySearchPaths(paths []string) Option { // WithDisabledHook allows specific hooks to the disabled. // This option can be specified multiple times for each hook. -func WithDisabledHook(hook HookName) Option { +func WithDisabledHook[T string | HookName](hook T) Option { return func(o *nvcdilib) { if o.disabledHooks == nil { o.disabledHooks = make(map[HookName]bool) } - o.disabledHooks[hook] = true + o.disabledHooks.Set(HookName(hook)) } }