Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

14 files changed, 63 insertions, 23 deletions

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index d4e2e18a5881..caaab28f8400 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -228,11 +228,11 @@ OPTIONS
 
         With the metric option perf script can compute metrics for
         sampling periods, similar to perf stat. This requires
-        specifying a group with multiple metrics with the :S option
+        specifying a group with multiple events defining metrics with the :S option
         for perf record. perf will sample on the first event, and
-        compute metrics for all the events in the group. Please note
+        print computed metrics for all the events in the group. Please note
         that the metric computed is averaged over the whole sampling
-        period, not just for the sample point.
+        period (since the last sample), not just for the sample point.
 
         For sample events it's possible to display misc field with -F +misc option,
         following letters are displayed for each bit:
@@ -384,7 +384,7 @@ include::itrace.txt[]
         perf script --time 0%-10%,30%-40%
 
 --max-blocks::
-        Set the maximum number of program blocks to print with brstackasm for
+        Set the maximum number of program blocks to print with brstackinsn for
         each sample.
 
 --reltime::
diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
index 5f54feb19977..d030c87ed9f5 100644
--- a/tools/perf/Documentation/perf.data-file-format.txt
+++ b/tools/perf/Documentation/perf.data-file-format.txt
@@ -126,7 +126,7 @@ vendor,family,model,stepping. For example: GenuineIntel,6,69,1
 
         HEADER_TOTAL_MEM = 10,
 
-An uint64_t with the total memory in bytes.
+An uint64_t with the total memory in kilobytes.
 
         HEADER_CMDLINE = 11,
 
diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
index b4e6f9e6204a..c29976eca4a8 100644
--- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
@@ -355,6 +355,8 @@
 431     common  fsconfig                __x64_sys_fsconfig
 432     common  fsmount                 __x64_sys_fsmount
 433     common  fspick                  __x64_sys_fspick
+434     common  pidfd_open              __x64_sys_pidfd_open
+435     common  clone3                  __x64_sys_clone3/ptregs
 
 #
 # x32-specific system call numbers start at 512 to avoid cache impact
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 6418782951a4..3d0ffd41fb55 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -698,6 +698,16 @@ __cmd_probe(int argc, const char **argv)
 
                 ret = perf_add_probe_events(params.events, params.nevents);
                 if (ret < 0) {
+
+                        /*
+                         * When perf_add_probe_events() fails it calls
+                         * cleanup_perf_probe_events(pevs, npevs), i.e.
+                         * cleanup_perf_probe_events(params.events, params.nevents), which
+                         * will call clear_perf_probe_event(), so set nevents to zero
+                         * to avoid cleanup_params() to call clear_perf_probe_event() again
+                         * on the same pevs.
+                         */
+                        params.nevents = 0;
                         pr_err_with_code("  Error: Failed to add events.", ret);
                         return ret;
                 }
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 8f24865596af..0140ddb8dd0b 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1059,7 +1059,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample,
 
                         printed += ip__fprintf_sym(ip, thread, x.cpumode, x.cpu, &lastsym, attr, fp);
                         if (ip == end) {
-                                printed += ip__fprintf_jump(ip, &br->entries[i], &x, buffer + off, len - off, insn, fp,
+                                printed += ip__fprintf_jump(ip, &br->entries[i], &x, buffer + off, len - off, ++insn, fp,
                                                             &total_cycles);
                                 if (PRINT_FIELD(SRCCODE))
                                         printed += print_srccode(thread, x.cpumode, ip);
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index b55a534b4de0..352cf39d7c2f 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -607,7 +607,13 @@ try_again:
          * group leaders.
          */
         read_counters(&(struct timespec) { .tv_nsec = t1-t0 });
-        perf_evlist__close(evsel_list);
+
+        /*
+         * We need to keep evsel_list alive, because it's processed
+         * later the evsel_list will be closed after.
+         */
+        if (!STAT_RECORD)
+                perf_evlist__close(evsel_list);
 
         return WEXITSTATUS(status);
 }
@@ -1997,6 +2003,7 @@ int cmd_stat(int argc, const char **argv)
                         perf_session__write_header(perf_stat.session, evsel_list, fd, true);
                 }
 
+                perf_evlist__close(evsel_list);
                 perf_session__delete(perf_stat.session);
         }
 
diff --git a/tools/perf/trace/beauty/usbdevfs_ioctl.sh b/tools/perf/trace/beauty/usbdevfs_ioctl.sh
index 930b80f422e8..aa597ae53747 100755
--- a/tools/perf/trace/beauty/usbdevfs_ioctl.sh
+++ b/tools/perf/trace/beauty/usbdevfs_ioctl.sh
@@ -3,10 +3,13 @@
 
 [ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/
 
+# also as:
+# #define USBDEVFS_CONNINFO_EX(len)  _IOC(_IOC_READ, 'U', 32, len)
+
 printf "static const char *usbdevfs_ioctl_cmds[] = {\n"
-regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
-egrep $regex ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \
-        sed -r "s/$regex/\2 \1/g"       | \
+regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
+egrep "$regex" ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \
+        sed -r "s/$regex/\4 \1/g"       | \
         sort | xargs printf "\t[%s] = \"%s\",\n"
 printf "};\n\n"
 printf "#if 0\n"
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index ebb46da4dfe5..52459dd5ad0c 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1291,6 +1291,7 @@ static void perf_evsel__free_id(struct perf_evsel *evsel)
         xyarray__delete(evsel->sample_id);
         evsel->sample_id = NULL;
         zfree(&evsel->id);
+        evsel->ids = 0;
 }
 
 static void perf_evsel__free_config_terms(struct perf_evsel *evsel)
