tracing: Remove duplicate checks for online CPUs

Some trace events have conditions that check if the current CPU is online or
not before recording the tracepoint. That's because certain trace events are
in locations that can be called as the CPU is going offline and when RCU no
longer monitors it (like kfree and friends). The check was added because
trace events require RCU to be active.

This is a trace event infrastructure issue and not something that individual
trace events should worry about. The tracepoint.h code now has added a check
to see if the current CPU is considered online, and it only does the
tracepoint if it is. There's no more need for individual trace events to
also include this check. It is now redundant.

Cc: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index f7554fd7fc62b92d6b1d73d7db6030599b552014..325b2a9b1959cdc70dac80b7fb2ad42b6d2f6dce 100644 (file)
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -140,42 +140,19 @@ DEFINE_EVENT(kmem_free, kfree,
        TP_ARGS(call_site, ptr)
 );
 
-DEFINE_EVENT_CONDITION(kmem_free, kmem_cache_free,
+DEFINE_EVENT(kmem_free, kmem_cache_free,
 
        TP_PROTO(unsigned long call_site, const void *ptr),
 
-       TP_ARGS(call_site, ptr),
-
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id()))
+       TP_ARGS(call_site, ptr)
 );
 
-TRACE_EVENT_CONDITION(mm_page_free,
+TRACE_EVENT(mm_page_free,
 
        TP_PROTO(struct page *page, unsigned int order),
 
        TP_ARGS(page, order),
 
-
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id())),
-
        TP_STRUCT__entry(
                __field(        unsigned long,  pfn             )
                __field(        unsigned int,   order           )
@@ -276,23 +253,12 @@ DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked,
        TP_ARGS(page, order, migratetype)
 );
 
-TRACE_EVENT_CONDITION(mm_page_pcpu_drain,
+TRACE_EVENT(mm_page_pcpu_drain,
 
        TP_PROTO(struct page *page, unsigned int order, int migratetype),
 
        TP_ARGS(page, order, migratetype),
 
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id())),
-
        TP_STRUCT__entry(
                __field(        unsigned long,  pfn             )
                __field(        unsigned int,   order           )

diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h
index bc8815f45f3b384e411738664ff0d3fa1b99bc0b..9d14b199210832091b3bfc314c019cf918070005 100644 (file)
--- a/include/trace/events/tlb.h
+++ b/include/trace/events/tlb.h
@@ -34,13 +34,11 @@ TLB_FLUSH_REASON
 #define EM(a,b)                { a, b },
 #define EMe(a,b)       { a, b }
 
-TRACE_EVENT_CONDITION(tlb_flush,
+TRACE_EVENT(tlb_flush,
 
        TP_PROTO(int reason, unsigned long pages),
        TP_ARGS(reason, pages),
 
-       TP_CONDITION(cpu_online(smp_processor_id())),
-
        TP_STRUCT__entry(
                __field(          int, reason)
                __field(unsigned long,  pages)