Change:
Project description The NVIDIA Container Toolkit CLI provides a number of utilities that are useful for working with the NVIDIA Container Toolkit. Metadata homepage URL: source URL: license: Apache License platforms: linux More Info Looks some of the related tools for the container runtime. Have already been included. But not . Add a :+1: [reaction] to [issues you find important]. [reaction]: [issues you find important]:

Discussion:
<ins> From e4449f06a8989ff22947309151855b388c311aed Mon Sep 17 00:00:00 2001 From: Jared Baur <jaredbaur@fastmail.com> Date: Mon, 22 Jan 2024 20:42:48 -0800 Subject: [PATCH] Add dlopen discoverer --- internal/lookup/dlopen.go  | 57 ++++++++++++++++++++++++++++++++++++++ internal/lookup/library.go |  3 ++ 2 files changed, 60 insertions(+) create mode 100644 internal/lookup/dlopen.go diff --git a/internal/lookup/dlopen.go b/internal/lookup/dlopen.go new file mode 100644 index 00000000..7cd84522 --- /dev/null +++ b/internal/lookup/dlopen.go @@ -0,0 +1,57 @@ +package lookup + +// #cgo LDFLAGS: -ldl +// #define _GNU_SOURCE +// #include <dlfcn.h> +// #include <stdlib.h> +import "C" + +import ( +	"fmt" +	"path/filepath" +	"unsafe" +) + +// dlopenLocator can be used to locate libraries given a system's dynamic +// linker. +type dlopenLocator struct { +	file +} + +// NewDlopenLocator creats a locator that can be used for locating libraries +// through the dlopen mechanism. +func NewDlopenLocator(opts ...Option) Locator { +	f := newFileLocator(opts...) +	d := dlopenLocator{file: *f} +	return &d +} + +// Locate finds the specified pattern if the systems' dynamic linker can find +// it via dlopen. Note that patterns with wildcard patterns will likely not be +// found as it is uncommon for libraries to have wildcard patterns in their +// file name. +func (d dlopenLocator) Locate(pattern string) ([]string, error) { +	libname := C.CString(pattern) +	defer C.free(unsafe.Pointer(libname)) + +	d.logger.Debugf("Calling dlopen for %s", pattern) + +	handle := C.dlopen(libname, C.RTLD_LAZY) +	if handle == nil { +		return nil, fmt.Errorf("dlopen %s failed", pattern) +	} +	defer C.dlclose(handle) + +	libParentPath := C.CString("") + +	d.logger.Debugf("Calling dlinfo on handle for %s", pattern) +	ret := C.dlinfo(handle, C.RTLD_DI_ORIGIN, unsafe.Pointer(libParentPath)) +	if ret == -1 { +		return nil, fmt.Errorf("dlinfo on handle for %s failed", pattern) +	} + +	libAbsolutePath := filepath.Join(C.GoString(libParentPath), pattern) +	d.logger.Debugf("Found library for %s at %s", pattern, libAbsolutePath) + +	return []string{libAbsolutePath}, nil +} diff --git a/internal/lookup/library.go b/internal/lookup/library.go index 7f5cf7c8..916edde2 100644 --- a/internal/lookup/library.go +++ b/internal/lookup/library.go @@ -61,7 +61,10 @@ func NewLibraryLocator(opts ...Option) Locator { // We construct a symlink locator for expected library locations. symlinkLocator := NewSymlinkLocator(opts...) +	dlopenLocator := NewDlopenLocator(opts...) + l := First( +		dlopenLocator, symlinkLocator, newLdcacheLocator(opts...), ) -- </ins>

, configTemplate , configTemplatePath ? null , libnvidia-container <ins> , cudaPackages </ins> }: assert configTemplate != null -> (lib.isAttrs configTemplate && configTemplatePath == null);

''; configToml = if configTemplatePath != null then configTemplatePath else (formats.toml { }).generate "config.toml" configTemplate; <ins> # From https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L54 cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; </ins> in buildGoModule rec { pname = "container-toolkit/container-toolkit"; <del> version = "1.9.0"; </del> <ins> version = "1.15.0-rc.3"; </ins> src = fetchFromGitLab { owner = "nvidia"; repo = pname; rev = "v${version}"; <del> hash = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; </del> <ins> hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo="; </ins> }; vendorHash = null; <ins> patches = [ # This patch causes library lookups to first attempt loading via dlopen # before falling back to the regular symlink location and ldcache location. ./0001-Add-dlopen-discoverer.patch ]; </ins> postPatch = '' <del> # replace the default hookDefaultFilePath to the $out path substituteInPlace cmd/nvidia-container-runtime/main.go  --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' </del> <ins> # Replace the default hookDefaultFilePath to the $out path and override # default ldconfig locations to the one in nixpkgs. substituteInPlace internal/config/config.go  --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook"  --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' substituteInPlace internal/config/config_test.go  --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' substituteInPlace tools/container/toolkit/toolkit.go  --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go  --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' </ins> ''; <del> ldflags = [ "-s" "-w" ]; </del> <ins> # Based on upstream's Makefile: # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64 ldflags = [ "-extldflags=-Wl,-z,lazy" # May be redunandant, cf. `man ld`: "Lazy binding is the default". "--strip-all" # May be redundant. Upstream: "-s". # Omitting the upstream flag: "-w" (suppresses errors and warnings). "--discard-locals" # May be redundant. Upstream: "-X". "${cliVersionPackage}.version=${version}" ]; </ins> <del> nativeBuildInputs = [ makeWrapper ]; </del> <ins> nativeBuildInputs = [ cudaPackages.autoAddOpenGLRunpathHook makeWrapper ]; </ins> preConfigure = '' # Ensure the runc symlink isn't broken:

substituteInPlace $out/etc/nvidia-container-runtime/config.toml  --subst-var-by glibcbin ${lib.getBin glibc} <del> ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} </del> <ins> # See: https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/packaging/debian/nvidia-container-toolkit.postinst#L12 ln -s $out/bin/nvidia-container-runtime-hook $out/bin/nvidia-container-toolkit </ins> wrapProgram $out/bin/nvidia-container-toolkit  --add-flags "-config ${placeholder "out"}/etc/nvidia-container-runtime/config.toml"