From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <peterz@infradead.org>
X-Google-Smtp-Source: AH8x224j7M0aro/MhgINjcintODKcm3hrU9dr1oVurRBOHi/XhMUz5BUxC6NJjsvbkza3lJM/TJs
ARC-Seal: i=1; a=rsa-sha256; t=1516721585; cv=none;
        d=google.com; s=arc-20160816;
        b=ZQgNlXegvd/Fc0IhM5qgMn1hyqR6Rhjcr6r5KFKGYaOBrqAslCTVwcq9J5IrPYHAtb
         B35teK1AkQC9cQKfzVACdoufyiTVsUUskTTZX83O++ohEFmPZI+sJQWAQb5gnUrLe5ef
         HDZyyiHk/CQx0yq37wmWRPSRxQ5OO2gYcJEvrTPbg4dIO+bAh1yv4VUQaNhYNKdILMjd
         fkU5mSfbGSUWgE1CYvBHZbVjjsmLDlEV6vywHY+I0j1AJ8ymabua/i/FddUq2ai+vcVO
         KJkju578rfUu3FVVKZIHLmeHRZhoFYyKtmUJQgHTFw+WDtUYuF6BrFgtAtd2ue8fB7Dj
         FkPA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=content-disposition:mime-version:references:subject:cc:to:from:date
         :user-agent:message-id:dkim-signature:arc-authentication-results;
        bh=98CyJfC4k2yxQeyJLPl5QNTVjkoxyTt1aY6SCjzKUp4=;
        b=FHaSxiJ+cuTqzXOiCIrWU3SbPy9FH+QAh15+hvJf54yKeFyczxwsxqRGBSpCQvfQy8
         IyB2RBgJffDcThUU6lw1EKCyIaifCp0mn4YSAnitn7pWSWbie1MUgr/QBw1GxHJACiJG
         /VTlCOznxUTdnVLL6jVTrQVAeMYLiwd4j7zUW3y/K7sjUqzXF3o16NfLCJoo6X9hpqNd
         z5A837asH08hTnZdy7TeaXkGg+6kadLbXbB9csK3p79jVIHeXKD77BbXNtX4WBmCwiub
         tjtVD6QDyuC/lYXrwx+eQZLHW/RU1GeS+7a6HALW8nHU/84lGGdCEWsqLQWKZObXb8xq
         I3oQ==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=H3XKX7Pb;
       spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org
Authentication-Results: mx.google.com;
       dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=H3XKX7Pb;
       spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org
Message-Id: <20180123152638.277821436@infradead.org>
User-Agent: quilt/0.63-1
Date: Tue, 23 Jan 2018 16:25:44 +0100
From: Peter Zijlstra <peterz@infradead.org>
To: David Woodhouse <dwmw2@infradead.org>,
 Thomas Gleixner <tglx@linutronix.de>,
 Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-kernel@vger.kernel.org,
 Dave Hansen <dave.hansen@intel.com>,
 Ashok Raj <ashok.raj@intel.com>,
 Tim Chen <tim.c.chen@linux.intel.com>,
 Andy Lutomirski <luto@kernel.org>,
 Linus Torvalds <torvalds@linux-foundation.org>,
 Greg KH <gregkh@linuxfoundation.org>,
 Andrea Arcangeli <aarcange@redhat.com>,
 Andi Kleen <ak@linux.intel.com>,
 Arjan Van De Ven <arjan.van.de.ven@intel.com>,
 Dan Williams <dan.j.williams@intel.com>,
 Paolo Bonzini <pbonzini@redhat.com>,
 Jun Nakajima <jun.nakajima@intel.com>,
 Asit Mallick <asit.k.mallick@intel.com>,
 Jason Baron <jbaron@akamai.com>,
 Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 05/24] x86: Annotate indirect jump in head_64.S
References: <20180123152539.374360046@infradead.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline; filename=peterz-objtool-retpoline-annotate.patch
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: =?utf-8?q?1590397853777235548?=
X-GMAIL-MSGID: =?utf-8?q?1590397853777235548?=
X-Mailing-List: linux-kernel@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>

The objtool retpoline validation found this indirect jump. Seeing how
its on CPU bringup before we run userspace it should be safe, annotate
it.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 arch/x86/kernel/head_64.S |    2 ++
 1 file changed, 2 insertions(+)

--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -23,6 +23,7 @@
 #include <asm/nops.h>
 #include "../entry/calling.h"
 #include <asm/export.h>
+#include <asm/nospec-branch.h>
 
 #ifdef CONFIG_PARAVIRT
 #include <asm/asm-offsets.h>
@@ -134,6 +135,7 @@ ENTRY(secondary_startup_64)
 
 	/* Ensure I am executing from virtual addresses */
 	movq	$1f, %rax
+	ANNOTATE_RETPOLINE_SAFE
 	jmp	*%rax
 1:
 	UNWIND_HINT_EMPTY