UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-22 04:07:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1,444 Commits 13 Branches 75 Tags 18 MiB
1b1aae9c4a
Commit Graph

293 Commits

Author SHA1 Message Date
Evan Lezar
a02bc27c3e Define a basic logger interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-06-12 10:46:10 +02:00
Evan Lezar
3f03a71afd Skip additional modifications in CDI mode 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-06-05 15:01:58 +02:00
Evan Lezar
43c44a0f48 Merge branch 'treat-log-errors-as-non-fatal' into 'main' 
Ignore errors when creating debug log file

See merge request nvidia/container-toolkit/container-toolkit!404
 2023-06-01 07:44:56 +00:00
Evan Lezar
6b1e8171c8 Merge branch 'add-mod-probe' into 'main' 
Add option to load NVIDIA kernel modules

See merge request nvidia/container-toolkit/container-toolkit!409
 2023-05-31 18:14:45 +00:00
Evan Lezar
2e50b3da7c Merge branch 'ldcache-resolve-circular' into 'main' 
Fix infinite recursion when resolving libraries in LDCache

Closes #13

See merge request nvidia/container-toolkit/container-toolkit!406
 2023-05-31 17:35:27 +00:00
Evan Lezar
7b801a0ce0 Add option to load NVIDIA kernel modules 
These changes add a --load-kernel-modules option to the
nvidia-ctk system commands. If specified the NVIDIA kernel modules
(nvidia, nvidia-uvm, and nvidia-modeset) are loaded before any
operations on device nodes are performed.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-31 19:31:38 +02:00
Evan Lezar
528cbbb636 Merge branch 'fix-device-symlinks' into 'main' 
Fix creation of device symlinks in /dev/char

See merge request nvidia/container-toolkit/container-toolkit!399
 2023-05-31 17:31:04 +00:00
Evan Lezar
a6b0f45d2c Fix infinite recursion when resolving ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-30 11:03:36 +02:00
Evan Lezar
05632c0a40 Treat missing nvidia device majors as an error 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-26 10:24:36 +02:00
Evan Lezar
02656b624d Create log directory if required 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-25 15:17:00 +02:00
Evan Lezar
61af2aee8e Ignore errors when creating debug log file 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-25 14:44:00 +02:00
Evan Lezar
ac11727ec5 Add nvidia-contianer-runtime-hook.path config option 
This change adds an nvidia-container-runtime-hook.path config option
to allow the path used for the prestart hook to be overridden. This
is useful in cases where multiple NVIDIA Container Toolkit installations
are present.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-25 12:05:33 +02:00
Evan Lezar
013a1b413b Fix ineffectual assignment 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-23 21:14:02 +02:00
Evan Lezar
3be16d8077 Create individual links instead of processing CSV 
This change switches to generating a OCI runtime hook to create
individual symlinks instead of processing a CSV file in the hook.
This allows for better reuse of the logic generating CDI
specifications, for example.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-23 20:43:36 +02:00
Evan Lezar
927ec78b6e Add symlinks package with Resolve function 
This change adds a symlinks.Resolve function for resolving symlinks and
updates usages across the code to make use of it.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-23 20:42:17 +02:00
Evan Lezar
e7d2a9c212 Merge branch 'CNT-1876/cdi-specs-from-csv' into 'main' 
Add csv mode to CDI spec generation

See merge request nvidia/container-toolkit/container-toolkit!393
 2023-05-23 14:47:19 +00:00
Evan Lezar
e30fd0f4ad Add csv mode to nvidia-ctk cdi generate command 
This chagne allows the csv mode option to specified in the
nvidia-ctk cdi generate command and adds a --csv.file option
that can be repeated to specify the CSV files to be processed.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-22 13:56:45 +02:00
Evan Lezar
540dbcbc03 Move tegra system mounts to tegra-specific discoverer 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-22 13:55:22 +02:00
Evan Lezar
a8265f8846 Add tegra discoverer 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-22 13:55:22 +02:00
Evan Lezar
424b8c9d46 Use *.* pattern when locating libcuda.so 
This change ensures that libcuda.so can be located on systems
where no patch version is specified in the driver version.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-22 13:53:19 +02:00
Evan Lezar
b7e5cef934 Include xorg discoverer with graphics mounts 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 17:07:55 +02:00
Evan Lezar
9378d0cd0f Move discover.FindNvidiaCTK to config.ResolveNVIDIACTKPath 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 15:12:44 +02:00
Evan Lezar
8bb0235c92 Remove discover.Config 
These changes remove the use of discover.Config which was used
to pass the driver root and the nvidiaCTK path in some cases.

Instead, the nvidiaCTKPath is resolved at the begining of runtime
invocation to ensure that this is valid at all points where it is
used.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 15:03:37 +02:00
Evan Lezar
37c66fc33c Ensure that the nvidia-container-cli.user option is uncommented on suse 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:54 +02:00
Evan Lezar
1bd5798a99 Use toml representation to get defaults 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:53 +02:00
Evan Lezar
90c4c4811a Fallback to ldconfig if ldconfig.real does not exist 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:24 +02:00
Evan Lezar
49de170652 Generate default config.toml contents 
This change adds a GetDefaultConfigToml function to the config package.

