libnvidia-container: include binaries from driver package #372320
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There's really no reason to require the binaries from the nvidia driver package to be passed to libnvidia-container via the PATH. We do the same thing via driverLink for the libraries already, so let's be consistent here.
github-actions
bot
added
10.rebuild-darwin: 0
|
msanft
force-pushed
the
msanft/libnvidia-container/driver-bins
branch
3 times, most recently
from
a831dbe to
07db7b5
Compare
|
Tested this to work, also in conjunction with #372148 |
13 tasks
NixOS@24d9b8a introduced a bug, that, if `PATH` was actually set to a value when libnvidia-container was ran, caused a segfault. This fixes this bug by scrapping the dynamic `PATH` behavior in favor of simply using the driver package's `driverLink` abstraction for that, which is more fit for the purpose than `PATH` either way.
msanft
force-pushed
the
msanft/libnvidia-container/driver-bins
branch
from
07db7b5 to
6e4ca5c
Compare
This was referenced Jan 9, 2025
greg-hellings
approved these changes
Jan 9, 2025
wegank
added
the
12.approvals: 1
ConnorBaker
approved these changes
Jan 14, 2025
Comment on lines
+20
to
25
| + // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS. | ||
| + // It only exists to maintain compatibility with the old nvidia-docker package. | ||
| + if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:@driverLink@/bin") == NULL) { | ||
| error_setx(err, "environment variable PATH not found"); | ||
| return (-1); | ||
| } |
There was a problem hiding this comment.
Unless you wanted to keep the if statement for some reason, I'm okay with this being removed entirely.
| + if ((os_path = secure_getenv("PATH")) == NULL) { | ||
| + // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS. | ||
| + // It only exists to maintain compatibility with the old nvidia-docker package. | ||
| + if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:@driverLink@/bin") == NULL) { |
There was a problem hiding this comment.
Why do late-binding for nixos (/run paths) but not other systems (e.g. via PATH), and why not just always use the early-bound @driverLink@/bin?
There was a problem hiding this comment.
If I'm not mistaken, /run/nvidia-docker/bin are remnants of virtualisation.docker.enableNvidia. This patch goes back to always using that, while adding @driverLink@/bin. I had added additional support for PATH before (#366855), but things went south there as I introduced a bug. Looking back at that, I decided to go back to a static path, which I did in this PR.
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There's really no reason to require the binaries from the nvidia driver package to be passed to libnvidia-container via the PATH. We do the same thing via driverLink for the libraries already, so let's be consistent here.
This also fixes a segfault in the patch I wrote in #366855, which causes uninitialized memory to be written if binaries are mounted into the container. Thus, I scrap the complicated patch entirely here, going back to just including the binaries from the driver package and not via PATH.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.