Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp946676ybz; Fri, 1 May 2020 11:26:05 -0700 (PDT) X-Google-Smtp-Source: APiQypJmsz8PEj2CPOm01wniT+QDeZ/TDHHga0in38eAC5JXDpo2zFnwMvd24nt0LGKwaIWZwxa2 X-Received: by 2002:a50:fc82:: with SMTP id f2mr4420826edq.38.1588357564898; Fri, 01 May 2020 11:26:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588357564; cv=none; d=google.com; s=arc-20160816; b=GgLD0eaXvj+hmiwt7tooYm0zshOjTV4kIMmRhkX4JHajdx+av4Yx4cqYtak31gOfkx KNnXLyJkgyRojmeKkHA+K1D2NiFbH4yFhEFjm27vWI03oh6h/bP+h8ygnjQj59YN7aFt xTVFFCdfgIBuWgvu7IT/hzTDFaLOgZSep1Yftf8IGkD9MZwtyYs/L0qfOmB/Sa0iXLW6 rbyNdAoqzLcOnExJodwP4rDNxKtrCt/rxcLKDfehQrdil5Gmf4fuyxDjexYC4xzoEGIh RwFrhdNX6s2bZtfRCy+H4yJJ7Bv3nYvG6SFW1oxkNfGXQi8E6p1JtPMjpuWvg+Gnhew9 mttQ== 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=8CtjOzlwg86mH+d40HvpbuNLEqi/ka+tlY9LmVZgqMA=; b=uwzbCo/I2zyoLTrxVSDSGJgS2qlrjlKWndKuFd5hOUqT2aCdvN2iPFH0JAdMYFJUyp KDdNK6GhEXSIu8Hv2b11wA2+nbfJ9oz5j1twNrBiXlE2rqLeSsvCsXX8cAhpruj0y32y 7t0UQiuY+419gIFtr6pDHFybU3VzMiKkkpkITeC3gwkdTwl7rY7mlX+2UtZsFWhv0Rf3 OBzbKbk2Fm0y7kkz8yCCmkXG/CDOk6SkGejziNaL5dQsn1CKqGP8uohNwqaKsDVYLUf1 8Y06lk8Xx2KKmd4xj3UTNd8Fa999REzTAY3qt7/7xf3Cc+xQ8PiE4C7SIWCsjB18k68t dsfA== 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 d20si2053294edz.32.2020.05.01.11.25.42; Fri, 01 May 2020 11:26:04 -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 S1730879AbgEASXI (ORCPT + 99 others); Fri, 1 May 2020 14:23:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730700AbgEASWb (ORCPT ); Fri, 1 May 2020 14:22:31 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38E41C061A0C; Fri, 1 May 2020 11:22:31 -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 1jUaIq-0003fz-CD; Fri, 01 May 2020 20:22:24 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 1D85E1C04DD; Fri, 1 May 2020 20:22:22 +0200 (CEST) Date: Fri, 01 May 2020 18:22:22 -0000 From: "tip-bot2 for Alexandre Chartre" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] objtool: UNWIND_HINT_RET_OFFSET should not check registers Cc: Alexandre Chartre , "Peter Zijlstra (Intel)" , Miroslav Benes , Josh Poimboeuf , x86 , LKML In-Reply-To: <20200407073142.20659-3-alexandre.chartre@oracle.com> References: <20200407073142.20659-3-alexandre.chartre@oracle.com> MIME-Version: 1.0 Message-ID: <158835734207.8414.4101263536708269303.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 objtool/core branch of tip: Commit-ID: c721b3f80faebc7891211fa82de303eebadfed15 Gitweb: https://git.kernel.org/tip/c721b3f80faebc7891211fa82de303eebadfed15 Author: Alexandre Chartre AuthorDate: Tue, 07 Apr 2020 09:31:35 +02:00 Committer: Peter Zijlstra CommitterDate: Thu, 30 Apr 2020 20:14:32 +02:00 objtool: UNWIND_HINT_RET_OFFSET should not check registers UNWIND_HINT_RET_OFFSET will adjust a modified stack. However if a callee-saved register was pushed on the stack then the stack frame will still appear modified. So stop checking registers when UNWIND_HINT_RET_OFFSET is used. Signed-off-by: Alexandre Chartre Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Acked-by: Josh Poimboeuf Link: https://lkml.kernel.org/r/20200407073142.20659-3-alexandre.chartre@oracle.com --- tools/objtool/check.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 8af8de2..068897d 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1507,6 +1507,14 @@ static bool has_modified_stack_frame(struct instruction *insn, struct insn_state if (cfi->stack_size != initial_func_cfi.cfa.offset + ret_offset) return true; + /* + * If there is a ret offset hint then don't check registers + * because a callee-saved register might have been pushed on + * the stack. + */ + if (ret_offset) + return false; + for (i = 0; i < CFI_NUM_REGS; i++) { if (cfi->regs[i].base != initial_func_cfi.regs[i].base || cfi->regs[i].offset != initial_func_cfi.regs[i].offset)