Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm fixes for 5.3

- A bunch of switch/case fall-through annotation, fixing one actual bug
- Fix PMU reset bug
- Add missing exception class debug strings

1 files changed, 14 insertions, 3 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index d0eb7224dd36..4f0bbffee05f 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -19,6 +19,7 @@
 #include <api/fs/tracing_path.h>
 #include <bpf/bpf.h>
 #include "util/bpf_map.h"
+#include "util/rlimit.h"
 #include "builtin.h"
 #include "util/cgroup.h"
 #include "util/color.h"
@@ -61,6 +62,7 @@
 #include <linux/random.h>
 #include <linux/stringify.h>
 #include <linux/time64.h>
+#include <linux/zalloc.h>
 #include <fcntl.h>
 #include <sys/sysmacros.h>
 
@@ -1038,10 +1040,10 @@ static struct thread_trace *thread_trace__new(void)
 {
         struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
-        if (ttrace)
+        if (ttrace) {
                 ttrace->files.max = -1;
-
-        ttrace->syscall_stats = intlist__new(NULL);
+                ttrace->syscall_stats = intlist__new(NULL);
+        }
 
         return ttrace;
 }
@@ -3863,6 +3865,15 @@ int cmd_trace(int argc, const char **argv)
                 goto out;
         }
 
+        /*
+         * Parsing .perfconfig may entail creating a BPF event, that may need
+         * to create BPF maps, so bump RLIM_MEMLOCK as the default 64K setting
+         * is too small. This affects just this process, not touching the
+         * global setting. If it fails we'll get something in 'perf trace -v'
+         * to help diagnose the problem.
+         */
+        rlimit__bump_memlock();
+
         err = perf_config(trace__config, &trace);
         if (err)
                 goto out;