From patchwork Wed Apr 12 19:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82646 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp561144vqo; Wed, 12 Apr 2023 12:38:15 -0700 (PDT) X-Google-Smtp-Source: AKy350YlskyXoV0ZhUQBOBmqC3PX4ucQWcNUj+1Jxq/nlr0xyd3drRe0TvpaFSeSPctJz0JFgCxI X-Received: by 2002:a17:902:ecc4:b0:1a1:b238:d1a5 with SMTP id a4-20020a170902ecc400b001a1b238d1a5mr108351plh.4.1681328295192; Wed, 12 Apr 2023 12:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681328295; cv=none; d=google.com; s=arc-20160816; b=OaUjT2YuFiq4jBeArKn2gp+tX7JYqJeaALzZQ0/SIdOzY5cessTZcTnDlnScY754Hu 5cNdi0R4WB9bO/CD7SrarYGBsDNNKI5ZW9N5E6BcAkqv7kXyyRNHYZ3hcGWepqu5BtNZ HiRZ7YfBq7CP13cD7pLP2MJ/gk8BwzOdf6chrIsb+vUMVykzfqgVijoeKN2KYQ3DFtBf obrOMPMGQOYwx4NkYz+6Ia1CSw1BwlQEBixVq2Bh8bYa7Vu+KlMyCXxne9r3w3tzLAJF DQVsgRuJHNtsaaUh0M451MvZcsgDt6OE3HhTzJUBHOtxKFOFyeTlcPgTOddDi5pIgL2P +xYw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hxl2VmCL9sh5XwsCS8sXx6VmYYFqfG3c2Y9tSXblm18=; b=W7TrGjLoaDYUnz6ZL1OGIKHzd3hyddkLm/oVDHIA4gKsMv7eZAB1vDLQaakrl9YlE0 ZPsOsA5yJ+xfswgeCuPTRyK/aOBdeW2mS32WiWb647PeUp3fsPSBaKfDyMS0NQ4iUAeu rqqxc+gsXP+2JWpQ9MhmmQg271jmKEusjdTu9/5jPCVo1H01xO1wD33QTgk/TBTDxXpE tUQn3uK2S6vYz2uP5A8d+kgeIR9otOiUC39kBsSWSvXd4YUWWX00L+usCtBGBK4iNGzB 8KY1qBrtRFCRSBtCRSw6AGdQBNGjyPcgzr+at2ZBusj/9wi0jaqldTFUuBhPe/FSpNUt uMdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QTa6Mq9H; 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 g2-20020a170902934200b001a05d8436d8si16096982plp.475.2023.04.12.12.38.00; Wed, 12 Apr 2023 12:38:15 -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=QTa6Mq9H; 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 S230131AbjDLTED (ORCPT + 99 others); Wed, 12 Apr 2023 15:04:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbjDLTDt (ORCPT ); Wed, 12 Apr 2023 15:03:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75616E69 for ; Wed, 12 Apr 2023 12:03:48 -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 04D7263879 for ; Wed, 12 Apr 2023 19:03:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DA5AC4339E; Wed, 12 Apr 2023 19:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681326227; bh=ZbdbfriA0hOhgUPH3GEXbKxjxz1wYETUQssT8P5Kvmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QTa6Mq9HtuH6HEOc6xiuWAnaIPbHGzYHuN2rthxwa9ieVHkamL+uFKhhJXoh2tZrg FBHVARFe/1m1NhUwTrVGYYbz0bcFUkbLZVF3C56YvsNjpCXRZWehFOrodfpfWWHa6P Rn33Y0PoL38yPxatStxYNMnLpCQfI3Zds/9YaNH8vXb5Xw/1LtEMJUfMbbig473iWF xrqYOO8S66mFYjZw8P//3mGEQzQ+upg8x9aQThS2bBoiwryJNxYWQ5tnem/swE4WlG 1X5cE576yBV6X3CcCDidtBre0k+O24vhjlvswqMTAAKo2SbLgTY891phXTAg6yPuVK aCDqC0zZ8idAg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH v2 7/9] objtool: Remove superfluous dead_end_function() check Date: Wed, 12 Apr 2023 12:03:22 -0700 Message-Id: <5d603a301e9a8b1036b61503385907e154867ace.1681325924.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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?1763000498483239977?= X-GMAIL-MSGID: =?utf-8?q?1763000498483239977?= annotate_call_site() already sets 'insn->dead_end' for calls to dead end functions. Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index b9e5e0e9c1ee..5e7d3c62fb9d 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4081,8 +4081,7 @@ static bool ignore_unreachable_insn(struct objtool_file *file, struct instructio * It may also insert a UD2 after calling a __noreturn function. */ prev_insn = prev_insn_same_sec(file, insn); - if ((prev_insn->dead_end || - dead_end_function(file, insn_call_dest(prev_insn))) && + if (prev_insn->dead_end && (insn->type == INSN_BUG || (insn->type == INSN_JUMP_UNCONDITIONAL && insn->jump_dest && insn->jump_dest->type == INSN_BUG)))