From 3ebd90eabc93bb2c24a706919528627058680bbd Mon Sep 17 00:00:00 2001 From: Antti Kervinen Date: Tue, 5 Aug 2025 17:24:57 +0300 Subject: [PATCH 1/2] Drop RDT fields deprecated in runtime-spec Drop IntelRdt.EnableCMT and EnableMBM to match runtime-spec versions after v1.2.1. Signed-off-by: Antti Kervinen --- pkg/cdi/container-edits_test.go | 6 ------ pkg/cdi/oci.go | 2 -- specs-go/config.go | 2 -- 3 files changed, 10 deletions(-) diff --git a/pkg/cdi/container-edits_test.go b/pkg/cdi/container-edits_test.go index 9f01a6eb..ace0fd2e 100644 --- a/pkg/cdi/container-edits_test.go +++ b/pkg/cdi/container-edits_test.go @@ -527,8 +527,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff;1=ff", MemBwSchema: "MB:0=50;1=50", - EnableCMT: true, - EnableMBM: true, }, }, result: &oci.Spec{ @@ -537,8 +535,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff;1=ff", MemBwSchema: "MB:0=50;1=50", - EnableCMT: true, - EnableMBM: true, }, }, }, @@ -551,8 +547,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff", MemBwSchema: "MB:0=100", - EnableCMT: true, - EnableMBM: true, }, }, }, diff --git a/pkg/cdi/oci.go b/pkg/cdi/oci.go index 4d62c41f..e7d18cdc 100644 --- a/pkg/cdi/oci.go +++ b/pkg/cdi/oci.go @@ -59,7 +59,5 @@ func (i *IntelRdt) toOCI() *spec.LinuxIntelRdt { ClosID: i.ClosID, L3CacheSchema: i.L3CacheSchema, MemBwSchema: i.MemBwSchema, - EnableCMT: i.EnableCMT, - EnableMBM: i.EnableMBM, } } diff --git a/specs-go/config.go b/specs-go/config.go index f28657b8..6f403e63 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -67,6 +67,4 @@ type IntelRdt struct { ClosID string `json:"closID,omitempty" yaml:"closID,omitempty"` L3CacheSchema string `json:"l3CacheSchema,omitempty" yaml:"l3CacheSchema,omitempty"` MemBwSchema string `json:"memBwSchema,omitempty" yaml:"memBwSchema,omitempty"` - EnableCMT bool `json:"enableCMT,omitempty" yaml:"enableCMT,omitempty"` - EnableMBM bool `json:"enableMBM,omitempty" yaml:"enableMBM,omitempty"` } From 4cf4788403fca29aaa2febcd5fde3df9953f6503 Mon Sep 17 00:00:00 2001 From: Antti Kervinen Date: Tue, 5 Aug 2025 17:24:57 +0300 Subject: [PATCH 2/2] Add new IntelRdt.EnableMonitoring field Signed-off-by: Antti Kervinen --- cmd/cdi/go.mod | 2 +- cmd/cdi/go.sum | 4 ++-- cmd/validate/go.sum | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/cdi/container-edits_test.go | 21 ++++++++++++--------- pkg/cdi/oci.go | 7 ++++--- schema/go.mod | 2 +- schema/go.sum | 4 ++-- specs-go/config.go | 7 ++++--- 10 files changed, 30 insertions(+), 25 deletions(-) diff --git a/cmd/cdi/go.mod b/cmd/cdi/go.mod index 68932856..e43c804d 100644 --- a/cmd/cdi/go.mod +++ b/cmd/cdi/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.5.1 - github.com/opencontainers/runtime-spec v1.1.0 + github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 github.com/spf13/cobra v1.6.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/cmd/cdi/go.sum b/cmd/cdi/go.sum index b1265d50..2868b724 100644 --- a/cmd/cdi/go.sum +++ b/cmd/cdi/go.sum @@ -18,8 +18,8 @@ github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= -github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 h1:6S6r1L8VO9b1UfgIQi+nteqlElma9KDlzZw/nM3ctI0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI= github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= diff --git a/cmd/validate/go.sum b/cmd/validate/go.sum index 5089ed5f..e6e01fb7 100644 --- a/cmd/validate/go.sum +++ b/cmd/validate/go.sum @@ -3,7 +3,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 h1:6S6r1L8VO9b1UfgIQi+nteqlElma9KDlzZw/nM3ctI0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/go.mod b/go.mod index 3ec778a9..99e5c498 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.5.1 - github.com/opencontainers/runtime-spec v1.1.0 + github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.19.0 diff --git a/go.sum b/go.sum index 719eb144..da1a3d56 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= -github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 h1:6S6r1L8VO9b1UfgIQi+nteqlElma9KDlzZw/nM3ctI0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI= github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= diff --git a/pkg/cdi/container-edits_test.go b/pkg/cdi/container-edits_test.go index ace0fd2e..098080ba 100644 --- a/pkg/cdi/container-edits_test.go +++ b/pkg/cdi/container-edits_test.go @@ -524,17 +524,19 @@ func TestApplyContainerEdits(t *testing.T) { spec: &oci.Spec{}, edits: &cdi.ContainerEdits{ IntelRdt: &cdi.IntelRdt{ - ClosID: "clos-1", - L3CacheSchema: "L3:0=ff;1=ff", - MemBwSchema: "MB:0=50;1=50", + ClosID: "clos-1", + L3CacheSchema: "L3:0=ff;1=ff", + MemBwSchema: "MB:0=50;1=50", + EnableMonitoring: true, }, }, result: &oci.Spec{ Linux: &oci.Linux{ IntelRdt: &oci.LinuxIntelRdt{ - ClosID: "clos-1", - L3CacheSchema: "L3:0=ff;1=ff", - MemBwSchema: "MB:0=50;1=50", + ClosID: "clos-1", + L3CacheSchema: "L3:0=ff;1=ff", + MemBwSchema: "MB:0=50;1=50", + EnableMonitoring: true, }, }, }, @@ -544,9 +546,10 @@ func TestApplyContainerEdits(t *testing.T) { spec: &oci.Spec{ Linux: &oci.Linux{ IntelRdt: &oci.LinuxIntelRdt{ - ClosID: "clos-1", - L3CacheSchema: "L3:0=ff", - MemBwSchema: "MB:0=100", + ClosID: "clos-1", + L3CacheSchema: "L3:0=ff", + MemBwSchema: "MB:0=100", + EnableMonitoring: true, }, }, }, diff --git a/pkg/cdi/oci.go b/pkg/cdi/oci.go index e7d18cdc..750f8042 100644 --- a/pkg/cdi/oci.go +++ b/pkg/cdi/oci.go @@ -56,8 +56,9 @@ func (d *DeviceNode) toOCI() spec.LinuxDevice { // toOCI returns the opencontainers runtime Spec LinuxIntelRdt for this IntelRdt config. func (i *IntelRdt) toOCI() *spec.LinuxIntelRdt { return &spec.LinuxIntelRdt{ - ClosID: i.ClosID, - L3CacheSchema: i.L3CacheSchema, - MemBwSchema: i.MemBwSchema, + ClosID: i.ClosID, + L3CacheSchema: i.L3CacheSchema, + MemBwSchema: i.MemBwSchema, + EnableMonitoring: i.EnableMonitoring, } } diff --git a/schema/go.mod b/schema/go.mod index 87074a01..0ea8dc77 100644 --- a/schema/go.mod +++ b/schema/go.mod @@ -13,7 +13,7 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/opencontainers/runtime-spec v1.1.0 // indirect + github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 // indirect github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect diff --git a/schema/go.sum b/schema/go.sum index 6ebffba6..7746858e 100644 --- a/schema/go.sum +++ b/schema/go.sum @@ -15,8 +15,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= -github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 h1:6S6r1L8VO9b1UfgIQi+nteqlElma9KDlzZw/nM3ctI0= +github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0= github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI= github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= diff --git a/specs-go/config.go b/specs-go/config.go index 6f403e63..62faf77f 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -64,7 +64,8 @@ type Hook struct { // IntelRdt describes the Linux IntelRdt parameters to set in the OCI spec. type IntelRdt struct { - ClosID string `json:"closID,omitempty" yaml:"closID,omitempty"` - L3CacheSchema string `json:"l3CacheSchema,omitempty" yaml:"l3CacheSchema,omitempty"` - MemBwSchema string `json:"memBwSchema,omitempty" yaml:"memBwSchema,omitempty"` + ClosID string `json:"closID,omitempty" yaml:"closID,omitempty"` + L3CacheSchema string `json:"l3CacheSchema,omitempty" yaml:"l3CacheSchema,omitempty"` + MemBwSchema string `json:"memBwSchema,omitempty" yaml:"memBwSchema,omitempty"` + EnableMonitoring bool `json:"enableMonitoring,omitempty" yaml:"enableMonitoring,omitempty"` }