From patchwork Tue Jul 10 22:26:33 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: 10518181 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 E2720600CA for ; Tue, 10 Jul 2018 22:32:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D372F1FF7E for ; Tue, 10 Jul 2018 22:32:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6B44212D6; Tue, 10 Jul 2018 22:32:03 +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 5CB411FF7E for ; Tue, 10 Jul 2018 22:32:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B1EE6B026E; Tue, 10 Jul 2018 18:31:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 53DD76B0272; Tue, 10 Jul 2018 18:31:19 -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 290D76B0270; Tue, 10 Jul 2018 18:31:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id DAA356B0270 for ; Tue, 10 Jul 2018 18:31:18 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id cf17-v6so5907125plb.2 for ; Tue, 10 Jul 2018 15:31:18 -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=kx+lo6UpVP3UsF9WQbo8HAcIYgvVwvthPk9F4G7XGe0=; b=FjC0GcaQe4NaHL3mtntMPh9MugtZrNOVqRkd453nS4J/k79un5bGpwr1HUDmTy8zcs ETqaEMt0thOrGGc/7/hpiQBOtAkzNR08cenBCToSf3M6wNPARZglta4jQdWGMA8wpb0i xs8NKN/6SMizIPnzqElcRle3O9/9DLX9isY+TU72UTdpfIkdwFwgewcwg2bSVnwExMaD opYmx9oldZ65Ils0SuGkrOZyBvW00c7WcgsRHHiI+mkIIKPtQ48iRFrXq0F93XfK9Xt3 yxRKMGKZgwVyyVpLud1nfPGabmRLgA7tF67mPnyejlrj+4Mti9iSlBjdYH7J8mjFaitV aZRw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 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: APt69E0bs5JL7BmOldASEW8y3WQw9dNEQcS7BPq64QGhLYk+R2vvaSDR 06FlrkIKhOQ7IFfCNsd8R48ZgA0p2uJI5M5A/wHj1W76HCJDFpzFPQdXdDFnb+2Q6sUectqWOWU I1A+DOA8qYzxIx2jbdlmlTtX7unbtacwUhOQndbZjCml6Au0WJOABstwdjEkswcJeYg== X-Received: by 2002:a62:5d55:: with SMTP id r82-v6mr18661286pfb.150.1531261878591; Tue, 10 Jul 2018 15:31:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdWkdLbftje/NiQ4CYPa9UcN/x/Fqor9XjgGj2Z81/vKRTSeheBL8b6ddrWyHdrAVtz9sT9 X-Received: by 2002:a62:5d55:: with SMTP id r82-v6mr18661251pfb.150.1531261877919; Tue, 10 Jul 2018 15:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261877; cv=none; d=google.com; s=arc-20160816; b=E8GUXzsuKDzKbjogiP7OZcHn7Y0BUT91NbnQZaCkOdckjEeMUYY2sgnCy8Kz2Wt7jU fIJBxrPt+PdxdwKdbd0uB4fLPBCwhpCJBRnBvCrW8tTXPaNR/AOgKQX/YBhzGGHVgp3O l/Lje1w5o1aeMci0FNBGgIf0viFQWYm/1fb2hjhZu96711RHa+YY4jZ2uLGzsThWvVO1 apQTuuIXk3baPxdtOCbz8eBbjlENYwIEB6M2MK+italbfIaJ0ns6+DUe3qtItl7LI4w5 VWoHBLcmpSo/sn/zY2F4lSc3tqwgKJesp11xE9egROlYsGjq/T0xnjuNTgJ+F17cs6ke kD3w== 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=kx+lo6UpVP3UsF9WQbo8HAcIYgvVwvthPk9F4G7XGe0=; b=eph+X4wGWEqgNeDSquDgICOCG98xYq6yc6npukl6oIOueu6YwHDhYor0VPzgOxkXfy R1qZdu0pc/Y5HFWIYwqM3HMx55nPosZuadFjNXTAmjRoyUPvuahcXv575vC+pJPCdNxU tG+G6yViqHFbL2MrR6Tt+/+j9Ff3REp3wqJvojPU3x7uPN97QWr474sUWNR3BfYjj56o xBu5vk7Cm9JkqfzEpGTR7ZgBa0ldvUj9pcAWi7PjKXtMPxx/3iby0wzNbhMTlIbDoFY+ yiUWtSUn6Eoqh813wgjVy4Za+HRk8CghPBhYhOsf99DfFXu5sQKmR3/OxhTp01TuEU7+ OH6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id h1-v6si16605731pgs.221.2018.07.10.15.31.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:17 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.136 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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305445" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:16 -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 21/27] x86/cet/ibt: Add Kconfig option for user-mode Indirect Branch Tracking Date: Tue, 10 Jul 2018 15:26:33 -0700 Message-Id: <20180710222639.8241-22-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 The user-mode indirect branch tracking support is done mostly by GCC to insert ENDBR64/ENDBR32 instructions at branch targets. The kernel provides CPUID enumeration, feature MSR setup and the allocation of legacy bitmap. Signed-off-by: Yu-cheng Yu --- arch/x86/Kconfig | 12 ++++++++++++ arch/x86/Makefile | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 768343768643..01de9743efe6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1945,6 +1945,18 @@ config X86_INTEL_SHADOW_STACK_USER If unsure, say y. +config X86_INTEL_BRANCH_TRACKING_USER + prompt "Intel Indirect Branch Tracking for user-mode" + def_bool n + depends on CPU_SUP_INTEL && X86_64 + select X86_INTEL_CET + select ARCH_HAS_PROGRAM_PROPERTIES + ---help--- + Indirect Branch Tracking provides hardware protection against return-/jmp- + oriented programing attacks. + + If unsure, say y + config EFI bool "EFI runtime service support" depends on ACPI diff --git a/arch/x86/Makefile b/arch/x86/Makefile index ad1314e5ef65..a7913de34866 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -164,6 +164,13 @@ ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER endif endif +# Check compiler ibt support +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + ifeq ($(call cc-option-yn, -fcf-protection=branch), n) + $(error CONFIG_X86_INTEL_BRANCH_TRACKING_USER not supported by compiler) + endif +endif + # # If the function graph tracer is used with mcount instead of fentry, # '-maccumulate-outgoing-args' is needed to prevent a GCC bug