Merge remote-tracking branch 'upstream/master' into fixes

drop my changes from 087d22f which were replicated in master

src/epoll.c

@@ -33,21 +33,6 @@ SYS_FUNC(epoll_create1)
 
 #include "xlat/epollevents.h"
 
-static void
-print_epoll_data(const __u64 data)
-{
-	/*
-	 * We cannot know what format the tracee uses, so
-	 * print both u32 and u64 which will cover every value.
-	 */
-	union dummy { __u64 u64; __u32 u32; } u; u.u64 = data;
-	tprint_struct_begin();
-	PRINT_FIELD_U(u, u32);
-	tprint_struct_next();
-	PRINT_FIELD_U(u, u64);
-	tprint_struct_end();
-}
-
 static bool
 print_epoll_event(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
@@ -56,7 +41,7 @@ print_epoll_event(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 	tprint_struct_begin();
 	PRINT_FIELD_FLAGS(*ev, events, epollevents, "EPOLL???");
 	tprint_struct_next();
-	PRINT_FIELD_OBJ_VAL(*ev, data, print_epoll_data);
+	PRINT_FIELD_X(*ev, data);
 	tprint_struct_end();
 
 	return true;

tests/epoll_ctl.c

@@ -12,8 +12,8 @@
 
 #include <inttypes.h>
 #include <stdio.h>
-#include <sys/epoll.h>
 #include <unistd.h>
+#include <linux/eventpoll.h>
 
 static long
 invoke_syscall(unsigned long epfd, unsigned long op, unsigned long fd, void *ev)
@@ -30,8 +30,8 @@ main(void)
 
 	long rc = invoke_syscall(-1U, EPOLL_CTL_ADD, -2U, ev);
 	printf("epoll_ctl(-1, EPOLL_CTL_ADD, -2"
-	       ", {events=EPOLLIN, data={u32=%u, u64=%" PRIu64 "}}) = %s\n",
-	       ev->data.u32, ev->data.u64, sprintrc(rc));
+	       ", {events=EPOLLIN, data=%#" PRI__x64 "}) = %s\n",
+	       ev->data, sprintrc(rc));
 
 	rc = invoke_syscall(-3U, EPOLL_CTL_DEL, -4U, ev);
 	printf("epoll_ctl(-3, EPOLL_CTL_DEL, -4, %p) = %s\n",

tests/epoll_pwait.c

@@ -12,8 +12,8 @@
 
 # include <signal.h>
 # include <stdio.h>
-# include <sys/epoll.h>
 # include <unistd.h>
+# include <linux/eventpoll.h>
 
 int
 main(void)

tests/epoll_pwait2-y.c

@@ -1,4 +1,4 @@
-#define DECODE_FDS 1
+#define FD9_PATH "</dev/full>"
 #define SKIP_IF_PROC_IS_UNAVAILABLE skip_if_unavailable("/proc/self/fd/")
 
 #include "epoll_pwait2.c"

tests/epoll_pwait2.c

@@ -10,15 +10,14 @@
 #include "tests.h"
 #include "scno.h"
 #include "xmalloc.h"
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/epoll.h>
+#include <linux/eventpoll.h>
 #include "kernel_timespec.h"
 
-#ifndef DECODE_FDS
-# define DECODE_FDS 0
+#ifndef FD9_PATH
+# define FD9_PATH ""
 #endif
 #ifndef SKIP_IF_PROC_IS_UNAVAILABLE
 # define SKIP_IF_PROC_IS_UNAVAILABLE
@@ -52,14 +51,8 @@ main(void)
 {
 	SKIP_IF_PROC_IS_UNAVAILABLE;
 
-	static const char fd_path[] = "/dev/full";
-	int fd = open(fd_path, O_WRONLY);
-	if (fd < 0)
-		perror_msg_and_fail("open: %s", fd_path);
-	char *fd_str = xasprintf("%d%s%s%s", fd,
-				 DECODE_FDS ? "<" : "",
-				 DECODE_FDS ? fd_path : "",
-				 DECODE_FDS ? ">" : "");
+	int fd = 9;
+	char *fd_str = xasprintf("%d%s", fd, FD9_PATH);
 
 	TAIL_ALLOC_OBJECT_CONST_PTR(struct epoll_event, events);
 	TAIL_ALLOC_OBJECT_CONST_PTR(kernel_timespec64_t, timeout);

tests/epoll_wait.c

@@ -11,8 +11,8 @@
 #ifdef __NR_epoll_wait
 
 # include <stdio.h>
-# include <sys/epoll.h>
 # include <unistd.h>
+# include <linux/eventpoll.h>
 
 int
 main(void)

tests/gen_tests.in

@@ -108,9 +108,9 @@ epoll_create	-a17
 epoll_create1	-a28
 epoll_ctl
 epoll_pwait
-epoll_pwait2
-epoll_pwait2-P	--trace=epoll_pwait2 -P /dev/full
-epoll_pwait2-y	--trace=epoll_pwait2 -y
+epoll_pwait2	9>>/dev/full
+epoll_pwait2-P	--trace=epoll_pwait2 -P /dev/full 9>>/dev/full
+epoll_pwait2-y	--trace=epoll_pwait2 -y 9>>/dev/full
 epoll_wait	-a26
 erestartsys	-a34 -e signal=none -e trace=recvfrom
 eventfd-yy -a15 --trace=eventfd2,fchdir -yy -qq

tests/init.sh

@@ -554,7 +554,6 @@ test_pidns()
 
 check_scno_tampering()
 {
-	uname_r="$(uname -r)"
 	case "$STRACE_ARCH" in
 		arm)
 			# PTRACE_SET_SYSCALL is supported by linux kernel