fix: zfs extensions with nvidia #410
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
frezbo
force-pushed
the
fix/zfs-extensions
branch
from
3e9b4e8 to
c9b9df1
Compare
Introduce a proper fix for siderolabs#401, keep musl path's as is, and use `/usr/local/glibc` as install path for all glibc related stuff so that any new common libraries will not cause an issue in the future. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
force-pushed
the
fix/zfs-extensions
branch
from
c9b9df1 to
3526f45
Compare
smira
approved these changes
Jun 12, 2024
|
/m |
frezbo
added a commit
to frezbo/extensions
that referenced
this pull request
Jun 24, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
added a commit
to frezbo/extensions
that referenced
this pull request
Jun 24, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. `nvidia-container-cli` explicitly sets an `RPATH` `$ORIGIN/../$LIB` here: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/blob/v1.14.6/Makefile?ref_type=tags#L183, this means `/usr/local/lib` would be searched first, since `zfs` and nvidia ship their own `libtirpc`, `nvidia-container-cli` first tries to use the `libtirpc` shippeed with `zfs` at `/usr/local/lib` instead of the one at `/usr/local/glibc/lib`. Fix this by setting an additional `RPATH` as `$ORIGIN/../glibc/$LIB`, so that libraries in `/usr/local/glibc/lib` have higher preference. Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
added a commit
to frezbo/extensions
that referenced
this pull request
Jun 24, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. `nvidia-container-cli` explicitly sets an `RPATH` as `$ORIGIN/../$LIB` here: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/blob/v1.14.6/Makefile?ref_type=tags#L183, this means `/usr/local/lib` would be searched first, since `zfs` and nvidia ship their own `libtirpc`, `nvidia-container-cli` first tries to use the `libtirpc` shippeed with `zfs` at `/usr/local/lib` instead of the one at `/usr/local/glibc/lib`. Fix this by setting an additional `RPATH` as `$ORIGIN/../glibc/$LIB`, so that libraries in `/usr/local/glibc/lib` have higher preference. ```bash ❯ scanelf -r _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli TYPE RPATH FILE ET_DYN $ORIGIN/../glibc/$LIB:$ORIGIN/../$LIB _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli ``` Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
added a commit
to frezbo/extensions
that referenced
this pull request
Jun 24, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. `nvidia-container-cli` explicitly sets an `RPATH` as `$ORIGIN/../$LIB` here: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/blob/v1.14.6/Makefile?ref_type=tags#L183, this means `/usr/local/lib` would be searched first, since `zfs` and nvidia ship their own `libtirpc`, `nvidia-container-cli` first tries to use the `libtirpc` shippeed with `zfs` at `/usr/local/lib` instead of the one at `/usr/local/glibc/lib`. Fix this by setting an additional `RPATH` as `$ORIGIN/../glibc/$LIB`, so that libraries in `/usr/local/glibc/lib` have higher preference. ```bash ❯ scanelf -r _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli TYPE RPATH FILE ET_DYN $ORIGIN/../glibc/$LIB:$ORIGIN/../$LIB _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli ``` Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo
added a commit
to frezbo/extensions
that referenced
this pull request
Jun 24, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. `nvidia-container-cli` explicitly sets an `RPATH` as `$ORIGIN/../$LIB` here: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/blob/v1.14.6/Makefile?ref_type=tags#L183, this means `/usr/local/lib` would be searched first, since `zfs` and nvidia ship their own `libtirpc`, `nvidia-container-cli` first tries to use the `libtirpc` shippeed with `zfs` at `/usr/local/lib` instead of the one at `/usr/local/glibc/lib`. Fix this by setting an additional `RPATH` as `$ORIGIN/../glibc/$LIB`, so that libraries in `/usr/local/glibc/lib` have higher preference. ```bash ❯ scanelf -r _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli TYPE RPATH FILE ET_DYN $ORIGIN/../glibc/$LIB:$ORIGIN/../$LIB _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli ``` Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
jfroy
pushed a commit
to jfroy/siderolabs-extensions
that referenced
this pull request
Sep 5, 2024
Set `glibc/lib` as first `rpath` for `nvidia-container-cli`. Also install nvidia libraries to `/usr/local/glibc/lib` so any musl libraries lives separately. `nvidia-container-cli` explicitly sets an `RPATH` as `$ORIGIN/../$LIB` here: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/blob/v1.14.6/Makefile?ref_type=tags#L183, this means `/usr/local/lib` would be searched first, since `zfs` and nvidia ship their own `libtirpc`, `nvidia-container-cli` first tries to use the `libtirpc` shippeed with `zfs` at `/usr/local/lib` instead of the one at `/usr/local/glibc/lib`. Fix this by setting an additional `RPATH` as `$ORIGIN/../glibc/$LIB`, so that libraries in `/usr/local/glibc/lib` have higher preference. ```bash ❯ scanelf -r _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli TYPE RPATH FILE ET_DYN $ORIGIN/../glibc/$LIB:$ORIGIN/../$LIB _out/rootfs/rootfs/usr/local/bin/nvidia-container-cli ``` Properly fixes: siderolabs#380 Fixes from siderolabs#401 and siderolabs#410 were not complete. Manually tested by spinning up a NVIDIA worker in AWS. Signed-off-by: Noel Georgi <git@frezbo.dev>
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.
Introduce a proper fix for #401, keep musl path's as is, and use
/usr/local/glibcas install path for all glibc related stuff so that any new common libraries will not cause an issue in the future.