Use virtio-net device for forwarding networking data between the guest and the host

Author: vyasgun

cmd/crc/cmd/daemon.go

@@ -81,7 +81,7 @@ func createNewVirtualNetworkConfig(providedConfig *crcConfig.Config) types.Confi
 		GatewayIP:         constants.VSockGateway,
 		GatewayMacAddress: "5a:94:ef:e4:0c:dd",
 		DHCPStaticLeases: map[string]string{
-			"192.168.127.2": "5a:94:ef:e4:0c:ee",
+			"192.168.127.2": constants.VsockMacAddress,
 		},
 		DNS: []types.Zone{
 			{
@@ -146,11 +146,6 @@ func createNewVirtualNetworkConfig(providedConfig *crcConfig.Config) types.Confi
 }
 
 func run(configuration *types.Configuration) error {
-	vsockListener, err := vsockListener()
-	if err != nil {
-		return err
-	}
-
 	vn, err := virtualnetwork.New(configuration)
 	if err != nil {
 		return err
@@ -213,6 +208,21 @@ func run(configuration *types.Configuration) error {
 		}
 	}()
 
+	go func() {
+		_, err := unixgramListener(vn)
+		if err != nil {
+			// Don't return an error if the connection is closed
+			if !errors.Is(err, net.ErrClosed) {
+				errCh <- err
+			}
+			return
+		}
+	}()
+
+	vsockListener, err := vsockListener()
+	if err != nil {
+		return err
+	}
 	go func() {
 		mux := http.NewServeMux()
 		mux.Handle(types.ConnectPath, vn.Mux())

cmd/crc/cmd/daemon_darwin.go

@@ -1,11 +1,16 @@
 package cmd
 
 import (
+	"context"
+	"fmt"
 	"net"
 	"os"
 
+	"github.com/containers/gvisor-tap-vsock/pkg/transport"
+	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/pkg/errors"
 )
 
 func vsockListener() (net.Listener, error) {
@@ -28,6 +33,21 @@ func httpListener() (net.Listener, error) {
 	return ln, nil
 }
 
+func unixgramListener(vn *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
+	_ = os.Remove(constants.UnixgramSocketPath)
+	conn, err := transport.ListenUnixgram(fmt.Sprintf("unixgram://%v", constants.UnixgramSocketPath))
+	if err != nil {
+		return conn, errors.Wrap(err, "failed to listen unixgram")
+	}
+	logging.Infof("listening on %s:", constants.UnixgramSocketPath)
+	vfkitConn, err := transport.AcceptVfkit(conn)
+	if err != nil {
+		return conn, errors.Wrap(err, "failed to accept vfkit connection")
+	}
+	err = vn.AcceptVfkit(context.Background(), vfkitConn)
+	return conn, errors.Wrap(err, "failed to accept vfkit connection")
+}
+
 func checkIfDaemonIsRunning() (bool, error) {
 	return checkDaemonVersion()
 }

cmd/crc/cmd/daemon_linux.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
+	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
 
@@ -124,6 +125,10 @@ func httpListener() (net.Listener, error) {
 	return ln, nil
 }
 
+func unixgramListener(_ *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
+	return nil, nil
+}
+
 func startupDone() {
 	_, _ = daemon.SdNotify(false, daemon.SdNotifyReady)
 }

cmd/crc/cmd/daemon_windows.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
+	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
 )
@@ -35,5 +36,9 @@ func checkIfDaemonIsRunning() (bool, error) {
 	return checkDaemonVersion()
 }
 
+func unixgramListener(_ *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
+	return nil, nil
+}
+
 func startupDone() {
 }

pkg/crc/constants/constants.go

@@ -39,9 +39,10 @@ const (
 	RootlessPodmanSocket      = "/run/user/1000/podman/podman.sock"
 	RootfulPodmanSocket       = "/run/podman/podman.sock"
 
-	VSockGateway = "192.168.127.1"
-	VsockSSHPort = 2222
-	LocalIP      = "127.0.0.1"
+	VSockGateway    = "192.168.127.1"
+	VsockSSHPort    = 2222
+	LocalIP         = "127.0.0.1"
+	VsockMacAddress = "5a:94:ef:e4:0c:ee"
 
 	OkdPullSecret = `{"auths":{"fake":{"auth": "Zm9vOmJhcgo="}}}` // #nosec G101
 

pkg/crc/constants/constants_darwin.go

@@ -14,4 +14,5 @@ const (
 var (
 	TapSocketPath        = filepath.Join(CrcBaseDir, "tap.sock")
 	DaemonHTTPSocketPath = filepath.Join(CrcBaseDir, "crc-http.sock")
+	UnixgramSocketPath   = filepath.Join(CrcBaseDir, "crc-unixgram.sock")
 )

pkg/crc/constants/constants_windows.go

@@ -7,4 +7,5 @@ const (
 	DaemonHTTPNamedPipe        = `\\.\pipe\crc-http`
 	DaemonTaskName             = "crcDaemon"
 	AdminHelperServiceName     = "crcAdminHelper"
+	UnixgramSocketPath         = ""
 )

pkg/drivers/vfkit/driver_darwin.go

@@ -47,6 +47,9 @@ type Driver struct {
 	VsockPath       string
 	DaemonVsockPort uint
 	QemuGAVsockPort uint
+
+	UnixgramMacAddress string
+	UnixgramSockPath   string
 }
 
 func NewDriver(hostName, storePath string) *Driver {
@@ -63,7 +66,9 @@ func NewDriver(hostName, storePath string) *Driver {
 		},
 		// needed when loading a VM which was created before
 		// DaemonVsockPort was introduced
-		DaemonVsockPort: constants.DaemonVsockPort,
+		DaemonVsockPort:    constants.DaemonVsockPort,
+		UnixgramSockPath:   constants.UnixgramSocketPath,
+		UnixgramMacAddress: constants.VsockMacAddress,
 	}
 }
 
@@ -246,14 +251,25 @@ func (d *Driver) Start() error {
 		return err
 	}
 
-	// virtio-vsock device
-	dev, err = config.VirtioVsockNew(d.DaemonVsockPort, d.VsockPath, true)
-	if err != nil {
-		return err
-	}
-	err = vm.AddDevice(dev)
-	if err != nil {
-		return err
+	if d.UnixgramSockPath == "" {
+		dev, err = config.VirtioVsockNew(d.DaemonVsockPort, d.VsockPath, true)
+		if err != nil {
+			return err
+		}
+		err = vm.AddDevice(dev)
+		if err != nil {
+			return err
+		}
+	} else {
+		netDev, err := config.VirtioNetNew(d.UnixgramMacAddress)
+		if err != nil {
+			return err
+		}
+		netDev.SetUnixSocketPath(d.UnixgramSockPath)
+		err = vm.AddDevice(netDev)
+		if err != nil {
+			return err
+		}
 	}
 
 	// when loading a VM created by a crc version predating this commit,