Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp780963imm; Fri, 21 Sep 2018 08:11:44 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYMmoRIKDuk6XjsSgkcNn/8wBUQ7vP9XhkSx4moLb3Lk6TB2niXOsWJCDfs3xkGFaqvbn60 X-Received: by 2002:a63:26c4:: with SMTP id m187-v6mr6930256pgm.268.1537542704624; Fri, 21 Sep 2018 08:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542704; cv=none; d=google.com; s=arc-20160816; b=sQpJTHm4QvWMoaCjAJ7fGBqpJEchl9FObwopfnvLOBYlpRxtQKaeo0oLhe/hyokx0L gA4o0rKI8ZD4yVcS8VSNmSeplP57/MT5c9YMTLE9KeanUiqyCDyn+7EhUfn/jn2EEPf6 iNewU0oXiIZQNPk0N1fXNibzypJCDCtzHKbaSwc1LHsXZeYZ3cbZqnRosXdMBx5S/SZb ADJXVUHA3k+taXmjeRaze70RwvaLfC4Z/6Pb6RPPkLQok+Pc5qK5ynQIeXNnsIbDM8TQ YAGBnRYJQkUwBVz7DbPgFZ8JEe2+k+kfB/9yrPEaQK3manWNJmiPXnR7pBPj7CtOUc3S r+Ag== 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:to:from; bh=DzxbjDY4h6ee9dgtV6hY0nHV4jolczbZKl0Vg0iYMGs=; b=A2BOzGWRONHfmRqrTKqP4HpMpeznWtwYYXWpQw1FhZ/dZhqHgDkZ0K+iLCI/X/2l46 9iTwl1XLj9MtMVrgTfI+5R6Y4t4lGOEqcMhFI7/N9E5YsBP94OZ/wfrObH17sWB2SmLs C//2xpq/I7782V5oMIXjws7EtXUqj/m+8TVX9ppytdikclr/6Pkj0nFU5tSkVa3lPu9G EfnRe5P2qgW3tMRQg0c3PgUsxUH8hhXPGmYPoppDFK4QwEydv6GZKGjGG3P3XSLjneVZ Q4Na8f7mBp3u3WyBVIt12SfZhqraBMby+2h+GaR/xebZ3yn6jZFOo61LWrsEH6bPDfQ/ ofCg== 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 b34-v6si27522060plc.170.2018.09.21.08.11.29; Fri, 21 Sep 2018 08:11:44 -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 S2390949AbeIUVAA (ORCPT + 99 others); Fri, 21 Sep 2018 17:00:00 -0400 Received: from mga11.intel.com ([192.55.52.93]:13768 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390535AbeIUU7s (ORCPT ); Fri, 21 Sep 2018 16:59:48 -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="88187985" 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 Subject: [RFC PATCH v4 8/9] x86: Insert endbr32/endbr64 to vDSO Date: Fri, 21 Sep 2018 08:05:52 -0700 Message-Id: <20180921150553.21016-9-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 From: "H.J. Lu" When Intel indirect branch tracking is enabled, functions in vDSO which may be called indirectly must have endbr32 or endbr64 as the first instruction. Compiler must support -fcf-protection=branch so that it can be used to compile vDSO. Signed-off-by: H.J. Lu --- arch/x86/entry/vdso/.gitignore | 4 ++++ arch/x86/entry/vdso/Makefile | 12 +++++++++++- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/.gitignore b/arch/x86/entry/vdso/.gitignore index aae8ffdd5880..552941fdfae0 100644 --- a/arch/x86/entry/vdso/.gitignore +++ b/arch/x86/entry/vdso/.gitignore @@ -5,3 +5,7 @@ vdso32-sysenter-syms.lds vdso32-int80-syms.lds vdso-image-*.c vdso2c +vclock_gettime.S +vgetcpu.S +vclock_gettime.asm +vgetcpu.asm diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index fa3f439f0a92..8694f70c08e6 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -102,13 +102,17 @@ vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F) # Convert 64bit object file to x32 for x32 vDSO. quiet_cmd_x32 = X32 $@ - cmd_x32 = $(OBJCOPY) -O elf32-x86-64 $< $@ + cmd_x32 = $(OBJCOPY) -R .note.gnu.property -O elf32-x86-64 $< $@ $(obj)/%-x32.o: $(obj)/%.o FORCE $(call if_changed,x32) targets += vdsox32.lds $(vobjx32s-y) +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + $(obj)/vclock_gettime.o $(obj)/vgetcpu.o $(obj)/vdso32/vclock_gettime.o: KBUILD_CFLAGS += -fcf-protection=branch +endif + $(obj)/%.so: OBJCOPYFLAGS := -S $(obj)/%.so: $(obj)/%.so.dbg $(call if_changed,objcopy) @@ -160,6 +164,12 @@ quiet_cmd_vdso = VDSO $@ VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ $(call ld-option, --build-id) -Bsymbolic +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + VDSO_LDFLAGS += $(call ldoption, -z$(comma)ibt) +endif +ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER + VDSO_LDFLAGS += $(call ldoption, -z$(comma)shstk) +endif GCOV_PROFILE := n # diff --git a/arch/x86/entry/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S index acfd5ba7d943..cabaeedfed78 100644 --- a/arch/x86/entry/vdso/vdso-layout.lds.S +++ b/arch/x86/entry/vdso/vdso-layout.lds.S @@ -74,6 +74,7 @@ SECTIONS .fake_shstrtab : { *(.fake_shstrtab) } :text + .note.gnu.property : { *(.note.gnu.property) } :text :note .note : { *(.note.*) } :text :note .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr -- 2.17.1