Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752299AbbEGRln (ORCPT ); Thu, 7 May 2015 13:41:43 -0400 Received: from mga11.intel.com ([192.55.52.93]:39318 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752196AbbEGRlc (ORCPT ); Thu, 7 May 2015 13:41:32 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,384,1427785200"; d="scan'208";a="691508802" Subject: [PATCH 05/12] x86, pkeys: new page fault error code bit: PF_PK To: dave@sr71.net Cc: linux-kernel@vger.kernel.org, x86@kernel.org From: Dave Hansen Date: Thu, 07 May 2015 10:41:34 -0700 References: <20150507174132.34AF8FAF@viggo.jf.intel.com> In-Reply-To: <20150507174132.34AF8FAF@viggo.jf.intel.com> Message-Id: <20150507174134.6EF61ECE@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1369 Lines: 49 Note: "PK" is how the Intel SDM refers to this bit, so we also use that nomenclature. This only defines the bit, it does not plumb it anywhere to be handled. --- b/arch/x86/mm/fault.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN arch/x86/mm/fault.c~pkeys-4-pfec arch/x86/mm/fault.c --- a/arch/x86/mm/fault.c~pkeys-4-pfec 2015-05-07 10:31:42.568240681 -0700 +++ b/arch/x86/mm/fault.c 2015-05-07 10:31:42.571240816 -0700 @@ -31,6 +31,7 @@ * bit 2 == 0: kernel-mode access 1: user-mode access * bit 3 == 1: use of reserved bit detected * bit 4 == 1: fault was an instruction fetch + * bit 5 == 1: protection keys block access */ enum x86_pf_error_code { @@ -39,6 +40,7 @@ enum x86_pf_error_code { PF_USER = 1 << 2, PF_RSVD = 1 << 3, PF_INSTR = 1 << 4, + PF_PK = 1 << 5, }; /* @@ -912,7 +914,10 @@ static int spurious_fault_check(unsigned if ((error_code & PF_INSTR) && !pte_exec(*pte)) return 0; - + /* + * Note: We do not do lazy flushing on protection key + * changes, so no spurious fault will ever set PF_PK. + */ return 1; } _ -- 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/