Skip to content

memory-policy: use NRI memory policy adjustments #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

memory-policy: use NRI memory policy adjustments #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8176596
WIP: use NRI with memory policy adjustments
askervin Aug 6, 2025
7a67c19
Fix empty node mask and add a test with a policy that needs it
askervin Aug 27, 2025
487ebc8
memory-policy: fix crashes without configuration
askervin Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions cmd/plugins/memory-policy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (p *plugin) Configure(ctx context.Context, config, runtime, version string)
}
// If we are to use mpolset injection, prepare /mnt/nri-memory-policy-mpolset
// to contain mpolset so that it can be injected into containers
if p.config != nil && p.config.InjectMpolset {
if p.config.InjectMpolset {
if err := prepareMpolset(); err != nil {
log.Errorf("failed to prepare mpolset: %v", err)
return 0, fmt.Errorf("configuration option injectMpolset preparation failed: %v", err)
Expand Down Expand Up @@ -401,6 +401,11 @@ func (policySpec *MemoryPolicySpec) ToLinuxMemoryPolicy(ctr *api.Container) (*Li
}
log.Tracef("- nodes %q (max-dist %d from CPU nodes %q)", nodeMask.MemsetString(), maxDistInt, fromNodes)

// "" (empty) includes no nodes into the mask.
case policySpec.Nodes == "":
nodeMask = libmem.NewNodeMask()
log.Tracef("- nodes %q (empty)", nodeMask.MemsetString())

// <int>[-<int>][, ...] includes the set of nodes.
case policySpec.Nodes[0] >= '0' && policySpec.Nodes[0] <= '9':
nodeMask, err = libmem.ParseNodeMask(policySpec.Nodes)
Expand All @@ -414,7 +419,7 @@ func (policySpec *MemoryPolicySpec) ToLinuxMemoryPolicy(ctr *api.Container) (*Li
}

nodes := nodeMask.MemsetString()
if (nodeMask & allowedMemsMask) != nodeMask {
if nodeMask.Size() != 0 && (nodeMask&allowedMemsMask) != nodeMask {
log.Debugf("some memory policy nodes (%s) are not allowed (%s)", nodes, allowedMemsMask.MemsetString())
}

Expand Down Expand Up @@ -442,25 +447,23 @@ func (policy *LinuxMemoryPolicy) ToMemoryPolicyAdjustment() (*api.ContainerAdjus
if policy == nil {
return nil, nil
}
return nil, fmt.Errorf("memory policy adjustment is not implemented yet")

// // Uncomment this to use memory policy in NRI API
// ca := &api.ContainerAdjustment{}
// mode, ok := api.MpolMode_value[policy.Mode]
// if !ok {
// return nil, fmt.Errorf("invalid memory policy mode %q", policy.Mode)
// }
//
// flags := []api.MpolFlag{}
// for _, flag := range policy.Flags {
// if flagValue, ok := api.MpolFlag_value[flag]; ok {
// flags = append(flags, api.MpolFlag(flagValue))
// } else {
// return nil, fmt.Errorf("invalid memory policy flag %q", flag)
// }
// }
// ca.SetLinuxMemoryPolicy(api.MpolMode(mode), policy.Nodes, flags...)
// return ca, nil

ca := &api.ContainerAdjustment{}
mode, ok := api.MpolMode_value[policy.Mode]
if !ok {
return nil, fmt.Errorf("invalid memory policy mode %q", policy.Mode)
}

flags := []api.MpolFlag{}
for _, flag := range policy.Flags {
if flagValue, ok := api.MpolFlag_value[flag]; ok {
flags = append(flags, api.MpolFlag(flagValue))
} else {
return nil, fmt.Errorf("invalid memory policy flag %q", flag)
}
}
ca.SetLinuxMemoryPolicy(api.MpolMode(mode), policy.Nodes, flags...)
return ca, nil
}

// ToCommandInjectionAdjustment() converts the memory policy into a
Expand Down Expand Up @@ -556,7 +559,9 @@ func main() {
log.SetLevel(logrus.TraceLevel)
}

p := &plugin{}
p := &plugin{
config: &Config{},
}

if configFile != "" {
log.Debugf("read configuration from %q", configFile)
Expand Down
11 changes: 7 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/containers/nri-plugins

go 1.24.0
go 1.24.3

toolchain go1.24.4

require (
github.com/askervin/gofmbt v0.0.0-20250119175120-506d925f666f
Expand Down Expand Up @@ -62,12 +64,12 @@ require (
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knqyf263/go-plugin v0.8.1-0.20240827022226-114c6257e441 // indirect
github.com/knqyf263/go-plugin v0.9.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/common v0.55.0 // indirect
Expand Down Expand Up @@ -100,8 +102,9 @@ require (
)

replace (
github.com/containerd/nri => github.com/askervin/nri v0.1.1-0.20250805132206-a9827f7d8b9a
github.com/containers/nri-plugins/pkg/topology v0.0.0 => ./pkg/topology
github.com/opencontainers/runtime-tools => github.com/opencontainers/runtime-tools v0.0.0-20221026201742-946c877fa809
github.com/opencontainers/runtime-tools => github.com/askervin/runtime-tools v0.0.0-20250805113549-904c7269e2a7
)

tool k8s.io/code-generator
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/askervin/gofmbt v0.0.0-20250119175120-506d925f666f h1:AKRIaPPDqBRhpWnvxhvtdbVtkV/3XrboabuFaLyp1kw=
github.com/askervin/gofmbt v0.0.0-20250119175120-506d925f666f/go.mod h1:1rWH2fCHPoGz1ApWyGyEV9YhZ2ZHeeCPaHcicW3b6uk=
github.com/askervin/nri v0.1.1-0.20250805132206-a9827f7d8b9a h1:1MlnYAVGwd9Em/3DRA4VLRO+ImSZS1LxGXli/mpBzJs=
github.com/askervin/nri v0.1.1-0.20250805132206-a9827f7d8b9a/go.mod h1:Ej7TxkHmzXcTmlgOkycncvLzi54rwi1nV/ScEapghLk=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
Expand Down Expand Up @@ -643,8 +645,6 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/nri v0.9.1-0.20250530003506-6120e633d4ad h1:FiRhXzn9B9ToI30hX/2i4dRUKUoVELTc7PlEqvFLwGE=
github.com/containerd/nri v0.9.1-0.20250530003506-6120e633d4ad/go.mod h1:zA1mhuTD3Frj9fyyIp+1+H2AXS/IueLvxRpkAzmP6RQ=
github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ=
github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q=
github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak=
Expand Down Expand Up @@ -856,8 +856,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/knqyf263/go-plugin v0.8.1-0.20240827022226-114c6257e441 h1:Q/sZeuWkXprbKJSs7AwXryuZKSEL/a8ltC7e7xSspN0=
github.com/knqyf263/go-plugin v0.8.1-0.20240827022226-114c6257e441/go.mod h1:CvCrNDMiKFlAlLFLmcoEfsTROEfNKbEZAMMrwQnLXCM=
github.com/knqyf263/go-plugin v0.9.0 h1:CQs2+lOPIlkZVtcb835ZYDEoyyWJWLbSTWeCs0EwTwI=
github.com/knqyf263/go-plugin v0.9.0/go.mod h1:2z5lCO1/pez6qGo8CvCxSlBFSEat4MEp1DrnA+f7w8Q=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
Expand Down Expand Up @@ -889,8 +889,8 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
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/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/memory.test-suite/memory-policy/n6-hbm-cxl/dram-hbm-cxl.helm-config.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ config:
policy:
mode: MPOL_BIND
nodes: 2,3

- name: local
policy:
mode: MPOL_LOCAL
12 changes: 7 additions & 5 deletions test/e2e/memory.test-suite/memory-policy/n6-hbm-cxl/test01-policies/code.var.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ ANN4="policy.memory-policy.nri.io/container.pod0c4: |+
nodes: 4,5
flags:
- MPOL_F_STATIC_NODES" \
ANN5="policy.memory-policy.nri.io/container.pod0c5: \"\"" \
ANN6="class.memory-policy.nri.io/container.pod0c6: \"\"" \
CONTCOUNT=7 \
ANN5="class.memory-policy.nri.io/container.pod0c5: \"local\"" \
ANN6="policy.memory-policy.nri.io/container.pod0c6: \"\"" \
ANN7="class.memory-policy.nri.io/container.pod0c7: \"\"" \
CONTCOUNT=8 \
create besteffort

verify-policy pod0c0 'prefer=relative:4'
verify-policy pod0c1 'prefer (many):4-5'
verify-policy pod0c2 'interleave=static:0-3'
verify-policy pod0c3 'bind:2-3'
verify-policy pod0c4 'bind=static:4-5'
verify-policy pod0c5 'default' # unset pod-default with empty policy
verify-policy pod0c6 'default' # unset pod-default with empty class
verify-policy pod0c5 'local' # policy class with empty nodes
verify-policy pod0c6 'default' # unset pod-default with empty policy
verify-policy pod0c7 'default' # unset pod-default with empty class