Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56dd9470 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

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: default avatarFrederic 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>
parent 6dbe51c2

arch/x86/include/asm/context_tracking.h

+0 −21
Original line number Diff line number Diff line 
#ifndef _ASM_X86_CONTEXT_TRACKING_H

#define _ASM_X86_CONTEXT_TRACKING_H



#ifndef __ASSEMBLY__

#include <linux/context_tracking.h>

#include <asm/ptrace.h>



static inline void exception_enter(struct pt_regs *regs)

{

	user_exit();

}



static inline void exception_exit(struct pt_regs *regs)

{

#ifdef CONFIG_CONTEXT_TRACKING

	if (user_mode(regs))

		user_enter();

#endif

}



#else /* __ASSEMBLY__ */



#ifdef CONFIG_CONTEXT_TRACKING

# define SCHEDULE_USER call schedule_user

#else

# define SCHEDULE_USER call schedule

#endif



#endif /* !__ASSEMBLY__ */



#endif

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 *   Authors: Anthony Liguori <aliguori@us.ibm.com>

 */



#include <linux/context_tracking.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kvm_para.h>
@@ -43,7 +44,6 @@ 
#include <asm/apicdef.h>

#include <asm/hypervisor.h>

#include <asm/kvm_guest.h>

#include <asm/context_tracking.h>



static int kvmapf = 1;

arch/x86/kernel/traps.c

+1 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/context_tracking.h>

#include <linux/interrupt.h>

#include <linux/kallsyms.h>

#include <linux/spinlock.h>
@@ -55,8 +56,6 @@ 
#include <asm/i387.h>

#include <asm/fpu-internal.h>

#include <asm/mce.h>

#include <asm/context_tracking.h>



#include <asm/mach_traps.h>



#ifdef CONFIG_X86_64

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 
#include <linux/perf_event.h>		/* perf_sw_event		*/

#include <linux/hugetlb.h>		/* hstate_index_to_shift	*/

#include <linux/prefetch.h>		/* prefetchw			*/

#include <linux/context_tracking.h>	/* exception_enter(), ...	*/



#include <asm/traps.h>			/* dotraplinkage, ...		*/

#include <asm/pgalloc.h>		/* pgd_*(), ...			*/

#include <asm/kmemcheck.h>		/* kmemcheck_*(), ...		*/

#include <asm/fixmap.h>			/* VSYSCALL_START		*/

#include <asm/context_tracking.h>	/* exception_enter(), ...	*/



/*

 * Page fault error code bits:

include/linux/context_tracking.h

+16 −1
Original line number Diff line number Diff line 
#ifndef _LINUX_CONTEXT_TRACKING_H

#define _LINUX_CONTEXT_TRACKING_H



#ifdef CONFIG_CONTEXT_TRACKING

#include <linux/sched.h>

#include <linux/percpu.h>

#include <asm/ptrace.h>



#ifdef CONFIG_CONTEXT_TRACKING

struct context_tracking {

	/*

	 * When active is false, probes are unset in order
@@ -33,12 +34,26 @@ static inline bool context_tracking_active(void) 


extern void user_enter(void);

extern void user_exit(void);



static inline void exception_enter(struct pt_regs *regs)

{

	user_exit();

}



static inline void exception_exit(struct pt_regs *regs)

{

	if (user_mode(regs))

		user_enter();

}



extern void context_tracking_task_switch(struct task_struct *prev,

					 struct task_struct *next);

#else

static inline bool context_tracking_in_user(void) { return false; }

static inline void user_enter(void) { }

static inline void user_exit(void) { }

static inline void exception_enter(struct pt_regs *regs) { }

static inline void exception_exit(struct pt_regs *regs) { }

static inline void context_tracking_task_switch(struct task_struct *prev,

						struct task_struct *next) { }

#endif /* !CONFIG_CONTEXT_TRACKING */