Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932632AbbLNTGb (ORCPT ); Mon, 14 Dec 2015 14:06:31 -0500 Received: from mga11.intel.com ([192.55.52.93]:63857 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932137AbbLNTG0 (ORCPT ); Mon, 14 Dec 2015 14:06:26 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,428,1444719600"; d="scan'208";a="707235082" Subject: [PATCH 26/32] x86, pkeys: add arch_validate_pkey() To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com From: Dave Hansen Date: Mon, 14 Dec 2015 11:06:25 -0800 References: <20151214190542.39C4886D@viggo.jf.intel.com> In-Reply-To: <20151214190542.39C4886D@viggo.jf.intel.com> Message-Id: <20151214190625.958CA94A@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2814 Lines: 86 From: Dave Hansen The syscall-level code is passed a protection key and need to return an appropriate error code if the protection key is bogus. We will be using this in subsequent patches. Note that this also begins a series of arch-specific calls that we need to expose in otherwise arch-independent code. We create a linux/pkeys.h header where we will put *all* the stubs for these functions. Signed-off-by: Dave Hansen --- b/arch/x86/Kconfig | 1 + b/arch/x86/include/asm/pkeys.h | 6 ++++++ b/include/linux/pkeys.h | 25 +++++++++++++++++++++++++ b/mm/Kconfig | 2 ++ 4 files changed, 34 insertions(+) diff -puN /dev/null arch/x86/include/asm/pkeys.h --- /dev/null 2015-12-10 15:28:13.322405854 -0800 +++ b/arch/x86/include/asm/pkeys.h 2015-12-14 10:42:50.619153291 -0800 @@ -0,0 +1,6 @@ +#ifndef _ASM_X86_PKEYS_H +#define _ASM_X86_PKEYS_H + +#define arch_max_pkey() (boot_cpu_has(X86_FEATURE_OSPKE) ? 16 : 1) + +#endif /*_ASM_X86_PKEYS_H */ diff -puN arch/x86/Kconfig~pkeys-71-arch_validate_pkey arch/x86/Kconfig --- a/arch/x86/Kconfig~pkeys-71-arch_validate_pkey 2015-12-14 10:42:50.614153067 -0800 +++ b/arch/x86/Kconfig 2015-12-14 10:42:50.620153335 -0800 @@ -153,6 +153,7 @@ config X86 select X86_DEV_DMA_OPS if X86_64 select X86_FEATURE_NAMES if PROC_FS select ARCH_USES_HIGH_VMA_FLAGS if X86_INTEL_MEMORY_PROTECTION_KEYS + select ARCH_HAS_PKEYS if X86_INTEL_MEMORY_PROTECTION_KEYS config INSTRUCTION_DECODER def_bool y diff -puN /dev/null include/linux/pkeys.h --- /dev/null 2015-12-10 15:28:13.322405854 -0800 +++ b/include/linux/pkeys.h 2015-12-14 10:42:50.620153335 -0800 @@ -0,0 +1,25 @@ +#ifndef _LINUX_PKEYS_H +#define _LINUX_PKEYS_H + +#include +#include + +#ifdef CONFIG_ARCH_HAS_PKEYS +#include +#else /* ! CONFIG_ARCH_HAS_PKEYS */ +#define arch_max_pkey() (1) +#endif /* ! CONFIG_ARCH_HAS_PKEYS */ + +/* + * This is called from mprotect_pkey(). + * + * Returns true if the protection keys is valid. + */ +static inline bool validate_pkey(int pkey) +{ + if (pkey < 0) + return false; + return (pkey < arch_max_pkey()); +} + +#endif /* _LINUX_PKEYS_H */ diff -puN mm/Kconfig~pkeys-71-arch_validate_pkey mm/Kconfig --- a/mm/Kconfig~pkeys-71-arch_validate_pkey 2015-12-14 10:42:50.616153156 -0800 +++ b/mm/Kconfig 2015-12-14 10:42:50.621153380 -0800 @@ -671,3 +671,5 @@ config FRAME_VECTOR config ARCH_USES_HIGH_VMA_FLAGS bool +config ARCH_HAS_PKEYS + bool _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/