-
Notifications
You must be signed in to change notification settings - Fork 592
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Balaji Vijayakumar <[email protected]>
- Loading branch information
1 parent
da0e698
commit b0ae1bc
Showing
25 changed files
with
1,074 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "os" | ||
| "strconv" | ||
|
|
||
| "github.com/lima-vm/lima/pkg/networks/usernet" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func newUsernetCommand() *cobra.Command { | ||
| var hostagentCommand = &cobra.Command{ | ||
| Use: "usernet", | ||
| Short: "run usernet", | ||
| Args: cobra.ExactArgs(0), | ||
| RunE: usernetAction, | ||
| Hidden: true, | ||
| } | ||
| hostagentCommand.Flags().StringP("pidfile", "p", "", "write pid to file") | ||
| hostagentCommand.Flags().StringP("endpoint", "e", "", "exposes usernet api(s) on this endpoint") | ||
| hostagentCommand.Flags().String("listen-qemu", "", "listen for qemu connections") | ||
| hostagentCommand.Flags().String("listen-fd", "", "listen for fd connections") | ||
| hostagentCommand.Flags().Int("mtu", 1500, "mtu") | ||
| return hostagentCommand | ||
| } | ||
|
|
||
| func usernetAction(cmd *cobra.Command, args []string) error { | ||
|
|
||
| pidfile, err := cmd.Flags().GetString("pidfile") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if pidfile != "" { | ||
| if _, err := os.Stat(pidfile); !errors.Is(err, os.ErrNotExist) { | ||
| return fmt.Errorf("pidfile %q already exists", pidfile) | ||
| } | ||
| if err := os.WriteFile(pidfile, []byte(strconv.Itoa(os.Getpid())+"\n"), 0644); err != nil { | ||
| return err | ||
| } | ||
| defer os.RemoveAll(pidfile) | ||
| } | ||
| endpoint, err := cmd.Flags().GetString("endpoint") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| qemuSocket, err := cmd.Flags().GetString("listen-qemu") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fdSocket, err := cmd.Flags().GetString("listen-fd") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| mtu, err := cmd.Flags().GetInt("mtu") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| os.RemoveAll(endpoint) | ||
| os.RemoveAll(qemuSocket) | ||
| os.RemoveAll(fdSocket) | ||
|
|
||
| return usernet.StartGVisorNetstack(cmd.Context(), &usernet.GVisorNetstackOpts{ | ||
| MTU: mtu, | ||
| Endpoint: endpoint, | ||
| QemuSocket: qemuSocket, | ||
| FdSocket: fdSocket, | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Example to run vz instance with lima usernet enabled | ||
| vmType: "vz" | ||
| images: | ||
| - location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img" | ||
| arch: "x86_64" | ||
| - location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-arm64.img" | ||
| arch: "aarch64" | ||
|
|
||
| mounts: | ||
| - location: "~" | ||
| - location: "/tmp/lima" | ||
| writable: true | ||
| mountType: "virtiofs" | ||
| networks: | ||
| - lima: default |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| //go:build !windows | ||
| // +build !windows | ||
|
|
||
| // This file has been adapted from https://github.com/ftrvxmtrx/fd/blob/master/fd.go | ||
|
|
||
| // Package fd provides a simple API to pass file descriptors | ||
| // between different OS processes. | ||
| // | ||
| // It can be useful if you want to inherit network connections | ||
| // from another process without closing them. | ||
| // | ||
| // Example scenario: | ||
| // | ||
| // 1. Running server receives a "let's upgrade" message | ||
| // 2. Server opens a Unix domain socket for the "upgrade" | ||
| // 3. Server starts a new copy of itself and passes Unix domain socket name | ||
| // 4. New copy starts reading for the socket | ||
| // 5. Server sends its state over the socket, also sending the number | ||
| // of network connections to inherit, then it sends those connections | ||
| // using fd.Put() | ||
| // 6. New copy reads the state and inherits connections using fd.Get(), | ||
| // checks that everything is OK and sends the "OK" message to the socket | ||
| // 7. Server receives "OK" message and kills itself | ||
| package fd | ||
|
|
||
| import ( | ||
| "net" | ||
| "os" | ||
| "syscall" | ||
| ) | ||
|
|
||
| // Get receives single file descriptors from a Unix domain socket. | ||
| // | ||
| // Num specifies the expected number of file descriptors in one message. | ||
| // Internal files' names to be assigned are specified via optional filenames | ||
| // argument. | ||
| // | ||
| // You need to close all files in the returned slice. The slice can be | ||
| // non-empty even if this function returns an error. | ||
| // | ||
| // Use net.FileConn() if you're receiving a network connection. | ||
| func Get(via *net.UnixConn, num int, filenames []string) ([]*os.File, error) { | ||
| if num < 1 { | ||
| return nil, nil | ||
| } | ||
|
|
||
| // get the underlying socket | ||
| viaf, err := via.File() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| socket := int(viaf.Fd()) | ||
| defer viaf.Close() | ||
|
|
||
| // recvmsg | ||
| buf := make([]byte, syscall.CmsgSpace(num*4)) | ||
| _, _, _, _, err = syscall.Recvmsg(socket, nil, buf, 0) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // parse control msgs | ||
| var msgs []syscall.SocketControlMessage | ||
| msgs, err = syscall.ParseSocketControlMessage(buf) | ||
|
|
||
| // convert fds to files | ||
| res := make([]*os.File, 0, len(msgs)) | ||
| for i := 0; i < len(msgs) && err == nil; i++ { | ||
| var fds []int | ||
| fds, err = syscall.ParseUnixRights(&msgs[i]) | ||
|
|
||
| for fi, fd := range fds { | ||
| var filename string | ||
| if fi < len(filenames) { | ||
| filename = filenames[fi] | ||
| } | ||
|
|
||
| res = append(res, os.NewFile(uintptr(fd), filename)) | ||
| } | ||
| } | ||
|
|
||
| return res, err | ||
| } | ||
|
|
||
| // Put sends file descriptors to Unix domain socket. | ||
| // | ||
| // Please note that the number of descriptors in one message is limited | ||
| // and is rather small. | ||
| // Use conn.File() to get a file if you want to put a network connection. | ||
| func Put(via *net.UnixConn, files ...*os.File) error { | ||
| if len(files) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| viaf, err := via.File() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| socket := int(viaf.Fd()) | ||
| defer viaf.Close() | ||
|
|
||
| fds := make([]int, len(files)) | ||
| for i := range files { | ||
| fds[i] = int(files[i].Fd()) | ||
| } | ||
|
|
||
| rights := syscall.UnixRights(fds...) | ||
| return syscall.Sendmsg(socket, nil, rights, nil, 0) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| //go:build linux && darwin | ||
| // +build linux,darwin | ||
|
|
||
| // This file has been adapted from https://github.com/ftrvxmtrx/fd/blob/master/fd_test.go | ||
|
|
||
| package fd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net" | ||
| "os" | ||
| "sync" | ||
| "testing" | ||
| ) | ||
|
|
||
| var SockFilename = "/tmp/sendfd.sock" | ||
|
|
||
| func getFD(w *sync.WaitGroup) error { | ||
| defer w.Done() | ||
|
|
||
| c, err := net.Dial("unix", SockFilename) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer c.Close() | ||
| sendfdConn := c.(*net.UnixConn) | ||
|
|
||
| var fs []*os.File | ||
| fs, err = Get(sendfdConn, 1, []string{"a file"}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| f := fs[0] | ||
| defer f.Close() | ||
|
|
||
| b := make([]byte, 64) | ||
| var n int | ||
| n, err = f.Read(b) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if n < 1 { | ||
| return errors.New("failed to read the data") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func TestPutGet(t *testing.T) { | ||
| f, err := os.Open("/dev/urandom") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer f.Close() | ||
|
|
||
| os.Remove(SockFilename) | ||
| l, err := net.Listen("unix", SockFilename) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer l.Close() | ||
|
|
||
| var w sync.WaitGroup | ||
| w.Add(1) | ||
|
|
||
| go func() { | ||
| err := getFD(&w) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| }() | ||
|
|
||
| var a net.Conn | ||
| a, err = l.Accept() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer a.Close() | ||
|
|
||
| listenConn := a.(*net.UnixConn) | ||
|
|
||
| if err = Put(listenConn, f); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| w.Wait() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| //go:build windows | ||
| // +build windows | ||
|
|
||
| package fd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net" | ||
| "os" | ||
| ) | ||
|
|
||
| func Get(via *net.UnixConn, num int, filenames []string) ([]*os.File, error) { | ||
| return nil, errors.New("Not supported") | ||
| } | ||
|
|
||
| func Put(via *net.UnixConn, files ...*os.File) error { | ||
| return errors.New("Not supported") | ||
| } |
Oops, something went wrong.