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.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 2EB82C433ED for ; Thu, 23 Jul 2020 16:10:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CCD0820714 for ; Thu, 23 Jul 2020 16:10:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCD0820714 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 2652F6B0027; Thu, 23 Jul 2020 12:10:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 216066B0029; Thu, 23 Jul 2020 12:10:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 104CE6B002A; Thu, 23 Jul 2020 12:10:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0022.hostedemail.com [216.40.44.22]) by kanga.kvack.org (Postfix) with ESMTP id EE4956B0027 for ; Thu, 23 Jul 2020 12:10:57 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7CD30181AF5E6 for ; Thu, 23 Jul 2020 16:10:57 +0000 (UTC) X-FDA: 77069829354.27.crib80_19178c326f40 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id F414F17F1F for ; Thu, 23 Jul 2020 16:10:45 +0000 (UTC) X-HE-Tag: crib80_19178c326f40 X-Filterd-Recvd-Size: 5138 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Thu, 23 Jul 2020 16:10:43 +0000 (UTC) IronPort-SDR: ViTCwJzzt9aMr6i4+isZyRuRb84ah5NZwhmw0lwB4eHZl/AU732+N+Dw8sZCuljpkCpYFCPo8K do5+Guo9u+Fw== X-IronPort-AV: E=McAfee;i="6000,8403,9691"; a="212101450" X-IronPort-AV: E=Sophos;i="5.75,387,1589266800"; d="scan'208";a="212101450" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2020 09:10:41 -0700 IronPort-SDR: sMTr1T4Ot5Yvoa3Z7f6Gt+sLRJaAGqkGv0CKqHpKa6bv1iw8QUxMeH7wjKcme7VYbDmyD+KuPr iT9q6o6QxZ5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,387,1589266800"; d="scan'208";a="320703879" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.152]) by fmsmga002.fm.intel.com with ESMTP; 23 Jul 2020 09:10:40 -0700 Date: Thu, 23 Jul 2020 09:10:39 -0700 From: Sean Christopherson To: Yu-cheng Yu 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 , 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 , Weijiang Yang Subject: Re: [PATCH v10 03/26] x86/fpu/xstate: Introduce CET MSR XSAVES supervisor states Message-ID: <20200723161039.GE21891@linux.intel.com> References: <20200429220732.31602-1-yu-cheng.yu@intel.com> <20200429220732.31602-4-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200429220732.31602-4-yu-cheng.yu@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Rspamd-Queue-Id: F414F17F1F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 Wed, Apr 29, 2020 at 03:07:09PM -0700, Yu-cheng Yu wrote: > diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h > index 12c9684d59ba..47f603729543 100644 > --- a/arch/x86/include/asm/msr-index.h > +++ b/arch/x86/include/asm/msr-index.h > @@ -885,4 +885,22 @@ > #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 MSR_IA32_PL0_SSP 0x6a4 /* kernel shstk pointer */ > +#define MSR_IA32_PL1_SSP 0x6a5 /* ring-1 shstk pointer */ > +#define MSR_IA32_PL2_SSP 0x6a6 /* ring-2 shstk pointer */ > +#define MSR_IA32_PL3_SSP 0x6a7 /* user shstk pointer */ > +#define MSR_IA32_INT_SSP_TAB 0x6a8 /* exception shstk table */ > + > +/* MSR_IA32_U_CET and MSR_IA32_S_CET bits */ > +#define MSR_IA32_CET_SHSTK_EN 0x0000000000000001ULL Can we drop the MSR_IA32 prefix for the individual bits? Mostly to yield shorter line lengths, but also because it's more or less redundant info, and in some ways unhelpful as it's hard to quickly differentiate between "this is an MSR index" and "this is a bit/mask for an MSR". My vote would also be to use BIT() or BIT_ULL(). The SDM defines the flags by their (decimal) bit number. Manually converting the bits to masks makes it difficult to check for correctness. E.g. #define CET_SHSTK_EN BIT(0) #define CET_WRSS_EN BIT(1) #define CET_ENDBR_EN BIT(2) #define CET_LEG_IW_EN BIT(3) #define CET_NO_TRACK_EN BIT(4) #define CET_WAIT_ENDBR BIT(5) > +#define MSR_IA32_CET_WRSS_EN 0x0000000000000002ULL > +#define MSR_IA32_CET_ENDBR_EN 0x0000000000000004ULL > +#define MSR_IA32_CET_LEG_IW_EN 0x0000000000000008ULL > +#define MSR_IA32_CET_NO_TRACK_EN 0x0000000000000010ULL > +#define MSR_IA32_CET_WAIT_ENDBR 0x00000000000000800UL > +#define MSR_IA32_CET_BITMAP_MASK 0xfffffffffffff000ULL This particular define, the so called BITMAP_MASK, is no longer used in the IBT series. IMO it'd be better off dropping this mask as it's not clear from the name that this is really nothing more than a mask for a virtual address, e.g. at first glance (for someone without CET knowledge) it looks like bits 63:12 hold a bitmap as opposed to holding a pointer to a bitmap.