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=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 6BA5CC433E0 for ; Wed, 24 Feb 2021 15:42:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E72A364DD3 for ; Wed, 24 Feb 2021 15:42:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E72A364DD3 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 634966B0006; Wed, 24 Feb 2021 10:42:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BE2C6B006C; Wed, 24 Feb 2021 10:42:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AC026B0070; Wed, 24 Feb 2021 10:42:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id 31E746B0006 for ; Wed, 24 Feb 2021 10:42:12 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id F2F52A2AA for ; Wed, 24 Feb 2021 15:42:11 +0000 (UTC) X-FDA: 77853577662.26.800D617 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by imf06.hostedemail.com (Postfix) with ESMTP id D1B13C0007D0 for ; Wed, 24 Feb 2021 15:42:11 +0000 (UTC) IronPort-SDR: YTrud5UJasWJeoe4hQv5KsYSgx453ilLJC2G3d7pnqVvAlE6FO8hq+ydvTuqpJaZSxVH36TPzD Y+dxc5DYB79Q== X-IronPort-AV: E=McAfee;i="6000,8403,9905"; a="164428347" X-IronPort-AV: E=Sophos;i="5.81,203,1610438400"; d="scan'208";a="164428347" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Feb 2021 07:42:08 -0800 IronPort-SDR: jVuiEXB3Ug+T7q0ChWO76c7J/zB516uphMzYjgWe5wHSF8FdwZb9pfX+9diNdIylxZgSfwptVM /+B2F5+DiIWg== X-IronPort-AV: E=Sophos;i="5.81,203,1610438400"; d="scan'208";a="431718569" Received: from yyu32-mobl1.amr.corp.intel.com (HELO [10.212.35.50]) ([10.212.35.50]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Feb 2021 07:42:05 -0800 Subject: Re: [PATCH v21 05/26] x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states To: Borislav Petkov Cc: 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 , 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 , Weijiang Yang , Pengfei Xu , Haitao Huang References: <20210217222730.15819-1-yu-cheng.yu@intel.com> <20210217222730.15819-6-yu-cheng.yu@intel.com> <20210224153457.GC20344@zn.tnic> From: "Yu, Yu-cheng" Message-ID: <6e644e1d-7034-20f1-4850-336b143ba01c@intel.com> Date: Wed, 24 Feb 2021 07:42:05 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210224153457.GC20344@zn.tnic> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Stat-Signature: edwot4k3hponn6n7kiszttntxco7raz6 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D1B13C0007D0 Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mga12.intel.com; client-ip=192.55.52.136 X-HE-DKIM-Result: none/none X-HE-Tag: 1614181331-634719 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 2/24/2021 7:34 AM, Borislav Petkov wrote: > On Wed, Feb 17, 2021 at 02:27:09PM -0800, Yu-cheng Yu wrote: >> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h >> index 546d6ecf0a35..fae6b3ea1f6d 100644 >> --- a/arch/x86/include/asm/msr-index.h >> +++ b/arch/x86/include/asm/msr-index.h >> @@ -933,4 +933,23 @@ >> #define MSR_VM_IGNNE 0xc0010115 >> #define MSR_VM_HSAVE_PA 0xc0010117 >> >> +/* Control-flow Enforcement Technology MSRs */ >> +#define MSR_IA32_U_CET 0x6a0 /* user mode cet setting */ >> +#define MSR_IA32_S_CET 0x6a2 /* kernel mode cet setting */ >> +#define CET_SHSTK_EN BIT_ULL(0) >> +#define CET_WRSS_EN BIT_ULL(1) >> +#define CET_ENDBR_EN BIT_ULL(2) >> +#define CET_LEG_IW_EN BIT_ULL(3) >> +#define CET_NO_TRACK_EN BIT_ULL(4) >> +#define CET_SUPPRESS_DISABLE BIT_ULL(5) >> +#define CET_RESERVED (BIT_ULL(6) | BIT_ULL(7) | BIT_ULL(8) | BIT_ULL(9)) >> +#define CET_SUPPRESS BIT_ULL(10) >> +#define CET_WAIT_ENDBR BIT_ULL(11) >> + >> +#define MSR_IA32_PL0_SSP 0x6a4 /* kernel shadow stack pointer */ >> +#define MSR_IA32_PL1_SSP 0x6a5 /* ring-1 shadow stack pointer */ >> +#define MSR_IA32_PL2_SSP 0x6a6 /* ring-2 shadow stack pointer */ >> +#define MSR_IA32_PL3_SSP 0x6a7 /* user shadow stack pointer */ >> +#define MSR_IA32_INT_SSP_TAB 0x6a8 /* exception shadow stack table */ > > When you look at the formatting in that file and the MSR numbers in it, what > stops you from formatting your addition the same way? > Ah, got it. I will add some leading zeros. Thanks! -- Yu-cheng