From patchwork Wed Apr 12 17:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp499930vqo; Wed, 12 Apr 2023 10:42:06 -0700 (PDT) X-Google-Smtp-Source: AKy350YkGDWtKKKOqXsNaML8sLvnarPXKcO3SVKz/9BN15OlcIxJUPbCMM+e9MJDtTk0qtEMZsAu X-Received: by 2002:aa7:d844:0:b0:505:7d54:db93 with SMTP id f4-20020aa7d844000000b005057d54db93mr1241348eds.21.1681321326236; Wed, 12 Apr 2023 10:42:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681321326; cv=none; d=google.com; s=arc-20160816; b=v0OgOLmdSNnIheQhXRstc6UuiXRogjvQrnFvF5r1dVmSof+vuLj+bGSuvcP0GAsWqr ys+KQ0fS9TO4nHB24D644VVrLpH8Gc9hEqT+wfvaPuoh2m+Ek9nZjoW7/2ovNejI+/gx l2bavyJEhCIDic9EbZ+ShSuduGChXeHaqAt6NEfB1KhBbN+EMSm6x7OT2Zj2SIniJLqn GNAumb8WCVEW68BOMJRfLDMwBvp7Epja5wqeJvaRBmaCYyOD43loesPbNu6U8R6JodZu UpCCv87MJypIJ5zchp0JIadNQ7qAE1CuigP1q7p7gG5EU+WLCKSR8MIIA3M8Gw8wG6b4 JVEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5okJ8nmysvZ4PmaA3+FJzzlTtdYqNzzjt346XvUB4hc=; b=fVyqnfsDnyv2F0MMSLk9/53wyF6XhpgP988OU5yxl6nzgg1PzmmmGG/VfHGG0r/yKP wDAOX7iXs3qds+0iKOQG82YOubTQb4HwIOwjFGFWy0Fkw0/fQIZAgYfU+x6d0SAEJcp7 ggqE2MOnPTngcxLtft9kPv/V+bU+8BNQ4ODPIGGohKK+dqwrnPiYl8PAxYNkNHWRD7lh ayCEiA3tCUotkv4rI2gEFaXO1NNj97HH9aSA67r8xsbQByQ/Q3sShpvtVijx+pE86mIh rr4szGWZsrp166l4U2uK5AhQf+rELyllaVH7RwPDHMmWw+z1znyX2ppd5z1oSlEgk9SS CmSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="nq/bmzRA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p1-20020a056402044100b005049b859721si2523419edw.49.2023.04.12.10.41.42; Wed, 12 Apr 2023 10:42:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="nq/bmzRA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbjDLR3M (ORCPT + 99 others); Wed, 12 Apr 2023 13:29:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbjDLR3K (ORCPT ); Wed, 12 Apr 2023 13:29:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33AF3A8C for ; Wed, 12 Apr 2023 10:29:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5B8ED6112F for ; Wed, 12 Apr 2023 17:29:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81658C433EF; Wed, 12 Apr 2023 17:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681320548; bh=yPWF+AX3r7/SGclGU3fdZWtloVm4hwY+5bZUWOk9k5E=; h=From:To:Cc:Subject:Date:From; b=nq/bmzRAvuVg/P1eLNDiiFSxIHUuvPGmDQXcINLQABOXROv9AQsnYz28op6G3lAed F5XeB8rZsfbvxRj2jorGD4/k2cl4sWALKKxgFr76xRPmZicNn4KSq6USLQn6Bccfpd IHwa/B8lr2egKaUeI2At2BI2JLxv9oQs5Pb7nnHea+E2QGNOyQ+k2bZ2nxJ6/qFRA0 eYGxcakty3GxaAakFtAkdyfjmBq8XA1Acm2z5p3UsRrRiLux5PG5b6RJe70WcI3gef CdmYRCZxOfiSz2M3lgpwPEBwISAK+XW+QCno9wSe9aPcZg+1GWrGXg3WeIRh6tSHvd xVoyMynZdacjg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes , kernel test robot Subject: [PATCH] Revert "objtool: Support addition to set CFA base" Date: Wed, 12 Apr 2023 10:29:01 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762993191330599570?= X-GMAIL-MSGID: =?utf-8?q?1762993191330599570?= Commit 468af56a7bba ("objtool: Support addition to set CFA base") was added as a preparatory patch for arm64 support, but that support never came. It triggers a false positive warning on x86, so just revert it for now. Fixes the following warning: vmlinux.o: warning: objtool: cdce925_regmap_i2c_write+0xdb: stack state mismatch: cfa1=4+120 cfa2=5+40 Fixes: 468af56a7bba ("objtool: Support addition to set CFA base") Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202304080538.j5G6h1AB-lkp@intel.com/ Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 34bd6a11bddd..7b78ffdc55fe 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2978,17 +2978,6 @@ static int update_cfi_state(struct instruction *insn, break; } - if (!cfi->drap && op->src.reg == CFI_SP && - op->dest.reg == CFI_BP && cfa->base == CFI_SP && - check_reg_frame_pos(®s[CFI_BP], -cfa->offset + op->src.offset)) { - - /* lea disp(%rsp), %rbp */ - cfa->base = CFI_BP; - cfa->offset -= op->src.offset; - cfi->bp_scratch = false; - break; - } - if (op->src.reg == CFI_SP && cfa->base == CFI_SP) { /* drap: lea disp(%rsp), %drap */