From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791AbdKWAh3 (ORCPT ); Wed, 22 Nov 2017 19:37:29 -0500 Received: from mga04.intel.com ([192.55.52.120]:45692 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752647AbdKWAgZ (ORCPT ); Wed, 22 Nov 2017 19:36:25 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,438,1505804400"; d="scan'208";a="179513538" Subject: [PATCH 20/23] x86, kaiser: add a function to check for KAISER being enabled To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, dave.hansen@linux.intel.com, moritz.lipp@iaik.tugraz.at, daniel.gruss@iaik.tugraz.at, michael.schwarz@iaik.tugraz.at, richard.fellner@student.tugraz.at, luto@kernel.org, torvalds@linux-foundation.org, keescook@google.com, hughd@google.com, x86@kernel.org From: Dave Hansen Date: Wed, 22 Nov 2017 16:35:18 -0800 References: <20171123003438.48A0EEDE@viggo.jf.intel.com> In-Reply-To: <20171123003438.48A0EEDE@viggo.jf.intel.com> Message-Id: <20171123003518.B7D81B14@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen Currently, all of the checks for KAISER are compile-time checks. Runtime checks are needed for turning it on/off at runtime. Add a function to do that. Signed-off-by: Dave Hansen Cc: Moritz Lipp Cc: Daniel Gruss Cc: Michael Schwarz Cc: Richard Fellner Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Kees Cook Cc: Hugh Dickins Cc: x86@kernel.org --- b/arch/x86/include/asm/kaiser.h | 5 +++++ b/include/linux/kaiser.h | 5 +++++ 2 files changed, 10 insertions(+) diff -puN arch/x86/include/asm/kaiser.h~kaiser-dynamic-check-func arch/x86/include/asm/kaiser.h --- a/arch/x86/include/asm/kaiser.h~kaiser-dynamic-check-func 2017-11-22 15:45:55.262619723 -0800 +++ b/arch/x86/include/asm/kaiser.h 2017-11-22 15:45:55.267619723 -0800 @@ -56,6 +56,11 @@ extern void kaiser_remove_mapping(unsign */ extern void kaiser_init(void); +static inline bool kaiser_active(void) +{ + extern int kaiser_enabled; + return kaiser_enabled; +} #endif #endif /* __ASSEMBLY__ */ diff -puN include/linux/kaiser.h~kaiser-dynamic-check-func include/linux/kaiser.h --- a/include/linux/kaiser.h~kaiser-dynamic-check-func 2017-11-22 15:45:55.264619723 -0800 +++ b/include/linux/kaiser.h 2017-11-22 15:45:55.268619723 -0800 @@ -28,5 +28,10 @@ static inline int kaiser_add_mapping(uns static inline void kaiser_add_mapping_cpu_entry(int cpu) { } + +static inline bool kaiser_active(void) +{ + return 0; +} #endif /* !CONFIG_KAISER */ #endif /* _INCLUDE_KAISER_H */ _