POC

PiperOrigin-RevId: 616900703
google · Apr 4, 2024 · 14d3292 · 14d3292
1 parent 5b30c4a
commit 14d3292
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/pkg/sentry/inet/namespace.go b/pkg/sentry/inet/namespace.go
@@ -29,7 +29,7 @@ type Namespace struct {
 	inode *nsfs.Inode
 
 	// stack is the network stack implementation of this network namespace.
-	stack Stack `state:"nosave"`
+	stack Stack
 
 	// creator allows kernel to create new network stack for network namespaces.
 	// If nil, no networking will function if network is namespaced.

diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go
@@ -715,7 +715,17 @@ func (k *Kernel) LoadFrom(ctx context.Context, r wire.Reader, timeReady chan str
 
 	// rootNetworkNamespace should be populated after loading the state file.
 	// Restore the root network stack.
-	k.rootNetworkNamespace.RestoreRootStack(net)
+	//k.rootNetworkNamespace.RestoreRootStack(net)
+
+	log.Infof("Saved Network stack: %+v", k.rootNetworkNamespace.Stack())
+	log.Infof("Network stack: %+v", net)
+
+	if k.rootNetworkNamespace.Stack() != nil {
+		log.Infof("Saved Network stack: %+v", k.rootNetworkNamespace.Stack().Interfaces())
+		log.Infof("Network stack: %+v", net.Interfaces())
+	} else {
+		log.Infof("Network stack is nil")
+	}
 
 	// Load the memory files' state.
 	memoryStart := time.Now()

diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go
@@ -76,6 +76,8 @@ var netRawMissingLogger = log.BasicRateLimitedLogger(time.Minute)
 // table.
 //
 // LOCK ORDERING: mu > routeMu.
+//
+// +stateify savable
 type Stack struct {
 	transportProtocols map[tcpip.TransportProtocolNumber]*transportProtocolState
 	networkProtocols   map[tcpip.NetworkProtocolNumber]NetworkProtocol