Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1621777ybz; Sun, 26 Apr 2020 00:26:44 -0700 (PDT) X-Google-Smtp-Source: APiQypLgzrLhbtCsAmzLcivRgNQYIqmgyWQZHAuAfFDHwehPDzrvq1AQtPX/a8yjCE7mLWdyJnIR X-Received: by 2002:a50:9dc4:: with SMTP id l4mr14445537edk.234.1587886004604; Sun, 26 Apr 2020 00:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587886004; cv=none; d=google.com; s=arc-20160816; b=UavzI4yG6vaeekCumfBs2H6uJ+dSsQ+2KoG3ovowjujBdKn9pP5DfrCO93wWpC7wyb ViHo8pZwX+n1H6Mb67YsTelsaKi4jrrLXXG0anVSZGXUsBlpn8HnbpBq/bZocHQKMdUF qaQmYAbZG27lPjcy3FVHx5hN99/u3SnMSwZUJOt7oTMA/UyIWjgOUpwPcefka+VIEkkM 7d8pyK6zJU9Rbs4EBpHbZ1d5ftGplLHawboXVxrXjihT0K19HwcBof7fnEXkp73m9Xru SVAoNEkv3P8EN5wTCnBSaNvEvR39Vqpmcpmb1VViFDOGzF7Kb5TvW3tQCI9IOJtpcRgX gaaw== 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=7EMlAdw9pdDkjPM50k+4E9SbPBs2/ZITPV/E14fRqkg=; b=IrJAYBb+pkHfqYAJOggoSwNeREIJlABYG2U9ikCnjUbsQ5fUSUrG/f4KugFFpCrMbw VQJAnzJP7CQeTHEG8dTOAkuKPOB9MUKbeDXcMAWepgqcS8D4CnUUIMEG7iMg2k7XEPib SVCmzsLu9H9jXdqGlSTynH75pxQST0I+/cmPBWYh3euUq5qhrtJQufZu1DuD/x4k8LOc JxWc0d0Iu2GTuj7D9FxHyLsDe0YbvMEHABygjz5inmTL2S/n90ypL7F1sthpusyKQk6z fSvSfrzlsNpVfZpGNhfan1c14gxxq65Cr208FvehcKFdhTbdYaHhdEL1e1/Ye0wY9e/b iAew== 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 j21si5642605edt.523.2020.04.26.00.26.22; Sun, 26 Apr 2020 00:26:44 -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 S1726404AbgDZGr5 (ORCPT + 99 others); Sun, 26 Apr 2020 02:47:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726126AbgDZGrx (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 0CEE4C061A0C; 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 1jSb4o-0008Ta-PM; Sun, 26 Apr 2020 08:47:42 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 677391C0330; Sun, 26 Apr 2020 08:47:42 +0200 (CEST) Date: Sun, 26 Apr 2020 06:47:42 -0000 From: "tip-bot2 for Jann Horn" 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 rewind_stack_do_exit() Cc: Miroslav Benes , Jann Horn , Josh Poimboeuf , Ingo Molnar , Andy Lutomirski , Dave Jones , Peter Zijlstra , Thomas Gleixner , Vince Weaver , x86 , LKML In-Reply-To: <68c33e17ae5963854916a46f522624f8e1d264f2.1587808742.git.jpoimboe@redhat.com> References: <68c33e17ae5963854916a46f522624f8e1d264f2.1587808742.git.jpoimboe@redhat.com> MIME-Version: 1.0 Message-ID: <158788366202.28353.15767352618686056076.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: f977df7b7ca45a4ac4b66d30a8931d0434c394b1 Gitweb: https://git.kernel.org/tip/f977df7b7ca45a4ac4b66d30a8931d0434c394b1 Author: Jann Horn AuthorDate: Sat, 25 Apr 2020 05:03:04 -05:00 Committer: Ingo Molnar CommitterDate: Sat, 25 Apr 2020 12:22:28 +02:00 x86/entry/64: Fix unwind hints in rewind_stack_do_exit() The LEAQ instruction in rewind_stack_do_exit() moves the stack pointer directly below the pt_regs at the top of the task stack before calling do_exit(). Tell the unwinder to expect pt_regs. Fixes: 8c1f75587a18 ("x86/entry/64: Add unwind hint annotations") Reviewed-by: Miroslav Benes Signed-off-by: Jann Horn Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Cc: Andy Lutomirski Cc: Dave Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vince Weaver Link: https://lore.kernel.org/r/68c33e17ae5963854916a46f522624f8e1d264f2.1587808742.git.jpoimboe@redhat.com --- arch/x86/entry/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 34a5889..9fe0d5c 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1739,7 +1739,7 @@ SYM_CODE_START(rewind_stack_do_exit) movq PER_CPU_VAR(cpu_current_top_of_stack), %rax leaq -PTREGS_SIZE(%rax), %rsp - UNWIND_HINT_FUNC sp_offset=PTREGS_SIZE + UNWIND_HINT_REGS call do_exit SYM_CODE_END(rewind_stack_do_exit)