Date: Mon, 13 Mar 2017 23:04:42 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: Qi Hou <qi.hou@windriver.com>
Cc: <mingo@redhat.com>, <tglx@linutronix.de>,
        <linux-kernel@vger.kernel.org>, <C.Emde@osadl.org>,
        <paul.gortmaker@windriver.com>, <bruce.ashfield@windriver.com>
Subject: Re: [PATCH] lockdep: call time_hardirqs_off after clearing
 hardirqs_enabled
Message-ID: <20170313230442.17705320@grimm.local.home>
In-Reply-To: <1489456807-160132-1-git-send-email-qi.hou@windriver.com>
References: <1489456807-160132-1-git-send-email-qi.hou@windriver.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 871
Lines: 31

On Tue, 14 Mar 2017 10:00:07 +0800
Qi Hou <qi.hou@windriver.com> wrote:

> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index 577f026..e8b35e4 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -2627,8 +2627,6 @@ __visible void trace_hardirqs_off_caller(unsigned long ip)
>  {
>  	struct task_struct *curr = current;
>  
> -	time_hardirqs_off(CALLER_ADDR0, ip);
> -
>  	if (unlikely(!debug_locks || current->lockdep_recursion))
>  		return;

You do realize that this breaks irqsoff tracing if lockdep ever
triggers. Right?

-- Steve

>  
> @@ -2649,6 +2647,8 @@ __visible void trace_hardirqs_off_caller(unsigned long ip)
>  		debug_atomic_inc(hardirqs_off_events);
>  	} else
>  		debug_atomic_inc(redundant_hardirqs_off);
> +
> +	time_hardirqs_off(CALLER_ADDR0, ip);
>  }
>  EXPORT_SYMBOL(trace_hardirqs_off_caller);
>