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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 EE3A6C433DB for ; Wed, 10 Feb 2021 18:03:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 72A9764EDA for ; Wed, 10 Feb 2021 18:03:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72A9764EDA 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 271F76B006E; Wed, 10 Feb 2021 13:03:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 12EF46B0072; Wed, 10 Feb 2021 13:03:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E06226B0070; Wed, 10 Feb 2021 13:03:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id A970A6B0071 for ; Wed, 10 Feb 2021 13:03:05 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 67C088245571 for ; Wed, 10 Feb 2021 18:03:05 +0000 (UTC) X-FDA: 77803129530.06.44A25DF Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf12.hostedemail.com (Postfix) with ESMTP id 96AB1EF for ; Wed, 10 Feb 2021 18:03:03 +0000 (UTC) IronPort-SDR: fs8G0rRWQZqOYZWKBdgo19x7gSoI646X82VK88JQn5Gbg9SoniiTSch1tdHi3BB6zfp+UzfCH9 WA5P2KDEYD9A== X-IronPort-AV: E=McAfee;i="6000,8403,9891"; a="181349418" X-IronPort-AV: E=Sophos;i="5.81,168,1610438400"; d="scan'208";a="181349418" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2021 10:03:01 -0800 IronPort-SDR: pLnKYJcbtjlsshhAeAamdmrtE+ArlzJW3A5trUKIpN3I152CfqhFT4H2J8pS6nq0/JwApWiU2n 8ADYUvHcCsTg== X-IronPort-AV: E=Sophos;i="5.81,168,1610438400"; d="scan'208";a="380239216" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2021 10:02:57 -0800 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 , 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 , Pengfei Xu , Cc: Yu-cheng Yu Subject: [PATCH v20 4/7] x86/cet/ibt: Update ELF header parsing for Indirect Branch Tracking Date: Wed, 10 Feb 2021 10:02:42 -0800 Message-Id: <20210210180245.13770-5-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210210180245.13770-1-yu-cheng.yu@intel.com> References: <20210210180245.13770-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 X-Stat-Signature: zrst5diztu6er13z8mi63ot75qsw78cn X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 96AB1EF Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf12; identity=mailfrom; envelope-from=""; helo=mga14.intel.com; client-ip=192.55.52.115 X-HE-DKIM-Result: none/none X-HE-Tag: 1612980183-213372 Content-Transfer-Encoding: quoted-printable 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: An ELF file's .note.gnu.property indicates features the file supports. The property is parsed at loading time and passed to arch_setup_elf_ property(). Update it for Indirect Branch Tracking. Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook --- arch/x86/kernel/process_64.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 19f138f7a209..ccf3f66f4d2c 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -864,6 +864,14 @@ int arch_setup_elf_property(struct arch_elf_state *s= tate) r =3D cet_setup_shstk(); } =20 + if (r < 0) + return r; + + if (static_cpu_has(X86_FEATURE_IBT)) { + if (state->gnu_property & GNU_PROPERTY_X86_FEATURE_1_IBT) + r =3D cet_setup_ibt(); + } + return r; } #endif --=20 2.21.0