From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756895AbbGGKvS (ORCPT ); Tue, 7 Jul 2015 06:51:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59892 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756880AbbGGKvG (ORCPT ); Tue, 7 Jul 2015 06:51:06 -0400 Date: Tue, 7 Jul 2015 03:50:06 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: luto@amacapital.net, torvalds@linux-foundation.org, bp@alien8.de, peterz@infradead.org, tglx@linutronix.de, fweisbec@gmail.com, oleg@redhat.com, brgerst@gmail.com, vda.linux@googlemail.com, hpa@zytor.com, keescook@chromium.org, luto@kernel.org, riel@redhat.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: keescook@chromium.org, luto@kernel.org, brgerst@gmail.com, hpa@zytor.com, vda.linux@googlemail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, riel@redhat.com, dvlasenk@redhat.com, peterz@infradead.org, bp@alien8.de, torvalds@linux-foundation.org, luto@amacapital.net, tglx@linutronix.de, oleg@redhat.com, fweisbec@gmail.com In-Reply-To: <5da41fb2ceb29eac671f427c67040401ba2a1fa0.1435952415.git.luto@kernel.org> References: <5da41fb2ceb29eac671f427c67040401ba2a1fa0.1435952415.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] context_tracking: Add ct_state() and CT_WARN_ON() Git-Commit-ID: f9281648ecd5081803bb2da84b9ccb0cf48436cd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f9281648ecd5081803bb2da84b9ccb0cf48436cd Gitweb: http://git.kernel.org/tip/f9281648ecd5081803bb2da84b9ccb0cf48436cd Author: Andy Lutomirski AuthorDate: Fri, 3 Jul 2015 12:44:21 -0700 Committer: Ingo Molnar CommitDate: Tue, 7 Jul 2015 10:59:04 +0200 context_tracking: Add ct_state() and CT_WARN_ON() This will let us sprinkle sanity checks around the kernel without making too much of a mess. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: paulmck@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/5da41fb2ceb29eac671f427c67040401ba2a1fa0.1435952415.git.luto@kernel.org Signed-off-by: Ingo Molnar --- include/linux/context_tracking.h | 15 +++++++++++++++ include/linux/context_tracking_state.h | 1 + 2 files changed, 16 insertions(+) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index b96bd29..008fc67 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -49,13 +49,28 @@ static inline void exception_exit(enum ctx_state prev_ctx) } } + +/** + * ct_state() - return the current context tracking state if known + * + * Returns the current cpu's context tracking state if context tracking + * is enabled. If context tracking is disabled, returns + * CONTEXT_DISABLED. This should be used primarily for debugging. + */ +static inline enum ctx_state ct_state(void) +{ + return context_tracking_is_enabled() ? + this_cpu_read(context_tracking.state) : CONTEXT_DISABLED; +} #else static inline void user_enter(void) { } static inline void user_exit(void) { } static inline enum ctx_state exception_enter(void) { return 0; } static inline void exception_exit(enum ctx_state prev_ctx) { } +static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; } #endif /* !CONFIG_CONTEXT_TRACKING */ +#define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond)) #ifdef CONFIG_CONTEXT_TRACKING_FORCE extern void context_tracking_init(void); diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h index 678ecdf..ee956c5 100644 --- a/include/linux/context_tracking_state.h +++ b/include/linux/context_tracking_state.h @@ -14,6 +14,7 @@ struct context_tracking { bool active; int recursion; enum ctx_state { + CONTEXT_DISABLED = -1, /* returned by ct_state() if unknown */ CONTEXT_KERNEL = 0, CONTEXT_USER, CONTEXT_GUEST,