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 06/34] x86, pkeys: add PKRU xsave fields and data structure(s) Date: Thu, 03 Dec 2015 17:14:33 -0800 [thread overview] Message-ID: <20151204011433.0BB662DD@viggo.jf.intel.com> (raw) In-Reply-To: <20151204011424.8A36E365@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> The protection keys register (PKRU) is saved and restored using xsave. Define the data structure that we will use to access it inside the xsave buffer. Note that we also have to widen the printk of the xsave feature masks since this is feature 0x200 and we only did two characters before. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> --- b/arch/x86/include/asm/fpu/types.h | 11 +++++++++++ b/arch/x86/include/asm/fpu/xstate.h | 4 +++- b/arch/x86/kernel/fpu/xstate.c | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff -puN arch/x86/include/asm/fpu/types.h~pkeys-03-xsave arch/x86/include/asm/fpu/types.h --- a/arch/x86/include/asm/fpu/types.h~pkeys-03-xsave 2015-12-03 16:21:20.747450032 -0800 +++ b/arch/x86/include/asm/fpu/types.h 2015-12-03 16:21:20.753450304 -0800 @@ -109,6 +109,7 @@ enum xfeature { XFEATURE_ZMM_Hi256, XFEATURE_Hi16_ZMM, XFEATURE_PT_UNIMPLEMENTED_SO_FAR, + XFEATURE_PKRU, XFEATURE_MAX, }; @@ -121,6 +122,7 @@ enum xfeature { #define XFEATURE_MASK_OPMASK (1 << XFEATURE_OPMASK) #define XFEATURE_MASK_ZMM_Hi256 (1 << XFEATURE_ZMM_Hi256) #define XFEATURE_MASK_Hi16_ZMM (1 << XFEATURE_Hi16_ZMM) +#define XFEATURE_MASK_PKRU (1 << XFEATURE_PKRU) #define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | XFEATURE_MASK_SSE) #define XFEATURE_MASK_AVX512 (XFEATURE_MASK_OPMASK \ @@ -213,6 +215,15 @@ struct avx_512_hi16_state { struct reg_512_bit hi16_zmm[16]; } __packed; +/* + * State component 9: 32-bit PKRU register. The state is + * 8 bytes long but only 4 bytes is used currently. + */ +struct pkru_state { + u32 pkru; + u32 pad; +} __packed; + struct xstate_header { u64 xfeatures; u64 xcomp_bv; diff -puN arch/x86/include/asm/fpu/xstate.h~pkeys-03-xsave arch/x86/include/asm/fpu/xstate.h --- a/arch/x86/include/asm/fpu/xstate.h~pkeys-03-xsave 2015-12-03 16:21:20.748450077 -0800 +++ b/arch/x86/include/asm/fpu/xstate.h 2015-12-03 16:21:20.754450349 -0800 @@ -27,7 +27,9 @@ XFEATURE_MASK_Hi16_ZMM) /* Supported features which require eager state saving */ -#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR) +#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | \ + XFEATURE_MASK_BNDCSR | \ + XFEATURE_MASK_PKRU) /* All currently supported features */ #define XCNTXT_MASK (XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER) diff -puN arch/x86/kernel/fpu/xstate.c~pkeys-03-xsave arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~pkeys-03-xsave 2015-12-03 16:21:20.750450168 -0800 +++ b/arch/x86/kernel/fpu/xstate.c 2015-12-03 16:21:20.754450349 -0800 @@ -29,6 +29,8 @@ static const char *xfeature_names[] = "AVX-512 Hi256" , "AVX-512 ZMM_Hi256" , "Processor Trace (unused)" , + "Protection Keys User registers", + "unknown xstate feature" , }; /* @@ -57,6 +59,7 @@ void fpu__xstate_clear_all_cpu_caps(void setup_clear_cpu_cap(X86_FEATURE_AVX512ER); setup_clear_cpu_cap(X86_FEATURE_AVX512CD); setup_clear_cpu_cap(X86_FEATURE_MPX); + setup_clear_cpu_cap(X86_FEATURE_PKU); } /* @@ -235,7 +238,7 @@ static void __init print_xstate_feature( const char *feature_name; if (cpu_has_xfeatures(xstate_mask, &feature_name)) - pr_info("x86/fpu: Supporting XSAVE feature 0x%02Lx: '%s'\n", xstate_mask, feature_name); + pr_info("x86/fpu: Supporting XSAVE feature 0x%03Lx: '%s'\n", xstate_mask, feature_name); } /* @@ -251,6 +254,7 @@ static void __init print_xstate_features print_xstate_feature(XFEATURE_MASK_OPMASK); print_xstate_feature(XFEATURE_MASK_ZMM_Hi256); print_xstate_feature(XFEATURE_MASK_Hi16_ZMM); + print_xstate_feature(XFEATURE_MASK_PKRU); } /* @@ -467,6 +471,7 @@ static void check_xstate_against_struct( XCHECK_SZ(sz, nr, XFEATURE_OPMASK, struct avx_512_opmask_state); XCHECK_SZ(sz, nr, XFEATURE_ZMM_Hi256, struct avx_512_zmm_uppers_state); XCHECK_SZ(sz, nr, XFEATURE_Hi16_ZMM, struct avx_512_hi16_state); + XCHECK_SZ(sz, nr, XFEATURE_PKRU, struct pkru_state); /* * Make *SURE* to add any feature numbers in below if _
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 06/34] x86, pkeys: add PKRU xsave fields and data structure(s) Date: Thu, 03 Dec 2015 17:14:33 -0800 [thread overview] Message-ID: <20151204011433.0BB662DD@viggo.jf.intel.com> (raw) In-Reply-To: <20151204011424.8A36E365@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> The protection keys register (PKRU) is saved and restored using xsave. Define the data structure that we will use to access it inside the xsave buffer. Note that we also have to widen the printk of the xsave feature masks since this is feature 0x200 and we only did two characters before. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> --- b/arch/x86/include/asm/fpu/types.h | 11 +++++++++++ b/arch/x86/include/asm/fpu/xstate.h | 4 +++- b/arch/x86/kernel/fpu/xstate.c | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff -puN arch/x86/include/asm/fpu/types.h~pkeys-03-xsave arch/x86/include/asm/fpu/types.h --- a/arch/x86/include/asm/fpu/types.h~pkeys-03-xsave 2015-12-03 16:21:20.747450032 -0800 +++ b/arch/x86/include/asm/fpu/types.h 2015-12-03 16:21:20.753450304 -0800 @@ -109,6 +109,7 @@ enum xfeature { XFEATURE_ZMM_Hi256, XFEATURE_Hi16_ZMM, XFEATURE_PT_UNIMPLEMENTED_SO_FAR, + XFEATURE_PKRU, XFEATURE_MAX, }; @@ -121,6 +122,7 @@ enum xfeature { #define XFEATURE_MASK_OPMASK (1 << XFEATURE_OPMASK) #define XFEATURE_MASK_ZMM_Hi256 (1 << XFEATURE_ZMM_Hi256) #define XFEATURE_MASK_Hi16_ZMM (1 << XFEATURE_Hi16_ZMM) +#define XFEATURE_MASK_PKRU (1 << XFEATURE_PKRU) #define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | XFEATURE_MASK_SSE) #define XFEATURE_MASK_AVX512 (XFEATURE_MASK_OPMASK \ @@ -213,6 +215,15 @@ struct avx_512_hi16_state { struct reg_512_bit hi16_zmm[16]; } __packed; +/* + * State component 9: 32-bit PKRU register. The state is + * 8 bytes long but only 4 bytes is used currently. + */ +struct pkru_state { + u32 pkru; + u32 pad; +} __packed; + struct xstate_header { u64 xfeatures; u64 xcomp_bv; diff -puN arch/x86/include/asm/fpu/xstate.h~pkeys-03-xsave arch/x86/include/asm/fpu/xstate.h --- a/arch/x86/include/asm/fpu/xstate.h~pkeys-03-xsave 2015-12-03 16:21:20.748450077 -0800 +++ b/arch/x86/include/asm/fpu/xstate.h 2015-12-03 16:21:20.754450349 -0800 @@ -27,7 +27,9 @@ XFEATURE_MASK_Hi16_ZMM) /* Supported features which require eager state saving */ -#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR) +#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | \ + XFEATURE_MASK_BNDCSR | \ + XFEATURE_MASK_PKRU) /* All currently supported features */ #define XCNTXT_MASK (XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER) diff -puN arch/x86/kernel/fpu/xstate.c~pkeys-03-xsave arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~pkeys-03-xsave 2015-12-03 16:21:20.750450168 -0800 +++ b/arch/x86/kernel/fpu/xstate.c 2015-12-03 16:21:20.754450349 -0800 @@ -29,6 +29,8 @@ static const char *xfeature_names[] = "AVX-512 Hi256" , "AVX-512 ZMM_Hi256" , "Processor Trace (unused)" , + "Protection Keys User registers", + "unknown xstate feature" , }; /* @@ -57,6 +59,7 @@ void fpu__xstate_clear_all_cpu_caps(void setup_clear_cpu_cap(X86_FEATURE_AVX512ER); setup_clear_cpu_cap(X86_FEATURE_AVX512CD); setup_clear_cpu_cap(X86_FEATURE_MPX); + setup_clear_cpu_cap(X86_FEATURE_PKU); } /* @@ -235,7 +238,7 @@ static void __init print_xstate_feature( const char *feature_name; if (cpu_has_xfeatures(xstate_mask, &feature_name)) - pr_info("x86/fpu: Supporting XSAVE feature 0x%02Lx: '%s'\n", xstate_mask, feature_name); + pr_info("x86/fpu: Supporting XSAVE feature 0x%03Lx: '%s'\n", xstate_mask, feature_name); } /* @@ -251,6 +254,7 @@ static void __init print_xstate_features print_xstate_feature(XFEATURE_MASK_OPMASK); print_xstate_feature(XFEATURE_MASK_ZMM_Hi256); print_xstate_feature(XFEATURE_MASK_Hi16_ZMM); + print_xstate_feature(XFEATURE_MASK_PKRU); } /* @@ -467,6 +471,7 @@ static void check_xstate_against_struct( XCHECK_SZ(sz, nr, XFEATURE_OPMASK, struct avx_512_opmask_state); XCHECK_SZ(sz, nr, XFEATURE_ZMM_Hi256, struct avx_512_zmm_uppers_state); XCHECK_SZ(sz, nr, XFEATURE_Hi16_ZMM, struct avx_512_hi16_state); + XCHECK_SZ(sz, nr, XFEATURE_PKRU, struct pkru_state); /* * Make *SURE* to add any feature numbers in below if _ -- 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:[~2015-12-04 1:14 UTC|newest] Thread overview: 145+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-04 1:14 [PATCH 00/34] x86: Memory Protection Keys (v5) Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 01/34] mm, gup: introduce concept of "foreign" get_user_pages() Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 02/34] x86, fpu: add placeholder for Processor Trace XSAVE state Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 03/34] x86, pkeys: Add Kconfig option Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 04/34] x86, pkeys: cpuid bit definition Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 05/34] x86, pkeys: define new CR4 bit Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` Dave Hansen [this message] 2015-12-04 1:14 ` [PATCH 06/34] x86, pkeys: add PKRU xsave fields and data structure(s) Dave Hansen 2015-12-04 1:14 ` [PATCH 07/34] x86, pkeys: PTE bits for storing protection key Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 08/34] x86, pkeys: new page fault error code bit: PF_PK Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 09/34] x86, pkeys: store protection in high VMA flags Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 14:17 ` Thomas Gleixner 2015-12-08 14:17 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 10/34] x86, pkeys: arch-specific protection bits Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 15:15 ` [PATCH 10/34] x86, pkeys: arch-specific protection bitsy Thomas Gleixner 2015-12-08 15:15 ` Thomas Gleixner 2015-12-08 16:34 ` Dave Hansen 2015-12-08 16:34 ` Dave Hansen 2015-12-08 17:24 ` Thomas Gleixner 2015-12-08 17:24 ` Thomas Gleixner 2015-12-08 18:06 ` Dave Hansen 2015-12-08 18:29 ` Thomas Gleixner 2015-12-08 18:29 ` Thomas Gleixner 2015-12-08 18:35 ` Thomas Gleixner 2015-12-08 18:35 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 11/34] x86, pkeys: pass VMA down in to fault signal generation code Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 12/34] signals, pkeys: notify userspace about protection key faults Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 13/34] x86, pkeys: fill in pkey field in siginfo Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 14/34] x86, pkeys: add functions to fetch PKRU Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 15:18 ` Thomas Gleixner 2015-12-08 15:18 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 15/34] mm: factor out VMA fault permission checking Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 17:26 ` Thomas Gleixner 2015-12-08 17:26 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 16/34] x86, mm: simplify get_user_pages() PTE bit handling Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:01 ` Thomas Gleixner 2015-12-08 18:01 ` Thomas Gleixner 2015-12-08 18:30 ` Dave Hansen 2015-12-08 18:30 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 17/34] x86, pkeys: check VMAs and PTEs for protection keys Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:11 ` Thomas Gleixner 2015-12-08 18:11 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 18/34] mm: add gup flag to indicate "foreign" mm access Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 19/34] x86, pkeys: optimize fault handling in access_error() Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:14 ` Thomas Gleixner 2015-12-08 18:14 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 20/34] x86, pkeys: differentiate instruction fetches Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:17 ` Thomas Gleixner 2015-12-08 18:17 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 21/34] x86, pkeys: dump PKRU with other kernel registers Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:19 ` Thomas Gleixner 2015-12-08 18:19 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 22/34] x86, pkeys: dump PTE pkey in /proc/pid/smaps Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:20 ` Thomas Gleixner 2015-12-08 18:20 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 23/34] x86, pkeys: add Kconfig prompt to existing config option Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:21 ` Thomas Gleixner 2015-12-08 18:21 ` Thomas Gleixner 2015-12-04 1:14 ` [PATCH 24/34] mm, multi-arch: pass a protection key in to calc_vm_flag_bits() Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-04 1:14 ` [PATCH 25/34] x86, pkeys: add arch_validate_pkey() Dave Hansen 2015-12-04 1:14 ` Dave Hansen 2015-12-08 18:39 ` Thomas Gleixner 2015-12-08 18:39 ` Thomas Gleixner 2015-12-04 1:15 ` [PATCH 26/34] mm: implement new mprotect_key() system call Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-05 6:50 ` Michael Kerrisk (man-pages) 2015-12-05 6:50 ` Michael Kerrisk (man-pages) 2015-12-05 6:50 ` Michael Kerrisk (man-pages) 2015-12-07 16:44 ` Dave Hansen 2015-12-07 16:44 ` Dave Hansen 2015-12-09 11:08 ` Michael Kerrisk (man-pages) 2015-12-09 11:08 ` Michael Kerrisk (man-pages) 2015-12-09 15:48 ` Dave Hansen 2015-12-09 15:48 ` Dave Hansen 2015-12-09 16:45 ` Michael Kerrisk (man-pages) 2015-12-09 16:45 ` Michael Kerrisk (man-pages) 2015-12-09 16:45 ` Michael Kerrisk (man-pages) 2015-12-09 17:05 ` Dave Hansen 2015-12-09 17:05 ` Dave Hansen 2015-12-09 17:05 ` Dave Hansen 2015-12-11 20:13 ` Michael Kerrisk (man-pages) 2015-12-11 20:13 ` Michael Kerrisk (man-pages) 2015-12-04 1:15 ` [PATCH 27/34] x86, pkeys: make mprotect_key() mask off additional vm_flags Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-08 18:41 ` Thomas Gleixner 2015-12-08 18:41 ` Thomas Gleixner 2015-12-04 1:15 ` [PATCH 28/34] x86: wire up mprotect_key() system call Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-08 18:44 ` Thomas Gleixner 2015-12-08 18:44 ` Thomas Gleixner 2015-12-08 18:44 ` Thomas Gleixner 2015-12-08 19:06 ` Dave Hansen 2015-12-08 19:06 ` Dave Hansen 2015-12-08 20:38 ` Thomas Gleixner 2015-12-08 20:38 ` Thomas Gleixner 2015-12-08 20:38 ` Thomas Gleixner 2015-12-04 1:15 ` [PATCH 29/34] x86: separate out LDT init from context init Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-08 18:45 ` Thomas Gleixner 2015-12-08 18:45 ` Thomas Gleixner 2015-12-04 1:15 ` [PATCH 30/34] x86, fpu: allow setting of XSAVE state Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-08 18:48 ` Thomas Gleixner 2015-12-08 18:48 ` Thomas Gleixner 2015-12-04 1:15 ` [PATCH 31/34] x86, pkeys: allocation/free syscalls Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-04 1:15 ` [PATCH 32/34] x86, pkeys: add pkey set/get syscalls Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-04 1:15 ` [PATCH 33/34] x86, pkeys: actually enable Memory Protection Keys in CPU Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-04 1:15 ` [PATCH 34/34] x86, pkeys: Documentation Dave Hansen 2015-12-04 1:15 ` Dave Hansen 2015-12-04 23:31 ` [PATCH 00/34] x86: Memory Protection Keys (v5) Andy Lutomirski 2015-12-04 23:31 ` Andy Lutomirski 2015-12-04 23:38 ` Dave Hansen 2015-12-04 23:38 ` Dave Hansen 2015-12-04 23:38 ` Dave Hansen 2015-12-11 20:16 ` Andy Lutomirski 2015-12-11 20:16 ` Andy Lutomirski 2015-12-11 20:16 ` Andy Lutomirski
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=20151204011433.0BB662DD@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.