Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 9 Feb 2021 13:24:30 +0000
From:   Mark Rutland <mark.rutland@arm.com>
To:     Peter Zijlstra <peterz@infradead.org>
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>,
        Josh Poimboeuf <jpoimboe@redhat.com>
Subject: Re: [PATCH] lockdep: Noinstr annotate warn_bogus_irq_restore()
Message-ID: <20210209132430.GB71297@C02TD0UTHF1T.local>
References: <20210208235246.01cb4daf@canb.auug.org.au>
 <2000eae0-89f4-a88f-a113-7fa47f16def7@infradead.org>
 <YCJJAoC+r414zO+2@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YCJJAoC+r414zO+2@hirez.programming.kicks-ass.net>
Precedence: bulk

On Tue, Feb 09, 2021 at 09:34:10AM +0100, Peter Zijlstra wrote:
> 
> Subject: lockdep: Noinstr annotate warn_bogus_irq_restore()
> From: Peter Zijlstra <peterz@infradead.org>
> Date: Tue Feb 9 09:30:03 CET 2021
> 
>   vmlinux.o: warning: objtool: lock_is_held_type()+0x107: call to warn_bogus_irq_restore() leaves .noinstr.text section
> 
> As per the general rule that WARNs are allowed to violate noinstr to
> get out, annotate it away.
> 
> Fixes: 997acaf6b4b5 ("lockdep: report broken irq restoration")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Whoops; sorry for missing that!

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  include/linux/irqflags.h |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> --- a/include/linux/irqflags.h
> +++ b/include/linux/irqflags.h
> @@ -153,8 +153,11 @@ do {						\
>  extern void warn_bogus_irq_restore(void);
>  #define raw_check_bogus_irq_restore()			\
>  	do {						\
> -		if (unlikely(!arch_irqs_disabled()))	\
> +		if (unlikely(!arch_irqs_disabled())) {	\
> +			instrumentation_begin();	\
>  			warn_bogus_irq_restore();	\
> +			instrumentation_end();		\
> +		}					\
>  	} while (0)
>  #else
>  #define raw_check_bogus_irq_restore() do { } while (0)