mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

sysfs: requires all methods to return syscall.Errno

Browse Source 
This forces all syscall functions, notably filesystem, to return numeric
codes as opposed to mapping in two different areas. The result of this
change is better consolidation in call sites of `sysfs.FS`, while
further refactoring is needed to address consolidation of file errors.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Adrian Cole
2023-03-21 22:20:28 +08:00
parent b384cd70b2
commit 4ea9d1a7b5
65 changed files with 1349 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/gojs/errno.go
View File

@@ -30,6 +30,8 @@ var (
ErrnoBadf = &Errno{"EBADF"}
// ErrnoExist File exists.
ErrnoExist = &Errno{"EEXIST"}
// ErrnoFault Bad address.
ErrnoFault = &Errno{"EFAULT"}
// ErrnoIntr Interrupted function.
ErrnoIntr = &Errno{"EINTR"}
// ErrnoInval Invalid argument.
@@ -77,6 +79,8 @@ func ToErrno(err error) *Errno {
return ErrnoBadf
case syscall.EEXIST:
return ErrnoExist
case syscall.EFAULT:
return ErrnoFault
case syscall.EINTR:
return ErrnoIntr
case syscall.EINVAL:

5
internal/gojs/errno_test.go
View File

@@ -39,6 +39,11 @@ func TestToErrno(t *testing.T) {
input: syscall.EEXIST,
expected: ErrnoExist,
},
{
name: "syscall.EFAULT",
input: syscall.EFAULT,
expected: ErrnoFault,
},
{
name: "syscall.EINTR",
input: syscall.EINTR,

129
internal/gojs/fs.go
View File

@@ -110,9 +110,9 @@ func (o *jsfsOpen) invoke(ctx context.Context, mod api.Module, args ...interface
fsc := mod.(*wasm.CallContext).Sys.FS()
fd, err := fsc.OpenFile(fsc.RootFS(), path, int(flags), perm)
fd, errno := fsc.OpenFile(fsc.RootFS(), path, int(flags), perm)
return callback.invoke(ctx, mod, goos.RefJsfs, err, fd) // note: error first
return callback.invoke(ctx, mod, goos.RefJsfs, maybeError(errno), fd) // note: error first
}
// jsfsStat implements jsFn for syscall.Stat
@@ -134,8 +134,8 @@ func (s *jsfsStat) invoke(ctx context.Context, mod api.Module, args ...interface
func syscallStat(mod api.Module, path string) (*jsSt, error) {
fsc := mod.(*wasm.CallContext).Sys.FS()
if st, err := fsc.RootFS().Stat(path); err != nil {
return nil, err
if st, errno := fsc.RootFS().Stat(path); errno != 0 {
return nil, errno
} else {
return newJsSt(st), nil
}
@@ -161,8 +161,8 @@ func (l *jsfsLstat) invoke(ctx context.Context, mod api.Module, args ...interfac
func syscallLstat(mod api.Module, path string) (*jsSt, error) {
fsc := mod.(*wasm.CallContext).Sys.FS()
if st, err := fsc.RootFS().Lstat(path); err != nil {
return nil, err
if st, errno := fsc.RootFS().Lstat(path); errno != 0 {
return nil, errno
} else {
return newJsSt(st), nil
}
@@ -191,7 +191,7 @@ func syscallFstat(fsc *internalsys.FSContext, fd uint32) (*jsSt, error) {
}
if st, err := f.Stat(); err != nil {
return nil, err
return nil, platform.UnwrapOSError(err)
} else {
return newJsSt(st), nil
}
@@ -222,9 +222,9 @@ func (jsfsClose) invoke(ctx context.Context, mod api.Module, args ...interface{}
fd := goos.ValueToUint32(args[0])
callback := args[1].(funcWrapper)
err := fsc.CloseFile(fd)
errno := fsc.CloseFile(fd)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsRead implements jsFn for syscall.Read and syscall.Pread, called by
@@ -345,14 +345,14 @@ func syscallReaddir(_ context.Context, mod api.Module, name string) (*objectArra
fsc := mod.(*wasm.CallContext).Sys.FS()
// don't allocate a file descriptor
f, err := fsc.RootFS().OpenFile(name, os.O_RDONLY, 0)
if err != nil {
return nil, err
f, errno := fsc.RootFS().OpenFile(name, os.O_RDONLY, 0)
if errno != 0 {
return nil, errno
}
defer f.Close() //nolint
if names, err := platform.Readdirnames(f, -1); err != nil {
return nil, err
if names, errno := platform.Readdirnames(f, -1); errno != 0 {
return nil, errno
} else {
entries := make([]interface{}, 0, len(names))
for _, e := range names {
@@ -378,16 +378,16 @@ func (m *jsfsMkdir) invoke(ctx context.Context, mod api.Module, args ...interfac
root := fsc.RootFS()
var fd uint32
var err error
var errno syscall.Errno
// We need at least read access to open the file descriptor
if perm == 0 {
perm = 0o0500
}
if err = root.Mkdir(path, perm); err == nil {
fd, err = fsc.OpenFile(root, path, os.O_RDONLY, 0)
if errno = root.Mkdir(path, perm); errno == 0 {
fd, errno = fsc.OpenFile(root, path, os.O_RDONLY, 0)
}
return callback.invoke(ctx, mod, goos.RefJsfs, err, fd) // note: error first
return callback.invoke(ctx, mod, goos.RefJsfs, maybeError(errno), fd) // note: error first
}
// jsfsRmdir implements jsFn for the following
@@ -402,9 +402,9 @@ func (r *jsfsRmdir) invoke(ctx context.Context, mod api.Module, args ...interfac
callback := args[1].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Rmdir(path)
errno := fsc.RootFS().Rmdir(path)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsRename implements jsFn for the following
@@ -421,9 +421,9 @@ func (r *jsfsRename) invoke(ctx context.Context, mod api.Module, args ...interfa
callback := args[2].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Rename(from, to)
errno := fsc.RootFS().Rename(from, to)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsUnlink implements jsFn for the following
@@ -438,9 +438,9 @@ func (u *jsfsUnlink) invoke(ctx context.Context, mod api.Module, args ...interfa
callback := args[1].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Unlink(path)
errno := fsc.RootFS().Unlink(path)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsUtimes implements jsFn for the following
@@ -460,9 +460,9 @@ func (u *jsfsUtimes) invoke(ctx context.Context, mod api.Module, args ...interfa
times := [2]syscall.Timespec{
syscall.NsecToTimespec(atimeSec * 1e9), syscall.NsecToTimespec(mtimeSec * 1e9),
}
err := fsc.RootFS().Utimens(path, &times, true)
errno := fsc.RootFS().Utimens(path, &times, true)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsChmod implements jsFn for the following
@@ -478,9 +478,9 @@ func (c *jsfsChmod) invoke(ctx context.Context, mod api.Module, args ...interfac
callback := args[2].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Chmod(path, mode)
errno := fsc.RootFS().Chmod(path, mode)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsFchmod implements jsFn for the following
@@ -495,16 +495,16 @@ func (jsfsFchmod) invoke(ctx context.Context, mod api.Module, args ...interface{
// Check to see if the file descriptor is available
fsc := mod.(*wasm.CallContext).Sys.FS()
var err error
var errno syscall.Errno
if f, ok := fsc.LookupFile(fd); !ok {
err = syscall.EBADF
errno = syscall.EBADF
} else if chmodFile, ok := f.File.(chmodFile); !ok {
err = syscall.EBADF // possibly a fake file
errno = syscall.EBADF // possibly a fake file
} else {
err = chmodFile.Chmod(mode)
errno = platform.UnwrapOSError(chmodFile.Chmod(mode))
}
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsChown implements jsFn for the following
@@ -521,9 +521,9 @@ func (c *jsfsChown) invoke(ctx context.Context, mod api.Module, args ...interfac
callback := args[3].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Chown(path, int(uid), int(gid))
errno := fsc.RootFS().Chown(path, int(uid), int(gid))
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsFchown implements jsFn for the following
@@ -539,14 +539,14 @@ func (jsfsFchown) invoke(ctx context.Context, mod api.Module, args ...interface{
// Check to see if the file descriptor is available
fsc := mod.(*wasm.CallContext).Sys.FS()
var err error
var errno syscall.Errno
if f, ok := fsc.LookupFile(fd); !ok {
err = syscall.EBADF
errno = syscall.EBADF
} else {
err = platform.ChownFile(f.File, int(uid), int(gid))
errno = platform.ChownFile(f.File, int(uid), int(gid))
}
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsLchown implements jsFn for the following
@@ -563,9 +563,9 @@ func (l *jsfsLchown) invoke(ctx context.Context, mod api.Module, args ...interfa
callback := args[3].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Lchown(path, int(uid), int(gid))
errno := fsc.RootFS().Lchown(path, int(uid), int(gid))
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsTruncate implements jsFn for the following
@@ -581,9 +581,9 @@ func (t *jsfsTruncate) invoke(ctx context.Context, mod api.Module, args ...inter
callback := args[2].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Truncate(path, length)
errno := fsc.RootFS().Truncate(path, length)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsFtruncate implements jsFn for the following
@@ -598,16 +598,16 @@ func (jsfsFtruncate) invoke(ctx context.Context, mod api.Module, args ...interfa
// Check to see if the file descriptor is available
fsc := mod.(*wasm.CallContext).Sys.FS()
var err error
var errno syscall.Errno
if f, ok := fsc.LookupFile(fd); !ok {
err = syscall.EBADF
errno = syscall.EBADF
} else if truncateFile, ok := f.File.(truncateFile); !ok {
err = syscall.EBADF // possibly a fake file
errno = syscall.EBADF // possibly a fake file
} else {
err = truncateFile.Truncate(length)
errno = platform.UnwrapOSError(truncateFile.Truncate(length))
}
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsReadlink implements jsFn for syscall.Readlink
@@ -622,9 +622,9 @@ func (r *jsfsReadlink) invoke(ctx context.Context, mod api.Module, args ...inter
callback := args[1].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
dst, err := fsc.RootFS().Readlink(path)
dst, errno := fsc.RootFS().Readlink(path)
return callback.invoke(ctx, mod, goos.RefJsfs, err, dst) // note: error first
return callback.invoke(ctx, mod, goos.RefJsfs, maybeError(errno), dst) // note: error first
}
// jsfsLink implements jsFn for the following
@@ -641,9 +641,9 @@ func (l *jsfsLink) invoke(ctx context.Context, mod api.Module, args ...interface
callback := args[2].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Link(path, link)
errno := fsc.RootFS().Link(path, link)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsSymlink implements jsFn for the following
@@ -659,9 +659,9 @@ func (s *jsfsSymlink) invoke(ctx context.Context, mod api.Module, args ...interf
callback := args[2].(funcWrapper)
fsc := mod.(*wasm.CallContext).Sys.FS()
err := fsc.RootFS().Symlink(dst, link)
errno := fsc.RootFS().Symlink(dst, link)
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsfsFsync implements jsFn for the following
@@ -675,16 +675,16 @@ func (jsfsFsync) invoke(ctx context.Context, mod api.Module, args ...interface{}
// Check to see if the file descriptor is available
fsc := mod.(*wasm.CallContext).Sys.FS()
var err error
var errno syscall.Errno
if f, ok := fsc.LookupFile(fd); !ok {
err = syscall.EBADF
errno = syscall.EBADF
} else if syncFile, ok := f.File.(syncFile); !ok {
err = syscall.EBADF // possibly a fake file
errno = syscall.EBADF // possibly a fake file
} else {
err = syncFile.Sync()
errno = platform.UnwrapOSError(syncFile.Sync())
}
return jsfsInvoke(ctx, mod, callback, err)
return jsfsInvoke(ctx, mod, callback, errno)
}
// jsSt is pre-parsed from fs_js.go setStat to avoid thrashing
@@ -751,6 +751,13 @@ func (s *jsSt) call(_ context.Context, _ api.Module, _ goos.Ref, method string,
panic(fmt.Sprintf("TODO: stat.%s", method))
}
func jsfsInvoke(ctx context.Context, mod api.Module, callback funcWrapper, err error) (interface{}, error) {
return callback.invoke(ctx, mod, goos.RefJsfs, err, err == nil) // note: error first
func jsfsInvoke(ctx context.Context, mod api.Module, callback funcWrapper, err syscall.Errno) (interface{}, error) {
return callback.invoke(ctx, mod, goos.RefJsfs, maybeError(err), err == 0) // note: error first
}
func maybeError(errno syscall.Errno) error {
if errno != 0 {
return errno
}
return nil
}