From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751593AbdJWMsZ (ORCPT ); Mon, 23 Oct 2017 08:48:25 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36029 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbdJWMsU (ORCPT ); Mon, 23 Oct 2017 08:48:20 -0400 Date: Mon, 23 Oct 2017 05:43:57 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: avagin@virtuozzo.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, luto@kernel.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com Reply-To: luto@kernel.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, mingo@kernel.org, hpa@zytor.com, avagin@virtuozzo.com, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org In-Reply-To: <931d57f0551ed7979d5e7e05370d445c8e5137f8.1508516398.git.jpoimboe@redhat.com> References: <931d57f0551ed7979d5e7e05370d445c8e5137f8.1508516398.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry: Fix idtentry unwind hint Git-Commit-ID: 98990a33b77dda9babf91cb235654f6729e5702e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 98990a33b77dda9babf91cb235654f6729e5702e Gitweb: https://git.kernel.org/tip/98990a33b77dda9babf91cb235654f6729e5702e Author: Josh Poimboeuf AuthorDate: Fri, 20 Oct 2017 11:21:33 -0500 Committer: Ingo Molnar CommitDate: Mon, 23 Oct 2017 13:30:35 +0200 x86/entry: Fix idtentry unwind hint This fixes the following ORC warning in the 'int3' entry code: WARNING: can't dereference iret registers at ffff8801c5f17fe0 for ip ffffffff95f0d94b The ORC metadata had the wrong stack offset for the iret registers. Their location on the stack is dependent on whether the exception has an error code. Reported-and-tested-by: Andrei Vagin Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 8c1f75587a18 ("x86/entry/64: Add unwind hint annotations") Link: http://lkml.kernel.org/r/931d57f0551ed7979d5e7e05370d445c8e5137f8.1508516398.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- 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 4916725..f6cdb7a 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -808,7 +808,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 ENTRY(\sym) - UNWIND_HINT_IRET_REGS offset=8 + UNWIND_HINT_IRET_REGS offset=\has_error_code*8 /* Sanity check */ .if \shift_ist != -1 && \paranoid == 0