libcontainer: set PidsLimit to be a pointer

Signed-off-by: Peter Hunt <pehunt@redhat.com>
opencontainers · Sep 13, 2023 · aa86265 · aa86265
1 parent fefc1d3
commit aa86265
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/libcontainer/cgroups/fs/pids.go b/libcontainer/cgroups/fs/pids.go
@@ -20,11 +20,14 @@ func (s *PidsGroup) Apply(path string, _ *configs.Resources, pid int) error {
 }
 
 func (s *PidsGroup) Set(path string, r *configs.Resources) error {
+	if r.PidsLimit == nil {
+		return nil
+	}
 	// "max" is the fallback value.
 	limit := "max"
 
-	if r.PidsLimit > 0 {
-		limit = strconv.FormatInt(r.PidsLimit, 10)
+	if *r.PidsLimit > 0 {
+		limit = strconv.FormatInt(*r.PidsLimit, 10)
 	}
 
 	return cgroups.WriteFile(path, "pids.max", limit)

diff --git a/libcontainer/cgroups/fs2/create.go b/libcontainer/cgroups/fs2/create.go
@@ -39,7 +39,7 @@ func needAnyControllers(r *configs.Resources) (bool, error) {
 		return ok
 	}
 
-	if have("pids") {
+	if r.PidsLimit != nil && have("pids") {
 		return true, nil
 	}
 	if isMemorySet(r) && have("memory") {

diff --git a/libcontainer/cgroups/fs2/pids.go b/libcontainer/cgroups/fs2/pids.go
@@ -14,7 +14,10 @@ import (
 )
 
 func setPids(dirPath string, r *configs.Resources) error {
-	if val := numToStr(r.PidsLimit); val != "" {
+	if r.PidsLimit == nil {
+		return nil
+	}
+	if val := numToStr(*r.PidsLimit); val != "" {
 		if err := cgroups.WriteFile(dirPath, "pids.max", val); err != nil {
 			return err
 		}

diff --git a/libcontainer/cgroups/systemd/v1.go b/libcontainer/cgroups/systemd/v1.go
@@ -98,9 +98,9 @@ func genV1ResourcesProperties(r *configs.Resources, cm *dbusConnManager) ([]syst
 			newProp("BlockIOWeight", uint64(r.BlkioWeight)))
 	}
 
-	if r.PidsLimit > 0 || r.PidsLimit == -1 {
+	if r.PidsLimit != nil && (*r.PidsLimit > 0 || *r.PidsLimit == -1) {
 		properties = append(properties,
-			newProp("TasksMax", uint64(r.PidsLimit)))
+			newProp("TasksMax", uint64(*r.PidsLimit)))
 	}
 
 	err = addCpuset(cm, &properties, r.CpusetCpus, r.CpusetMems)

diff --git a/libcontainer/cgroups/systemd/v2.go b/libcontainer/cgroups/systemd/v2.go
@@ -257,9 +257,9 @@ func genV2ResourcesProperties(dirPath string, r *configs.Resources, cm *dbusConn
 
 	addCpuQuota(cm, &properties, r.CpuQuota, r.CpuPeriod)
 
-	if r.PidsLimit > 0 || r.PidsLimit == -1 {
+	if r.PidsLimit != nil && (*r.PidsLimit > 0 || *r.PidsLimit == -1) {
 		properties = append(properties,
-			newProp("TasksMax", uint64(r.PidsLimit)))
+			newProp("TasksMax", uint64(*r.PidsLimit)))
 	}
 
 	err = addCpuset(cm, &properties, r.CpusetCpus, r.CpusetMems)

diff --git a/libcontainer/configs/cgroup_linux.go b/libcontainer/configs/cgroup_linux.go
@@ -88,7 +88,7 @@ type Resources struct {
 	CPUIdle *int64 `json:"cpu_idle,omitempty"`
 
 	// Process limit; set <= `0' to disable limit.
-	PidsLimit int64 `json:"pids_limit"`
+	PidsLimit *int64 `json:"pids_limit"`
 
 	// Specifies per cgroup weight, range is from 10 to 1000.
 	BlkioWeight uint16 `json:"blkio_weight"`

diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -768,7 +768,8 @@ func CreateCgroupConfig(opts *CreateOpts, defaultDevs []*devices.Device) (*confi
 				c.Resources.CPUIdle = r.CPU.Idle
 			}
 			if r.Pids != nil {
-				c.Resources.PidsLimit = r.Pids.Limit
+				p := r.Pids.Limit
+				c.Resources.PidsLimit = &p
 			}
 			if r.BlockIO != nil {
 				if r.BlockIO.Weight != nil {

diff --git a/update.go b/update.go
@@ -310,8 +310,9 @@ other options are ignored.
 		config.Cgroups.Resources.MemoryReservation = *r.Memory.Reservation
 		config.Cgroups.Resources.MemorySwap = *r.Memory.Swap
 		config.Cgroups.Resources.MemoryCheckBeforeUpdate = *r.Memory.CheckBeforeUpdate
-		config.Cgroups.Resources.PidsLimit = r.Pids.Limit
 		config.Cgroups.Resources.Unified = r.Unified
+		l := r.Pids.Limit
+		config.Cgroups.Resources.PidsLimit = &l
 
 		// Update Intel RDT
 		l3CacheSchema := context.String("l3-cache-schema")