Merge pull request #166 from askervin/5aW_mempolicy

Enable adjusting memory policy from NRI plugins

Author: mikebrow

README.md

@@ -276,6 +276,7 @@ property was first available in.
 | Linux network devices                 | v0.11.0   | v2.2.1     | v1.35.0 |
 | Linux RDT CLOS adjustment             | v0.11.0   | v2.2.1     | v1.35.0 |
 | Linux sysctl                          | v0.11.0   | v2.2.1     | v1.35.0 |
+| Linux memory policy                   | TODO      | TODO       | TODO    |
 
 ### Container Updates
 

pkg/adaptation/adaptation_suite_test.go

@@ -593,6 +593,11 @@ var _ = Describe("Plugin container creation adjustments", func() {
 		case "linux sysctl":
 			a.SetLinuxSysctl("net.core.somaxconn", "256")
 
+		case "linux memory policy":
+			a.SetLinuxMemoryPolicy(
+				api.MpolMode_MPOL_INTERLEAVE, "0,1", api.MpolFlag_MPOL_F_STATIC_NODES,
+			)
+
 		case "resources/cpu":
 			a.SetLinuxCPUShares(123)
 			a.SetLinuxCPUQuota(456)
@@ -889,6 +894,20 @@ var _ = Describe("Plugin container creation adjustments", func() {
 				},
 			),
 
+			Entry("adjust linux memory policy", "linux memory policy",
+				&api.ContainerAdjustment{
+					Linux: &api.LinuxContainerAdjustment{
+						MemoryPolicy: &api.LinuxMemoryPolicy{
+							Mode:  api.MpolMode_MPOL_INTERLEAVE,
+							Nodes: "0,1",
+							Flags: []api.MpolFlag{
+								api.MpolFlag_MPOL_F_STATIC_NODES,
+							},
+						},
+					},
+				},
+			),
+
 			Entry("adjust CPU resources", "resources/cpu",
 				&api.ContainerAdjustment{
 					Linux: &api.LinuxContainerAdjustment{

pkg/adaptation/api.go

@@ -88,6 +88,7 @@ type (
 	LinuxResources           = api.LinuxResources
 	LinuxCPU                 = api.LinuxCPU
 	LinuxMemory              = api.LinuxMemory
+	LinuxMemoryPolicy        = api.LinuxMemoryPolicy
 	LinuxDevice              = api.LinuxDevice
 	LinuxDeviceCgroup        = api.LinuxDeviceCgroup
 	LinuxIOPriority          = api.LinuxIOPriority

pkg/adaptation/result.go

@@ -255,6 +255,9 @@ func (r *result) adjust(rpl *ContainerAdjustment, plugin string) error {
 		if err := r.adjustRdt(rpl.Linux.Rdt, plugin); err != nil {
 			return err
 		}
+		if err := r.adjustMemoryPolicy(rpl.Linux.MemoryPolicy, plugin); err != nil {
+			return err
+		}
 	}
 
 	if err := r.adjustRlimits(rpl.Rlimits, plugin); err != nil {
@@ -1024,6 +1027,22 @@ func (r *result) adjustLinuxScheduler(sch *LinuxScheduler, plugin string) error
 	return nil
 }
 
+func (r *result) adjustMemoryPolicy(memoryPolicy *LinuxMemoryPolicy, plugin string) error {
+	if memoryPolicy == nil {
+		return nil
+	}
+
+	id := r.request.create.Container.Id
+
+	if err := r.owners.ClaimMemoryPolicy(id, plugin); err != nil {
+		return err
+	}
+
+	r.reply.adjust.Linux.MemoryPolicy = memoryPolicy
+
+	return nil
+}
+
 func (r *result) adjustRlimits(rlimits []*POSIXRlimit, plugin string) error {
 	create, id, adjust := r.request.create, r.request.create.Container.Id, r.reply.adjust
 	for _, l := range rlimits {

pkg/api/adjustment.go

@@ -180,6 +180,14 @@ func (a *ContainerAdjustment) RemoveLinuxNetDevice(hostDev string) {
 	a.Linux.NetDevices[MarkForRemoval(hostDev)] = nil
 }
 
+// SetLinuxMemoryPolicy records setting the Linux memory policy for a container.
+func (a *ContainerAdjustment) SetLinuxMemoryPolicy(mode MpolMode, nodes string, flags ...MpolFlag) {
+	a.initLinuxMemoryPolicy()
+	a.Linux.MemoryPolicy.Mode = mode
+	a.Linux.MemoryPolicy.Nodes = nodes
+	a.Linux.MemoryPolicy.Flags = slices.Clone(flags)
+}
+
 // SetLinuxMemoryLimit records setting the memory limit for a container.
 func (a *ContainerAdjustment) SetLinuxMemoryLimit(value int64) {
 	a.initLinuxResourcesMemory()
@@ -402,6 +410,13 @@ func (a *ContainerAdjustment) initLinuxNamespaces() {
 	}
 }
 
+func (a *ContainerAdjustment) initLinuxMemoryPolicy() {
+	a.initLinux()
+	if a.Linux.MemoryPolicy == nil {
+		a.Linux.MemoryPolicy = &LinuxMemoryPolicy{}
+	}
+}
+
 func (a *ContainerAdjustment) initLinuxResources() {
 	a.initLinux()
 	if a.Linux.Resources == nil {