From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62901C3F68F for ; Tue, 17 Dec 2019 15:30:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4225224672 for ; Tue, 17 Dec 2019 15:30:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728445AbfLQP37 (ORCPT ); Tue, 17 Dec 2019 10:29:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:45458 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727546AbfLQP36 (ORCPT ); Tue, 17 Dec 2019 10:29:58 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 76D82AE8C; Tue, 17 Dec 2019 15:29:56 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id D8D8FDA81D; Tue, 17 Dec 2019 16:29:54 +0100 (CET) Date: Tue, 17 Dec 2019 16:29:54 +0100 From: David Sterba To: Josh Poimboeuf Cc: Randy Dunlap , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Linux Btrfs , Peter Zijlstra Subject: Re: linux-next: Tree for Dec 6 (objtool, lots in btrfs) Message-ID: <20191217152954.GH3929@suse.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Josh Poimboeuf , Randy Dunlap , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Linux Btrfs , Peter Zijlstra References: <20191206135406.563336e7@canb.auug.org.au> <20191211134929.GL3929@twin.jikos.cz> <20191212184725.db3ost7rcopotr5u@treble> <20191213235054.6k2lcnwa63r26zwi@treble> <20191214054515.ougsr5ykhl3vvy57@treble> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191214054515.ougsr5ykhl3vvy57@treble> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Fri, Dec 13, 2019 at 11:45:15PM -0600, Josh Poimboeuf wrote: > On Fri, Dec 13, 2019 at 04:04:58PM -0800, Randy Dunlap wrote: > > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > > > index b2e8fd8a8e59..bbd68520f5f1 100644 > > > --- a/fs/btrfs/ctree.h > > > +++ b/fs/btrfs/ctree.h > > > @@ -3110,14 +3110,16 @@ do { \ > > > rcu_read_unlock(); \ > > > } while (0) > > > > > > -__cold > > > +#ifdef CONFIG_BTRFS_ASSERT > > > +__cold __unlikely > > > > what provides __unlikely? It is causing build errors. > > > > and if I remove the "__unlikely", I still see the objtool warnings > > (unreachable instructions). > > Ha, not sure how that happened... Should be __noreturn instead of > __unlikely. Cheers... > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index b2e8fd8a8e59..398bd010dfc5 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -3110,14 +3110,16 @@ do { \ > rcu_read_unlock(); \ > } while (0) > > -__cold > +#ifdef CONFIG_BTRFS_ASSERT > +__cold __noreturn > static inline void assfail(const char *expr, const char *file, int line) > { > - if (IS_ENABLED(CONFIG_BTRFS_ASSERT)) { > - pr_err("assertion failed: %s, in %s:%d\n", expr, file, line); > - BUG(); > - } > + pr_err("assertion failed: %s, in %s:%d\n", expr, file, line); > + BUG(); > } > +#else > +static inline void assfail(const char *expr, const char *file, int line) {} > +#endif > > #define ASSERT(expr) \ > (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) Separating the definitions by #ifdef looks ok, I'd rather do separate definitions of ASSERT too, to avoid the ternary operator. I'll send the patch.