pkg/runtime-tools/generate: support new RDT fields

marquiz · marquiz · commit 725289b25687 · 2025-12-12T13:40:36.000+02:00
Add support for direct manipulation of the linuxRdt object in the
container config.

Signed-off-by: Markus Lehtonen &lt;markus.lehtonen@intel.com&gt;
diff --git a/pkg/runtime-tools/generate/generate.go b/pkg/runtime-tools/generate/generate.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 
@@ -189,6 +190,7 @@ func (g *Generator) Adjust(adjust *nri.ContainerAdjustment) error {
 	if err := g.AdjustRdtClass(resources.GetRdtClass().Get()); err != nil {
 		return err
 	}
+	g.AdjustRdt(adjust.GetLinux().GetRdt())
 
 	if err := g.AdjustMounts(adjust.GetMounts()); err != nil {
 		return err
@@ -388,6 +390,38 @@ func (g *Generator) AdjustRdtClass(rdtClass *string) error {
 	return nil
 }
 
+// AdjustRdt adjusts the intelRdt object in the OCI Spec.
+func (g *Generator) AdjustRdt(r *nri.LinuxRdt) {
+	if r == nil {
+		return
+	}
+
+	g.AdjustRdtClosID(r.ClosId.Get())
+	g.AdjustRdtSchemata(r.Schemata.Get())
+	g.AdjustRdtEnableMonitoring(r.EnableMonitoring.Get())
+}
+
+// AdjustRdtClosID adjusts the RDT CLOS id in the OCI Spec.
+func (g *Generator) AdjustRdtClosID(value *string) {
+	if value != nil {
+		g.SetLinuxIntelRdtClosID(*value)
+	}
+}
+
+// AdjustRdtSchemata adjusts the RDT schemata in the OCI Spec.
+func (g *Generator) AdjustRdtSchemata(value *[]string) {
+	if value != nil {
+		g.SetLinuxIntelRdtSchemata(*value)
+	}
+}
+
+// AdjustRdtEnableMonitoring adjusts the RDT monitoring in the OCI Spec.
+func (g *Generator) AdjustRdtEnableMonitoring(value *bool) {
+	if value != nil {
+		g.SetLinuxIntelRdtEnableMonitoring(*value)
+	}
+}
+
 // AdjustCgroupsPath adjusts the cgroup pseudofs path in the OCI Spec.
 func (g *Generator) AdjustCgroupsPath(path string) {
 	if path != "" {
@@ -682,6 +716,24 @@ func (g *Generator) SetLinuxIntelRdt(rdt *rspec.LinuxIntelRdt) {
 	g.Config.Linux.IntelRdt = rdt
 }
 
+// SetLinuxIntelRdtClosID sets g.Config.Linux.IntelRdt.ClosID
+func (g *Generator) SetLinuxIntelRdtClosID(closID string) {
+	g.initConfigLinuxIntelRdt()
+	g.Config.Linux.IntelRdt.ClosID = closID
+}
+
+// SetLinuxIntelRdtEnableMonitoring sets g.Config.Linux.IntelRdt.EnableMonitoring
+func (g *Generator) SetLinuxIntelRdtEnableMonitoring(value bool) {
+	g.initConfigLinuxIntelRdt()
+	g.Config.Linux.IntelRdt.EnableMonitoring = value
+}
+
+// SetLinuxIntelRdtSchemata sets g.Config.Linux.IntelRdt.Schemata
+func (g *Generator) SetLinuxIntelRdtSchemata(schemata []string) {
+	g.initConfigLinuxIntelRdt()
+	g.Config.Linux.IntelRdt.Schemata = slices.Clone(schemata)
+}
+
 // ClearLinuxResourcesBlockIO clears Block I/O settings.
 func (g *Generator) ClearLinuxResourcesBlockIO() {
 	g.initConfigLinuxResources()
@@ -773,3 +825,10 @@ func (g *Generator) initConfigLinuxNetDevices() {
 		g.Config.Linux.NetDevices = map[string]rspec.LinuxNetDevice{}
 	}
 }
+
+func (g *Generator) initConfigLinuxIntelRdt() {
+	g.initConfigLinux()
+	if g.Config.Linux.IntelRdt == nil {
+		g.Config.Linux.IntelRdt = &rspec.LinuxIntelRdt{}
+	}
+}
diff --git a/pkg/runtime-tools/generate/generate_suite_test.go b/pkg/runtime-tools/generate/generate_suite_test.go
@@ -457,6 +457,31 @@ var _ = Describe("Adjustment", func() {
 		})
 	})
 
+	When("has a RDT adjustment", func() {
+		It("adjusts Spec correctly", func() {
+			spec := makeSpec()
+			adjust := &api.ContainerAdjustment{
+				Linux: &api.LinuxContainerAdjustment{
+					Rdt: &api.LinuxRdt{
+						ClosId:           api.String("foo"),
+						Schemata:         api.RepeatedString([]string{"L2:0=ff", "L3:0=f"}),
+						EnableMonitoring: api.Bool(true),
+					},
+				},
+			}
+
+			rg := &rgen.Generator{Config: spec}
+			xg := xgen.SpecGenerator(rg)
+
+			Expect(xg).ToNot(BeNil())
+			Expect(xg.Adjust(adjust)).To(Succeed())
+			Expect(spec.Linux.IntelRdt).To(Equal(&rspec.LinuxIntelRdt{
+				ClosID:           "foo",
+				Schemata:         []string{"L2:0=ff", "L3:0=f"},
+				EnableMonitoring: true,
+			}))
+		})
+	})
 })
 
 type specOption func(*rspec.Spec)