@@ -2077,6 +2078,7 @@ void perf_evsel__close(struct perf_evsel *evsel)
 
         perf_evsel__close_fd(evsel);
         perf_evsel__free_fd(evsel);
+        perf_evsel__free_id(evsel);
 }
 
 int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c24db7f4909c..1903d7ec9797 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3559,6 +3559,13 @@ int perf_session__read_header(struct perf_session *session)
                            data->file.path);
         }
 
+        if (f_header.attr_size == 0) {
+                pr_err("ERROR: The %s file's attr size field is 0 which is unexpected.\n"
+                       "Was the 'perf record' command properly terminated?\n",
+                       data->file.path);
+                return -EINVAL;
+        }
+
         nr_attrs = f_header.attrs.size / f_header.attr_size;
         lseek(fd, f_header.attrs.offset, SEEK_SET);
 
@@ -3639,7 +3646,7 @@ int perf_event__synthesize_attr(struct perf_tool *tool,
         size += sizeof(struct perf_event_header);
         size += ids * sizeof(u64);
 
-        ev = malloc(size);
+        ev = zalloc(size);
 
         if (ev == NULL)
                 return -ENOMEM;
@@ -3747,7 +3754,7 @@ int perf_event__process_feature(struct perf_session *session,
                 return 0;
 
         ff.buf  = (void *)fe->data;
-        ff.size = event->header.size - sizeof(event->header);
+        ff.size = event->header.size - sizeof(*fe);
         ff.ph = &session->header;
 
         if (feat_ops[feat].process(&ff, NULL))
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index cd1eb73cfe83..8394d48f8b32 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2230,6 +2230,7 @@ void clear_perf_probe_event(struct perf_probe_event *pev)
                         field = next;
                 }
         }
+        pev->nargs = 0;
         zfree(&pev->args);
 }
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index d0fd6c614e68..37efa1f43d8b 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -36,10 +36,16 @@ static int perf_session__process_compressed_event(struct perf_session *session,
         void *src;
         size_t decomp_size, src_size;
         u64 decomp_last_rem = 0;
-        size_t decomp_len = session->header.env.comp_mmap_len;
+        size_t mmap_len, decomp_len = session->header.env.comp_mmap_len;
         struct decomp *decomp, *decomp_last = session->decomp_last;
 
-        decomp = mmap(NULL, sizeof(struct decomp) + decomp_len, PROT_READ|PROT_WRITE,
+        if (decomp_last) {
+                decomp_last_rem = decomp_last->size - decomp_last->head;
+                decomp_len += decomp_last_rem;
+        }
+
+        mmap_len = sizeof(struct decomp) + decomp_len;
+        decomp = mmap(NULL, mmap_len, PROT_READ|PROT_WRITE,
                       MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
         if (decomp == MAP_FAILED) {
                 pr_err("Couldn't allocate memory for decompression\n");
@@ -47,10 +53,10 @@ static int perf_session__process_compressed_event(struct perf_session *session,
         }
 
         decomp->file_pos = file_offset;
+        decomp->mmap_len = mmap_len;
         decomp->head = 0;
 
-        if (decomp_last) {
-                decomp_last_rem = decomp_last->size - decomp_last->head;
+        if (decomp_last_rem) {
                 memcpy(decomp->data, &(decomp_last->data[decomp_last->head]), decomp_last_rem);
                 decomp->size = decomp_last_rem;
         }
@@ -61,7 +67,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
         decomp_size = zstd_decompress_stream(&(session->zstd_data), src, src_size,
                                 &(decomp->data[decomp_last_rem]), decomp_len - decomp_last_rem);
         if (!decomp_size) {
-                munmap(decomp, sizeof(struct decomp) + decomp_len);
+                munmap(decomp, mmap_len);
                 pr_err("Couldn't decompress data\n");
                 return -1;
         }
@@ -255,15 +261,15 @@ static void perf_session__delete_threads(struct perf_session *session)
 static void perf_session__release_decomp_events(struct perf_session *session)
 {
         struct decomp *next, *decomp;
-        size_t decomp_len;
+        size_t mmap_len;
         next = session->decomp;
-        decomp_len = session->header.env.comp_mmap_len;
         do {
                 decomp = next;
                 if (decomp == NULL)
                         break;
                 next = decomp->next;
-                munmap(decomp, decomp_len + sizeof(struct decomp));
+                mmap_len = decomp->mmap_len;
+                munmap(decomp, mmap_len);
         } while (1);
 }
 
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index dd8920b745bc..863dbad87849 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -46,6 +46,7 @@ struct perf_session {
 struct decomp {
         struct decomp *next;
         u64 file_pos;
+        size_t mmap_len;
         u64 head;
         size_t size;
         char data[];
diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 656065af4971..accb1bf1cfd8 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -819,7 +819,8 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
                                         "stalled cycles per insn",
                                         ratio);
                 } else if (have_frontend_stalled) {
-                        print_metric(config, ctxp, NULL, NULL,
+                        out->new_line(config, ctxp);
+                        print_metric(config, ctxp, NULL, "%7.2f ",
                                      "stalled cycles per insn", 0);
                 }
         } else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES)) {
diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c
index 23bdb9884576..d2202392ffdb 100644
--- a/tools/perf/util/zstd.c
+++ b/tools/perf/util/zstd.c
@@ -99,8 +99,8 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_size
         while (input.pos < input.size) {
                 ret = ZSTD_decompressStream(data->dstream, &output, &input);
                 if (ZSTD_isError(ret)) {
-                        pr_err("failed to decompress (B): %ld -> %ld : %s\n",
-                               src_size, output.size, ZSTD_getErrorName(ret));
+                        pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",
+                               src_size, output.size, dst_size, ZSTD_getErrorName(ret));
                         break;
                 }
                 output.dst  = dst + output.pos;