From patchwork Fri Jun 2 17:54:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 102661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1215477vqr; Fri, 2 Jun 2023 11:18:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7qHy9f9fdlSIVJ9RUwD7vmTdqUQnpZMI5iy1Pxp8Ms+9TiLxpPPyVmoHJoa+Gfo1mpT+Pn X-Received: by 2002:a17:902:a715:b0:1b0:4934:88bc with SMTP id w21-20020a170902a71500b001b0493488bcmr572686plq.47.1685729881440; Fri, 02 Jun 2023 11:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685729881; cv=none; d=google.com; s=arc-20160816; b=XGE4Ne8xwRtN4Sn5WFDgbihryFjkF0EJOInSQcK7IXJI5Ktw4jL/csiJ/pGRhIUNp+ PsaSO7CfdQnm7ltTaThlgIoz6VwdLSxvXYlArvTDZmzJURRXqa1ZbenH5lf0POd7rvyO uSENvaznuBkNNZ4nnrJFmESSrwKlPFq9E8ha2MftmiWVfrK6p9RuX2hSTI9jb+wSzyAa zkYMCennxlQ1xHPo3wyJTxxMkZ9AxPZ26DGUf08WaDvVtRwkMUl5mBXbbuidjxLQRRha iOBOp0NFwbTJt5uljN/4HQtPM/C8YC6nt63P9zciQkpyBIWBuH4Pkus4QlR2C3aYqPiL XMMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=A2GWzFwra1+jhKMkkemVF4c36G5bmiYE9Ty/suaHyS4=; b=EtmIUxopThnM72cN9m+0vt7hxaXOyVWGRDPIZuz80pvNpPeFAYWpNLD2Sc21Xt+kPR PeZovgD8a0sguggyDXVvvI7YOgl7LsF9EYMoKB9Ccj0eFa0l7Pu6duW0UerU0k4Lkk3g fdXgmqB/DO9y6kLkXOj5I2PnQRnc/sLOeqCcs23gBk5my5+hlh3JH2c9UOe66LlLx3Ub I+5RKFJYm/WeM9uUtgzjMtBHdrGGyf4r5VRR9KfJx47Qf/JA7T5E++ZBCkmg0d2ymL3v 4pws5gBfvagS5tBQotQ6gMIU1vfB2+NkHLW5p3iKEglv2ArKiUleBA7kxuEq+9Ahtin5 yO9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xq99a37N; 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 ix12-20020a170902f80c00b001a9f42553ddsi1219410plb.296.2023.06.02.11.17.46; Fri, 02 Jun 2023 11:18:01 -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=Xq99a37N; 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 S236860AbjFBRy6 (ORCPT + 99 others); Fri, 2 Jun 2023 13:54:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230430AbjFBRy5 (ORCPT ); Fri, 2 Jun 2023 13:54:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 910D2123; Fri, 2 Jun 2023 10:54:56 -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 173CD61120; Fri, 2 Jun 2023 17:54:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17AD8C433D2; Fri, 2 Jun 2023 17:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685728495; bh=/Fha51BP3sm6ndA/PVNCmNHln36UDvTlLxwLX1uUDlw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Xq99a37N4aPyn3Ql9vrjO7E55WnEO+EeZXMiIjGLgPTMAuK0k0rxdT9L7veCohXXS pWmluk0mkA6TCRFcB43Zt+7uaoD45BUj9kDdCr9CFuaIZPM4/0j78bh/V2GcvpAodp PuCQV77RIdi5Nz+nuTgs3LVTOoVmyKGm3LPRY+VyKAe7/Gc253weOjM6ToMeKoZOWY igtriA+1OiTU5A92uBJM7dAcIrAjS5GS5Lzkc652amXeJHcoTqQTA0nA/rBOahlU71 ppkGDswLLkIJIkTykQkaOhEN5AG88tXFyR3hcnrG2QKCx5fWSZK2ZygohuDYVW+UBw jsS5HOjIrpQ7A== Date: Fri, 2 Jun 2023 10:54:53 -0700 From: Josh Poimboeuf To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Kernel Mailing List , Linux Next Mailing List , David Gow , Shuah Khan Subject: [PATCH] objtool: Add __kunit_abort() to noreturns Message-ID: <20230602175453.swsn3ehyochtwkhy@treble> References: <20230602131229.3589f3bf@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230602131229.3589f3bf@canb.auug.org.au> X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1767615896258823091?= X-GMAIL-MSGID: =?utf-8?q?1767615896258823091?= Fixes a bunch of warnings like: drivers/input/tests/input_test.o: warning: objtool: input_test_init+0x1cb: stack state mismatch: cfa1=4+64 cfa2=4+56 lib/kunit/kunit-test.o: warning: objtool: kunit_log_newline_test+0xfb: return with modified stack frame ... Fixes: 260755184cbd ("kunit: Move kunit_abort() call out of kunit_do_failed_assertion()") Reported-by: Stephen Rothwell Signed-off-by: Josh Poimboeuf Reviewed-by: David Gow --- tools/objtool/noreturns.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index cede6068ddf6..1514e84d5cc4 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -7,6 +7,7 @@ * Yes, this is unfortunate. A better solution is in the works. */ NORETURN(__invalid_creds) +NORETURN(__kunit_abort) NORETURN(__module_put_and_kthread_exit) NORETURN(__reiserfs_panic) NORETURN(__stack_chk_fail)