libcontainer/intelrdt: support explicit assignment to root CLOS

marquiz · marquiz · commit b8a83ac255fa · 2025-08-28T14:08:37.000+03:00
Makes it possible e.g. to enable monitoring (linux.intelRdt.enableMonitoring) without creating a CLOS (resctrl group) for the container. Implements opencontainers/runtime-spec#1289. Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
diff --git a/libcontainer/configs/validate/validator.go b/libcontainer/configs/validate/validator.go
@@ -287,8 +287,9 @@ func intelrdtCheck(config *configs.Config) error {
 			return fmt.Errorf("intelRdt is specified in config, but Intel RDT is not enabled")
 		}
 
-		if config.IntelRdt.ClosID == "." || config.IntelRdt.ClosID == ".." || strings.Contains(config.IntelRdt.ClosID, "/") {
-			return fmt.Errorf("invalid intelRdt.ClosID %q", config.IntelRdt.ClosID)
+		switch clos := config.IntelRdt.ClosID; {
+		case clos == ".", clos == "..", len(clos) > 1 && strings.Contains(clos, "/"):
+			return fmt.Errorf("invalid intelRdt.ClosID %q", clos)
 		}
 
 		if !intelrdt.IsCATEnabled() && config.IntelRdt.L3CacheSchema != "" {

Original file line number	Diff line number	Diff line change
`@@ -287,8 +287,9 @@ func intelrdtCheck(config *configs.Config) error {`
`287`	`287`	`return fmt.Errorf("intelRdt is specified in config, but Intel RDT is not enabled")`
`288`	`288`	`}`
`289`	`289`
`290`		`- if config.IntelRdt.ClosID == "." \|\| config.IntelRdt.ClosID == ".." \|\| strings.Contains(config.IntelRdt.ClosID, "/") {`
`291`		`- return fmt.Errorf("invalid intelRdt.ClosID %q", config.IntelRdt.ClosID)`
	`290`	`+ switch clos := config.IntelRdt.ClosID; {`
	`291`	`+ case clos == ".", clos == "..", len(clos) > 1 && strings.Contains(clos, "/"):`
	`292`	`+ return fmt.Errorf("invalid intelRdt.ClosID %q", clos)`
`292`	`293`	`}`
`293`	`294`
`294`	`295`	`if !intelrdt.IsCATEnabled() && config.IntelRdt.L3CacheSchema != "" {`