sys/linux: remove FUTEX_WAIT_MULTIPLE operation

FUTEX_WAIT_MULTIPLE was added before it was merged, and nowadays we have
other plans for futex. Remove all WAIT_MULTIPLE references so futex
fuzzing can be re-enabled.

Signed-off-by: André Almeida <andrealmeid@collabora.com>

9 files changed, 15 insertions, 100 deletions

diff --git a/sys/linux/futex.txt b/sys/linux/futex.txt
index cb412f938..12627ecd9 100644
--- a/sys/linux/futex.txt
+++ b/sys/linux/futex.txt
@@ -4,7 +4,6 @@
 include <linux/futex.h>
 
 futex(addr ptr[in, int32[0:2]], op flags[futex_op], val int32[0:2], timeout ptr[in, timespec], addr2 ptr[in, int32[0:2]], val3 int32[0:2])
-futex$FUTEX_WAIT_MULTIPLE(addr ptr[in, array[futex_wait_block, 0:129]], op const[FUTEX_WAIT_MULTIPLE], val len[addr], timeout ptr[in, timespec], addr2 const[0], val3 const[0])
 set_robust_list(head ptr[in, robust_list_head], len len[head])
 get_robust_list(pid pid, head ptr[in, ptr[out, robust_list_head]], len ptr[inout, len[head, intptr]])
 
@@ -18,10 +17,4 @@ robust_list {
 	next	ptr[in, robust_list, opt]
 }
 
-futex_wait_block {
-	uaddr	ptr[in, int32[0:2]]
-	val	int32[0:2]
-	bitset	const[4294967295, int32]
-}
-
-futex_op = FUTEX_WAIT, FUTEX_WAIT_BITSET, FUTEX_WAKE, FUTEX_REQUEUE, FUTEX_CMP_REQUEUE, FUTEX_WAIT_MULTIPLE, FUTEX_WAIT_PRIVATE, FUTEX_WAKE_PRIVATE, FUTEX_WAIT_REQUEUE_PI_PRIVATE, FUTEX_CMP_REQUEUE_PI_PRIVATE, FUTEX_WAIT_MULTIPLE_PRIVATE
+futex_op = FUTEX_WAIT, FUTEX_WAIT_BITSET, FUTEX_WAKE, FUTEX_REQUEUE, FUTEX_CMP_REQUEUE, FUTEX_WAIT_PRIVATE, FUTEX_WAKE_PRIVATE, FUTEX_WAIT_REQUEUE_PI_PRIVATE, FUTEX_CMP_REQUEUE_PI_PRIVATE
diff --git a/sys/linux/futex.txt.const b/sys/linux/futex.txt.const
new file mode 100644
index 000000000..ab6964d47
--- /dev/null
+++ b/sys/linux/futex.txt.const
@@ -0,0 +1,14 @@
+# Code generated by syz-sysgen. DO NOT EDIT.
+arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
+FUTEX_CMP_REQUEUE = 4
+FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
+FUTEX_REQUEUE = 3
+FUTEX_WAIT = 0
+FUTEX_WAIT_BITSET = 9
+FUTEX_WAIT_PRIVATE = 128
+FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
+FUTEX_WAKE = 1
+FUTEX_WAKE_PRIVATE = 129
+__NR_futex = 98, 386:arm:240, amd64:202, mips64le:5194, ppc64le:221, s390x:238
+__NR_get_robust_list = 100, 386:312, amd64:274, arm:339, mips64le:5269, ppc64le:299, s390x:305
+__NR_set_robust_list = 99, 386:311, amd64:273, arm:338, mips64le:5268, ppc64le:300, s390x:304
diff --git a/sys/linux/futex_386.const b/sys/linux/futex_386.const
deleted file mode 100644
index 2da0ec78c..000000000
--- a/sys/linux/futex_386.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 240
-__NR_get_robust_list = 312
-__NR_set_robust_list = 311
diff --git a/sys/linux/futex_amd64.const b/sys/linux/futex_amd64.const
deleted file mode 100644
index fe82b3ccf..000000000
--- a/sys/linux/futex_amd64.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 202
-__NR_get_robust_list = 274
-__NR_set_robust_list = 273
diff --git a/sys/linux/futex_arm.const b/sys/linux/futex_arm.const
deleted file mode 100644
index 4367494b5..000000000
--- a/sys/linux/futex_arm.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 240
-__NR_get_robust_list = 339
-__NR_set_robust_list = 338
diff --git a/sys/linux/futex_arm64.const b/sys/linux/futex_arm64.const
deleted file mode 100644
index 2a685aa16..000000000
--- a/sys/linux/futex_arm64.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 98
-__NR_get_robust_list = 100
-__NR_set_robust_list = 99
diff --git a/sys/linux/futex_mips64le.const b/sys/linux/futex_mips64le.const
deleted file mode 100644
index 28af2f199..000000000
--- a/sys/linux/futex_mips64le.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 5194
-__NR_get_robust_list = 5269
-__NR_set_robust_list = 5268
diff --git a/sys/linux/futex_ppc64le.const b/sys/linux/futex_ppc64le.const
deleted file mode 100644
index 4c09ad7f9..000000000
--- a/sys/linux/futex_ppc64le.const
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED FILE
-FUTEX_CMP_REQUEUE = 4
-FUTEX_CMP_REQUEUE_PI_PRIVATE = 140
-FUTEX_REQUEUE = 3
-FUTEX_WAIT = 0
-FUTEX_WAIT_BITSET = 9
-FUTEX_WAIT_MULTIPLE = 13
-FUTEX_WAIT_MULTIPLE_PRIVATE = 141
-FUTEX_WAIT_PRIVATE = 128
-FUTEX_WAIT_REQUEUE_PI_PRIVATE = 139
-FUTEX_WAKE = 1
-FUTEX_WAKE_PRIVATE = 129
-__NR_futex = 221
-__NR_get_robust_list = 299
-__NR_set_robust_list = 300
diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go
index f8a93adcf..477877d3c 100644
--- a/sys/syz-extract/extract.go
+++ b/sys/syz-extract/extract.go
@@ -265,8 +265,6 @@ func archFileList(os, arch string, files []string) (string, []string, []string,
 		manualFiles := map[string]bool{
 			// Not upstream, generated on https://github.com/multipath-tcp/mptcp_net-next
 			"vnet_mptcp.txt": true,
-			// Not upstream, generated on unknown tree.
-			"futex.txt": true,
 			// Was in linux-next, but then was removed, fate is unknown.
 			"dev_watch_queue.txt": true,
 		}