From patchwork Wed Jun 28 09:26:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 113738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8795249vqr; Wed, 28 Jun 2023 02:48:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6URPzFNtPnng3nXCKDdUefLHaXHwxPs6g2nQQJd3ERjAljkxoWpZ1iO7Fobh+q9fV2sPbo X-Received: by 2002:a05:6a20:7295:b0:111:fba0:bd3b with SMTP id o21-20020a056a20729500b00111fba0bd3bmr41447022pzk.1.1687945707910; Wed, 28 Jun 2023 02:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687945707; cv=none; d=google.com; s=arc-20160816; b=02CAnrEtB8Au9dDzryijK3buQ6pKuQ1hZV200ypx7EPf5s/2xmaCo6hsMfqG4/obZj NeUNuoQlmpGHEk82BB+tuIWx6jzHscbbEi8bSg2wsc8HB6DMF+90xJBP6Mm1zygyDD69 wZIpUJcp7AyOr7CYzt/Yer6kllVPZTCjGYMlLcCWz0LtwAGvda1LNUwglYSceprUZz7p 2nz/lfzrtYSkUZEXVL5BM07G8Qy5K9ENI9RZysLy2DbcNdIoad2b/axRQDdpQq9d/7Xn 1JMNheTrzPGUWBPuYIipWFXkDm1+cHUVObJguquuhBPPiU3t2ufLcDFaNVUI96JlThrx jLDA== 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:sender:dkim-signature; bh=5qKK5utJ9WUOCHYsz3PoXdTZVo2YNgLhQoii2fNTDAo=; fh=H8aHqU+A2KuIPxxWkbQUvZbjEUYl0dMviovxHBhxRvI=; b=WpqrrTcmLLG6CucgDP+YMfbQSAXua7X209c4kFULIqiVqiZzpEH7nFR9S7ORdgli0T 5VDQdTIzQFjb7tPBflEYvrWyhCdqfoXlJk/iqORxcCQKwBhPoHsjZUw3wdWR5j+26ZSu v63dOGld0s45WpQ/SjzeRTZnbEsubyRjiU/ZcysayLhuDKqRfNh9sHON/3VnQFDPnc6m D9J4j3kud0AB3PR6t5B12Nc/11hGNZ5ZnTe3ub90XgfneM7i6xYux/R/cZaVZB1z336/ sV7rAH+Q9/64UyV2kUxUiLUGb8tuQgucWwnD5DE/itI7Oxc7ju5UD29FHAThOCittE3T vFeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=RCxuizjr; 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 z7-20020a056a001d8700b0066874556a58si1597841pfw.213.2023.06.28.02.48.14; Wed, 28 Jun 2023 02:48:27 -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=@gmail.com header.s=20221208 header.b=RCxuizjr; 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 S234545AbjF1Jc2 (ORCPT + 99 others); Wed, 28 Jun 2023 05:32:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbjF1J1R (ORCPT ); Wed, 28 Jun 2023 05:27:17 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DDC52947 for ; Wed, 28 Jun 2023 02:26:17 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3128fcd58f3so6349743f8f.1 for ; Wed, 28 Jun 2023 02:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687944376; x=1690536376; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=5qKK5utJ9WUOCHYsz3PoXdTZVo2YNgLhQoii2fNTDAo=; b=RCxuizjrqEplk6mORLmvlUHF4+4hHCL3E6cWQhBwxYCxsHEyTkxt04mYDp1cbrFxQI 7A4AJrDbuGfSipMPXa91qOFk7iz4RJ8lWqhZvwg8fxZ54tvNpoJy24mfzD8s3DGu82E9 0GT49xLXsE8ml8GfMdRIxYIwPZGZoOIGcqUMMiYW9GSNfzh1ijXEObap7krCL5xbSIyI fClOtL4dUlG411/oCPkgH86RMo94aGddLHn/wQk5unvzd3BXk04SOlSj2N+YYZvaI4hm 4aSwMCRPY9dFwKvayjBdBRi2kj5VTIM+b1V17jKeTJ/ZSJnYDRMvwsKPnwpmBCIyROKG tsEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687944376; x=1690536376; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5qKK5utJ9WUOCHYsz3PoXdTZVo2YNgLhQoii2fNTDAo=; b=BnyFPk6sr7ncb4bd9OfShGZnBPoAjGx+yQUZiU94Ab+0UDtsR4TnMPSO+OwuTrJtAw doKQdEDUgNEmsaF0X6uqntmfXW5XDJHByVM/ceQvQ0YH3or216u9Q83HODIKVdDVIo8v RfeI24BqucuIQ1V+lLnPe40jPGzVLXDepmhAMC6Jksk+tTNN1d6m6k45D7wy16VQf/Rc xvH3S7lIOn4bZ9zRDOV9gN9IzMfxr+l1BLg7Llv8xUhF+fSRWBssClscMw+FQ+ob4Ul7 Xo7YMrNSfNFzq4d9MyI2nRcw2IAeCDn9KtdYWV85+8bkhi2s3/352dN/QBwQtjA/RCXu draw== X-Gm-Message-State: AC+VfDx67ZxFmd/5JFxiVztxyupVEwhrbLvKfClTXg5rcDVuddumI4LT n3DLs4jKplpxlVrodidptdpkEVX3XRs= X-Received: by 2002:a5d:58d8:0:b0:313:e2a2:fc80 with SMTP id o24-20020a5d58d8000000b00313e2a2fc80mr10134350wrf.33.1687944375548; Wed, 28 Jun 2023 02:26:15 -0700 (PDT) Received: from gmail.com ([31.46.247.226]) by smtp.gmail.com with ESMTPSA id n1-20020a5d4c41000000b0030ae499da59sm12721365wrt.111.2023.06.28.02.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 02:26:14 -0700 (PDT) Sender: Ingo Molnar Date: Wed, 28 Jun 2023 11:26:11 +0200 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Josh Poimboeuf , Peter Zijlstra , Thomas Gleixner , Borislav Petkov , Andrew Morton Subject: [PATCH] objtool: Remove btrfs_assertfail() from the noreturn exceptions list Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1769939358567317452?= X-GMAIL-MSGID: =?utf-8?q?1769939358567317452?= * Ingo Molnar wrote: > > * Ingo Molnar wrote: > > > Linus, > > > > Please pull the latest objtool/core git tree from: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git objtool-core-2023-06-27 > > > > # HEAD: 301cf77e21317b3465c5e2bb0188df24bbf1c2e2 x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y > > I forgot to mention that there's a new conflict when you merge this, in > tools/objtool/check.c, plus a semantic conflict in the new > tools/objtool/noreturns.h file - to remove the 'btrfs_assertfail' entry > from the new tools/objtool/noreturns.h file. > > Our -tip CI conflict resolution can be double checked here: > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/merge I believe the (minor & silent) semantic conflict was overlooked in your upstream merge: 6f612579be9d Merge tag 'objtool-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip I've fixed it up with the attached patch. [ There was no harm done to build correctness or functionality AFAICS, because the extra leftover entry in upstream tools/objtool/noreturns.h is now meaningless, as btrfs_assertfail() has become a macro that will not show up as an ELF symbol. ] Thanks, Ingo ======================> From: Ingo Molnar Date: Wed, 28 Jun 2023 11:16:03 +0200 Subject: [PATCH] objtool: Remove btrfs_assertfail() from the noreturn exceptions list Upstream merge commit: 6f612579be9d Merge tag 'objtool-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... generated a (minor) semantic conflict that was not resolved: the btrfs_assertfail() entry that was removed from the list in tools/objtool/check.c in: b831306b3b7d ("btrfs: print assertion failure report and stack trace from the same line") ... because btrfs_assertfail() was changed from a noreturn function into a macro. But the list was moved to a different file, in a different enumeration format: 6245ce4ab670 ("objtool: Move noreturn function list to separate file") And has to be removed from tools/objtool/noreturns.h post-merge as well. Do it explicitly. Cc: David Sterba Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- tools/objtool/noreturns.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 1514e84d5cc4..e45c7cb1d5bc 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail) NORETURN(__ubsan_handle_builtin_unreachable) NORETURN(arch_call_rest_init) NORETURN(arch_cpu_idle_dead) -NORETURN(btrfs_assertfail) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)