Merge pull request #1319 from elezar/bump-github.com/NVIDIA/go-nvlib-0.8.1

elezar · web-flow · commit f5b4c153a463 · 2025-09-26T12:29:26.000+02:00
Disable generation of nvidia.com/gpu.[non]coherent CDI specs by default
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # NVIDIA Container Toolkit Changelog
 
+## v1.18.0-rc.5
+- Update go-nvlib to restrict nvidia.com/gpu.coherent devices to devices with an ATS addressing mode.
+
 ## v1.18.0-rc.4
 
 - Add drop-in file support for containerd and crio
diff --git a/cmd/nvidia-ctk/cdi/generate/generate_test.go b/cmd/nvidia-ctk/cdi/generate/generate_test.go
@@ -29,7 +29,6 @@ import (
 	"tags.cncf.io/container-device-interface/specs-go"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/test"
-	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 )
 
 func TestGenerateSpec(t *testing.T) {
@@ -478,7 +477,6 @@ containerEdits:
 			}
 			tc.options.nvmllib = server
 
-			tc.options.featureFlags = []string{string(nvcdi.FeatureDisableCoherentAnnotations)}
 			specs, err := c.generateSpecs(&tc.options)
 			require.ErrorIs(t, err, tc.expectedError)
 
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.24.0
 toolchain go1.24.4
 
 require (
-	github.com/NVIDIA/go-nvlib v0.8.0
+	github.com/NVIDIA/go-nvlib v0.8.1
 	github.com/NVIDIA/go-nvml v0.13.0-1
 	github.com/cyphar/filepath-securejoin v0.5.0
 	github.com/moby/sys/reexec v0.1.0
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/NVIDIA/go-nvlib v0.8.0 h1:vorMvnsJYvZaxiluSXFd+fIFeQFPWSiSjNPiJyvDs0c=
-github.com/NVIDIA/go-nvlib v0.8.0/go.mod h1:bV+OEgjJCbFXf5T8c082mVPFuiF+gKwf9CMT7DWGUBI=
+github.com/NVIDIA/go-nvlib v0.8.1 h1:OPEHVvn3zcV5OXB68A7WRpeCnYMRSPl7LdeJH/d3gZI=
+github.com/NVIDIA/go-nvlib v0.8.1/go.mod h1:7mzx9FSdO9fXWP9NKuZmWkCwhkEcSWQFe2tmFwtLb9c=
 github.com/NVIDIA/go-nvml v0.13.0-1 h1:OLX8Jq3dONuPOQPC7rndB6+iDmDakw0XTYgzMxObkEw=
 github.com/NVIDIA/go-nvml v0.13.0-1/go.mod h1:+KNA7c7gIBH7SKSJ1ntlwkfN80zdx8ovl4hrK3LmPt4=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
diff --git a/pkg/nvcdi/api.go b/pkg/nvcdi/api.go
@@ -80,7 +80,7 @@ const (
 	// FeatureDisableNvsandboxUtils disables the use of nvsandboxutils when
 	// querying devices.
 	FeatureDisableNvsandboxUtils = FeatureFlag("disable-nvsandbox-utils")
-	// FeatureDisableCoherentAnnotations disables the addition of annotations
+	// FeatureEnableCoherentAnnotations enables the addition of annotations
 	// coherent or non-coherent devices.
-	FeatureDisableCoherentAnnotations = FeatureFlag("disable-coherent-annotations")
+	FeatureEnableCoherentAnnotations = FeatureFlag("enable-coherent-annotations")
 )
diff --git a/pkg/nvcdi/full-gpu-nvml.go b/pkg/nvcdi/full-gpu-nvml.go
@@ -112,7 +112,7 @@ func (l *fullGPUDeviceSpecGenerator) device() (device.Device, error) {
 }
 
 func (l *fullGPUDeviceSpecGenerator) getDeviceAnnotations() (map[string]string, error) {
-	if l.featureFlags[FeatureDisableCoherentAnnotations] {
+	if !l.featureFlags[FeatureEnableCoherentAnnotations] {
 		return nil, nil
 	}
 
diff --git a/pkg/nvcdi/mig-device-nvml.go b/pkg/nvcdi/mig-device-nvml.go
@@ -41,7 +41,7 @@ func (l *migDeviceSpecGenerator) GetUUID() (string, error) {
 }
 
 func (l *nvmllib) newMIGDeviceSpecGeneratorFromDevice(i int, d device.Device, j int, m device.MigDevice) (*migDeviceSpecGenerator, error) {
-	parent, err := l.newFullGPUDeviceSpecGeneratorFromDevice(i, d, map[FeatureFlag]bool{FeatureDisableCoherentAnnotations: true})
+	parent, err := l.newFullGPUDeviceSpecGeneratorFromDevice(i, d, make(map[FeatureFlag]bool))
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/device.go b/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/device.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/NVIDIA/go-nvlib v0.8.0
+# github.com/NVIDIA/go-nvlib v0.8.1
 ## explicit; go 1.20
 github.com/NVIDIA/go-nvlib/pkg/nvlib/device
 github.com/NVIDIA/go-nvlib/pkg/nvlib/info

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ import (`
`29`	`29`	`"tags.cncf.io/container-device-interface/specs-go"`
`30`	`30`
`31`	`31`	`"github.com/NVIDIA/nvidia-container-toolkit/internal/test"`
`32`		`- "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"`
`33`	`32`	`)`
`34`	`33`
`35`	`34`	`func TestGenerateSpec(t *testing.T) {`
`@@ -478,7 +477,6 @@ containerEdits:`
`478`	`477`	`}`
`479`	`478`	`tc.options.nvmllib = server`
`480`	`479`
`481`		`- tc.options.featureFlags = []string{string(nvcdi.FeatureDisableCoherentAnnotations)}`
`482`	`480`	`specs, err := c.generateSpecs(&tc.options)`
`483`	`481`	`require.ErrorIs(t, err, tc.expectedError)`
`484`	`482`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (l *fullGPUDeviceSpecGenerator) device() (device.Device, error) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func (l *fullGPUDeviceSpecGenerator) getDeviceAnnotations() (map[string]string, error) {`
`115`		`- if l.featureFlags[FeatureDisableCoherentAnnotations] {`
	`115`	`+ if !l.featureFlags[FeatureEnableCoherentAnnotations] {`
`116`	`116`	`return nil, nil`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (l *migDeviceSpecGenerator) GetUUID() (string, error) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func (l nvmllib) newMIGDeviceSpecGeneratorFromDevice(i int, d device.Device, j int, m device.MigDevice) (migDeviceSpecGenerator, error) {`
`44`		`- parent, err := l.newFullGPUDeviceSpecGeneratorFromDevice(i, d, map[FeatureFlag]bool{FeatureDisableCoherentAnnotations: true})`
	`44`	`+ parent, err := l.newFullGPUDeviceSpecGeneratorFromDevice(i, d, make(map[FeatureFlag]bool))`
`45`	`45`	`if err != nil {`
`46`	`46`	`return nil, err`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# github.com/NVIDIA/go-nvlib v0.8.0`
	`1`	`+# github.com/NVIDIA/go-nvlib v0.8.1`
`2`	`2`	`## explicit; go 1.20`
`3`	`3`	`github.com/NVIDIA/go-nvlib/pkg/nvlib/device`
`4`	`4`	`github.com/NVIDIA/go-nvlib/pkg/nvlib/info`