From patchwork Tue Jul 10 22:26:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10518131 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE2206032A for ; Tue, 10 Jul 2018 22:31:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF01128F39 for ; Tue, 10 Jul 2018 22:31:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A244A28F59; Tue, 10 Jul 2018 22:31:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39B5728F39 for ; Tue, 10 Jul 2018 22:31:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DC256B000D; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 92F2F6B0003; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FAAA6B000A; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 380E96B0003 for ; Tue, 10 Jul 2018 18:31:13 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id h14-v6so14879573pfi.19 for ; Tue, 10 Jul 2018 15:31:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=DQlus+Wv4nWJkufUc+dJwiTyQ8N+4bQ0/dgEkJB973A=; b=qCa8dHetYyH7CGhJP/xgU72mS9tmK3Q6dULD+7ed9/5OhhTaq/eQiCe20olF/znuST oGHa5eagsU6vDr0n2/90bJpW50AVW/2tdgAIf3oBiH9ThoCGN1Ys3qj1c7yAZneCSlTd LOB+NxxVQLv8tcdrK36+jXja7wd29tbuzL1x0jE2T/nhq/b8z/b7oXZC35wa19eWq+0T PH48ibsgcigiLI/TOi28qn+oRBFqwGY2mmWDAyZZvqU+tIBxSJBKRGdcvYZmImWqQfqh uF46wc3NoHMxzb9OkynJnW222I1reEuEx1dAvmw18CKFT1r9A7bB+kC/D/528bUWeusH xhWw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E2yDcpcqObne/CoVRYEU8rfov/XQ6m5rr7L/mTjuu9/KgQ6JI9o n9zvIWs7/mUUXc9TbZhn7KUgYGZKTkFWG3yWvg1JSBs18azFF6k7hHN2PEtUiB/tUZiuqSfZLEi tADg9X8+7I1448IMD/dWHZwSErSbsiAdLwmJedjutBz3X6K/9ut46fOX72HxAAXiN2A== X-Received: by 2002:a62:a119:: with SMTP id b25-v6mr25819382pff.163.1531261872879; Tue, 10 Jul 2018 15:31:12 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfllODo7CszQ4NRDjj4GOnauTHyEbEMh8OrdVI79VzjKSGjvtKKD5zyB5gnURlmksDcItB2 X-Received: by 2002:a62:a119:: with SMTP id b25-v6mr25819312pff.163.1531261871588; Tue, 10 Jul 2018 15:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261871; cv=none; d=google.com; s=arc-20160816; b=OAZ1u1Bc7tcX1vkk4GaVY/GW3rh7mQJxT9gXfDJAgjthkPBkzdP6SHGBxFpwijAs5p bqymCK6mZdJahAn5HdC8x7bjWE228zRv4eri9zhbjH+DJspnwvx1Ne8ZAtArHtKVCXuV ubykt4BM/+Ubt+oL+yYkEmOGeBWJ0oQ4R9htqmUTauzOSWktogZOb88Jqc/0fJ/MCu4b AH2/0MmWgi3bpp1LxWqfU6ZC3opj8i+4jIqYt80WnIeDQ7US43Z5+rr5DMFVUvVXxEO0 d/fnKQb9Pt5Ot1v0vZjc9tmQxK5JeGRDKIUANXe9xwwf5brxn4OQB+Idu8LE57So2r2D Ekgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=DQlus+Wv4nWJkufUc+dJwiTyQ8N+4bQ0/dgEkJB973A=; b=Eg0i3caJM57AhAPG03QLacCo0tQWOLkFZzz7z1FJYpGqzDA4tSLZuUaX0fbgaVJvOD 2FMVsknPVtBZZhIjb7TyPcQl/ZDIwRa43VIwjP8hcnbun0JCKmqkECdRZMbQ5MTJVqpE g3LS/JiNuGxd+lOegBE8Ng/9TVPR6O7YI6CYBhehPplBAGgwWjTXd2C2MwzFxRnl+6R7 oMqVnrOByFF301y0X1vnWiBRcs9LZIBbPkKq5ReFX176crYvmnHtRFH/HiDMxbmzliyw VkujYMCOSv+GVlRuwTGfwwFqI50bbBVlesx5I1+oUA1YDztnc+61mH6MpOKkmK7iXWrj shsQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id q185-v6si17504162pga.322.2018.07.10.15.31.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305362" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:10 -0700 From: Yu-cheng Yu To: 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 , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v2 01/27] x86/cpufeatures: Add CPUIDs for Control-flow Enforcement Technology (CET) Date: Tue, 10 Jul 2018 15:26:13 -0700 Message-Id: <20180710222639.8241-2-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710222639.8241-1-yu-cheng.yu@intel.com> References: <20180710222639.8241-1-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: X-Virus-Scanned: ClamAV using ClamSMTP Add CPUIDs 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 --- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/kernel/cpu/scattered.c | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 5701f5cecd31..f479345e344b 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -219,6 +219,7 @@ #define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */ #define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */ #define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */ +#define X86_FEATURE_IBT ( 7*32+29) /* Indirect Branch Tracking */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */ @@ -319,6 +320,7 @@ #define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */ #define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */ #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 */ diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 772c219b6889..63cbb4d9938e 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -21,6 +21,7 @@ struct cpuid_bit { static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 }, { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 }, + { X86_FEATURE_IBT, CPUID_EDX, 20, 0x00000007, 0}, { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 }, { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 }, { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },