Extended LoadSnapshot and Offload

Signed-off-by: Plamen Petrov <[email protected]>

Author: plamenmpetrov

internal/common.go

@@ -34,6 +34,8 @@ const (
 	// FirecrackerVSockName is the name of the Firecracker VSock unix path used for communication
 	// between the runtime and the agent
 	FirecrackerVSockName = "firecracker.vsock"
+	// FirecrackerUPFSockName is the name of the Firecracker UPF socker
+	FirecrackerUPFSockName = "firecracker.upfsock"
 	// FirecrackerLogFifoName is the name of the Firecracker VMM log FIFO
 	FirecrackerLogFifoName = "fc-logs.fifo"
 	// FirecrackerMetricsFifoName is the name of the Firecracker VMM metrics FIFO

internal/vm/dir.go

@@ -95,6 +95,12 @@ func (d Dir) FirecrackerSockRelPath() (string, error) {
 	return relPathTo(d.FirecrackerSockPath())
 }
 
+// FirecrackerUPFSockPath returns the path to the user page faults
+// socket of the firecracker process
+func (d Dir) FirecrackerUPFSockPath() string {
+	return filepath.Join(d.RootPath(), internal.FirecrackerUPFSockName)
+}
+
 // FirecrackerVSockPath returns the path to the vsock unix socket that the runtime uses
 // to communicate with the VM agent.
 func (d Dir) FirecrackerVSockPath() string {

proto/firecracker.pb.go

@@ -113,6 +113,7 @@ message LoadSnapshotRequest {
     string VMID = 1;
     string SnapshotFilePath = 2;
     string MemFilePath = 3;
+    bool EnableUserPF = 4;
 }
 
 message OffloadRequest {

proto/firecracker.proto

@@ -106,6 +106,13 @@ var (
 	_ shim.Init           = NewService
 )
 
+type loadSnapReq struct {
+	SnapshotPath         string `json:"snapshot_path"`
+	MemFilePath          string `json:"mem_file_path"`
+	SendSockAddr         string `json:"sock_file_path"`
+	EnableUserPageFaults bool   `json:"enable_user_page_faults"`
+}
+
 // implements shimapi
 type service struct {
 	taskManager   vm.TaskManager
@@ -1770,13 +1777,16 @@ func formPauseReq() (*http.Request, error) {
 	return req, nil
 }
 
-func formLoadSnapReq(snapshotPath, memPath string) (*http.Request, error) {
+func formLoadSnapReq(snapshotPath, memPath, sendSockAddr string, isUpf bool) (*http.Request, error) {
 	var req *http.Request
 
-	data := map[string]string{
-		"snapshot_path": snapshotPath,
-		"mem_file_path": memPath,
+	data := loadSnapReq{
+		SnapshotPath:         snapshotPath,
+		MemFilePath:          memPath,
+		SendSockAddr:         sendSockAddr,
+		EnableUserPageFaults: isUpf,
 	}
+
 	json, err := json.Marshal(data)
 	if err != nil {
 		logrus.WithError(err).Error("Failed to marshal json data")