From b46bc10c44607cb5fd028f9bae34340f2c678917 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 22 Nov 2023 13:48:11 +0100 Subject: [PATCH 1/2] Include nvidia/nvoptix.bin in graphics mounts Signed-off-by: Evan Lezar --- CHANGELOG.md | 1 + internal/discover/graphics.go | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd59bfd..e1fbf3c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Skip update of ldcache in containers without ldconfig. The .so.SONAME symlinks are still created. * Normalize ldconfig path on use. This automatically adjust the ldconfig setting applied to ldconfig.real on systems where this exists. +* Include `nvidia/nvoptix.bin` in list of graphics mounts. * [libnvidia-container] Fix device permission check when using cgroupv2 (fixes #227) diff --git a/internal/discover/graphics.go b/internal/discover/graphics.go index 73145c89..b577de9d 100644 --- a/internal/discover/graphics.go +++ b/internal/discover/graphics.go @@ -76,6 +76,7 @@ func NewGraphicsMountsDiscoverer(logger logger.Interface, driverRoot string, nvi "vulkan/implicit_layer.d/nvidia_layers.json", "egl/egl_external_platform.d/15_nvidia_gbm.json", "egl/egl_external_platform.d/10_nvidia_wayland.json", + "nvidia/nvoptix.bin", }, ) From 7d79b311d83f6de8b82840b3e9b556d11f8168d9 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 22 Nov 2023 13:48:58 +0100 Subject: [PATCH 2/2] Include vulkan/icd.d/nvidia_layers.json This change includes vulkan/icd.d/nvidia_layers.json in the list of possible graphics mounts. --- CHANGELOG.md | 2 ++ internal/discover/graphics.go | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1fbf3c8..6ad567a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Skip update of ldcache in containers without ldconfig. The .so.SONAME symlinks are still created. * Normalize ldconfig path on use. This automatically adjust the ldconfig setting applied to ldconfig.real on systems where this exists. * Include `nvidia/nvoptix.bin` in list of graphics mounts. +* Include `vulkan/icd.d/nvidia_layers.json` in list of graphics mounts. + * [libnvidia-container] Fix device permission check when using cgroupv2 (fixes #227) diff --git a/internal/discover/graphics.go b/internal/discover/graphics.go index b577de9d..1860715b 100644 --- a/internal/discover/graphics.go +++ b/internal/discover/graphics.go @@ -73,6 +73,7 @@ func NewGraphicsMountsDiscoverer(logger logger.Interface, driverRoot string, nvi []string{ "glvnd/egl_vendor.d/10_nvidia.json", "vulkan/icd.d/nvidia_icd.json", + "vulkan/icd.d/nvidia_layers.json", "vulkan/implicit_layer.d/nvidia_layers.json", "egl/egl_external_platform.d/15_nvidia_gbm.json", "egl/egl_external_platform.d/10_nvidia_wayland.json",