| Message ID | 1389828206-9467-1-git-send-email-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 01/15/14 18:23, Cong Wang wrote: > Cc: Jamal Hadi Salim <jhs@mojatatu.com> > Cc: David S. Miller <davem@davemloft.net> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal > --- > net/sched/act_police.c | 30 +++--------------------------- > 1 file changed, 3 insertions(+), 27 deletions(-) > > diff --git a/net/sched/act_police.c b/net/sched/act_police.c > index a719fdf..5ba467b 100644 > --- a/net/sched/act_police.c > +++ b/net/sched/act_police.c > @@ -104,20 +104,6 @@ nla_put_failure: > goto done; > } > > -static void tcf_police_destroy(struct tcf_police *p) > -{ > - spin_lock_bh(&police_hash_info.lock); > - hlist_del(&p->tcf_head); > - spin_unlock_bh(&police_hash_info.lock); > - gen_kill_estimator(&p->tcf_bstats, > - &p->tcf_rate_est); > - /* > - * gen_estimator est_timer() might access p->tcf_lock > - * or bstats, wait a RCU grace period before freeing p > - */ > - kfree_rcu(p, tcf_rcu); > -} > - > static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = { > [TCA_POLICE_RATE] = { .len = TC_RTAB_SIZE }, > [TCA_POLICE_PEAKRATE] = { .len = TC_RTAB_SIZE }, > @@ -272,19 +258,9 @@ failure: > static int tcf_act_police_cleanup(struct tc_action *a, int bind) > { > struct tcf_police *p = a->priv; > - int ret = 0; > - > - if (p != NULL) { > - if (bind) > - p->tcf_bindcnt--; > - > - p->tcf_refcnt--; > - if (p->tcf_refcnt <= 0 && !p->tcf_bindcnt) { > - tcf_police_destroy(p); > - ret = 1; > - } > - } > - return ret; > + if (p) > + return tcf_hash_release(&p->common, bind, &police_hash_info); > + return 0; > } > > static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Wed, 15 Jan 2014 15:23:26 -0800 > Cc: Jamal Hadi Salim <jhs@mojatatu.com> > Cc: David S. Miller <davem@davemloft.net> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index a719fdf..5ba467b 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -104,20 +104,6 @@ nla_put_failure: goto done; } -static void tcf_police_destroy(struct tcf_police *p) -{ - spin_lock_bh(&police_hash_info.lock); - hlist_del(&p->tcf_head); - spin_unlock_bh(&police_hash_info.lock); - gen_kill_estimator(&p->tcf_bstats, - &p->tcf_rate_est); - /* - * gen_estimator est_timer() might access p->tcf_lock - * or bstats, wait a RCU grace period before freeing p - */ - kfree_rcu(p, tcf_rcu); -} - static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = { [TCA_POLICE_RATE] = { .len = TC_RTAB_SIZE }, [TCA_POLICE_PEAKRATE] = { .len = TC_RTAB_SIZE }, @@ -272,19 +258,9 @@ failure: static int tcf_act_police_cleanup(struct tc_action *a, int bind) { struct tcf_police *p = a->priv; - int ret = 0; - - if (p != NULL) { - if (bind) - p->tcf_bindcnt--; - - p->tcf_refcnt--; - if (p->tcf_refcnt <= 0 && !p->tcf_bindcnt) { - tcf_police_destroy(p); - ret = 1; - } - } - return ret; + if (p) + return tcf_hash_release(&p->common, bind, &police_hash_info); + return 0; } static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a,
Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> --- net/sched/act_police.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)