Merge 69e0affa (automated)

12 files changed, 177 insertions, 111 deletions

diff --git a/pkg/abi/linux/ashmem.go b/pkg/abi/linux/ashmem.go
deleted file mode 100644
index 2a722abe0..000000000
--- a/pkg/abi/linux/ashmem.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package linux
-
-// Constants used by ashmem in pin-related ioctls.
-const (
-	AshmemNotPurged  = 0
-	AshmemWasPurged  = 1
-	AshmemIsUnpinned = 0
-	AshmemIsPinned   = 1
-)
-
-// AshmemPin structure is used for pin-related ioctls.
-type AshmemPin struct {
-	Offset uint32
-	Len    uint32
-}
diff --git a/pkg/abi/linux/binder.go b/pkg/abi/linux/binder.go
deleted file mode 100644
index 63b08324a..000000000
--- a/pkg/abi/linux/binder.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package linux
-
-// BinderVersion structure is used for BINDER_VERSION ioctl.
-type BinderVersion struct {
-	ProtocolVersion int32
-}
diff --git a/pkg/abi/linux/clone.go b/pkg/abi/linux/clone.go
new file mode 100644
index 000000000..c2cbfca5e
--- /dev/null
+++ b/pkg/abi/linux/clone.go
@@ -0,0 +1,41 @@
+// Copyright 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package linux
+
+// Clone constants per clone(2).
+const (
+	CLONE_VM             = 0x100
+	CLONE_FS             = 0x200
+	CLONE_FILES          = 0x400
+	CLONE_SIGHAND        = 0x800
+	CLONE_PARENT         = 0x8000
+	CLONE_PTRACE         = 0x2000
+	CLONE_VFORK          = 0x4000
+	CLONE_THREAD         = 0x10000
+	CLONE_NEWNS          = 0x20000
+	CLONE_SYSVSEM        = 0x40000
+	CLONE_SETTLS         = 0x80000
+	CLONE_PARENT_SETTID  = 0x100000
+	CLONE_CHILD_CLEARTID = 0x200000
+	CLONE_DETACHED       = 0x400000
+	CLONE_UNTRACED       = 0x800000
+	CLONE_CHILD_SETTID   = 0x1000000
+	CLONE_NEWUTS         = 0x4000000
+	CLONE_NEWIPC         = 0x8000000
+	CLONE_NEWUSER        = 0x10000000
+	CLONE_NEWPID         = 0x20000000
+	CLONE_NEWNET         = 0x40000000
+	CLONE_IO             = 0x80000000
+)
diff --git a/pkg/abi/linux/epoll.go b/pkg/abi/linux/epoll.go
new file mode 100644
index 000000000..72083b604
--- /dev/null
+++ b/pkg/abi/linux/epoll.go
@@ -0,0 +1,56 @@
+// Copyright 2019 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package linux
+
+// EpollEvent is equivalent to struct epoll_event from epoll(2).
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Data   int32
+}
+
+// Event masks.
+const (
+	EPOLLIN     = 0x1
+	EPOLLPRI    = 0x2
+	EPOLLOUT    = 0x4
+	EPOLLERR    = 0x8
+	EPOLLHUP    = 0x10
+	EPOLLRDNORM = 0x40
+	EPOLLRDBAND = 0x80
+	EPOLLWRNORM = 0x100
+	EPOLLWRBAND = 0x200
+	EPOLLMSG    = 0x400
+	EPOLLRDHUP  = 0x2000
+)
+
+// Per-file descriptor flags.
+const (
+	EPOLLET      = 0x80000000
+	EPOLLONESHOT = 0x40000000
+)
+
+// Operation flags.
+const (
+	EPOLL_CLOEXEC  = 0x80000
+	EPOLL_NONBLOCK = 0x800
+)
+
+// Control operations.
+const (
+	EPOLL_CTL_ADD = 0x1
+	EPOLL_CTL_DEL = 0x2
+	EPOLL_CTL_MOD = 0x3
+)
diff --git a/pkg/abi/linux/fcntl.go b/pkg/abi/linux/fcntl.go
index 30902a8ca..f78315ebf 100644
--- a/pkg/abi/linux/fcntl.go
+++ b/pkg/abi/linux/fcntl.go
@@ -16,21 +16,39 @@ package linux
 
 // Commands from linux/fcntl.h.
 const (
-	F_DUPFD         = 0
-	F_GETFD         = 1
-	F_GETFL         = 3
-	F_GETOWN        = 9
-	F_SETFD         = 2
-	F_SETFL         = 4
-	F_SETLK         = 6
-	F_SETLKW        = 7
-	F_SETOWN        = 8
+	F_DUPFD         = 0x0
+	F_GETFD         = 0x1
+	F_SETFD         = 0x2
+	F_GETFL         = 0x3
+	F_SETFL         = 0x4
+	F_SETLK         = 0x6
+	F_SETLKW        = 0x7
+	F_SETOWN        = 0x8
+	F_GETOWN        = 0x9
 	F_DUPFD_CLOEXEC = 1024 + 6
 	F_SETPIPE_SZ    = 1024 + 7
 	F_GETPIPE_SZ    = 1024 + 8
 )
 
