libcontainer/intelrdt: rm init() from intelrdt.go

Use sync.Once to init Intel RDT when needed for a small speedup to operations which do not require Intel RDT. Signed-off-by: Xiaochen Shen <[email protected]>
opencontainers · Oct 14, 2020 · 6368c84 · 6368c84
1 parent 9067950
commit 6368c84
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 40 deletions.
diff --git a/libcontainer/intelrdt/intelrdt.go b/libcontainer/intelrdt/intelrdt.go
@@ -187,6 +187,9 @@ var (
 	mbaEnabled bool
 	// The flag to indicate if Intel RDT/MBA Software Controller is enabled
 	mbaScEnabled bool
+
+	// For Intel RDT initialization
+	initOnce sync.Once
 )
 
 type intelRdtData struct {
@@ -195,54 +198,56 @@ type intelRdtData struct {
 	pid    int
 }
 
-// Check if Intel RDT sub-features are enabled in init()
-func init() {
-	// 1. Check if hardware and kernel support Intel RDT sub-features
-	flagsSet, err := parseCpuInfoFile("/proc/cpuinfo")
-	if err != nil {
-		return
-	}
+// Check if Intel RDT sub-features are enabled in InitIntelRdt()
+func InitIntelRdt() {
+	initOnce.Do(func() {
+		// 1. Check if hardware and kernel support Intel RDT sub-features
+		flagsSet, err := parseCpuInfoFile("/proc/cpuinfo")
+		if err != nil {
+			return
+		}
 
-	// 2. Check if Intel RDT "resource control" filesystem is mounted
-	// The user guarantees to mount the filesystem
-	if !isIntelRdtMounted() {
-		return
-	}
+		// 2. Check if Intel RDT "resource control" filesystem is mounted
+		// The user guarantees to mount the filesystem
+		if !isIntelRdtMounted() {
+			return
+		}
 
-	// 3. Double check if Intel RDT sub-features are available in
-	// "resource control" filesystem. Intel RDT sub-features can be
-	// selectively disabled or enabled by kernel command line
-	// (e.g., rdt=!l3cat,mba) in 4.14 and newer kernel
-	if flagsSet.CAT {
-		if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "L3")); err == nil {
-			catEnabled = true
+		// 3. Double check if Intel RDT sub-features are available in
+		// "resource control" filesystem. Intel RDT sub-features can be
+		// selectively disabled or enabled by kernel command line
+		// (e.g., rdt=!l3cat,mba) in 4.14 and newer kernel
+		if flagsSet.CAT {
+			if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "L3")); err == nil {
+				catEnabled = true
+			}
 		}
-	}
-	if mbaScEnabled {
-		// We confirm MBA Software Controller is enabled in step 2,
-		// MBA should be enabled because MBA Software Controller
-		// depends on MBA
-		mbaEnabled = true
-	} else if flagsSet.MBA {
-		if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "MB")); err == nil {
+		if mbaScEnabled {
+			// We confirm MBA Software Controller is enabled in step 2,
+			// MBA should be enabled because MBA Software Controller
+			// depends on MBA
 			mbaEnabled = true
+		} else if flagsSet.MBA {
+			if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "MB")); err == nil {
+				mbaEnabled = true
+			}
 		}
-	}
 
-	if flagsSet.MBMTotal || flagsSet.MBMLocal || flagsSet.CMT {
-		if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "L3_MON")); err == nil {
-			enabledMonFeatures, err = getMonFeatures(intelRdtRoot)
-			if err != nil {
-				return
-			}
-			if enabledMonFeatures.mbmTotalBytes || enabledMonFeatures.mbmLocalBytes {
-				mbmEnabled = true
-			}
-			if enabledMonFeatures.llcOccupancy {
-				cmtEnabled = true
+		if flagsSet.MBMTotal || flagsSet.MBMLocal || flagsSet.CMT {
+			if _, err := os.Stat(filepath.Join(intelRdtRoot, "info", "L3_MON")); err == nil {
+				enabledMonFeatures, err = getMonFeatures(intelRdtRoot)
+				if err != nil {
+					return
+				}
+				if enabledMonFeatures.mbmTotalBytes || enabledMonFeatures.mbmLocalBytes {
+					mbmEnabled = true
+				}
+				if enabledMonFeatures.llcOccupancy {
+					cmtEnabled = true
+				}
 			}
 		}
-	}
+	})
 }
 
 // Return the mount point path of Intel RDT "resource control" filesysem

diff --git a/utils_linux.go b/utils_linux.go
@@ -56,6 +56,7 @@ func loadFactory(context *cli.Context) (libcontainer.Factory, error) {
 		}
 	}
 
+	intelrdt.InitIntelRdt()
 	intelRdtManager := libcontainer.IntelRdtFs
 	if !intelrdt.IsCatEnabled() && !intelrdt.IsMbaEnabled() {
 		intelRdtManager = nil