diff --git a/pkg/sentry/fsimpl/lock/lock.go b/pkg/sentry/fsimpl/lock/lock.go index 99dbdba93..2ac7c515d 100644 --- a/pkg/sentry/fsimpl/lock/lock.go +++ b/pkg/sentry/fsimpl/lock/lock.go @@ -164,14 +164,6 @@ func (l *Locks) LockRegion(ctx context.Context, uid UniqueID, ownerPID int32, t } } -// LockRegionVFS1 is a wrapper around LockRegion for VFS1, which does not implement -// F_GETLK (and does not care about storing PIDs as a result). -// -// TODO(gvisor.dev/issue/1624): Delete. -func (l *Locks) LockRegionVFS1(ctx context.Context, uid UniqueID, t LockType, r LockRange, block bool) error { - return l.LockRegion(ctx, uid, 0 /* ownerPID */, t, r, block) -} - // Readiness always returns zero. func (l *Locks) Readiness(waiter.EventMask) waiter.EventMask { return 0 diff --git a/pkg/sentry/syscalls/linux/points.go b/pkg/sentry/syscalls/linux/points.go index 2c41265bc..12e646c7d 100644 --- a/pkg/sentry/syscalls/linux/points.go +++ b/pkg/sentry/syscalls/linux/points.go @@ -691,7 +691,7 @@ func signalfdHelper(t *kernel.Task, fields seccheck.FieldSet, cxtData *pb.Contex } sigset := info.Args[1].Pointer() sigsetsize := info.Args[2].SizeT() - mask, err := CopyInSigSet(t, sigset, sigsetsize) + mask, err := copyInSigSet(t, sigset, sigsetsize) if err == nil { // if NO error p.Sigset = uint64(mask) p.Sigset = uint64(mask) diff --git a/pkg/sentry/syscalls/linux/sigset.go b/pkg/sentry/syscalls/linux/sigset.go index 9d34d60a3..86cd9e427 100644 --- a/pkg/sentry/syscalls/linux/sigset.go +++ b/pkg/sentry/syscalls/linux/sigset.go @@ -21,13 +21,9 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel" ) -// CopyInSigSet copies in a sigset_t, checks its size, and ensures that KILL and +// copyInSigSet copies in a sigset_t, checks its size, and ensures that KILL and // STOP are clear. -// -// TODO(gvisor.dev/issue/1624): This is only exported because -// syscalls/vfs2/signal.go depends on it. Once vfs1 is deleted and the vfs2 -// syscalls are moved into this package, then they can be unexported. -func CopyInSigSet(t *kernel.Task, sigSetAddr hostarch.Addr, size uint) (linux.SignalSet, error) { +func copyInSigSet(t *kernel.Task, sigSetAddr hostarch.Addr, size uint) (linux.SignalSet, error) { if size != linux.SignalSetSize { return 0, linuxerr.EINVAL } diff --git a/pkg/sentry/syscalls/linux/sys_signal.go b/pkg/sentry/syscalls/linux/sys_signal.go index 413363366..80ea72d5d 100644 --- a/pkg/sentry/syscalls/linux/sys_signal.go +++ b/pkg/sentry/syscalls/linux/sys_signal.go @@ -295,7 +295,7 @@ func RtSigprocmask(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel } oldmask := t.SignalMask() if setaddr != 0 { - mask, err := CopyInSigSet(t, setaddr, sigsetsize) + mask, err := copyInSigSet(t, setaddr, sigsetsize) if err != nil { return 0, nil, err } @@ -365,7 +365,7 @@ func RtSigtimedwait(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne timespec := args[2].Pointer() sigsetsize := args[3].SizeT() - mask, err := CopyInSigSet(t, sigset, sigsetsize) + mask, err := copyInSigSet(t, sigset, sigsetsize) if err != nil { return 0, nil, err } @@ -517,7 +517,7 @@ func RestartSyscall(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne // sharedSignalfd is shared between the two calls. func sharedSignalfd(t *kernel.Task, fd int32, sigset hostarch.Addr, sigsetsize uint, flags int32) (uintptr, *kernel.SyscallControl, error) { // Copy in the signal mask. - mask, err := CopyInSigSet(t, sigset, sigsetsize) + mask, err := copyInSigSet(t, sigset, sigsetsize) if err != nil { return 0, nil, err } diff --git a/test/runtimes/runner/lib/lib.go b/test/runtimes/runner/lib/lib.go index f6f8e851d..ab71f162b 100644 --- a/test/runtimes/runner/lib/lib.go +++ b/test/runtimes/runner/lib/lib.go @@ -65,9 +65,6 @@ type Filter func(test string) bool // defered functions before exiting. It returns an exit code that should be // passed to os.Exit. func RunTests(lang, image string, filter Filter, batchSize int, timeout time.Duration, proctorSettings ProctorSettings) int { - // TODO(gvisor.dev/issue/1624): Remove those tests from all exclude lists - // that only fail with VFS1. - // Construct the shared docker instance. ctx := context.Background() d := dockerutil.MakeContainer(ctx, testutil.DefaultLogger(lang))