+// Commands for F_SETLK.
+const (
+	F_RDLCK = 0x0
+	F_WRLCK = 0x1
+	F_UNLCK = 0x2
+)
+
 // Flags for fcntl.
 const (
 	FD_CLOEXEC = 00000001
 )
+
+// Lock structure for F_SETLK.
+type Flock struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
diff --git a/pkg/abi/linux/file.go b/pkg/abi/linux/file.go
index 426003eb7..f78ffaa82 100644
--- a/pkg/abi/linux/file.go
+++ b/pkg/abi/linux/file.go
@@ -161,23 +161,36 @@ const (
 
 // Stat represents struct stat.
 type Stat struct {
-	Dev      uint64
-	Ino      uint64
-	Nlink    uint64
-	Mode     uint32
-	UID      uint32
-	GID      uint32
-	X_pad0   int32
-	Rdev     uint64
-	Size     int64
-	Blksize  int64
-	Blocks   int64
-	ATime    Timespec
-	MTime    Timespec
-	CTime    Timespec
-	X_unused [3]int64
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	UID     uint32
+	GID     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	ATime   Timespec
+	MTime   Timespec
+	CTime   Timespec
+	_       [3]int64
 }
 
+// File types.
+const (
+	DT_BLK     = 0x6
+	DT_CHR     = 0x2
+	DT_DIR     = 0x4
+	DT_FIFO    = 0x1
+	DT_LNK     = 0xa
+	DT_REG     = 0x8
+	DT_SOCK    = 0xc
+	DT_UNKNOWN = 0x0
+	DT_WHT     = 0xe
+)
+
 // SizeOfStat is the size of a Stat struct.
 var SizeOfStat = binary.Size(Stat{})
 
diff --git a/pkg/abi/linux/ioctl.go b/pkg/abi/linux/ioctl.go
index 04bb767dc..0e18db9ef 100644
--- a/pkg/abi/linux/ioctl.go
+++ b/pkg/abi/linux/ioctl.go
@@ -72,28 +72,3 @@ const (
 	SIOCGMIIPHY   = 0x8947
 	SIOCGMIIREG   = 0x8948
 )
-
-// ioctl(2) requests provided by uapi/linux/android/binder.h
-const (
-	BinderWriteReadIoctl       = 0xc0306201
-	BinderSetIdleTimeoutIoctl  = 0x40086203
-	BinderSetMaxThreadsIoctl   = 0x40046205
-	BinderSetIdlePriorityIoctl = 0x40046206
-	BinderSetContextMgrIoctl   = 0x40046207
-	BinderThreadExitIoctl      = 0x40046208
-	BinderVersionIoctl         = 0xc0046209
-)
-
-// ioctl(2) requests provided by drivers/staging/android/uapi/ashmem.h
-const (
-	AshmemSetNameIoctl        = 0x41007701
-	AshmemGetNameIoctl        = 0x81007702
-	AshmemSetSizeIoctl        = 0x40087703
-	AshmemGetSizeIoctl        = 0x00007704
-	AshmemSetProtMaskIoctl    = 0x40087705
-	AshmemGetProtMaskIoctl    = 0x00007706
-	AshmemPinIoctl            = 0x40087707
-	AshmemUnpinIoctl          = 0x40087708
-	AshmemGetPinStatusIoctl   = 0x00007709
-	AshmemPurgeAllCachesIoctl = 0x0000770a
-)
diff --git a/pkg/abi/linux/ipc.go b/pkg/abi/linux/ipc.go
index 2ef8d6cbb..22acd2d43 100644
--- a/pkg/abi/linux/ipc.go
+++ b/pkg/abi/linux/ipc.go
@@ -44,10 +44,10 @@ type IPCPerm struct {
 	CUID    uint32
 	CGID    uint32
 	Mode    uint16
-	pad1    uint16
+	_       uint16
 	Seq     uint16
-	pad2    uint16
-	pad3    uint32
+	_       uint16
+	_       uint32
 	unused1 uint64
 	unused2 uint64
 }
diff --git a/pkg/abi/linux/netlink.go b/pkg/abi/linux/netlink.go
index 5e718c363..e8b6544b4 100644
--- a/pkg/abi/linux/netlink.go
+++ b/pkg/abi/linux/netlink.go
@@ -41,10 +41,10 @@ const (
 
 // SockAddrNetlink is struct sockaddr_nl, from uapi/linux/netlink.h.
 type SockAddrNetlink struct {
-	Family  uint16
-	Padding uint16
-	PortID  uint32
-	Groups  uint32
+	Family uint16
+	_      uint16
+	PortID uint32
+	Groups uint32
 }
 
 // SockAddrNetlinkSize is the size of SockAddrNetlink.
diff --git a/pkg/abi/linux/netlink_route.go b/pkg/abi/linux/netlink_route.go
index 630dc339a..dd698e2bc 100644
--- a/pkg/abi/linux/netlink_route.go
+++ b/pkg/abi/linux/netlink_route.go
@@ -86,12 +86,12 @@ const (
 
 // InterfaceInfoMessage is struct ifinfomsg, from uapi/linux/rtnetlink.h.
 type InterfaceInfoMessage struct {
-	Family  uint8
-	Padding uint8
-	Type    uint16
-	Index   int32
-	Flags   uint32
-	Change  uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 // Interface flags, from uapi/linux/if.h.
diff --git a/pkg/abi/linux/sched.go b/pkg/abi/linux/sched.go
index 193d9a242..70e820823 100644
--- a/pkg/abi/linux/sched.go
+++ b/pkg/abi/linux/sched.go
@@ -28,3 +28,9 @@ const (
 	// reverted back to SCHED_NORMAL on fork.
 	SCHED_RESET_ON_FORK = 0x40000000
 )
+
+const (
+	PRIO_PGRP    = 0x1
+	PRIO_PROCESS = 0x0
+	PRIO_USER    = 0x2
+)
diff --git a/pkg/abi/linux/time.go b/pkg/abi/linux/time.go
index e727066d7..546668bca 100644
--- a/pkg/abi/linux/time.go
+++ b/pkg/abi/linux/time.go
@@ -241,3 +241,9 @@ func NsecToStatxTimestamp(nsec int64) (ts StatxTimestamp) {
 		Nsec: uint32(nsec % 1e9),
 	}
 }
+
+// Utime represents struct utimbuf used by utimes(2).
+type Utime struct {
+	Actime  int64
+	Modtime int64
+}