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=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 CD20DC433E7 for ; Mon, 12 Oct 2020 15:46:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6CE3E20714 for ; Mon, 12 Oct 2020 15:46:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CE3E20714 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 1D7FE94000E; Mon, 12 Oct 2020 11:45:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15E7694000C; Mon, 12 Oct 2020 11:45:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3BA594000E; Mon, 12 Oct 2020 11:45:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id C2FD594000C for ; Mon, 12 Oct 2020 11:45:56 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4C01F3623 for ; Mon, 12 Oct 2020 15:45:56 +0000 (UTC) X-FDA: 77363699112.20.frame61_4d12181271fb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 1FF37180C060F for ; Mon, 12 Oct 2020 15:45:56 +0000 (UTC) X-HE-Tag: frame61_4d12181271fb X-Filterd-Recvd-Size: 3689 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 15:45:55 +0000 (UTC) IronPort-SDR: yJDzB/2H7yhB4dOnm4My7XY5xjh7zippNf9CetYVXnD8aidaofowK/bbvdjgw1MmyYFTH/EVHS oEeCcCoAt4xA== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="165871730" X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="165871730" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:54 -0700 IronPort-SDR: uktNiKl6OrGraGtBexLD49EBKoSk4PWqNdqvRfE9JUhTzhcs8JxM9dleflCvMSf5Pd2el9vp80 gvY7DK0IsBSA== X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="530012655" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:45:54 -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 , 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 v14 7/7] x86/vdso: Insert endbr32/endbr64 to vDSO Date: Mon, 12 Oct 2020 08:45:30 -0700 Message-Id: <20201012154530.28382-8-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201012154530.28382-1-yu-cheng.yu@intel.com> References: <20201012154530.28382-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 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: From: "H.J. Lu" When Indirect Branch Tracking (IBT) is enabled, vDSO functions may be called indirectly, and must have ENDBR32 or ENDBR64 as the first instruction. The compiler must support -fcf-protection=3Dbranch so that = it can be used to compile vDSO. Signed-off-by: H.J. Lu Signed-off-by: Yu-cheng Yu Acked-by: Andy Lutomirski --- arch/x86/entry/vdso/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 215376d975a2..1f1b6893068a 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -94,6 +94,10 @@ endif =20 $(vobjs): KBUILD_CFLAGS :=3D $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOL= INE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL) =20 +ifdef CONFIG_X86_BRANCH_TRACKING_USER +$(vobjs) $(vobjs32): KBUILD_CFLAGS +=3D -fcf-protection=3Dbranch +endif + # # vDSO code runs in userspace and -pg doesn't help with profiling anyway= . # --=20 2.21.0