lkml.org 
[lkml]   [2018]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 24/40] rcu: Convert rcu_unlock_preempted_task tracepoint to ->gp_seq
    Date
    This commit makes the rcu_unlock_preempted_task tracepoint use ->gp_seq
    instead of ->gpnum.

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    include/trace/events/rcu.h | 12 ++++++------
    kernel/rcu/tree_plugin.h | 4 ++--
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
    index 38dbd97d65a3..95b7491196aa 100644
    --- a/include/trace/events/rcu.h
    +++ b/include/trace/events/rcu.h
    @@ -325,23 +325,23 @@ TRACE_EVENT(rcu_preempt_task,
    */
    TRACE_EVENT(rcu_unlock_preempted_task,

    - TP_PROTO(const char *rcuname, unsigned long gpnum, int pid),
    + TP_PROTO(const char *rcuname, unsigned long gp_seq, int pid),

    - TP_ARGS(rcuname, gpnum, pid),
    + TP_ARGS(rcuname, gp_seq, pid),

    TP_STRUCT__entry(
    __field(const char *, rcuname)
    - __field(unsigned long, gpnum)
    + __field(unsigned long, gp_seq)
    __field(int, pid)
    ),

    TP_fast_assign(
    __entry->rcuname = rcuname;
    - __entry->gpnum = gpnum;
    + __entry->gp_seq = gp_seq;
    __entry->pid = pid;
    ),

    - TP_printk("%s %lu %d", __entry->rcuname, __entry->gpnum, __entry->pid)
    + TP_printk("%s %lu %d", __entry->rcuname, __entry->gp_seq, __entry->pid)
    );

    /*
    @@ -762,7 +762,7 @@ TRACE_EVENT(rcu_barrier,
    do { } while (0)
    #define trace_rcu_nocb_wake(rcuname, cpu, reason) do { } while (0)
    #define trace_rcu_preempt_task(rcuname, pid, gp_seq) do { } while (0)
    -#define trace_rcu_unlock_preempted_task(rcuname, gpnum, pid) do { } while (0)
    +#define trace_rcu_unlock_preempted_task(rcuname, gp_seq, pid) do { } while (0)
    #define trace_rcu_quiescent_state_report(rcuname, gpnum, mask, qsmask, level, \
    grplo, grphi, gp_tasks) do { } \
    while (0)
    diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
    index 02ca3b4e6a8f..a10b0e26ce19 100644
    --- a/kernel/rcu/tree_plugin.h
    +++ b/kernel/rcu/tree_plugin.h
    @@ -545,7 +545,7 @@ void rcu_read_unlock_special(struct task_struct *t)
    list_del_init(&t->rcu_node_entry);
    t->rcu_blocked_node = NULL;
    trace_rcu_unlock_preempted_task(TPS("rcu_preempt"),
    - rnp->gpnum, t->pid);
    + rnp->gp_seq, t->pid);
    if (&t->rcu_node_entry == rnp->gp_tasks)
    rnp->gp_tasks = np;
    if (&t->rcu_node_entry == rnp->exp_tasks)
    @@ -708,7 +708,7 @@ static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)
    t = container_of(rnp->gp_tasks, struct task_struct,
    rcu_node_entry);
    trace_rcu_unlock_preempted_task(TPS("rcu_preempt-GPS"),
    - rnp->gpnum, t->pid);
    + rnp->gp_seq, t->pid);
    }
    WARN_ON_ONCE(rnp->qsmask);
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-06-26 02:12    [W:2.906 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site