This function returns the default config in the form of raw TOML
including comments. This is useful for generating a default config at
installation time, with platform-specific differences codified.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:22 +02:00
Evan Lezar
2e3a12438a Fix toml definition in cli config struct 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-03 15:59:02 +02:00
Evan Lezar
ae2a683929 Run go fmt 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-25 11:27:58 +02:00
Evan Lezar
2b5eeb8d24 Regenerate mocks for formatting 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-25 11:26:55 +02:00
Carlos Eduardo Arango Gutierrez
81d8b94cdc
Export pkg config/engine 
Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
 2023-04-25 07:16:59 +02:00
Evan Lezar
f1e201d368 Refactor runtime configure cli 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-24 18:32:04 +02:00
Evan Lezar
fc7c8f7520 Resolve all symlinks in ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-21 17:28:49 +02:00
Evan Lezar
46c1c45d85 Add /usr/lib/current to search path 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-21 11:47:42 +02:00
Evan Lezar
2136266d1d Make discovery of Xorg libraries optional 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-13 18:41:38 +02:00
Christopher Desiniotis
ee5be5e3f2 Merge branch 'CNT-4056/add-cdi-annotations' into 'main' 
Add nvidia-container-runtime.modes.cdi.annotation-prefixes config option.

See merge request nvidia/container-toolkit/container-toolkit!356
 2023-03-28 16:47:51 +00:00
Evan Lezar
149236b002 Configure containerd config based on specified annotation prefixes 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-28 16:22:48 +02:00
Evan Lezar
e774c51c97 Add nvidia-ctk system create-device-nodes command 
This change adds an nvidia-ctk system create-device-nodes command for
creating NVIDIA device nodes. Currently this is limited to control devices
(nvidia-uvm, nvidia-uvm-tools, nvidia-modeset, nvidiactl).

A --dry-run mode is included for outputing commands that would be executed and
the driver root can be specified.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-28 11:29:45 +02:00
Evan Lezar
c46b118f37 Add nvidia-container-runtime.modes.cdi.annotation-prefixes config option. 
This change adds an nvidia-container-runtime.modes.cdi.annotation-prefixes config
option that defaults to cdi.k8s.io/. This allows the annotation prefixes parsed
for CDI devices to be overridden in cases where CDI support in container engines such
as containerd or crio need to be overridden.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-27 16:36:54 +02:00
Evan Lezar
c13c6ebadb Inject xorg libs and config in container 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-26 17:04:06 +02:00
Evan Lezar
2abe679dd1 Move libcuda locator to internal/lookup package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-26 17:04:06 +02:00
Christopher Desiniotis
b2aaa21b0a Instantiate a logger when constructing a library Locator 
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
 2023-03-21 13:38:36 -07:00
Evan Lezar
df40fbe03e Locate persistenced and fabricmanager sockets at /run instead of /var/run 
This chagne prefers (non-symlink) sockets at /run over /var/run for
nvidia-persistenced and nvidia-fabricmanager sockets.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-17 09:23:48 +02:00
Christopher Desiniotis
48414e97bb Return empty list of devices for unprivileged containers when 'accept-nvidia-visible-devices-envvar-unprivileged=false' 
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
 2023-03-10 13:11:29 -08:00
Evan Lezar
3a11f6ee0a Add nvidia-container-runtime-hook.skip-mode-detection option to config 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 20:15:40 +02:00
Evan Lezar
973e7bda5e Check accept-nvidia-visible-devices-envvar-when-unprivileged option for CDI 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
154cd4ecf3 Add to config struct 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
936fad1d04 Move check for privileged images to config/image/ package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
510fb248fe Add cdi.k8s.io annotations to containerd config 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-08 07:23:27 +02:00
Evan Lezar
1c696b1e39 Merge branch 'CNT-3894/configure-mode-specific-runtimes' into 'main' 
Configure .cdi and .legacy executables in Toolkit Container

See merge request nvidia/container-toolkit/container-toolkit!308
 2023-03-08 05:12:50 +00:00
