From: Josh Poimboeuf <jpoimboe@redhat.com>
To: David Sterba <dsterba@suse.cz>
Cc: Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Btrfs <linux-btrfs@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: Tree for Dec 6 (objtool, lots in btrfs)
Date: Fri, 17 Jan 2020 09:28:05 -0600 [thread overview]
Message-ID: <20200117152805.ncy3z34imzpchg7m@treble> (raw)
In-Reply-To: <20200110194622.GS3929@twin.jikos.cz>
On Fri, Jan 10, 2020 at 08:46:22PM +0100, David Sterba wrote:
> On Tue, Dec 17, 2019 at 04:29:54PM +0100, David Sterba wrote:
> > 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.
>
> Subject: [PATCH] btrfs: separate definition of assertion failure handlers
>
> There's a report where objtool detects unreachable instructions, eg.:
>
> fs/btrfs/ctree.o: warning: objtool: btrfs_search_slot()+0x2d4: unreachable instruction
>
> This seems to be a false positive due to compiler version. The cause is
> in the ASSERT macro implementation that does the conditional check as
> IS_DEFINED(CONFIG_BTRFS_ASSERT) and not an #ifdef.
>
> To avoid that, use the ifdefs directly.
>
> CC: Josh Poimboeuf <jpoimboe@redhat.com>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
> fs/btrfs/ctree.h | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
This looks quite similar to my patch, would you mind giving me
attribution?
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index 569931dd0ce5..f90b82050d2d 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -3157,17 +3157,21 @@ do { \
> rcu_read_unlock(); \
> } while (0)
>
> -__cold
> -static inline void assfail(const char *expr, const char *file, int line)
> +#ifdef CONFIG_BTRFS_ASSERT
> +__cold __noreturn
> +static inline void assertfail(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();
assertfail() is definitely better than "assfail", but shouldn't you
update the callers so it doesn't break the build?
--
Josh
next prev parent reply other threads:[~2020-01-17 15:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 2:54 linux-next: Tree for Dec 6 Stephen Rothwell
2019-12-06 10:15 ` Geert Uytterhoeven
2019-12-06 12:43 ` Stephen Rothwell
2019-12-06 16:17 ` linux-next: Tree for Dec 6 (objtool, lots in btrfs) Randy Dunlap
2019-12-11 13:49 ` David Sterba
2019-12-11 16:21 ` Randy Dunlap
2019-12-12 18:47 ` Josh Poimboeuf
2019-12-12 20:25 ` Randy Dunlap
2019-12-13 23:03 ` Randy Dunlap
2019-12-13 23:50 ` Josh Poimboeuf
2019-12-14 0:04 ` Randy Dunlap
2019-12-14 5:45 ` Josh Poimboeuf
2019-12-14 7:05 ` Randy Dunlap
2019-12-17 15:25 ` David Sterba
2020-01-17 17:26 ` Josh Poimboeuf
2020-01-17 20:28 ` Marco Elver
2020-01-17 21:26 ` Josh Poimboeuf
2020-01-17 22:22 ` Josh Poimboeuf
2019-12-17 15:29 ` David Sterba
2020-01-10 19:46 ` David Sterba
2020-01-17 15:28 ` Josh Poimboeuf [this message]
2020-01-17 16:50 ` David Sterba
2020-01-17 17:03 ` Josh Poimboeuf
2020-01-20 15:52 ` Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200117152805.ncy3z34imzpchg7m@treble \
--to=jpoimboe@redhat.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).