From patchwork Thu Aug 30 14:40:04 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: 10581881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 610615A4 for ; Thu, 30 Aug 2018 14:45:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5015B2B560 for ; Thu, 30 Aug 2018 14:45:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4403F2BC83; Thu, 30 Aug 2018 14:45:56 +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 CFEF62B560 for ; Thu, 30 Aug 2018 14:45:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E4C46B5240; Thu, 30 Aug 2018 10:44:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5DE166B5245; Thu, 30 Aug 2018 10:44:45 -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 3871D6B523E; Thu, 30 Aug 2018 10:44:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id D7B426B5242 for ; Thu, 30 Aug 2018 10:44:44 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id gn4so4066212plb.9 for ; Thu, 30 Aug 2018 07:44:44 -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=5AncLO3+H4a3Qxt5aPYUuDM1C2fJ4G3DLVBYQUZy2Lw=; b=Fa/QQJ9xuf7saiKTWw5z5VwtI5hwW3jko882wZvrlNBhJNdhv5E2NS4uA1OOapmrda /4+mA0ViLkQdRT2cd8cbIp4rKY+DXFf1Mhm2P/PIXG6XhOUgyLCCRMBrFnWPfnRrVuUE SNxnfSKMGjLOt6cQh4WB0zxsDT7IhV+1Bh7zxSqH30IPxHZlaajz9wXdCxp1kfHKDnC+ J+HjzK8oMHG8WyNs8Ha90jkvs26xq13iHatYulmVMV5biEUKH2St4WqGAHqKisuEe88G MqbPDvAYgRDLLiGf2hE+LR/ysYDpot+Nu9vSMUYc9GKaQDe6Q2uvX8jmNOBisijK2O4A 7q8Q== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.126 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: APzg51AkKlGb5kgfuDiv9jkYqkPFQqqC2ddoOLg3L+N4XGbGSozKuzG5 pqIeY9OxKWe7aIHzGDb8i0DztkP8mClAG/Ak9vWUcKfC9WLKV6JU6yrTiEWD71AWHWKuE3I+OS3 p9eMWzSeHtHIYlin/PiASU/FMv7yKyG0KQ4ezD9uOjx6CeJsWYpUVJIzrpOZvM25ctQ== X-Received: by 2002:a62:5047:: with SMTP id e68-v6mr10644069pfb.157.1535640284587; Thu, 30 Aug 2018 07:44:44 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda68pg5b2XpVoFrwppr/mvERI+igjdXL+SxD/eDeKS6cZqau/kUdzbqYHMk60zrHxd/88ZI X-Received: by 2002:a62:5047:: with SMTP id e68-v6mr10644032pfb.157.1535640283935; Thu, 30 Aug 2018 07:44:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535640283; cv=none; d=google.com; s=arc-20160816; b=qi2nnT/dmC+04ccJA6f7km5YkRKlcZlI+H0Tt3KD+iIf48aw1GmoDQsRwor8/7T4Q9 RM+FgYzw64HWtP1cthP109FV8sZ6q8Obj9oVYQkXF7KiRcJs2hjDniW+YD4RQylTfGr0 BZ7PNXBdX6iL29xD7WeH1D0ZBdgtBzxtM3+EHx/aIZYRnTJSsmRL3GspgAxyHTpzEXe2 hjCVyidzeCqrOu7RC8TqEL1AjIMDo/M51SpTsMS3GE8sZT1K3ETkWWrvsm5j/pYwsT+4 oj6fZRHcUWQrBGodZ4Wa6FIIcWzilGi0lhKr1vy5Iz9HdQ1bE4c8p4QPaEZW8ipYUrHU 99mQ== 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=5AncLO3+H4a3Qxt5aPYUuDM1C2fJ4G3DLVBYQUZy2Lw=; b=p/i2599VixnoAMtM9VVIoNs4ofbVuBWA/YeK1KGVFbp4uZ9rxErzXMyil1s5XjLwsl JRTYoyY0H6tMeTpX1VeSjJ9Dr2riyXG6gMeZkmA/3f1O0b2fNEYULW65zEGFbaxaMOCy Nztn0SQoynf51DUzPiDJOrvF2weeK5fIY7NRGsmAMVbRYgW9I3LbgYqdYZy0unNmkl1s bgkQeVIcGliqXIIDrx+UkHKbhR1g/yWwq2P2WRtEhKAe/qXPbsQ57Hb6Y67yEA5Y1Pio 9ZBeaj3TQtSLg8EvhwVcQ3SyilkTqmNHkQ+Mt7wGQBZcsTYyBl+Aw98KZCCBGLMrvFq5 631w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga18.intel.com (mga18.intel.com. [134.134.136.126]) by mx.google.com with ESMTPS id t10-v6si6980653pgn.667.2018.08.30.07.44.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 07:44:43 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.126 as permitted sender) client-ip=134.134.136.126; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.126 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 orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Aug 2018 07:44:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,307,1531810800"; d="scan'208";a="228910405" Received: from 2b52.sc.intel.com ([143.183.136.52]) by orsmga004.jf.intel.com with ESMTP; 30 Aug 2018 07:44:31 -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 v3 3/8] x86/cet/ibt: ELF header parsing for IBT Date: Thu, 30 Aug 2018 07:40:04 -0700 Message-Id: <20180830144009.3314-4-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180830144009.3314-1-yu-cheng.yu@intel.com> References: <20180830144009.3314-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 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 a2c41bf39c58..41957f1bd9d0 100644 --- a/arch/x86/kernel/elf.c +++ b/arch/x86/kernel/elf.c @@ -298,7 +298,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) { @@ -333,6 +334,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; }