Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 56dd9470d7c8734f055da2a6bac553caf4a468eb

Authored by Frederic Weisbecker
1 parent 6dbe51c251
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

context_tracking: Move exception handling to generic code 

Exceptions handling on context tracking should share common
treatment: on entry we exit user mode if the exception triggered
in that context. Then on exception exit we return to that previous
context.

Generalize this to avoid duplication across archs.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Mats Liljegren <mats.liljegren@enea.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Showing 5 changed files with 19 additions and 26 deletions Side-by-side Diff

arch/x86/include/asm/context_tracking.h
Diff comments   View file @ 56dd947
1 1 #ifndef _ASM_X86_CONTEXT_TRACKING_H
2 2 #define _ASM_X86_CONTEXT_TRACKING_H
3 3  
4   -#ifndef __ASSEMBLY__
5   -#include <linux/context_tracking.h>
6   -#include <asm/ptrace.h>
7   -
8   -static inline void exception_enter(struct pt_regs *regs)
9   -{
10   - user_exit();
11   -}
12   -
13   -static inline void exception_exit(struct pt_regs *regs)
14   -{
15 4 #ifdef CONFIG_CONTEXT_TRACKING
16   - if (user_mode(regs))
17   - user_enter();
18   -#endif
19   -}
20   -
21   -#else /* __ASSEMBLY__ */
22   -
23   -#ifdef CONFIG_CONTEXT_TRACKING
24 5 # define SCHEDULE_USER call schedule_user
25 6 #else
26 7 # define SCHEDULE_USER call schedule
27 8 #endif
28   -
29   -#endif /* !__ASSEMBLY__ */
30 9  
31 10 #endif
arch/x86/kernel/kvm.c
Diff comments   View file @ 56dd947
... ... @@ -20,6 +20,7 @@
20 20 * Authors: Anthony Liguori <aliguori@us.ibm.com>
21 21 */
22 22  
  23 +#include <linux/context_tracking.h>
23 24 #include <linux/module.h>
24 25 #include <linux/kernel.h>
25 26 #include <linux/kvm_para.h>
... ... @@ -43,7 +44,6 @@
43 44 #include <asm/apicdef.h>
44 45 #include <asm/hypervisor.h>
45 46 #include <asm/kvm_guest.h>
46   -#include <asm/context_tracking.h>
47 47  
48 48 static int kvmapf = 1;
49 49  
arch/x86/kernel/traps.c
Diff comments   View file @ 56dd947
... ... @@ -12,6 +12,7 @@
12 12  
13 13 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
14 14  
  15 +#include <linux/context_tracking.h>
15 16 #include <linux/interrupt.h>
16 17 #include <linux/kallsyms.h>
17 18 #include <linux/spinlock.h>
... ... @@ -55,8 +56,6 @@
55 56 #include <asm/i387.h>
56 57 #include <asm/fpu-internal.h>
57 58 #include <asm/mce.h>
58   -#include <asm/context_tracking.h>
59   -
60 59 #include <asm/mach_traps.h>
61 60  
62 61 #ifdef CONFIG_X86_64
... ... @@ -13,12 +13,12 @@
13 13 #include <linux/perf_event.h> /* perf_sw_event */
14 14 #include <linux/hugetlb.h> /* hstate_index_to_shift */
15 15 #include <linux/prefetch.h> /* prefetchw */
  16 +#include <linux/context_tracking.h> /* exception_enter(), ... */
16 17  
17 18 #include <asm/traps.h> /* dotraplinkage, ... */
18 19 #include <asm/pgalloc.h> /* pgd_*(), ... */
19 20 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
20 21 #include <asm/fixmap.h> /* VSYSCALL_START */
21   -#include <asm/context_tracking.h> /* exception_enter(), ... */
22 22  
23 23 /*
24 24 * Page fault error code bits:
include/linux/context_tracking.h
Diff comments   View file @ 56dd947
1 1 #ifndef _LINUX_CONTEXT_TRACKING_H
2 2 #define _LINUX_CONTEXT_TRACKING_H
3 3  
4   -#ifdef CONFIG_CONTEXT_TRACKING
5 4 #include <linux/sched.h>
6 5 #include <linux/percpu.h>
  6 +#include <asm/ptrace.h>
7 7  
  8 +#ifdef CONFIG_CONTEXT_TRACKING
8 9 struct context_tracking {
9 10 /*
10 11 * When active is false, probes are unset in order
11 12  
... ... @@ -33,12 +34,26 @@
33 34  
34 35 extern void user_enter(void);
35 36 extern void user_exit(void);
  37 +
  38 +static inline void exception_enter(struct pt_regs *regs)
  39 +{
  40 + user_exit();
  41 +}
  42 +
  43 +static inline void exception_exit(struct pt_regs *regs)
  44 +{
  45 + if (user_mode(regs))
  46 + user_enter();
  47 +}
  48 +
36 49 extern void context_tracking_task_switch(struct task_struct *prev,
37 50 struct task_struct *next);
38 51 #else
39 52 static inline bool context_tracking_in_user(void) { return false; }
40 53 static inline void user_enter(void) { }
41 54 static inline void user_exit(void) { }
  55 +static inline void exception_enter(struct pt_regs *regs) { }
  56 +static inline void exception_exit(struct pt_regs *regs) { }
42 57 static inline void context_tracking_task_switch(struct task_struct *prev,
43 58 struct task_struct *next) { }
44 59 #endif /* !CONFIG_CONTEXT_TRACKING */