From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D819C5DF60 for ; Fri, 8 Nov 2019 13:28:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CF8E121D7F for ; Fri, 8 Nov 2019 13:28:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF8E121D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 681C96B0005; Fri, 8 Nov 2019 08:28:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 60A786B0006; Fri, 8 Nov 2019 08:28:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AB9D6B0007; Fri, 8 Nov 2019 08:28:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id 2DEF26B0005 for ; Fri, 8 Nov 2019 08:28:42 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id DFC9252A3 for ; Fri, 8 Nov 2019 13:28:41 +0000 (UTC) X-FDA: 76133190042.14.fight80_68ae6f9946c43 X-HE-Tag: fight80_68ae6f9946c43 X-Filterd-Recvd-Size: 9041 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Fri, 8 Nov 2019 13:28:39 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Nov 2019 05:28:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,281,1569308400"; d="scan'208";a="213241555" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.197]) ([10.237.72.197]) by fmsmga001.fm.intel.com with ESMTP; 08 Nov 2019 05:28:31 -0800 Subject: Re: [PATCH v8 27/27] x86/cet/shstk: Add Shadow Stack instructions to opcode map To: Yu-cheng Yu , x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , 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" , Vedvyas Shanbhogue , Dave Martin References: <20190813205225.12032-1-yu-cheng.yu@intel.com> <20190813205225.12032-28-yu-cheng.yu@intel.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <15568c48-b950-484d-d176-0f0e38a94bf7@intel.com> Date: Fri, 8 Nov 2019 15:27:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20190813205225.12032-28-yu-cheng.yu@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 13/08/19 11:52 PM, Yu-cheng Yu wrote: > Add the following shadow stack management instructions. > > INCSSP: > Increment shadow stack pointer by the steps specified. > > RDSSP: > Read SSP register into a GPR. > > SAVEPREVSSP: > Use "prev ssp" token at top of current shadow stack to > create a "restore token" on previous shadow stack. > > RSTORSSP: > Restore from a "restore token" pointed by a GPR to SSP. > > WRSS: > Write to kernel-mode shadow stack (kernel-mode instruction). > > WRUSS: > Write to user-mode shadow stack (kernel-mode instruction). > > SETSSBSY: > Verify the "supervisor token" pointed by IA32_PL0_SSP MSR, > if valid, set the token to busy, and set SSP to the value > of IA32_PL0_SSP MSR. > > CLRSSBSY: > Verify the "supervisor token" pointed by a GPR, if valid, > clear the busy bit from the token. > > Signed-off-by: Yu-cheng Yu > --- > arch/x86/lib/x86-opcode-map.txt | 26 +++++++++++++------ > tools/objtool/arch/x86/lib/x86-opcode-map.txt | 26 +++++++++++++------ > 2 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/arch/x86/lib/x86-opcode-map.txt b/arch/x86/lib/x86-opcode-map.txt > index e0b85930dd77..c5e825d44766 100644 > --- a/arch/x86/lib/x86-opcode-map.txt > +++ b/arch/x86/lib/x86-opcode-map.txt > @@ -366,7 +366,7 @@ AVXcode: 1 > 1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv > 1c: > 1d: > -1e: > +1e: RDSSP Rd (F3),REX.W > 1f: NOP Ev > # 0x0f 0x20-0x2f > 20: MOV Rd,Cd > @@ -610,7 +610,17 @@ fe: paddd Pq,Qq | vpaddd Vx,Hx,Wx (66),(v1) > ff: UD0 > EndTable > > -Table: 3-byte opcode 1 (0x0f 0x38) > +Table: 3-byte opcode 1 (0x0f 0x01) > +Referrer: > +AVXcode: > +# Skip 0x00-0xe7 > +e8: SETSSBSY (f3) > +e9: > +ea: SAVEPREVSSP (f3) > +# Skip 0xeb-0xff > +EndTable > + > +Table: 3-byte opcode 2 (0x0f 0x38) > Referrer: 3-byte escape 1 > AVXcode: 2 > # 0x0f 0x38 0x00-0x0f > @@ -789,12 +799,12 @@ f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2) | CRC32 Gd,Eb (66&F2) > f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2) | CRC32 Gd,Ew (66&F2) > f2: ANDN Gy,By,Ey (v) > f3: Grp17 (1A) > -f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) > -f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) > +f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) | WRUSS Pq,Qq (66),REX.W > +f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq (66),REX.W > f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) > EndTable > > -Table: 3-byte opcode 2 (0x0f 0x3a) > +Table: 3-byte opcode 3 (0x0f 0x3a) > Referrer: 3-byte escape 2 > AVXcode: 3 > # 0x0f 0x3a 0x00-0xff > @@ -948,7 +958,7 @@ GrpTable: Grp7 > 2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) > 3: LIDT Ms > 4: SMSW Mw/Rv > -5: rdpkru (110),(11B) | wrpkru (111),(11B) > +5: rdpkru (110),(11B) | wrpkru (111),(11B) | RSTORSSP Mq (F3) > 6: LMSW Ew > 7: INVLPG Mb | SWAPGS (o64),(000),(11B) | RDTSCP (001),(11B) > EndTable > @@ -1019,8 +1029,8 @@ GrpTable: Grp15 > 2: vldmxcsr Md (v1) | WRFSBASE Ry (F3),(11B) > 3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B) > 4: XSAVE | ptwrite Ey (F3),(11B) > -5: XRSTOR | lfence (11B) > -6: XSAVEOPT | clwb (66) | mfence (11B) > +5: XRSTOR | lfence (11B) | INCSSP Rd (F3),REX.W > +6: XSAVEOPT | clwb (66) | mfence (11B) | CLRSSBSY Mq (F3) > 7: clflush | clflushopt (66) | sfence (11B) > EndTable > > diff --git a/tools/objtool/arch/x86/lib/x86-opcode-map.txt b/tools/objtool/arch/x86/lib/x86-opcode-map.txt > index e0b85930dd77..c5e825d44766 100644 > --- a/tools/objtool/arch/x86/lib/x86-opcode-map.txt > +++ b/tools/objtool/arch/x86/lib/x86-opcode-map.txt > @@ -366,7 +366,7 @@ AVXcode: 1 > 1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv > 1c: > 1d: > -1e: > +1e: RDSSP Rd (F3),REX.W RDSSP is in a Grp with ENDBR32 and ENDBR64 > 1f: NOP Ev > # 0x0f 0x20-0x2f > 20: MOV Rd,Cd > @@ -610,7 +610,17 @@ fe: paddd Pq,Qq | vpaddd Vx,Hx,Wx (66),(v1) > ff: UD0 > EndTable > > -Table: 3-byte opcode 1 (0x0f 0x38) > +Table: 3-byte opcode 1 (0x0f 0x01) > +Referrer: > +AVXcode: > +# Skip 0x00-0xe7 > +e8: SETSSBSY (f3) > +e9: > +ea: SAVEPREVSSP (f3) SETSSBSY and SAVEPREVSSP should be in Grp7 > +# Skip 0xeb-0xff > +EndTable > + > +Table: 3-byte opcode 2 (0x0f 0x38) > Referrer: 3-byte escape 1 > AVXcode: 2 > # 0x0f 0x38 0x00-0x0f > @@ -789,12 +799,12 @@ f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2) | CRC32 Gd,Eb (66&F2) > f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2) | CRC32 Gd,Ew (66&F2) > f2: ANDN Gy,By,Ey (v) > f3: Grp17 (1A) > -f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) > -f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) > +f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) | WRUSS Pq,Qq (66),REX.W > +f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq (66),REX.W I know already commented on this, but WRSS does not have (66) prefix Also no other instructions have been annotated with REX.W so maybe omit that > f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) > EndTable > > -Table: 3-byte opcode 2 (0x0f 0x3a) > +Table: 3-byte opcode 3 (0x0f 0x3a) > Referrer: 3-byte escape 2 > AVXcode: 3 > # 0x0f 0x3a 0x00-0xff > @@ -948,7 +958,7 @@ GrpTable: Grp7 > 2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) > 3: LIDT Ms > 4: SMSW Mw/Rv > -5: rdpkru (110),(11B) | wrpkru (111),(11B) > +5: rdpkru (110),(11B) | wrpkru (111),(11B) | RSTORSSP Mq (F3) > 6: LMSW Ew > 7: INVLPG Mb | SWAPGS (o64),(000),(11B) | RDTSCP (001),(11B) > EndTable > @@ -1019,8 +1029,8 @@ GrpTable: Grp15 > 2: vldmxcsr Md (v1) | WRFSBASE Ry (F3),(11B) > 3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B) > 4: XSAVE | ptwrite Ey (F3),(11B) > -5: XRSTOR | lfence (11B) > -6: XSAVEOPT | clwb (66) | mfence (11B) > +5: XRSTOR | lfence (11B) | INCSSP Rd (F3),REX.W > +6: XSAVEOPT | clwb (66) | mfence (11B) | CLRSSBSY Mq (F3) > 7: clflush | clflushopt (66) | sfence (11B) > EndTable > >