zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-12-24 11:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5055 from kolyshkin/mpol-2

Browse Source 
libct/configs: mark MPOL_* constants as deprecated
This commit is contained in:
Akihiro Suda
2025-12-16 10:39:09 +09:00
committed by GitHub
parent f38b1cef24 3741f9186d
commit 4dcda051da
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libcontainer/configs/memorypolicy.go
View File

@@ -3,20 +3,22 @@ package configs
import "golang.org/x/sys/unix" import "golang.org/x/sys/unix"
// Memory policy modes and flags as defined in /usr/include/linux/mempolicy.h // Memory policy modes and flags as defined in /usr/include/linux/mempolicy.h
//
// Deprecated: use constants from [unix] instead.
//
//nolint:revive,staticcheck,nolintlint // ignore ALL_CAPS errors in consts from numaif.h, will match unix.* in the future //nolint:revive,staticcheck,nolintlint // ignore ALL_CAPS errors in consts from numaif.h, will match unix.* in the future
const ( const (
MPOL_DEFAULT = 0 MPOL_DEFAULT = unix.MPOL_DEFAULT
MPOL_PREFERRED = 1 MPOL_PREFERRED = unix.MPOL_PREFERRED
MPOL_BIND = 2 MPOL_BIND = unix.MPOL_BIND
MPOL_INTERLEAVE = 3 MPOL_INTERLEAVE = unix.MPOL_INTERLEAVE
MPOL_LOCAL = 4 MPOL_LOCAL = unix.MPOL_LOCAL
MPOL_PREFERRED_MANY = 5 MPOL_PREFERRED_MANY = unix.MPOL_PREFERRED_MANY
MPOL_WEIGHTED_INTERLEAVE = 6 MPOL_WEIGHTED_INTERLEAVE = unix.MPOL_WEIGHTED_INTERLEAVE
MPOL_F_STATIC_NODES = 1 << 15 MPOL_F_STATIC_NODES = unix.MPOL_F_STATIC_NODES
MPOL_F_RELATIVE_NODES = 1 << 14 MPOL_F_RELATIVE_NODES = unix.MPOL_F_RELATIVE_NODES
MPOL_F_NUMA_BALANCING = 1 << 13 MPOL_F_NUMA_BALANCING = unix.MPOL_F_NUMA_BALANCING
) )
// LinuxMemoryPolicy contains memory policy configuration. // LinuxMemoryPolicy contains memory policy configuration.

8
libcontainer/configs/validate/validator.go
View File

@@ -490,16 +490,16 @@ func memoryPolicy(config *configs.Config) error {
return nil return nil
} }
switch mpol.Mode { switch mpol.Mode {
case configs.MPOL_DEFAULT, configs.MPOL_LOCAL: case unix.MPOL_DEFAULT, unix.MPOL_LOCAL:
if mpol.Nodes != nil && mpol.Nodes.Count() != 0 { if mpol.Nodes != nil && mpol.Nodes.Count() != 0 {
return fmt.Errorf("memory policy mode requires 0 nodes but got %d", mpol.Nodes.Count()) return fmt.Errorf("memory policy mode requires 0 nodes but got %d", mpol.Nodes.Count())
} }
case configs.MPOL_BIND, configs.MPOL_INTERLEAVE, case unix.MPOL_BIND, unix.MPOL_INTERLEAVE,
configs.MPOL_PREFERRED_MANY, configs.MPOL_WEIGHTED_INTERLEAVE: unix.MPOL_PREFERRED_MANY, unix.MPOL_WEIGHTED_INTERLEAVE:
if mpol.Nodes == nil || mpol.Nodes.Count() == 0 { if mpol.Nodes == nil || mpol.Nodes.Count() == 0 {
return fmt.Errorf("memory policy mode requires at least one node but got 0") return fmt.Errorf("memory policy mode requires at least one node but got 0")
} }
case configs.MPOL_PREFERRED: case unix.MPOL_PREFERRED:
// Zero or more nodes are allowed by the kernel. // Zero or more nodes are allowed by the kernel.
default: default:
return fmt.Errorf("invalid memory policy mode: %d", mpol.Mode) return fmt.Errorf("invalid memory policy mode: %d", mpol.Mode)