From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751546AbdJBTiA (ORCPT <rfc822;w@1wt.eu>);
        Mon, 2 Oct 2017 15:38:00 -0400
Received: from mail.kernel.org ([198.145.29.99]:38530 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751252AbdJBTh6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 2 Oct 2017 15:37:58 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10390218B7
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org
Date: Mon, 2 Oct 2017 15:37:56 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: Joel Fernandes <joelaf@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
        LKML <linux-kernel@vger.kernel.org>, kernel-team@android.com
Subject: Re: [PATCH v6 2/2] tracing: Add support for preempt and irq
 enable/disable events
Message-ID: <20171002153756.485fa6a9@gandalf.local.home>
In-Reply-To: <CAJWu+oqbc+Axwe=v4yaVj4EZ+kGuQSVdfygRqB_3+M9MWp4tKQ@mail.gmail.com>
References: <20170922015024.16123-1-joelaf@google.com>
        <20170922015024.16123-3-joelaf@google.com>
        <20170922090229.rdicci6emtyffqdn@hirez.programming.kicks-ass.net>
        <CAJWu+oqjGQ_FP5x8QMvVji2vHWhB+B7oaZc5ZSGVEHzHm-XJ3w@mail.gmail.com>
        <20170925083432.jvaewlsrb46wjmjj@hirez.programming.kicks-ass.net>
        <CAJWu+ooMB7pDu0xAkqwZBgBO67CFW6A4AXa3hbKo-oSh93t5=Q@mail.gmail.com>
        <20170930050817.2a0147ba@vmware.local.home>
        <CAJWu+or=5KYvg0nXJmB=_ksJyYpZJ4GzMvXu64xqCfn0-9NGgg@mail.gmail.com>
        <CAJWu+oqbc+Axwe=v4yaVj4EZ+kGuQSVdfygRqB_3+M9MWp4tKQ@mail.gmail.com>
X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 2 Oct 2017 12:33:30 -0700
Joel Fernandes <joelaf@google.com> wrote:


> diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
> index 5dd1272d1ab2..2a1af0dd9cc4 100644
> --- a/include/linux/irqflags.h
> +++ b/include/linux/irqflags.h
> @@ -93,7 +93,9 @@
>  #define local_irq_save(flags)                          \
>         do {                                            \
>                 raw_local_irq_save(flags);              \
> -               trace_hardirqs_off();                   \
> +               if (!raw_irqs_disabled_flags(flags)) {  \
> +                       trace_hardirqs_off();           \
> +               }                                       \
>         } while (0)
> 
> 
> @@ -101,7 +103,6 @@
>         do {                                            \
>                 if (raw_irqs_disabled_flags(flags)) {   \
>                         raw_local_irq_restore(flags);   \
> -                       trace_hardirqs_off();           \
>                 } else {                                \
>                         trace_hardirqs_on();            \
>                         raw_local_irq_restore(flags);   \

I rather have the protection in trace_hardirqs_on/off(). Let's keep the
ugliness from spreading.

-- Steve