config-linux: Split Intel RDT CMT and MBM configuration.

Signed-off-by: Paweł Szulik <pawel.szulik@intel.com>
opencontainers · Nov 27, 2020 · 8f6cf10 · 8f6cf10
1 parent 5175c3e
commit 8f6cf10
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/config-linux.md b/config-linux.md
@@ -549,9 +549,11 @@ The following parameters can be specified for the container:
 
     * If `closID` is set, and neither of `l3CacheSchema` and `memBwSchema` are set, runtime MUST check if corresponding pre-configured directory `closID` is present in mounted `resctrl`. If such pre-configured directory `closID` exists, runtime MUST assign container to this `closID` and [generate an error](runtime.md#errors) if directory does not exist.
 
-* **`monitoring`** *(boolean OPTIONAL)* - specifies if Intel RDT monitoring features should be enabled:
+* **`enableCMT`** *(boolean OPTIONAL)* - specifies if Intel RDT CMT should be enabled:
     * CMT ( Cache Monitoring Technology ) supports monitoring of the last-level cache (LLC) occupancy
       for the container.
+
+* **`enableMBM`** *(boolean OPTIONAL)* - specifies if Intel RDT MBM should be enabled:
     * MBM ( Memory Bandwidth Monitoring ) supports monitoring of total and local memory bandwidth
       for the container.
 

diff --git a/schema/config-linux.json b/schema/config-linux.json
@@ -251,7 +251,10 @@
                         "type": "string",
                         "pattern": "^MB:[^\\n]*$"
                     },
-                    "monitoring": {
+                    "enableCMT": {
+                        "type": "boolean"
+                    },
+                    "enableMBM": {
                         "type": "boolean"
                     }
                 }

diff --git a/specs-go/config.go b/specs-go/config.go
@@ -679,8 +679,8 @@ type LinuxSyscall struct {
 }
 
 // LinuxIntelRdt has container runtime resource constraints for Intel RDT CAT and MBA
-// features and a flag of monitoring metric for Intel RDT CMT and MBM features.
-// Intel RDT features are available in Linux 4.14 and newer kernel versions
+// features and flags enabling Intel RDT CMT and MBM features.
+// Intel RDT features are available in Linux 4.14 and newer kernel versions.
 type LinuxIntelRdt struct {
 	// The identity for RDT Class of Service
 	ClosID string `json:"closID,omitempty"`
@@ -694,6 +694,11 @@ type LinuxIntelRdt struct {
 	// default, and in "MBps" if MBA Software Controller is enabled.
 	MemBwSchema string `json:"memBwSchema,omitempty"`
 
-	// The flag to indicate if Intel RDT monitoring features (CMT and MBM) are enabled.
-	Monitoring bool `json:"monitoring,omitempty"`
+	// The flag to indicate if Intel RDT CMT is enabled. CMT ( Cache Monitoring Technology ) supports monitoring of
+	// the last-level cache (LLC) occupancy for the container.
+	EnableCMT bool `json:"enableCMT,omitempty"`
+
+	// The flag to indicate if Intel RDT MBM is enabled. MBM ( Memory Bandwidth Monitoring ) supports monitoring of
+	// total and local memory bandwidth for the container.
+	EnableMBM bool `json:"enableMBM,omitempty"`
 }