From nobody Wed Feb 11 22:55:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4442DC7619A for ; Wed, 12 Apr 2023 17:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjDLR3N (ORCPT ); Wed, 12 Apr 2023 13:29:13 -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-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 m= ismatch: cfa1=3D4+120 cfa2=3D5+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; } =20 - if (!cfi->drap && op->src.reg =3D=3D CFI_SP && - op->dest.reg =3D=3D CFI_BP && cfa->base =3D=3D CFI_SP && - check_reg_frame_pos(®s[CFI_BP], -cfa->offset + op->src.offset)) { - - /* lea disp(%rsp), %rbp */ - cfa->base =3D CFI_BP; - cfa->offset -=3D op->src.offset; - cfi->bp_scratch =3D false; - break; - } - if (op->src.reg =3D=3D CFI_SP && cfa->base =3D=3D CFI_SP) { =20 /* drap: lea disp(%rsp), %drap */ --=20 2.39.2