Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1621475ybz; Sun, 26 Apr 2020 00:26:19 -0700 (PDT) X-Google-Smtp-Source: APiQypJi7iExGksiZltVFneDwHHRVKJ07Hk702vutDPQbdNT/854Vyf4KTsbTd3wKj1cSOy6/xXz X-Received: by 2002:a17:906:8549:: with SMTP id h9mr14027177ejy.145.1587885979190; Sun, 26 Apr 2020 00:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587885979; cv=none; d=google.com; s=arc-20160816; b=C5/JUZ05n1j/mwkQ+TknzU9Em77Upn146JTmXpEkHjDnWJF0mJB9RAgi7jdK2ZtKns HBeD923zzOoASbK6gZ5IW5ZIVgXj2cnFjUSHbu6nzGNsv0o4OrsieduC1t5iHh3YkcBp /K1XC9WAhHhpufneD+O+wGNOC23VEnb8TUUKojPmV63Q/9lkk9HBRml0pxYIwYZm7Bnk vD9+CTvi8yT905XaX5rSd4ioojlaW7eS5WMcsNAdCplaKGICTCohUrmojcfi2kPULUjS /lvz3lR296/yMlOKxzvaM7yGDwBVv55qRPch6iMiiDwrb4sCccnGxCp44yZFCiEz5GE2 j6bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=iaRaqWLe3Nht8iOCvm9hnRVpNGgeOQwehFgFBDIjvR4=; b=MASKhcVRRhPggVuYNvEgb4T0vxnxiIJzkAKszDBhDp5mwH4rESFmW32JlOZSet3RkU US7yqg5G1COqWAfsG1x/ABEku1KuFV2qCqx72Qi0pLyPy7qJCajFnPCDXo682QeoFHV3 yWxNnyaVOcUshG9z23Oy0giYyscR4kKUjyIZINWOTGBU2eUpvXr1j3ZLA7KrjpT2upq1 PMl7mv/3y48vrR1Y1vs6KwqRD8Nlaa6iwedhUXl62PW1vSjM9JwvmrtjkejGM9gXc6eB mamxJxGIQJALx5K637LpGBrrhmclPezkNx/NHQqtdCtmPzDXByTyKIeI7ISjzFe4PGki 6ezw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d24si5964875edv.539.2020.04.26.00.25.55; Sun, 26 Apr 2020 00:26:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726345AbgDZGrz (ORCPT + 99 others); Sun, 26 Apr 2020 02:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726262AbgDZGrx (ORCPT ); Sun, 26 Apr 2020 02:47:53 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 242EEC09B051; Sat, 25 Apr 2020 23:47:53 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jSb4p-0008U9-5N; Sun, 26 Apr 2020 08:47:43 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id D98831C0178; Sun, 26 Apr 2020 08:47:42 +0200 (CEST) Date: Sun, 26 Apr 2020 06:47:42 -0000 From: "tip-bot2 for Josh Poimboeuf" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/entry/64: Fix unwind hints in __switch_to_asm() Cc: Miroslav Benes , Josh Poimboeuf , Ingo Molnar , Andy Lutomirski , Dave Jones , Jann Horn , Peter Zijlstra , Thomas Gleixner , Vince Weaver , x86 , LKML In-Reply-To: <03d0411920d10f7418f2e909210d8e9a3b2ab081.1587808742.git.jpoimboe@redhat.com> References: <03d0411920d10f7418f2e909210d8e9a3b2ab081.1587808742.git.jpoimboe@redhat.com> MIME-Version: 1.0 Message-ID: <158788366248.28353.11684653234432670379.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 96c64806b4bf35f5edb465cafa6cec490e424a30 Gitweb: https://git.kernel.org/tip/96c64806b4bf35f5edb465cafa6cec490e424a30 Author: Josh Poimboeuf AuthorDate: Sat, 25 Apr 2020 05:03:03 -05:00 Committer: Ingo Molnar CommitterDate: Sat, 25 Apr 2020 12:22:28 +02:00 x86/entry/64: Fix unwind hints in __switch_to_asm() UNWIND_HINT_FUNC has some limitations: specifically, it doesn't reset all the registers to undefined. This causes objtool to get confused about the RBP push in __switch_to_asm(), resulting in bad ORC data. While __switch_to_asm() does do some stack magic, it's otherwise a normal callable-from-C function, so just annotate it as a function, which makes objtool happy and allows it to produces the correct hints automatically. Fixes: 8c1f75587a18 ("x86/entry/64: Add unwind hint annotations") Reviewed-by: Miroslav Benes Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Cc: Andy Lutomirski Cc: Dave Jones Cc: Jann Horn Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vince Weaver Link: https://lore.kernel.org/r/03d0411920d10f7418f2e909210d8e9a3b2ab081.1587808742.git.jpoimboe@redhat.com --- arch/x86/entry/entry_64.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 6b0d679..34a5889 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -279,8 +279,7 @@ SYM_CODE_END(entry_SYSCALL_64) * %rdi: prev task * %rsi: next task */ -SYM_CODE_START(__switch_to_asm) - UNWIND_HINT_FUNC +SYM_FUNC_START(__switch_to_asm) /* * Save callee-saved registers * This must match the order in inactive_task_frame @@ -321,7 +320,7 @@ SYM_CODE_START(__switch_to_asm) popq %rbp jmp __switch_to -SYM_CODE_END(__switch_to_asm) +SYM_FUNC_END(__switch_to_asm) /* * A newly forked process directly context switches into this address.