Implement removal of RDT

Makes it possible to remove/override the linux.intelRdt object from the
container configuration. Extend the API by adding new 'Remove' field to
the LinuxRdt message which is used as a marker to fully delete/override
the IntelRdt configuration. This patch also updates the adaptation
and runtime-tools correspondingly.

Signed-off-by: Markus Lehtonen <[email protected]>

Author: marquiz

pkg/adaptation/adaptation_suite_test.go

@@ -585,11 +585,11 @@ var _ = Describe("Plugin container creation adjustments", func() {
 			)
 		case "rdt":
 			if overwrite {
-				a.SetLinuxRDTClosID(p.name)
-			} else {
-				a.SetLinuxRDTSchemata([]string{"L3:0=ff", "MB:0=50"})
-				a.SetLinuxRDTEnableMonitoring(true)
+				a.RemoveLinuxRDT()
 			}
+			a.SetLinuxRDTClosID(p.name)
+			a.SetLinuxRDTSchemata([]string{"L3:0=ff", "MB:0=50"})
+			a.SetLinuxRDTEnableMonitoring(true)
 		}
 
 		return a, nil, nil
@@ -879,6 +879,7 @@ var _ = Describe("Plugin container creation adjustments", func() {
 				&api.ContainerAdjustment{
 					Linux: &api.LinuxContainerAdjustment{
 						Rdt: &api.LinuxRdt{
+							ClosId:           api.String("test"),
 							Schemata:         api.RepeatedString([]string{"L3:0=ff", "MB:0=50"}),
 							EnableMonitoring: api.Bool(true),
 						},

pkg/adaptation/result.go

@@ -464,6 +464,11 @@ func (r *result) adjustRdt(rdt *LinuxRdt, plugin string) error {
 
 	id := r.request.create.Container.Id
 
+	if rdt.GetRemove() {
+		r.owners.ClearRdt(id, plugin)
+		r.reply.adjust.Linux.Rdt = &LinuxRdt{}
+	}
+
 	if v := rdt.GetClosId(); v != nil {
 		if err := r.owners.ClaimRdtClosID(id, plugin); err != nil {
 			return err

pkg/api/adjustment.go

@@ -297,6 +297,12 @@ func (a *ContainerAdjustment) SetLinuxRDTEnableMonitoring(value bool) {
 	a.Linux.Rdt.EnableMonitoring = Bool(value)
 }
 
+// RemoveLinuxRdt records the removal of the RDT configuration.
+func (a *ContainerAdjustment) RemoveLinuxRDT() {
+	a.initLinuxRdt()
+	a.Linux.Rdt.Remove = true
+}
+
 // AddLinuxUnified sets a cgroupv2 unified resource.
 func (a *ContainerAdjustment) AddLinuxUnified(key, value string) {
 	a.initLinuxResourcesUnified()

pkg/api/api.pb.go

@@ -560,6 +560,8 @@ message LinuxRdt {
   OptionalString clos_id = 1;
   OptionalRepeatedString schemata = 2;
   OptionalBool enable_monitoring = 3;
+  // NRI specific field to mark the RDT config for removal.
+  bool remove = 4;
 }
 
 // KeyValue represents an environment variable.

pkg/api/api.proto

@@ -201,6 +201,10 @@ func (o *OwningPlugins) ClearArgs(id, plugin string) {
 	o.mustOwnersFor(id).ClearArgs(plugin)
 }
 
+func (o *OwningPlugins) ClearRdt(id, plugin string) {
+	o.mustOwnersFor(id).ClearRdt(plugin)
+}
+
 func (o *OwningPlugins) AnnotationOwner(id, key string) (string, bool) {
 	return o.ownersFor(id).compoundOwner(Field_Annotations.Key(), key)
 }
@@ -613,6 +617,12 @@ func (f *FieldOwners) ClearArgs(plugin string) {
 	f.clearSimple(Field_Args.Key(), plugin)
 }
 
+func (f *FieldOwners) ClearRdt(plugin string) {
+	f.clearSimple(Field_RdtClosID.Key(), plugin)
+	f.clearSimple(Field_RdtSchemata.Key(), plugin)
+	f.clearSimple(Field_RdtEnableMonitoring.Key(), plugin)
+}
+
 func (f *FieldOwners) Conflict(field int32, plugin, other string, qualifiers ...string) error {
 	return fmt.Errorf("plugins %q and %q both tried to set %s",
 		plugin, other, qualify(field, qualifiers...))

pkg/api/api_vtproto.pb.go

@@ -344,6 +344,10 @@ func (g *Generator) AdjustRdt(r *nri.LinuxRdt) {
 		return
 	}
 
+	if r.Remove {
+		g.ClearLinuxIntelRdt()
+	}
+
 	g.AdjustRdtClosID(r.ClosId.Get())
 	g.AdjustRdtSchemata(r.Schemata.Get())
 	g.AdjustRdtEnableMonitoring(r.EnableMonitoring.Get())