From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753059AbbI1TXB (ORCPT ); Mon, 28 Sep 2015 15:23:01 -0400 Received: from mga11.intel.com ([192.55.52.93]:38980 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbbI1TSX (ORCPT ); Mon, 28 Sep 2015 15:18:23 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,604,1437462000"; d="scan'208";a="653840669" Subject: [PATCH 12/25] x86, pkeys: add functions to fetch PKRU To: dave@sr71.net Cc: borntraeger@de.ibm.com, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org From: Dave Hansen Date: Mon, 28 Sep 2015 12:18:22 -0700 References: <20150928191817.035A64E2@viggo.jf.intel.com> In-Reply-To: <20150928191817.035A64E2@viggo.jf.intel.com> Message-Id: <20150928191822.9FFCB461@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen This adds the raw instruction to access PKRU as well as some accessor functions that correctly handle when the CPU does not support the instruction. We don't use it here, but we will use read_pkru() in the next patch. eigned-off-by: Dave Hansen --- b/arch/x86/include/asm/pgtable.h | 8 ++++++++ b/arch/x86/include/asm/special_insns.h | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff -puN arch/x86/include/asm/pgtable.h~pkeys-13-kernel-pkru-instructions arch/x86/include/asm/pgtable.h --- a/arch/x86/include/asm/pgtable.h~pkeys-13-kernel-pkru-instructions 2015-09-28 11:39:46.356201421 -0700 +++ b/arch/x86/include/asm/pgtable.h 2015-09-28 11:39:46.361201648 -0700 @@ -95,6 +95,14 @@ static inline int pte_dirty(pte_t pte) return pte_flags(pte) & _PAGE_DIRTY; } + +static inline u32 read_pkru(void) +{ + if (boot_cpu_has(X86_FEATURE_OSPKE)) + return __read_pkru(); + return 0; +} + static inline int pte_young(pte_t pte) { return pte_flags(pte) & _PAGE_ACCESSED; diff -puN arch/x86/include/asm/special_insns.h~pkeys-13-kernel-pkru-instructions arch/x86/include/asm/special_insns.h --- a/arch/x86/include/asm/special_insns.h~pkeys-13-kernel-pkru-instructions 2015-09-28 11:39:46.357201466 -0700 +++ b/arch/x86/include/asm/special_insns.h 2015-09-28 11:39:46.361201648 -0700 @@ -98,6 +98,26 @@ static inline void native_write_cr8(unsi } #endif +#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS +static inline u32 __read_pkru(void) +{ + unsigned int eax, edx; + unsigned int ecx = 0; + unsigned int pkru; + + asm volatile(".byte 0x0f,0x01,0xee\n\t" + : "=a" (eax), "=d" (edx) + : "c" (ecx)); + pkru = eax; + return pkru; +} +#else +static inline u32 __read_pkru(void) +{ + return 0; +} +#endif + static inline void native_wbinvd(void) { asm volatile("wbinvd": : :"memory"); _