Remove TESTONLY from the save restore netstack flag name.

PiperOrigin-RevId: 762056877

Author: nybidari

Makefile

@@ -365,7 +365,7 @@ docker-tests: load-basic $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-dcache,--fdlimit=2000 --dcache=100) # Used by TestDentryCacheLimit.
 	@$(call install_runtime,$(RUNTIME)-host-uds,--host-uds=all) # Used by TestHostSocketConnect.
 	@$(call install_runtime,$(RUNTIME)-overlay,--overlay2=all:self) # Used by TestOverlay*.
-	@$(call install_runtime,$(RUNTIME)-TESTONLY-save-restore-netstack,--TESTONLY-save-restore-netstack=true) # Used by TestRestoreListenConnWithNetstackSR.
+	@$(call install_runtime,$(RUNTIME)-save-restore-netstack,--save-restore-netstack=true) # Used by TestRestoreListenConnWithNetstackSR.
 	@$(call test_runtime,$(RUNTIME),$(INTEGRATION_TARGETS) --test_env=TEST_SAVE_RESTORE_NETSTACK=true //test/e2e:integration_runtime_test //test/e2e:runtime_in_docker_test)
 .PHONY: docker-tests
 

pkg/test/testutil/testutil.go

@@ -58,7 +58,7 @@ var (
 	isRunningWithOverlay             = flag.Bool("test-overlay", BoolFromEnv("TEST_OVERLAY", false), "whether test is running with --overlay2")
 	isRunningWithNetRaw              = flag.Bool("test-net-raw", BoolFromEnv("TEST_NET_RAW", false), "whether test is running with raw socket support")
 	isRunningWithHostNet             = flag.Bool("test-hostnet", BoolFromEnv("TEST_HOSTNET", false), "whether test is running with hostnet")
-	isRunningWithSaveRestoreNetstack = flag.Bool("test-save-restore-netstack", BoolFromEnv("TEST_SAVE_RESTORE_NETSTACK", false), "whether test is running with --TESTONLY-save-restore-netstack")
+	isRunningWithSaveRestoreNetstack = flag.Bool("test-save-restore-netstack", BoolFromEnv("TEST_SAVE_RESTORE_NETSTACK", false), "whether test is running with --save-restore-netstack")
 	// TestEnvSupportsNetAdmin indicates whether a test sandbox can perform
 	// all net admin tasks. Note that some test environments cannot perform
 	// some tasks despite the presence of CAP_NET_ADMIN.

runsc/boot/loader.go

@@ -569,7 +569,7 @@ func New(args Args) (*Loader, error) {
 	}
 
 	// S/R is not supported for hostinet.
-	if l.root.conf.Network != config.NetworkHost && args.Conf.TestOnlySaveRestoreNetstack {
+	if l.root.conf.Network != config.NetworkHost && args.Conf.SaveRestoreNetstack {
 		l.saveRestoreNet = true
 		if err := netns.Stack().EnableSaveRestore(); err != nil {
 			return nil, fmt.Errorf("enable s/r: %w", err)

runsc/config/config.go

@@ -382,9 +382,6 @@ type Config struct {
 	// TestOnlyAutosaveResume indicates save resume for syscall tests.
 	TestOnlyAutosaveResume bool `flag:"TESTONLY-autosave-resume"`
 
-	// TestOnlySaveRestoreNetstack indicates netstack should be saved and restored.
-	TestOnlySaveRestoreNetstack bool `flag:"TESTONLY-save-restore-netstack"`
-
 	// RestoreSpecValidation indicates the level of spec validation to be
 	// performed during restore.
 	RestoreSpecValidation RestoreSpecValidationPolicy `flag:"restore-spec-validation"`
@@ -394,6 +391,9 @@ type Config struct {
 
 	// SystrapDisableSyscallPatching disables syscall patching in Systrap.
 	SystrapDisableSyscallPatching bool `flag:"systrap-disable-syscall-patching"`
+
+	// SaveRestoreNetstack indicates whether netstack should be saved and restored.
+	SaveRestoreNetstack bool `flag:"save-restore-netstack"`
 }
 
 func (c *Config) validate() error {

runsc/config/flags.go

@@ -149,6 +149,7 @@ func RegisterFlags(flagSet *flag.FlagSet) {
 	flagSet.Bool("reproduce-nat", false, "Scrape the host netns NAT table and reproduce it in the sandbox.")
 	flagSet.Bool(flagReproduceNFTables, false, "Attempt to scrape and reproduce nftable rules inside the sandbox. Overrides reproduce-nat when true.")
 	flagSet.Bool(flagNetDisconnectOK, true, "Indicates whether open network connections and open unix domain sockets should be disconnected upon save.")
+	flagSet.Bool("save-restore-netstack", false, "Indicates whether netstack save/restore is enabled.")
 
 	// Flags that control sandbox runtime behavior: accelerator related.
 	flagSet.Bool("nvproxy", false, "EXPERIMENTAL: enable support for Nvidia GPUs")
@@ -164,7 +165,6 @@ func RegisterFlags(flagSet *flag.FlagSet) {
 	flagSet.Bool("TESTONLY-afs-syscall-panic", false, "TEST ONLY; do not ever use! Used for tests exercising gVisor panic reporting.")
 	flagSet.String("TESTONLY-autosave-image-path", "", "TEST ONLY; enable auto save for syscall tests and set path for state file.")
 	flagSet.Bool("TESTONLY-autosave-resume", false, "TEST ONLY; enable auto save and resume for syscall tests and set path for state file.")
-	flagSet.Bool("TESTONLY-save-restore-netstack", false, "TEST ONLY; enable save/restore for netstack.")
 }
 
 // overrideAllowlist lists all flags that can be changed using OCI

test/e2e/integration_test.go

@@ -1311,7 +1311,7 @@ func testCheckpointRestoreListeningConnection(ctx context.Context, t *testing.T,
 	}
 }
 
-// Test to check restore of a TCP listening connection.
+// Test to check restore of a TCP listening connection without netstack S/R.
 func TestRestoreListenConn(t *testing.T) {
 	if !testutil.IsCheckpointSupported() {
 		t.Skip("Checkpoint is not supported.")
@@ -1334,7 +1334,7 @@ func TestRestoreListenConnWithNetstackSR(t *testing.T) {
 	dockerutil.EnsureDockerExperimentalEnabled()
 
 	ctx := context.Background()
-	d := dockerutil.MakeContainerWithRuntime(ctx, t, "-TESTONLY-save-restore-netstack")
+	d := dockerutil.MakeContainerWithRuntime(ctx, t, "-save-restore-netstack")
 	testCheckpointRestoreListeningConnection(ctx, t, d, "./tcp_server" /* fName */, 1 /* numConn */)
 }
 
@@ -1349,6 +1349,6 @@ func TestRestoreMultipleListenConnWithNetstackSR(t *testing.T) {
 	dockerutil.EnsureDockerExperimentalEnabled()
 
 	ctx := context.Background()
-	d := dockerutil.MakeContainerWithRuntime(ctx, t, "-TESTONLY-save-restore-netstack")
+	d := dockerutil.MakeContainerWithRuntime(ctx, t, "-save-restore-netstack")
 	testCheckpointRestoreListeningConnection(ctx, t, d, "./tcp_stress_server" /* fName */, 100 /* numConn */)
 }

test/runner/main.go

@@ -405,7 +405,7 @@ func runRunsc(tc *gtest.TestCase, spec *specs.Spec) error {
 		// Create the state file.
 		if *save || *saveResume {
 			if *netstackSR {
-				args = append(args, "--TESTONLY-save-restore-netstack=true")
+				args = append(args, "--save-restore-netstack=true")
 			}
 			saveArgs = args
 			args, dirs, err = prepareSave(args, undeclaredOutputsDir, dirs, 0)