Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4106278ybb; Tue, 7 Apr 2020 00:29:35 -0700 (PDT) X-Google-Smtp-Source: APiQypInPwfnNiCP5TFhYEOUfZrAGZ8aEnLPAJU/aDm1ha+MVpBaPoRrg6W1m60SpQs05ohrWlWn X-Received: by 2002:aca:cdd1:: with SMTP id d200mr632299oig.153.1586244575233; Tue, 07 Apr 2020 00:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586244575; cv=none; d=google.com; s=arc-20160816; b=ftBSMjOiPTqVM7b50utfrrNxG97YVpXx4PLK/RKDmDlpcWQax+Jr4bKI7FTziVI+dx SvKfXS0c3UnveYzb0J6wf+5fpuIcbcrwyJrIw1GFCXBl6yafv39DDXQN4UvrrdFoZaMz ajpZPfLT0uc9nSh4+QSRm418xewkne6dGuzqxueut7j2P7pJHrqIA+C8ewXFrrz35u2z /YyvQh52MJT8QZpz0xXRWySBflhf3VI/z6wCe3EMgmmhGulRepoeQHZM/VSqvsyjyG/z Wsm53p/Wjr2gVKxUOgBvnIZKZyTO3UOT6cVjtJkhcCPC7Uh78uYXUx9hNX+pKFHH+kcR 0wzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=7tsZqCnPSqTL0O2P1Rr9JutvRVK1YzYVaBpfBhyLAHQ=; b=hNx3bDAXH7ZDKle3sXconcg0t9iLi1lidtsw7qUxNmPf+/8MLNAndpIhXt4WAp3uug q/29Iz4PRBXiFgl4HGYkFtsgA+omEyfcLmwkupxGYL7rI4tzaYEv4R/83D23onazdOgv ledPHa2gr70V078okH7q56Vlx2CiknLgxIZ7G6GBKqk+s4N7v90mZ9KuSQEsjzrUhnrz shwA3JleYxcK7k/agHUfaa5VgCypxYTQFA0Y8p6AkkJzbAJXc1oaYXIsm8fO6CgnJ4rl ztvc3M1FsP7HCnL/x3GJvllPDUT6XOb/j9sNeLFFrh5Yycxo1RK/57jvxjZCzUF0XW5a BnnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=LP5abjiW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i8si1013707otj.252.2020.04.07.00.29.23; Tue, 07 Apr 2020 00:29:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=LP5abjiW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727706AbgDGH15 (ORCPT + 99 others); Tue, 7 Apr 2020 03:27:57 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:45196 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgDGH14 (ORCPT ); Tue, 7 Apr 2020 03:27:56 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0377RaUi026351; Tue, 7 Apr 2020 07:27:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=7tsZqCnPSqTL0O2P1Rr9JutvRVK1YzYVaBpfBhyLAHQ=; b=LP5abjiWwG12+awu64RXbfz9bnuLyqYlC4oL/5Qy1WYeg9Q76qmdFS+BJC/MmCJxAYXJ TLg7pV6/g+B8QuEXxGoAh3G1YsXN4geK3Vj4aQgOb1WVD4duYi37jGIrfNJ+ggleiRe7 xLSpEDJPVoJvMoHHCa/0UeGtyVqObo7f+956r0+IH4zHoeiU/ZTpJS2QUFo46JhDP7qC duVWO5uA9dwmvuTp0usnC2Gz+oi0VLZDRvX2CEyWuVyQvQhOnwd0JhD1tJo19qgElPLw yBVvmZahGUV1deNT1tUkmO6wTYPnlfDmLVnSNq77+xxkauKxc3uh9kgWGmecnjC2hvwZ SQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 306j6mb2m8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Apr 2020 07:27:36 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0377MSJO194109; Tue, 7 Apr 2020 07:27:32 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 30839sfr7n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 07 Apr 2020 07:27:32 +0000 Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0377RVuY008151; Tue, 7 Apr 2020 07:27:31 GMT Received: from linux-1.home (/92.157.90.160) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 07 Apr 2020 00:27:30 -0700 From: Alexandre Chartre To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, jpoimboe@redhat.com, peterz@infradead.org, jthierry@redhat.com, tglx@linutronix.de, alexandre.chartre@oracle.com Subject: [PATCH V2 2/9] objtool: UNWIND_HINT_RET_OFFSET should not check registers Date: Tue, 7 Apr 2020 09:31:35 +0200 Message-Id: <20200407073142.20659-3-alexandre.chartre@oracle.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200407073142.20659-1-alexandre.chartre@oracle.com> References: <20200407073142.20659-1-alexandre.chartre@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9583 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 suspectscore=1 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004070061 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9583 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 suspectscore=1 lowpriorityscore=0 malwarescore=0 impostorscore=0 mlxscore=0 phishscore=0 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004070062 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/objtool/check.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index bbee26de92ec..c7fcaddfaa8a 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1390,6 +1390,14 @@ static bool has_modified_stack_frame(struct instruction *insn, if (state->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 (state->regs[i].base != initial_func_cfi.regs[i].base || state->regs[i].offset != initial_func_cfi.regs[i].offset) -- 2.18.2