Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

tests/runtime/probe

@@ -153,18 +153,18 @@ NAME kprobe_offset_module
 RUN {{BPFTRACE}} -e 'kprobe:nft_trans_alloc_gfp+0x5 { printf("hit\n"); exit(); }'
 AFTER /usr/sbin/nft add table bpftrace
 EXPECT hit
-ARCH x86_64|aarch64
+ARCH x86_64
 TIMEOUT 5
 REQUIRES lsmod | grep '^nf_tables'
 REQUIRES /usr/sbin/nft --help
 CLEANUP /usr/sbin/nft delete table bpftrace
 
-# Local entry point to nft_trans_alloc_gfp is located at offset of 8 bytes in ppc64.
+# Local entry point to nft_trans_alloc_gfp is located at offset of 8 bytes in ppc64 and aarch64.
 NAME kprobe_offset_module
 RUN {{BPFTRACE}} -e 'kprobe:nft_trans_alloc_gfp+0x8 { printf("hit\n"); exit(); }'
 AFTER /usr/sbin/nft add table bpftrace
 EXPECT hit
-ARCH ppc64|ppc64le
+ARCH ppc64|ppc64le|aarch64
 TIMEOUT 5
 REQUIRES lsmod | grep '^nf_tables'
 REQUIRES /usr/sbin/nft --help
@@ -173,6 +173,15 @@ CLEANUP /usr/sbin/nft delete table bpftrace
 NAME kprobe_offset_module_error
 RUN {{BPFTRACE}} -e 'kprobe:nft_trans_alloc_gfp+0x1 { printf("hit\n"); exit(); }'
 EXPECT Possible attachment attempt in the middle of an instruction, try a different offset.
+ARCH x86_64
+TIMEOUT 5
+REQUIRES lsmod | grep '^nf_tables'
+WILL_FAIL
+
+NAME kprobe_offset_module_error
+RUN {{BPFTRACE}} -e 'kprobe:nft_trans_alloc_gfp+0x1 { printf("hit\n"); exit(); }'
+EXPECT Invalid argument
+ARCH aarch64
 TIMEOUT 5
 REQUIRES lsmod | grep '^nf_tables'
 WILL_FAIL

tools/execsnoop.bt

@@ -15,6 +15,10 @@
  * 11-Sep-2018	   "     "	Switched to use join().
  */
 
+#ifndef BPFTRACE_HAVE_BTF
+#include <linux/sched.h>
+#endif
+
 BEGIN
 {
 	printf("%-10s %-7s %-7s %s\n", "TIME(ms)", "PID", "PPID", "ARGS");