From: Dave Hansen <dave@sr71.net> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com Subject: [PATCH 30/31] x86, pkeys: create an x86 arch_calc_vm_prot_bits() for VMA flags Date: Wed, 06 Jan 2016 16:01:46 -0800 [thread overview] Message-ID: <20160107000146.EB87C6BA@viggo.jf.intel.com> (raw) In-Reply-To: <20160107000104.1A105322@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> calc_vm_prot_bits() takes PROT_{READ,WRITE,EXECUTE} bits and turns them in to the vma->vm_flags/VM_* bits. We need to do a similar thing for protection keys. We take a protection key (4 bits) and encode it in to the 4 VM_PKEY_* bits. Note: this code is not new. It was simply a part of the mprotect_pkey() patch in the past. I broke it out for use in the execute-only support. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/include/uapi/asm/mman.h | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN arch/x86/include/uapi/asm/mman.h~pkeys-78-arch_calc_vm_prot_bits arch/x86/include/uapi/asm/mman.h --- a/arch/x86/include/uapi/asm/mman.h~pkeys-78-arch_calc_vm_prot_bits 2016-01-06 15:50:16.387641877 -0800 +++ b/arch/x86/include/uapi/asm/mman.h 2016-01-06 15:50:16.390642013 -0800 @@ -20,6 +20,12 @@ ((vm_flags) & VM_PKEY_BIT1 ? _PAGE_PKEY_BIT1 : 0) | \ ((vm_flags) & VM_PKEY_BIT2 ? _PAGE_PKEY_BIT2 : 0) | \ ((vm_flags) & VM_PKEY_BIT3 ? _PAGE_PKEY_BIT3 : 0)) + +#define arch_calc_vm_prot_bits(prot, key) ( \ + ((key) & 0x1 ? VM_PKEY_BIT0 : 0) | \ + ((key) & 0x2 ? VM_PKEY_BIT1 : 0) | \ + ((key) & 0x4 ? VM_PKEY_BIT2 : 0) | \ + ((key) & 0x8 ? VM_PKEY_BIT3 : 0)) #endif #include <asm-generic/mman.h> _
WARNING: multiple messages have this Message-ID (diff)
From: Dave Hansen <dave@sr71.net> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com Subject: [PATCH 30/31] x86, pkeys: create an x86 arch_calc_vm_prot_bits() for VMA flags Date: Wed, 06 Jan 2016 16:01:46 -0800 [thread overview] Message-ID: <20160107000146.EB87C6BA@viggo.jf.intel.com> (raw) In-Reply-To: <20160107000104.1A105322@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> calc_vm_prot_bits() takes PROT_{READ,WRITE,EXECUTE} bits and turns them in to the vma->vm_flags/VM_* bits. We need to do a similar thing for protection keys. We take a protection key (4 bits) and encode it in to the 4 VM_PKEY_* bits. Note: this code is not new. It was simply a part of the mprotect_pkey() patch in the past. I broke it out for use in the execute-only support. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/include/uapi/asm/mman.h | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN arch/x86/include/uapi/asm/mman.h~pkeys-78-arch_calc_vm_prot_bits arch/x86/include/uapi/asm/mman.h --- a/arch/x86/include/uapi/asm/mman.h~pkeys-78-arch_calc_vm_prot_bits 2016-01-06 15:50:16.387641877 -0800 +++ b/arch/x86/include/uapi/asm/mman.h 2016-01-06 15:50:16.390642013 -0800 @@ -20,6 +20,12 @@ ((vm_flags) & VM_PKEY_BIT1 ? _PAGE_PKEY_BIT1 : 0) | \ ((vm_flags) & VM_PKEY_BIT2 ? _PAGE_PKEY_BIT2 : 0) | \ ((vm_flags) & VM_PKEY_BIT3 ? _PAGE_PKEY_BIT3 : 0)) + +#define arch_calc_vm_prot_bits(prot, key) ( \ + ((key) & 0x1 ? VM_PKEY_BIT0 : 0) | \ + ((key) & 0x2 ? VM_PKEY_BIT1 : 0) | \ + ((key) & 0x4 ? VM_PKEY_BIT2 : 0) | \ + ((key) & 0x8 ? VM_PKEY_BIT3 : 0)) #endif #include <asm-generic/mman.h> _ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-01-07 0:03 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-07 0:01 [PATCH 00/31] x86: Memory Protection Keys (v8) Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 01/31] mm, gup: introduce concept of "foreign" get_user_pages() Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-13 19:00 ` Vlastimil Babka 2016-01-13 19:00 ` Vlastimil Babka 2016-01-13 19:16 ` Dave Hansen 2016-01-13 19:16 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 02/31] x86, fpu: add placeholder for Processor Trace XSAVE state Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 03/31] x86, pkeys: Add Kconfig option Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 04/31] x86, pkeys: cpuid bit definition Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 05/31] x86, pkeys: define new CR4 bit Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 06/31] x86, pkeys: add PKRU xsave fields and data structure(s) Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 07/31] x86, pkeys: PTE bits for storing protection key Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 08/31] x86, pkeys: new page fault error code bit: PF_PK Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 09/31] x86, pkeys: store protection in high VMA flags Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 10/31] x86, pkeys: arch-specific protection bits Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-08 19:31 ` Thomas Gleixner 2016-01-07 0:01 ` [PATCH 11/31] x86, pkeys: pass VMA down in to fault signal generation code Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 12/31] signals, pkeys: notify userspace about protection key faults Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 13/31] x86, pkeys: fill in pkey field in siginfo Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 14/31] x86, pkeys: add functions to fetch PKRU Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-08 19:32 ` Thomas Gleixner 2016-01-07 0:01 ` [PATCH 15/31] mm: factor out VMA fault permission checking Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 16/31] x86, mm: simplify get_user_pages() PTE bit handling Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 17/31] x86, pkeys: check VMAs and PTEs for protection keys Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 18/31] mm: add gup flag to indicate "foreign" mm access Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 19/31] x86, pkeys: optimize fault handling in access_error() Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 20/31] x86, pkeys: differentiate instruction fetches Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 21/31] x86, pkeys: dump PKRU with other kernel registers Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 22/31] x86, pkeys: dump pkey from VMA in /proc/pid/smaps Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 23/31] x86, pkeys: add Kconfig prompt to existing config option Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 24/31] x86, pkeys: actually enable Memory Protection Keys in CPU Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 25/31] mm, multi-arch: pass a protection key in to calc_vm_flag_bits() Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 26/31] x86, pkeys: add arch_validate_pkey() Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-08 19:34 ` Thomas Gleixner 2016-01-07 0:01 ` [PATCH 27/31] x86: separate out LDT init from context init Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 28/31] x86, fpu: allow setting of XSAVE state Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 0:01 ` [PATCH 29/31] x86, pkeys: allow kernel to modify user pkey rights register Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-08 19:40 ` Thomas Gleixner 2016-01-07 0:01 ` Dave Hansen [this message] 2016-01-07 0:01 ` [PATCH 30/31] x86, pkeys: create an x86 arch_calc_vm_prot_bits() for VMA flags Dave Hansen 2016-01-08 19:40 ` Thomas Gleixner 2016-01-07 0:01 ` [PATCH 31/31] x86, pkeys: execute-only support Dave Hansen 2016-01-07 0:01 ` Dave Hansen 2016-01-07 21:02 ` Kees Cook 2016-01-07 21:02 ` Kees Cook 2016-01-07 22:25 ` Dave Hansen 2016-01-07 22:25 ` Dave Hansen 2016-01-07 21:10 ` Andy Lutomirski 2016-01-07 21:10 ` Andy Lutomirski 2016-01-07 22:13 ` Dave Hansen 2016-01-07 22:13 ` Dave Hansen 2016-01-07 22:44 ` Andy Lutomirski 2016-01-07 22:44 ` Andy Lutomirski 2016-01-08 19:51 ` Thomas Gleixner 2016-01-08 19:51 ` Thomas Gleixner 2016-01-29 18:16 [PATCH 00/31] x86: Memory Protection Keys (v9) Dave Hansen 2016-01-29 18:17 ` [PATCH 30/31] x86, pkeys: create an x86 arch_calc_vm_prot_bits() for VMA flags Dave Hansen 2016-01-29 18:17 ` Dave Hansen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160107000146.EB87C6BA@viggo.jf.intel.com \ --to=dave@sr71.net \ --cc=dave.hansen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.