diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2014-09-28 11:52:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-30 01:02:26 -0400 |
| commit | 22e0f8b9322cb1a48b1357e8f4ae6f5a9eca8cfa (patch) | |
| tree | 2c9ef18dca9d9a441d92ea57cf7f7a292f4ceb3f /net/sched/sch_generic.c | |
| parent | 79cf79abce71eb7dbc40e2f3121048ca5405cb47 (diff) | |
net: sched: make bstats per cpu and estimator RCU safe
In order to run qdisc's without locking statistics and estimators
need to be handled correctly.
To resolve bstats make the statistics per cpu. And because this is
only needed for qdiscs that are running without locks which is not
the case for most qdiscs in the near future only create percpu
stats when qdiscs set the TCQ_F_CPUSTATS flag.
Next because estimators use the bstats to calculate packets per
second and bytes per second the estimator code paths are updated
to use the per cpu statistics.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 11b28f651ad1..7c8e5d73d433 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -632,6 +632,9 @@ static void qdisc_rcu_free(struct rcu_head *head) { struct Qdisc *qdisc = container_of(head, struct Qdisc, rcu_head); + if (qdisc_is_percpu_stats(qdisc)) + free_percpu(qdisc->cpu_bstats); + kfree((char *) qdisc - qdisc->padded); } |