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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0AC80C35E0E for ; Tue, 25 Feb 2020 20:02:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B2B0E21744 for ; Tue, 25 Feb 2020 20:02:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="K60ZZa7K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2B0E21744 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4F3F56B0005; Tue, 25 Feb 2020 15:02:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A5826B0006; Tue, 25 Feb 2020 15:02:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36D646B0007; Tue, 25 Feb 2020 15:02:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id 2032A6B0005 for ; Tue, 25 Feb 2020 15:02:49 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C88A8180AD804 for ; Tue, 25 Feb 2020 20:02:48 +0000 (UTC) X-FDA: 76529722416.17.star67_8ceaa26dd6d31 X-HE-Tag: star67_8ceaa26dd6d31 X-Filterd-Recvd-Size: 6337 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Tue, 25 Feb 2020 20:02:48 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id y30so57326pga.13 for ; Tue, 25 Feb 2020 12:02:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=aeBrpkuCL/cNn0iJh2rddagSts2JkNemNM1x7ifKADI=; b=K60ZZa7K1GcANSbCA8n8XkewtFw/PcYVEQ2jLmThWPTEZaTvW1Af9T5V7RcdIwnUC6 mZZthrNBNJwQhRF/IbrTvzmsO9RHKRDMxK2VqoyM75yq+AetzbjxTB9ZsO5ENF/wbqXX +PH3IkWEu0aUIUAFepOnyLCcsPwc6l2zCEW8c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=aeBrpkuCL/cNn0iJh2rddagSts2JkNemNM1x7ifKADI=; b=cUCQI2dg1Munxq/Cb+piYBBdo/a0EDdVkuzDANbbo/07DzVpuR7BaRRKd0Sk4M/WNS +tR2IcEsU06fXyRtxQ7ne3uVyP7xv3k6q5g6rwB68l14M8Dp3c8RWOtn1JYZaQpfbcv+ WH9eP7A4RWCmBfM3UNhV75cLOBAuAvIf/C79Po/gOouOO3oAQMxkyGxnPQfvHhm3+5Uk pSBlRtnwCNmT377m5FZu/N9nYdS8ynP1KZ4b0h+sMZ+hDham+61k6u4Fq05mvI26+OK5 FHGYYGeyv5/Zcdof3xdyil1guzdl3Mo+jkYbxFvh7+LB5PSwyIhZ7ghloC4aOB+Dm/Np tUuw== X-Gm-Message-State: APjAAAVJPKhLugmE03sOcJw8qmuTAkS886VnuTCJPRvl0nxBtoORkXKT KT1kxGFhie76fCfmAuaYl3b+6Q== X-Google-Smtp-Source: APXvYqyNms2P2aD6pJmBF4aKiw3f9i2LofLVp3p9FT47fAxwRvwqHGC9uxcYnsCUiFns2aSX1NwMqw== X-Received: by 2002:a63:e509:: with SMTP id r9mr225600pgh.274.1582660967228; Tue, 25 Feb 2020 12:02:47 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id b21sm19057903pfp.0.2020.02.25.12.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 12:02:46 -0800 (PST) Date: Tue, 25 Feb 2020 12:02:45 -0800 From: Kees Cook 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 , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , x86-patch-review@intel.com, Borislav Petkov Subject: Re: [RFC PATCH v9 02/27] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Message-ID: <202002251202.9ED97B977@keescook> References: <20200205181935.3712-1-yu-cheng.yu@intel.com> <20200205181935.3712-3-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200205181935.3712-3-yu-cheng.yu@intel.com> 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, Feb 05, 2020 at 10:19:10AM -0800, Yu-cheng Yu wrote: > Add CPU feature flags for Control-flow Enforcement Technology (CET). > > CPUID.(EAX=7,ECX=0):ECX[bit 7] Shadow stack > CPUID.(EAX=7,ECX=0):EDX[bit 20] Indirect Branch Tracking > > Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook -Kees > Reviewed-by: Borislav Petkov > --- > arch/x86/include/asm/cpufeatures.h | 2 ++ > arch/x86/kernel/cpu/cpuid-deps.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h > index e9b62498fe75..a2c6b1b5c026 100644 > --- a/arch/x86/include/asm/cpufeatures.h > +++ b/arch/x86/include/asm/cpufeatures.h > @@ -336,6 +336,7 @@ > #define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */ > #define X86_FEATURE_WAITPKG (16*32+ 5) /* UMONITOR/UMWAIT/TPAUSE Instructions */ > #define X86_FEATURE_AVX512_VBMI2 (16*32+ 6) /* Additional AVX512 Vector Bit Manipulation Instructions */ > +#define X86_FEATURE_SHSTK (16*32+ 7) /* Shadow Stack */ > #define X86_FEATURE_GFNI (16*32+ 8) /* Galois Field New Instructions */ > #define X86_FEATURE_VAES (16*32+ 9) /* Vector AES */ > #define X86_FEATURE_VPCLMULQDQ (16*32+10) /* Carry-Less Multiplication Double Quadword */ > @@ -361,6 +362,7 @@ > #define X86_FEATURE_MD_CLEAR (18*32+10) /* VERW clears CPU buffers */ > #define X86_FEATURE_TSX_FORCE_ABORT (18*32+13) /* "" TSX_FORCE_ABORT */ > #define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */ > +#define X86_FEATURE_IBT (18*32+20) /* Indirect Branch Tracking */ > #define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */ > #define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */ > #define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */ > diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c > index 3cbe24ca80ab..fec83cc74b9e 100644 > --- a/arch/x86/kernel/cpu/cpuid-deps.c > +++ b/arch/x86/kernel/cpu/cpuid-deps.c > @@ -69,6 +69,8 @@ static const struct cpuid_dep cpuid_deps[] = { > { X86_FEATURE_CQM_MBM_TOTAL, X86_FEATURE_CQM_LLC }, > { X86_FEATURE_CQM_MBM_LOCAL, X86_FEATURE_CQM_LLC }, > { X86_FEATURE_AVX512_BF16, X86_FEATURE_AVX512VL }, > + { X86_FEATURE_SHSTK, X86_FEATURE_XSAVES }, > + { X86_FEATURE_IBT, X86_FEATURE_XSAVES }, > {} > }; > > -- > 2.21.0 > -- Kees Cook