aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2018-08-23 18:59:35 -0400
committerIngo Molnar <mingo@kernel.org>2018-09-10 08:01:46 -0400
commit02e184476eff848273826c1d6617bb37e5bcc7ad (patch)
tree08cf74e197794bbc4226a42d420c060df87c6b3e
parent09121255c784fd36ad6237a4e239c634b0209de0 (diff)
perf/core: Force USER_DS when recording user stack data
Perf can record user stack data in response to a synchronous request, such as a tracepoint firing. If this happens under set_fs(KERNEL_DS), then we end up reading user stack data using __copy_from_user_inatomic() under set_fs(KERNEL_DS). I think this conflicts with the intention of using set_fs(KERNEL_DS). And it is explicitly forbidden by hardware on ARM64 when both CONFIG_ARM64_UAO and CONFIG_ARM64_PAN are used. So fix this by forcing USER_DS when recording user stack data. Signed-off-by: Yabin Cui <yabinc@google.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: <stable@vger.kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: 88b0193d9418 ("perf/callchain: Force USER_DS when invoking perf_callchain_user()") Link: http://lkml.kernel.org/r/20180823225935.27035-1-yabinc@google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/events/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index abaed4f8bb7f..c80549bf82c6 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5943,6 +5943,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
5943 unsigned long sp; 5943 unsigned long sp;
5944 unsigned int rem; 5944 unsigned int rem;
5945 u64 dyn_size; 5945 u64 dyn_size;
5946 mm_segment_t fs;
5946 5947
5947 /* 5948 /*
5948 * We dump: 5949 * We dump:
@@ -5960,7 +5961,10 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
5960 5961
5961 /* Data. */ 5962 /* Data. */
5962 sp = perf_user_stack_pointer(regs); 5963 sp = perf_user_stack_pointer(regs);
5964 fs = get_fs();
5965 set_fs(USER_DS);
5963 rem = __output_copy_user(handle, (void *) sp, dump_size); 5966 rem = __output_copy_user(handle, (void *) sp, dump_size);
5967 set_fs(fs);
5964 dyn_size = dump_size - rem; 5968 dyn_size = dump_size - rem;
5965 5969
5966 perf_output_skip(handle, rem); 5970 perf_output_skip(handle, rem);