Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp781218imm; Fri, 21 Sep 2018 08:11:58 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb/WijoQn50WKybh1SC8sO86Xj7ue9nxUcJOOCPM/5jXAQA/KN5pVu57Z6seE/SCCudaL9O X-Received: by 2002:a62:8d16:: with SMTP id z22-v6mr47568277pfd.181.1537542718620; Fri, 21 Sep 2018 08:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542718; cv=none; d=google.com; s=arc-20160816; b=xRyqyll0jvKSHcVTBCmVtPQpBPyvMmevIweWp9WjIerC3GuG1Iv+9ySQkK9WfgYw8r UbUwdP9UG85OHNVA0YRiKxbKCO9JUXD/DSNAhpCf0XzkCesDyARjw9EiGK7ZpIIANRPx Zfd9/B2SgTOfd4BrbOXHls3a5xsKQRABLSEFPPkvVTuJRDyMqhkmnZ2ptuXruDu2GHSy qTpXtv0OUXcVjGLO1cIg1ImOLfLVZ6Z+jLyAmB4qzjxG7oOOakbISFoI1NZtUBNuBB3c 4bozdDq4RFgbuxAAU+S7Kt6xt4C/ddaX6oVwQrgGqIBVNfnZ9ywy6Hyc2s3+yDMUzPq5 UGiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=kac2I6z3fQfSWOBvkXXMbQ+N+Ykk3JirFXzlhuyyKhc=; b=J1U6+9+WE4D5zk9QsJhLdIga5Rf7LzTptMxpVJkiyAgHPImwYb/ozrVNHLZm+zh3Vp RAlGuaZntqFZgqYQkvWQsr00BWGX0jit/nic/uTKZFB4WZE8+q3p0AmLVSNI0mrt2wVo 39ArVqK3Kr7VDTAdYoQlpTRv8uQKPtXdmmgIGHeMSleAqdHnBoYjz7hEhLIQULoShSJE 82cw72FZ4MDhsEziLt9Vdwa8Y+M8irABAsce1AqHJV7jot5iTOJrfZCEY49+yolnJUjI /6o+9ghYUyPc0PRTixOczIhvxzDfmcxoJB4BkPM1bXmaRzbxlXuC57Kv/84UhUi0jjds 8Aew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9-v6si24626716pgk.384.2018.09.21.08.11.41; Fri, 21 Sep 2018 08:11:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390893AbeIUU7s (ORCPT + 99 others); Fri, 21 Sep 2018 16:59:48 -0400 Received: from mga11.intel.com ([192.55.52.93]:13767 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390777AbeIUU7r (ORCPT ); Fri, 21 Sep 2018 16:59:47 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2018 08:10:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,285,1534834800"; d="scan'208";a="88187974" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga002.fm.intel.com with ESMTP; 21 Sep 2018 08:10:28 -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 , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v4 5/9] x86/cet/ibt: ELF header parsing for IBT Date: Fri, 21 Sep 2018 08:05:49 -0700 Message-Id: <20180921150553.21016-6-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921150553.21016-1-yu-cheng.yu@intel.com> References: <20180921150553.21016-1-yu-cheng.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Look in .note.gnu.property of an ELF file and check if Indirect Branch Tracking needs to be enabled for the task. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu --- arch/x86/include/uapi/asm/elf_property.h | 1 + arch/x86/kernel/elf.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/elf_property.h b/arch/x86/include/uapi/asm/elf_property.h index af361207718c..343a871b8fc1 100644 --- a/arch/x86/include/uapi/asm/elf_property.h +++ b/arch/x86/include/uapi/asm/elf_property.h @@ -11,5 +11,6 @@ * Bits for GNU_PROPERTY_X86_FEATURE_1_AND */ #define GNU_PROPERTY_X86_FEATURE_1_SHSTK (0x00000002) +#define GNU_PROPERTY_X86_FEATURE_1_IBT (0x00000001) #endif /* _UAPI_ASM_X86_ELF_PROPERTY_H */ diff --git a/arch/x86/kernel/elf.c b/arch/x86/kernel/elf.c index 2fddd0bc545b..13358026cd64 100644 --- a/arch/x86/kernel/elf.c +++ b/arch/x86/kernel/elf.c @@ -300,7 +300,8 @@ int arch_setup_features(void *ehdr_p, void *phdr_p, struct elf64_hdr *ehdr64 = ehdr_p; - if (!cpu_feature_enabled(X86_FEATURE_SHSTK)) + if (!cpu_feature_enabled(X86_FEATURE_SHSTK) && + !cpu_feature_enabled(X86_FEATURE_IBT)) return 0; if (ehdr64->e_ident[EI_CLASS] == ELFCLASS64) { @@ -335,6 +336,11 @@ int arch_setup_features(void *ehdr_p, void *phdr_p, } } + if (cpu_feature_enabled(X86_FEATURE_IBT)) { + if (feature & GNU_PROPERTY_X86_FEATURE_1_IBT) + err = cet_setup_ibt(); + } + out: return err; } -- 2.17.1