From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id 79A616B0668 for ; Thu, 8 Nov 2018 16:23:06 -0500 (EST) Received: by mail-wr1-f72.google.com with SMTP id j6-v6so20126357wre.1 for ; Thu, 08 Nov 2018 13:23:06 -0800 (PST) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 144-v6sor3641283wme.0.2018.11.08.13.23.04 for (Google Transport Security); Thu, 08 Nov 2018 13:23:05 -0800 (PST) MIME-Version: 1.0 References: <20181011151523.27101-1-yu-cheng.yu@intel.com> <20181011151523.27101-5-yu-cheng.yu@intel.com> <4295b8f786c10c469870a6d9725749ce75dcdaa2.camel@intel.com> In-Reply-To: <4295b8f786c10c469870a6d9725749ce75dcdaa2.camel@intel.com> From: Andy Lutomirski Date: Thu, 8 Nov 2018 13:22:54 -0800 Message-ID: Subject: Re: [PATCH v5 04/27] x86/fpu/xstate: Add XSAVES system states for shadow stack Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org List-ID: To: Yu-cheng Yu Cc: X86 ML , "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , LKML , "open list:DOCUMENTATION" , Linux-MM , linux-arch , Linux API , Arnd Bergmann , Balbir Singh , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H. J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , "Shanbhogue, Vedvyas" On Thu, Nov 8, 2018 at 1:06 PM Yu-cheng Yu wrote: > > On Thu, 2018-11-08 at 12:46 -0800, Andy Lutomirski wrote: > > On Thu, Oct 11, 2018 at 8:20 AM Yu-cheng Yu wrote: > > > > > > Intel Control-flow Enforcement Technology (CET) introduces the > > > following MSRs into the XSAVES system states. > > > > > > IA32_U_CET (user-mode CET settings), > > > IA32_PL3_SSP (user-mode shadow stack), > > > IA32_PL0_SSP (kernel-mode shadow stack), > > > IA32_PL1_SSP (ring-1 shadow stack), > > > IA32_PL2_SSP (ring-2 shadow stack). > > > > > > Signed-off-by: Yu-cheng Yu > > > --- > > > arch/x86/include/asm/fpu/types.h | 22 +++++++++++++++++++++ > > > arch/x86/include/asm/fpu/xstate.h | 4 +++- > > > arch/x86/include/uapi/asm/processor-flags.h | 2 ++ > > > arch/x86/kernel/fpu/xstate.c | 10 ++++++++++ > > > 4 files changed, 37 insertions(+), 1 deletion(-) > > > > > > diff --git a/arch/x86/include/asm/fpu/types.h > > > b/arch/x86/include/asm/fpu/types.h > > > index 202c53918ecf..e55d51d172f1 100644 > > > --- a/arch/x86/include/asm/fpu/types.h > > > +++ b/arch/x86/include/asm/fpu/types.h > > > @@ -114,6 +114,9 @@ enum xfeature { > > > XFEATURE_Hi16_ZMM, > > > XFEATURE_PT_UNIMPLEMENTED_SO_FAR, > > > XFEATURE_PKRU, > > > + XFEATURE_RESERVED, > > > + XFEATURE_SHSTK_USER, > > > + XFEATURE_SHSTK_KERNEL, > > > > > > XFEATURE_MAX, > > > }; > > > @@ -128,6 +131,8 @@ enum xfeature { > > > #define XFEATURE_MASK_Hi16_ZMM (1 << XFEATURE_Hi16_ZMM) > > > #define XFEATURE_MASK_PT (1 << > > > XFEATURE_PT_UNIMPLEMENTED_SO_FAR) > > > #define XFEATURE_MASK_PKRU (1 << XFEATURE_PKRU) > > > +#define XFEATURE_MASK_SHSTK_USER (1 << XFEATURE_SHSTK_USER) > > > +#define XFEATURE_MASK_SHSTK_KERNEL (1 << XFEATURE_SHSTK_KERNEL) > > > > > > #define XFEATURE_MASK_FPSSE (XFEATURE_MASK_FP | > > > XFEATURE_MASK_SSE) > > > #define XFEATURE_MASK_AVX512 (XFEATURE_MASK_OPMASK \ > > > @@ -229,6 +234,23 @@ struct pkru_state { > > > u32 pad; > > > } __packed; > > > > > > +/* > > > + * State component 11 is Control flow Enforcement user states > > > + */ > > > +struct cet_user_state { > > > + u64 u_cet; /* user control flow settings */ > > > + u64 user_ssp; /* user shadow stack pointer */ > > > +} __packed; > > > + > > > +/* > > > + * State component 12 is Control flow Enforcement kernel states > > > + */ > > > +struct cet_kernel_state { > > > + u64 kernel_ssp; /* kernel shadow stack */ > > > + u64 pl1_ssp; /* ring-1 shadow stack */ > > > + u64 pl2_ssp; /* ring-2 shadow stack */ > > > +} __packed; > > > + > > > > Why are these __packed? It seems like it'll generate bad code for no > > obvious purpose. > > That prevents any possibility that the compiler will insert padding, although in > 64-bit kernel this should not happen to either struct. Also all xstate > components here are packed. > They both seem like bugs, perhaps. As I understand it, __packed removes padding, but it also forces the compiler to expect the fields to be unaligned even if they are actually aligned.