pkg/adaptation: support new RDT fields

marquiz · klihub · marquiz · commit d05dd818ed26 · 2025-12-12T13:40:36.000+02:00
Add support for direct manipulation of the intelRdt object of the
container config.

Co-authored-by: Krisztian Litkey &lt;krisztian.litkey@intel.com&gt;
Signed-off-by: Markus Lehtonen &lt;markus.lehtonen@intel.com&gt;
diff --git a/pkg/adaptation/adaptation_suite_test.go b/pkg/adaptation/adaptation_suite_test.go
@@ -608,6 +608,13 @@ var _ = Describe("Plugin container creation adjustments", func() {
 					return api.FromOCILinuxSeccomp(&seccomp)
 				}(),
 			)
+		case "rdt":
+			if overwrite {
+				a.SetLinuxRDTClosID(p.name)
+			} else {
+				a.SetLinuxRDTSchemata([]string{"L3:0=ff", "MB:0=50"})
+				a.SetLinuxRDTEnableMonitoring(true)
+			}
 		}
 
 		return a, nil, nil
@@ -948,6 +955,16 @@ var _ = Describe("Plugin container creation adjustments", func() {
 					},
 				},
 			),
+			Entry("adjust RDT", "rdt",
+				&api.ContainerAdjustment{
+					Linux: &api.LinuxContainerAdjustment{
+						Rdt: &api.LinuxRdt{
+							Schemata:         api.RepeatedString([]string{"L3:0=ff", "MB:0=50"}),
+							EnableMonitoring: api.Bool(true),
+						},
+					},
+				},
+			),
 		)
 	})
 
@@ -1121,8 +1138,22 @@ var _ = Describe("Plugin container creation adjustments", func() {
 					},
 				},
 			),
+
 			Entry("adjust linux net devices (conflicts)", "linux net device", false, true, nil),
 			Entry("adjust linux scheduler (conflicts)", "linux scheduler", false, true, nil),
+
+			Entry("adjust RDT (conflicts)", "rdt", false, true, nil),
+			Entry("adjust RDT", "rdt", true, false,
+				&api.ContainerAdjustment{
+					Linux: &api.LinuxContainerAdjustment{
+						Rdt: &api.LinuxRdt{
+							ClosId:           api.String("foo"),
+							Schemata:         api.RepeatedString([]string{"L3:0=ff", "MB:0=50"}),
+							EnableMonitoring: api.Bool(true),
+						},
+					},
+				},
+			),
 		)
 	})
 
diff --git a/pkg/adaptation/api.go b/pkg/adaptation/api.go
@@ -96,6 +96,7 @@ type (
 	LinuxScheduler           = api.LinuxScheduler
 	LinuxSchedulerPolicy     = api.LinuxSchedulerPolicy
 	LinuxSchedulerFlag       = api.LinuxSchedulerFlag
+	LinuxRdt                 = api.LinuxRdt
 	CDIDevice                = api.CDIDevice
 	HugepageLimit            = api.HugepageLimit
 	Hooks                    = api.Hooks
@@ -156,14 +157,15 @@ type (
 
 // Aliased functions for api/optional.go.
 var (
-	String   = api.String
-	Int      = api.Int
-	Int32    = api.Int32
-	UInt32   = api.UInt32
-	Int64    = api.Int64
-	UInt64   = api.UInt64
-	Bool     = api.Bool
-	FileMode = api.FileMode
+	String         = api.String
+	RepeatedString = api.RepeatedString
+	Int            = api.Int
+	Int32          = api.Int32
+	UInt32         = api.UInt32
+	Int64          = api.Int64
+	UInt64         = api.UInt64
+	Bool           = api.Bool
+	FileMode       = api.FileMode
 )
 
 // Aliased functions for api/types.go.
diff --git a/pkg/adaptation/result.go b/pkg/adaptation/result.go
@@ -248,7 +248,11 @@ func (r *result) adjust(rpl *ContainerAdjustment, plugin string) error {
 		if err := r.adjustLinuxScheduler(rpl.Linux.Scheduler, plugin); err != nil {
 			return err
 		}
+		if err := r.adjustRdt(rpl.Linux.Rdt, plugin); err != nil {
+			return err
+		}
 	}
+
 	if err := r.adjustRlimits(rpl.Rlimits, plugin); err != nil {
 		return err
 	}
@@ -499,6 +503,37 @@ func (r *result) adjustSysctl(sysctl map[string]string, plugin string) error {
 	return nil
 }
 
+func (r *result) adjustRdt(rdt *LinuxRdt, plugin string) error {
+	if r == nil {
+		return nil
+	}
+
+	r.initAdjustRdt()
+
+	id := r.request.create.Container.Id
+
+	if v := rdt.GetClosId(); v != nil {
+		if err := r.owners.ClaimRdtClosID(id, plugin); err != nil {
+			return err
+		}
+		r.reply.adjust.Linux.Rdt.ClosId = String(v.GetValue())
+	}
+	if v := rdt.GetSchemata(); v != nil {
+		if err := r.owners.ClaimRdtSchemata(id, plugin); err != nil {
+			return err
+		}
+		r.reply.adjust.Linux.Rdt.Schemata = RepeatedString(v.GetValue())
+	}
+	if v := rdt.GetEnableMonitoring(); v != nil {
+		if err := r.owners.ClaimRdtEnableMonitoring(id, plugin); err != nil {
+			return err
+		}
+		r.reply.adjust.Linux.Rdt.EnableMonitoring = Bool(v.GetValue())
+	}
+
+	return nil
+}
+
 func (r *result) adjustCDIDevices(devices []*CDIDevice, plugin string) error {
 	if len(devices) == 0 {
 		return nil
@@ -1131,3 +1166,23 @@ func (r *result) getContainerUpdate(u *ContainerUpdate, plugin string) (*Contain
 
 	return update, nil
 }
+
+func (r *result) initAdjust() {
+	if r.reply.adjust == nil {
+		r.reply.adjust = &ContainerAdjustment{}
+	}
+}
+
+func (r *result) initAdjustLinux() {
+	r.initAdjust()
+	if r.reply.adjust.Linux == nil {
+		r.reply.adjust.Linux = &LinuxContainerAdjustment{}
+	}
+}
+
+func (r *result) initAdjustRdt() {
+	r.initAdjustLinux()
+	if r.reply.adjust.Linux.Rdt == nil {
+		r.reply.adjust.Linux.Rdt = &LinuxRdt{}
+	}
+}
