Add disableIMEXChannelCreation feature flag

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

cmd/nvidia-container-runtime-hook/main.go

@@ -95,6 +95,9 @@ func doPrestart() {
 	if cli.LoadKmods {
 		args = append(args, "--load-kmods")
 	}
+	if hook.Features.DisableIMEXChannelCreation.IsEnabled() {
+		args = append(args, "--no-create-imex-channels")
+	}
 	if cli.NoPivot {
 		args = append(args, "--no-pivot")
 	}

internal/config/features.go

@@ -19,11 +19,12 @@ package config
 type featureName string
 
 const (
-	FeatureGDS                       = featureName("gds")
-	FeatureMOFED                     = featureName("mofed")
-	FeatureNVSWITCH                  = featureName("nvswitch")
-	FeatureGDRCopy                   = featureName("gdrcopy")
-	FeatureIncludePersistencedSocket = featureName("include-persistenced-socket")
+	FeatureGDS      = featureName("gds")
+	FeatureMOFED    = featureName("mofed")
+	FeatureNVSWITCH = featureName("nvswitch")
+	FeatureGDRCopy  = featureName("gdrcopy")
+
+	FeatureDisableIMEXChannelCreation = featureName("disable-imex-channel-creation")
 )
 
 // features specifies a set of named features.
@@ -32,9 +33,9 @@ type features struct {
 	MOFED    *feature `toml:"mofed,omitempty"`
 	NVSWITCH *feature `toml:"nvswitch,omitempty"`
 	GDRCopy  *feature `toml:"gdrcopy,omitempty"`
-	// IncludePersistencedSocket enables the injection of the nvidia-persistenced
-	// socket into containers.
-	IncludePersistencedSocket *feature `toml:"include-persistenced-socket,omitempty"`
+	// DisableIMEXChannelCreation ensures that the implicit creation of
+	// requested IMEX channels is skipped when invoking the nvidia-container-cli.
+	DisableIMEXChannelCreation *feature `toml:"disable-imex-channel-creation,omitempty"`
 }
 
 type feature bool
@@ -54,8 +55,8 @@ func (fs features) IsEnabledInEnvironment(n featureName, in ...getenver) bool {
 	case FeatureGDRCopy:
 		return fs.GDRCopy.isEnabledWithEnvvarOverride("NVIDIA_GDRCOPY", in...)
 	// Features without envvar overrides
-	case FeatureIncludePersistencedSocket:
-		return fs.IncludePersistencedSocket.IsEnabled()
+	case FeatureDisableIMEXChannelCreation:
+		return fs.DisableIMEXChannelCreation.IsEnabled()
 	default:
 		return false
 	}