Merge 4.18-rc7 into usb-next

We want the USB fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

7 files changed, 103 insertions, 51 deletions

diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 32f9e397a6c0..3f140eff039f 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -217,6 +217,14 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32))
         int err;
         int fd;
 
+        if (argc < 3) {
+                p_err("too few arguments, id ID and FILE path is required");
+                return -1;
+        } else if (argc > 3) {
+                p_err("too many arguments");
+                return -1;
+        }
+
         if (!is_prefix(*argv, "id")) {
                 p_err("expected 'id' got %s", *argv);
                 return -1;
@@ -230,9 +238,6 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32))
         }
         NEXT_ARG();
 
-        if (argc != 1)
-                usage();
-
         fd = get_fd_by_id(id);
         if (fd < 0) {
                 p_err("can't get prog by id (%u): %s", id, strerror(errno));
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 0d1acb704f64..7ec85d567598 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -519,10 +519,12 @@ struct section *elf_create_section(struct elf *elf, const char *name,
         sec->sh.sh_flags = SHF_ALLOC;
 
 
-        /* Add section name to .shstrtab */
+        /* Add section name to .shstrtab (or .strtab for Clang) */
         shstrtab = find_section_by_name(elf, ".shstrtab");
+        if (!shstrtab)
+                shstrtab = find_section_by_name(elf, ".strtab");
         if (!shstrtab) {
-                WARN("can't find .shstrtab section");
+                WARN("can't find .shstrtab or .strtab section");
                 return NULL;
         }
 
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 7a6214e9ae58..a362e3d7abc6 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -105,7 +105,7 @@ $(OUTPUT)/test_xdp_noinline.o: CLANG_FLAGS += -fno-inline
 
 BTF_LLC_PROBE := $(shell $(LLC) -march=bpf -mattr=help 2>&1 | grep dwarfris)
 BTF_PAHOLE_PROBE := $(shell $(BTF_PAHOLE) --help 2>&1 | grep BTF)
-BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --version 2>&1 | grep LLVM)
+BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --help 2>&1 | grep -i 'usage.*llvm')
 
 ifneq ($(BTF_LLC_PROBE),)
 ifneq ($(BTF_PAHOLE_PROBE),)
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 2ecd27b670d7..41106d9d5cc7 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -4975,6 +4975,24 @@ static struct bpf_test tests[] = {
                 .prog_type = BPF_PROG_TYPE_LWT_XMIT,
         },
         {
+                "make headroom for LWT_XMIT",
+                .insns = {
+                        BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
+                        BPF_MOV64_IMM(BPF_REG_2, 34),
+                        BPF_MOV64_IMM(BPF_REG_3, 0),
+                        BPF_EMIT_CALL(BPF_FUNC_skb_change_head),
+                        /* split for s390 to succeed */
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
+                        BPF_MOV64_IMM(BPF_REG_2, 42),
+                        BPF_MOV64_IMM(BPF_REG_3, 0),
+                        BPF_EMIT_CALL(BPF_FUNC_skb_change_head),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_LWT_XMIT,
+        },
+        {
                 "invalid access of tc_classid for LWT_IN",
                 .insns = {
                         BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
@@ -11987,6 +12005,46 @@ static struct bpf_test tests[] = {
                 .prog_type = BPF_PROG_TYPE_XDP,
         },
         {
+                "xadd/w check whether src/dst got mangled, 1",
+                .insns = {
+                        BPF_MOV64_IMM(BPF_REG_0, 1),
+                        BPF_MOV64_REG(BPF_REG_6, BPF_REG_0),
+                        BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
+                        BPF_STX_MEM(BPF_DW, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_STX_XADD(BPF_DW, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_STX_XADD(BPF_DW, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_JMP_REG(BPF_JNE, BPF_REG_6, BPF_REG_0, 3),
+                        BPF_JMP_REG(BPF_JNE, BPF_REG_7, BPF_REG_10, 2),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_10, -8),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(BPF_REG_0, 42),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
+                .retval = 3,
+        },
+        {
+                "xadd/w check whether src/dst got mangled, 2",
+                .insns = {
+                        BPF_MOV64_IMM(BPF_REG_0, 1),
+                        BPF_MOV64_REG(BPF_REG_6, BPF_REG_0),
+                        BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
+                        BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_STX_XADD(BPF_W, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_STX_XADD(BPF_W, BPF_REG_10, BPF_REG_0, -8),
+                        BPF_JMP_REG(BPF_JNE, BPF_REG_6, BPF_REG_0, 3),
+                        BPF_JMP_REG(BPF_JNE, BPF_REG_7, BPF_REG_10, 2),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_10, -8),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(BPF_REG_0, 42),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
+                .retval = 3,
+        },
+        {
                 "bpf_get_stack return R0 within range",
                 .insns = {
                         BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
@@ -12554,8 +12612,11 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
         }
 
         if (fd_prog >= 0) {
+                __u8 tmp[TEST_DATA_LEN << 2];
+                __u32 size_tmp = sizeof(tmp);
+
                 err = bpf_prog_test_run(fd_prog, 1, test->data,
-                                        sizeof(test->data), NULL, NULL,
+                                        sizeof(test->data), tmp, &size_tmp,
                                         &retval, NULL);
                 if (err && errno != 524/*ENOTSUPP*/ && errno != EPERM) {
                         printf("Unexpected bpf_prog_test_run error\n");
diff --git a/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc b/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc
new file mode 100644
index 000000000000..3b1f45e13a2e
--- /dev/null
+++ b/tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc
@@ -0,0 +1,28 @@
+#!/bin/sh
+# description: Snapshot and tracing setting
+# flags: instance
+
+[ ! -f snapshot ] && exit_unsupported
+
+echo "Set tracing off"
+echo 0 > tracing_on
+
+echo "Allocate and take a snapshot"
+echo 1 > snapshot
+
+# Since trace buffer is empty, snapshot is also empty, but allocated
+grep -q "Snapshot is allocated" snapshot
+
+echo "Ensure keep tracing off"
+test `cat tracing_on` -eq 0
+
+echo "Set tracing on"
+echo 1 > tracing_on
+
+echo "Take a snapshot again"
+echo 1 > snapshot
+
+echo "Ensure keep tracing on"
+test `cat tracing_on` -eq 1
+
+exit 0
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index 78245d60d8bc..0f45633bd634 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -740,13 +740,6 @@ ipv6_rt_add()
         run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
         log_test $? 2 "Attempt to add duplicate route - reject route"
 
-        # iproute2 prepend only sets NLM_F_CREATE
-        # - adds a new route; does NOT convert existing route to ECMP
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro prepend 2001:db8:104::/64 via 2001:db8:103::2"
-        check_route6 "2001:db8:104::/64 via 2001:db8:101::2 dev veth1 metric 1024 2001:db8:104::/64 via 2001:db8:103::2 dev veth3 metric 1024"
-        log_test $? 0 "Add new route for existing prefix (w/o NLM_F_EXCL)"
-
         # route append with same prefix adds a new route
         # - iproute2 sets NLM_F_CREATE | NLM_F_APPEND
         add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
@@ -754,27 +747,6 @@ ipv6_rt_add()
         check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
         log_test $? 0 "Append nexthop to existing route - gw"
 
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 dev veth3"
-        check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop dev veth3 weight 1"
-        log_test $? 0 "Append nexthop to existing route - dev only"
-
-        # multipath route can not have a nexthop that is a reject route
-        add_route6 "2001:db8:104::/64" "via 2001:db8:101::2"
-        run_cmd "$IP -6 ro append unreachable 2001:db8:104::/64"
-        log_test $? 2 "Append nexthop to existing route - reject route"
-
-        # reject route can not be converted to multipath route
-        run_cmd "$IP -6 ro flush 2001:db8:104::/64"
-        run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 via 2001:db8:103::2"
-        log_test $? 2 "Append nexthop to existing reject route - gw"
-
-        run_cmd "$IP -6 ro flush 2001:db8:104::/64"
-        run_cmd "$IP -6 ro add unreachable 2001:db8:104::/64"
-        run_cmd "$IP -6 ro append 2001:db8:104::/64 dev veth3"
-        log_test $? 2 "Append nexthop to existing reject route - dev only"
-
         # insert mpath directly
         add_route6 "2001:db8:104::/64" "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
         check_route6  "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::2 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
@@ -819,13 +791,6 @@ ipv6_rt_replace_single()
         check_route6 "2001:db8:104::/64 metric 1024 nexthop via 2001:db8:101::3 dev veth1 weight 1 nexthop via 2001:db8:103::2 dev veth3 weight 1"
         log_test $? 0 "Single path with multipath"
 
-        # single path with reject
-        #
-        add_initial_route6 "nexthop via 2001:db8:101::2"
-        run_cmd "$IP -6 ro replace unreachable 2001:db8:104::/64"
-        check_route6 "unreachable 2001:db8:104::/64 dev lo metric 1024"
-        log_test $? 0 "Single path with reject route"
-
         # single path with single path using MULTIPATH attribute
         #
         add_initial_route6 "via 2001:db8:101::2"
@@ -873,12 +838,6 @@ ipv6_rt_replace_mpath()
         check_route6 "2001:db8:104::/64 via 2001:db8:101::3 dev veth1 metric 1024"
         log_test $? 0 "Multipath with single path via multipath attribute"
 
-        # multipath with reject
-        add_initial_route6 "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
-        run_cmd "$IP -6 ro replace unreachable 2001:db8:104::/64"
-        check_route6 "unreachable 2001:db8:104::/64 dev lo metric 1024"
-        log_test $? 0 "Multipath with reject route"
-
         # route replace fails - invalid nexthop 1
         add_initial_route6 "nexthop via 2001:db8:101::2 nexthop via 2001:db8:103::2"
         run_cmd "$IP -6 ro replace 2001:db8:104::/64 nexthop via 2001:db8:111::3 nexthop via 2001:db8:103::3"
diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh
index 792fa4d0285e..850767befa47 100755
--- a/tools/testing/selftests/net/udpgso_bench.sh
+++ b/tools/testing/selftests/net/udpgso_bench.sh
@@ -35,9 +35,6 @@ run_udp() {
 
         echo "udp gso"
         run_in_netns ${args} -S
-
-        echo "udp gso zerocopy"
-        run_in_netns ${args} -S -z
 }
 
 run_tcp() {