9p: hvsock support

Author: redbeam

cmd/crc/cmd/daemon.go

@@ -252,15 +252,29 @@ func run(configuration *types.Configuration) error {
 
 	// 9p home directory sharing
 	if runtime.GOOS == "windows" {
-		listener9p, err := vn.Listen("tcp", net.JoinHostPort(configuration.GatewayIP, fmt.Sprintf("%d", constants.Plan9TcpPort)))
+		// 9p over hvsock
+		listener9pHvsock, err := fs9p.GetHvsockListener(constants.Plan9HvsockGUID)
 		if err != nil {
 			return err
 		}
-		server9p, err := fs9p.New9pServer(listener9p, constants.GetHomeDir())
+		server9pHvsock, err := fs9p.New9pServer(listener9pHvsock, constants.GetHomeDir())
 		if err != nil {
 			return err
 		}
-		if err := server9p.Start(); err != nil {
+		if err := server9pHvsock.Start(); err != nil {
+			return err
+		}
+
+		// 9p over TCP (as a backup)
+		listener9pTcp, err := vn.Listen("tcp", net.JoinHostPort(configuration.GatewayIP, fmt.Sprintf("%d", constants.Plan9TcpPort)))
+		if err != nil {
+			return err
+		}
+		server9pTcp, err := fs9p.New9pServer(listener9pTcp, constants.GetHomeDir())
+		if err != nil {
+			return err
+		}
+		if err := server9pTcp.Start(); err != nil {
 			return err
 		}
 	}

packaging/windows/product.wxs.template

@@ -72,6 +72,11 @@
                             <RegistryValue Type="string" Name="ElementName" Value="gvisor-tap-vsock" KeyPath="yes"/>
                         </RegistryKey>
                     </Component>
+                    <Component Id="Hvsock9pRegistryEntry" Guid="*">
+                        <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Virtualization\GuestCommunicationServices\00009000-FACB-11E6-BD58-64006A7986D3">
+                            <RegistryValue Type="string" Name="ElementName" Value="fs9p-hvsock" KeyPath="yes"/>
+                        </RegistryKey>
+                    </Component>
                 </Directory>
             </Directory>
         </Directory>
@@ -130,6 +135,7 @@
             <ComponentRef Id="AddToPath"/>
             <ComponentRef Id="AddUserToCrcUsers" />
             <ComponentRef Id="VsockRegistryEntry" />
+            <ComponentRef Id="Hvsock9pRegistryEntry" />
         </Feature>
         <UI>
             <UIRef Id="WixUI_ErrorProgressText"/>

pkg/crc/constants/constants.go

@@ -56,8 +56,10 @@ const (
 
 	BackgroundLauncherExecutable = "crc-background-launcher.exe"
 
-	Plan9Msize   = 1024 * 1024
-	Plan9TcpPort = 564
+	Plan9Msize      = 1024 * 1024
+	Plan9TcpPort    = 564
+	Plan9HvsockGUID = "00009000-FACB-11E6-BD58-64006A7986D3"
+	Plan9HvsockPort = 36864
 )
 
 var adminHelperExecutableForOs = map[string]string{

pkg/crc/machine/start.go

@@ -264,8 +264,12 @@ func configureSharedDirs(vm *virtualMachine, sshRunner *crcssh.Runner) error {
 			if _, _, err := sshRunner.RunPrivileged("Changing owner of mount directory", "chown core:core", mount.Target); err != nil {
 				return err
 			}
-			if _, _, err := sshRunner.Run("9pfs 192.168.127.1", mount.Target); err != nil {
-				return err
+			if _, _, err := sshRunner.Run("9pfs -V -p", fmt.Sprintf("%d", constants.Plan9HvsockPort), mount.Target); err != nil {
+				logging.Warnf("Failed to connect to 9p server over hvsock: %v", err)
+				logging.Warnf("Falling back to 9p over TCP")
+				if _, _, err := sshRunner.Run("9pfs 192.168.127.1", mount.Target); err != nil {
+					return err
+				}
 			}
 
 		default:

pkg/fileserver/fs9p/server_fallback.go

@@ -0,0 +1,15 @@
+//go:build !windows
+
+package fs9p
+
+import (
+	"fmt"
+	"net"
+	"runtime"
+)
+
+// GetHvsockListener returns a net.Listener listening on the specified hvsock.
+// The used hvsock must already be defined before this function is called.
+func GetHvsockListener(hvsockGuid string) (net.Listener, error) {
+	return nil, fmt.Errorf("GetHvsockListener() not implemented on %s", runtime.GOOS)
+}

pkg/fileserver/fs9p/server_windows.go

@@ -0,0 +1,29 @@
+//go:build windows
+
+package fs9p
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/linuxkit/virtsock/pkg/hvsock"
+)
+
+// GetHvsockListener returns a net.Listener listening on the specified hvsock.
+// The used hvsock must already be defined before this function is called.
+func GetHvsockListener(hvsockGuid string) (net.Listener, error) {
+	service, err := hvsock.GUIDFromString(hvsockGuid)
+	if err != nil {
+		return nil, fmt.Errorf("parsing hvsock guid %s: %w", hvsockGuid, err)
+	}
+
+	listener, err := hvsock.Listen(hvsock.Addr{
+		VMID:      hvsock.GUIDWildcard,
+		ServiceID: service,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("retrieving listener for hvsock %s: %w", hvsockGuid, err)
+	}
+
+	return listener, nil
+}