perf record: Make per-cpu mmaps the default.

This affects the -p, -t and -u options that previously defaulted to
per-thread mmaps.

Consequently add an option to select per-thread mmaps to support the old
behaviour.

Note that per-thread can be used with a workload-only (i.e. none of -p,
-t, -u, -a or -C is selected) to get a per-thread mmap with no
inheritance.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/5286271D.3020808@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/tools/perf/util/target.c b/tools/perf/util/target.c
index 3c778a07b7cc..e74c5963dc7a 100644
--- a/tools/perf/util/target.c
+++ b/tools/perf/util/target.c
@@ -55,6 +55,13 @@ enum target_errno target__validate(struct target *target)
                         ret = TARGET_ERRNO__UID_OVERRIDE_SYSTEM;
         }
 
+        /* THREAD and SYSTEM/CPU are mutually exclusive */
+        if (target->per_thread && (target->system_wide || target->cpu_list)) {
+                target->per_thread = false;
+                if (ret == TARGET_ERRNO__SUCCESS)
+                        ret = TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD;
+        }
+
         return ret;
 }
 
@@ -100,6 +107,7 @@ static const char *target__error_str[] = {
         "UID switch overriding CPU",
         "PID/TID switch overriding SYSTEM",
         "UID switch overriding SYSTEM",
+        "SYSTEM/CPU switch overriding PER-THREAD",
         "Invalid User: %s",
         "Problems obtaining information for user %s",
 };
@@ -131,7 +139,8 @@ int target__strerror(struct target *target, int errnum,
         msg = target__error_str[idx];
 
         switch (errnum) {
-        case TARGET_ERRNO__PID_OVERRIDE_CPU ... TARGET_ERRNO__UID_OVERRIDE_SYSTEM:
+        case TARGET_ERRNO__PID_OVERRIDE_CPU ...
+             TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD:
                 snprintf(buf, buflen, "%s", msg);
                 break;