lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 05/22] rcu: Remove deprecated RCU debugfs tracing code
    Date
    From: Byungchul Park <byungchul.park@lge.com>

    Commit ae91aa0adb14 ("rcu: Remove debugfs tracing") removed the
    RCU debugfs tracing code, but did not remove the no-longer used
    ->exp_workdone{0,1,2,3} fields in the srcu_data structure. This commit
    therefore removes these fields along with the code that uselessly
    updates them.

    Signed-off-by: Byungchul Park <byungchul.park@lge.com>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    kernel/rcu/tree.h | 4 ----
    kernel/rcu/tree_exp.h | 13 +++++--------
    2 files changed, 5 insertions(+), 12 deletions(-)

    diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
    index 3a0dc30100e8..5fd374c71404 100644
    --- a/kernel/rcu/tree.h
    +++ b/kernel/rcu/tree.h
    @@ -224,10 +224,6 @@ struct rcu_data {
    #ifdef CONFIG_RCU_FAST_NO_HZ
    struct rcu_head oom_head;
    #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */
    - atomic_long_t exp_workdone0; /* # done by workqueue. */
    - atomic_long_t exp_workdone1; /* # done by others #1. */
    - atomic_long_t exp_workdone2; /* # done by others #2. */
    - atomic_long_t exp_workdone3; /* # done by others #3. */
    int exp_dynticks_snap; /* Double-check need for IPI. */

    /* 6) Callback offloading. */
    diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h
    index f72eefab8543..f512dd4e57a8 100644
    --- a/kernel/rcu/tree_exp.h
    +++ b/kernel/rcu/tree_exp.h
    @@ -248,14 +248,12 @@ static void rcu_report_exp_rdp(struct rcu_state *rsp, struct rcu_data *rdp,
    }

    /* Common code for synchronize_{rcu,sched}_expedited() work-done checking. */
    -static bool sync_exp_work_done(struct rcu_state *rsp, atomic_long_t *stat,
    - unsigned long s)
    +static bool sync_exp_work_done(struct rcu_state *rsp, unsigned long s)
    {
    if (rcu_exp_gp_seq_done(rsp, s)) {
    trace_rcu_exp_grace_period(rsp->name, s, TPS("done"));
    /* Ensure test happens before caller kfree(). */
    smp_mb__before_atomic(); /* ^^^ */
    - atomic_long_inc(stat);
    return true;
    }
    return false;
    @@ -289,7 +287,7 @@ static bool exp_funnel_lock(struct rcu_state *rsp, unsigned long s)
    * promoting locality and is not strictly needed for correctness.
    */
    for (; rnp != NULL; rnp = rnp->parent) {
    - if (sync_exp_work_done(rsp, &rdp->exp_workdone1, s))
    + if (sync_exp_work_done(rsp, s))
    return true;

    /* Work not done, either wait here or go up. */
    @@ -302,8 +300,7 @@ static bool exp_funnel_lock(struct rcu_state *rsp, unsigned long s)
    rnp->grplo, rnp->grphi,
    TPS("wait"));
    wait_event(rnp->exp_wq[rcu_seq_ctr(s) & 0x3],
    - sync_exp_work_done(rsp,
    - &rdp->exp_workdone2, s));
    + sync_exp_work_done(rsp, s));
    return true;
    }
    rnp->exp_seq_rq = s; /* Followers can wait on us. */
    @@ -313,7 +310,7 @@ static bool exp_funnel_lock(struct rcu_state *rsp, unsigned long s)
    }
    mutex_lock(&rsp->exp_mutex);
    fastpath:
    - if (sync_exp_work_done(rsp, &rdp->exp_workdone3, s)) {
    + if (sync_exp_work_done(rsp, s)) {
    mutex_unlock(&rsp->exp_mutex);
    return true;
    }
    @@ -633,7 +630,7 @@ static void _synchronize_rcu_expedited(struct rcu_state *rsp,
    rdp = per_cpu_ptr(rsp->rda, raw_smp_processor_id());
    rnp = rcu_get_root(rsp);
    wait_event(rnp->exp_wq[rcu_seq_ctr(s) & 0x3],
    - sync_exp_work_done(rsp, &rdp->exp_workdone0, s));
    + sync_exp_work_done(rsp, s));
    smp_mb(); /* Workqueue actions happen before return. */

    /* Let the next expedited grace period start. */
    --
    2.5.2
    \
     
     \ /
      Last update: 2018-04-23 04:35    [W:6.516 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site