diff --git a/CHANGELOG.md b/CHANGELOG.md index b796cd38..280d5671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Add `crun` to the list of configured low-level runtimes. * Added support for `--ldconfig-path` to `nvidia-ctk cdi generate` command. * Fix `nvidia-ctk runtime configure --cdi.enabled` for Docker. +* Add discovery of the GDRCopy device (`gdrdrv`) if the `NVIDIA_GDRCOPY` environment variable of the container is set to `enabled` * [toolkit-container] Bump CUDA base image version to 12.3.1. diff --git a/internal/discover/gdrcopy.go b/internal/discover/gdrcopy.go new file mode 100644 index 00000000..e6dcaec2 --- /dev/null +++ b/internal/discover/gdrcopy.go @@ -0,0 +1,27 @@ +/** +# Copyright (c) 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 discover + +import "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" + +func NewGDRCopyDiscoverer(logger logger.Interface, devRoot string) (Discover, error) { + return NewCharDeviceDiscoverer( + logger, + devRoot, + []string{"/dev/gdrdrv"}, + ), nil +} diff --git a/internal/modifier/gated.go b/internal/modifier/gated.go index c3b6df39..1af023ab 100644 --- a/internal/modifier/gated.go +++ b/internal/modifier/gated.go @@ -30,6 +30,7 @@ const ( nvidiaGDSEnvvar = "NVIDIA_GDS" nvidiaMOFEDEnvvar = "NVIDIA_MOFED" nvidiaNVSWITCHEnvvar = "NVIDIA_NVSWITCH" + nvidiaGDRCOPYEnvvar = "NVIDIA_GDRCOPY" ) // NewFeatureGatedModifier creates the modifiers for optional features. @@ -38,6 +39,7 @@ const ( // NVIDIA_GDS=enabled // NVIDIA_MOFED=enabled // NVIDIA_NVSWITCH=enabled +// NVIDIA_GDRCOPY=enabled // // If not devices are selected, no changes are made. func NewFeatureGatedModifier(logger logger.Interface, cfg *config.Config, image image.CUDA) (oci.SpecModifier, error) { @@ -75,5 +77,13 @@ func NewFeatureGatedModifier(logger logger.Interface, cfg *config.Config, image discoverers = append(discoverers, d) } + if image.Getenv(nvidiaGDRCOPYEnvvar) == "enabled" { + d, err := discover.NewGDRCopyDiscoverer(logger, devRoot) + if err != nil { + return nil, fmt.Errorf("failed to construct discoverer for GDRCopy devices: %w", err) + } + discoverers = append(discoverers, d) + } + return NewModifierFromDiscoverer(logger, discover.Merge(discoverers...)) }