From b8a83ac255fab9129e895210490b8ee9d0f10413 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 15 Aug 2025 15:06:48 +0300 Subject: [PATCH] libcontainer/intelrdt: support explicit assignment to root CLOS Makes it possible e.g. to enable monitoring (linux.intelRdt.enableMonitoring) without creating a CLOS (resctrl group) for the container. Implements https://github.com/opencontainers/runtime-spec/pull/1289. Signed-off-by: Markus Lehtonen --- libcontainer/configs/validate/validator.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcontainer/configs/validate/validator.go b/libcontainer/configs/validate/validator.go index 9be17ba05..e9a33a218 100644 --- 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 != "" {