From: Rik van Riel <[email protected]> Rename context_tracking_user_enter & context_tracking_user_exit to just context_tracking_enter & context_tracking_exit, since it will be used to track guest state, too.
This also breaks ARM. The rest of the series does not look like it impacts ARM. Cc: [email protected] Cc: [email protected] Suggested-by: Frederic Weisbecker <[email protected]> Signed-off-by: Rik van Riel <[email protected]> --- include/linux/context_tracking.h | 12 ++++++------ kernel/context_tracking.c | 31 ++++++++++++++++--------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index bd9f000fc98d..29d7fecb365a 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -10,21 +10,21 @@ #ifdef CONFIG_CONTEXT_TRACKING extern void context_tracking_cpu_set(int cpu); -extern void context_tracking_user_enter(enum ctx_state state); -extern void context_tracking_user_exit(enum ctx_state state); +extern void context_tracking_enter(enum ctx_state state); +extern void context_tracking_exit(enum ctx_state state); extern void __context_tracking_task_switch(struct task_struct *prev, struct task_struct *next); static inline void user_enter(void) { if (context_tracking_is_enabled()) - context_tracking_user_enter(IN_USER); + context_tracking_enter(IN_USER); } static inline void user_exit(void) { if (context_tracking_is_enabled()) - context_tracking_user_exit(IN_USER); + context_tracking_exit(IN_USER); } static inline enum ctx_state exception_enter(void) @@ -35,7 +35,7 @@ static inline enum ctx_state exception_enter(void) return 0; prev_ctx = this_cpu_read(context_tracking.state); - context_tracking_user_exit(prev_ctx); + context_tracking_exit(prev_ctx); return prev_ctx; } @@ -44,7 +44,7 @@ static inline void exception_exit(enum ctx_state prev_ctx) { if (context_tracking_is_enabled()) { if (prev_ctx == IN_USER) - context_tracking_user_enter(prev_ctx); + context_tracking_enter(prev_ctx); } } diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 4c010787c9ec..e031e8c0fb91 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -39,15 +39,15 @@ void context_tracking_cpu_set(int cpu) } /** - * context_tracking_user_enter - Inform the context tracking that the CPU is going to - * enter userspace mode. + * context_tracking_enter - Inform the context tracking that the CPU is going + * to enter user or guest space mode. * * This function must be called right before we switch from the kernel - * to userspace, when it's guaranteed the remaining kernel instructions - * to execute won't use any RCU read side critical section because this - * function sets RCU in extended quiescent state. + * to user or guest space, when it's guaranteed the remaining kernel + * instructions to execute won't use any RCU read side critical section + * because this function sets RCU in extended quiescent state. */ -void context_tracking_user_enter(enum ctx_state state) +void context_tracking_enter(enum ctx_state state) { unsigned long flags; @@ -105,20 +105,21 @@ void context_tracking_user_enter(enum ctx_state state) } local_irq_restore(flags); } -NOKPROBE_SYMBOL(context_tracking_user_enter); +NOKPROBE_SYMBOL(context_tracking_enter); /** - * context_tracking_user_exit - Inform the context tracking that the CPU is - * exiting userspace mode and entering the kernel. + * context_tracking_exit - Inform the context tracking that the CPU is + * exiting user or guest mode and entering the kernel. * - * This function must be called after we entered the kernel from userspace - * before any use of RCU read side critical section. This potentially include - * any high level kernel code like syscalls, exceptions, signal handling, etc... + * This function must be called after we entered the kernel from user or + * guest space before any use of RCU read side critical section. This + * potentially include any high level kernel code like syscalls, exceptions, + * signal handling, etc... * * This call supports re-entrancy. This way it can be called from any exception - * handler without needing to know if we came from userspace or not. + * handler without needing to know if we came from user or guest space or not. */ -void context_tracking_user_exit(enum ctx_state state) +void context_tracking_exit(enum ctx_state state) { unsigned long flags; @@ -143,7 +144,7 @@ void context_tracking_user_exit(enum ctx_state state) } local_irq_restore(flags); } -NOKPROBE_SYMBOL(context_tracking_user_exit); +NOKPROBE_SYMBOL(context_tracking_exit); /** * __context_tracking_task_switch - context switch the syscall callbacks -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