Evan Lezar
dca8e3123f Migrate containerd config to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:55 +02:00
Evan Lezar
3bac4fad09 Migrate cri-o config update to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
9fff19da23 Migrate docker config to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
e5bb4d2718 Move runtime config code from config to config/engine 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
5bfb51f801 Add API for interacting with runtime engine configs 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:53 +02:00
Evan Lezar
6d220ed9a2 Rework selection of devices in CDI mode 
The following changes are made:
* The default-cdi-kind config option is used to convert an envvar entry to a fully-qualified device name
* If annotation devices exist, these are used instead of the envvar devices.
* The `all` device is no longer treated as a special case and MUST exist in the CDI spec.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 16:18:53 +02:00
Evan Lezar
f00439c93e Add nvidia-container-runtime.modes.csv.default-kind config option 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 16:18:53 +02:00
Evan Lezar
35fc57291f Deduplicate WSL driverstore paths 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-21 11:48:56 +02:00
Evan Lezar
7eb435eb73 Add basic dxcore bindings 
This change copies dxcore.h and dxcore.c from libnvidia-container to
allow for the driver store path to be queried. Modifications are made
to dxcore to remove the code associated with checking the components
in the driver store path.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-20 10:30:13 +02:00
Evan Lezar
5d011c1333 Add Discoverer to create a single symlink 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-20 10:30:13 +02:00
Evan Lezar
7789ac6331 Fix logger.Update and Reset 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 15:22:56 +01:00
Evan Lezar
7a3aabbbda Add logger test 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 15:22:56 +01:00
Evan Lezar
bf6babe07e Fix issue with blank nvidia-ctk path 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 14:18:07 +01:00
Evan Lezar
456d2864a6 Log config in JSON if possible 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
406a5ec76f Implement runtime package for creating runtime CLI 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
f71c419cfb Move modifying OCI runtime wrapper to oci package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
076eed7eb4 Update ipcMount to add noexec option 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
33c7b056ea Add ipcMounts type 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
3b8c40c3e6 Move IPC discoverer to internal/discover package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
3f70521a63 Add Options to discover.Mount 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
daceac9117 Rename discover.Config.Root to discover.Config.DriverRoot 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-02 15:57:15 +01:00
Evan Lezar
0c8379f681 Fix nvidia-ctk path for update ldcache hook 
This change ensures that the update-ldcache hook is created in a manner
consistent with other nvidia-ctk hooks ensuring that a full path is
used.

Without this change the update-ldcache hook on Tegra-based sytems had an
invalid path.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
92dc0506fe Add hook path to logger output 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
7045a223d2 Only use configured nvidia-ctk path if it is a full path 
If this is not done, the default config which sets the nvidia-ctk.path
option as "nvidia-ctk" will result in an invalid OCI spec if a hook is
injected. This change ensures that the path used is always an absolute
path as required by the hook spec.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
14bcebd8b7 Fix relative link resolution for ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-31 13:51:48 +01:00
Evan Lezar
95394e0fc8 Add internal/info/proc/devices package to read device majors 
This change adds basic functionality to process the /proc/devices
file to extract device majors.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-25 13:43:43 +01:00
Evan Lezar
408eeae70f Allow locator to be marked as optional 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-25 10:38:11 +01:00
Evan Lezar
6237477ba3 Limit number of candidates for executables 
This change ensures that the first match of an executable in the path
is retured instead of a list of candidates. This prevents a CDI spec,
for example, from containing multiple entries for a single executable
(e.g. nvidia-smi).

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-20 15:10:24 +01:00
Evan Lezar
881b1c0e08 introduce resolveSelected helper 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:10:55 +01:00
Evan Lezar
3537d76726 Further refactoring of ldcache code 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:10:36 +01:00
Evan Lezar
ccd1961c60 Ensure root is included in absolute ldcache paths 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:09:43 +01:00
Evan Lezar
f350f0c0bb Refactor resolving of links in ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:09:41 +01:00
Evan Lezar
80672d33af Continue instead of break on error when listing libraries 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 13:54:24 +01:00
Evan Lezar
19cfb2774d Use common code to construct nvidia-ctk hooks 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 10:37:10 +01:00
Evan Lezar
27347c98d9 Consolidate code to find nvidia-ctk 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 10:31:42 +01:00
Evan Lezar
ebbc47702d Remove 'Executable' from private struct member names 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Evan Lezar
09d42f0ad9 Remove 'Executable' from config struct member 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Evan Lezar
35df24d63a Make handling of nvidia-ctk path consistent 
This change adds an --nvidia-ctk-path to the nvidia-ctk cdi generate
command. This ensures that the executable path for the generated
hooks can be specified consistently.

Since the NVIDIA Container Runtime already allows for the executable
path to be specified in the config the utility code to update the
LDCache and create other nvidia-ctk hooks are also updated.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Evan Lezar
3140810c95 Add NewContainerEdits utility function 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-07 11:03:45 +01:00
Evan Lezar
046d761f4c Ensure that an empty discoverer returns valid edits 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-06 14:01:35 +01:00
Evan Lezar
8604c255c4 Use Options to set FileLocator options 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:57:33 +01:00
Evan Lezar
bea8321205 Use prefix search for locating graphics files 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
db962c4bf2 Use getSearchPrefixes for all locators 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
d1a3de7671 Add test for device locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
8da7e74408 Add tests for executable locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
55eb898186 Add support for specifying multiple prefixes 
This change allows the file Locator to be instantiated with multiple
search prefixes.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
a7fc29d4bd Add tests for file locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
fdb3e51294 Add egl_external_platform.d/10_nvidia_wayland.json to graphics mounts 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
d51c8fcfa7 Add utility function to generatee nvidia-ctk OCI hook 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
9b33c34a57 Allow graphics mount discoverer to be instantiated independently 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00