| Message ID | 1435842455-30501-2-git-send-email-edumazet@google.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 15-07-02 06:07 AM, Eric Dumazet wrote: > qdisc_bstats_update_cpu() and other helpers were added to support > percpu stats for qdisc. > > We want to add percpu stats for tc action, so this patch add common > helpers. > > qdisc_bstats_update_cpu() is renamed to qdisc_bstats_cpu_update() > qdisc_qstats_drop_cpu() is renamed to qdisc_qstats_cpu_drop() > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Alexei Starovoitov <ast@plumgrid.com> > Cc: Jamal Hadi Salim <jhs@mojatatu.com> > Cc: John Fastabend <john.fastabend@gmail.com> > --- Acked-by: John Fastabend <john.r.fastabend@intel.com> stupid nit below, > include/net/sch_generic.h | 27 +++++++++++++++++---------- > net/core/dev.c | 4 ++-- > 2 files changed, 19 insertions(+), 12 deletions(-) > > diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h > index 2738f6f87908..0cd49b21b211 100644 > --- a/include/net/sch_generic.h > +++ b/include/net/sch_generic.h > @@ -513,17 +513,21 @@ static inline void bstats_update(struct gnet_stats_basic_packed *bstats, > bstats->packets += skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1; > } > > -static inline void qdisc_bstats_update_cpu(struct Qdisc *sch, > - const struct sk_buff *skb) > +static inline void bstats_cpu_update(struct gnet_stats_basic_cpu *bstats, > + const struct sk_buff *skb) > { > - struct gnet_stats_basic_cpu *bstats = > - this_cpu_ptr(sch->cpu_bstats); > - > u64_stats_update_begin(&bstats->syncp); > bstats_update(&bstats->bstats, skb); > u64_stats_update_end(&bstats->syncp); > } > > +static inline void qdisc_bstats_cpu_update(struct Qdisc *sch, > + const struct sk_buff *skb) > +{ > + bstats_cpu_update(this_cpu_ptr(sch->cpu_bstats), skb); > + spurious new line. > +} > + -- 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
On 07/02/15 09:07, Eric Dumazet wrote: > qdisc_bstats_update_cpu() and other helpers were added to support > percpu stats for qdisc. > > We want to add percpu stats for tc action, so this patch add common > helpers. > > qdisc_bstats_update_cpu() is renamed to qdisc_bstats_cpu_update() > qdisc_qstats_drop_cpu() is renamed to qdisc_qstats_cpu_drop() > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Alexei Starovoitov <ast@plumgrid.com> > Cc: Jamal Hadi Salim <jhs@mojatatu.com> > Cc: John Fastabend <john.fastabend@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal -- 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/include/net/sch_generic.h b/include/net/sch_generic.h index 2738f6f87908..0cd49b21b211 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -513,17 +513,21 @@ static inline void bstats_update(struct gnet_stats_basic_packed *bstats, bstats->packets += skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1; } -static inline void qdisc_bstats_update_cpu(struct Qdisc *sch, - const struct sk_buff *skb) +static inline void bstats_cpu_update(struct gnet_stats_basic_cpu *bstats, + const struct sk_buff *skb) { - struct gnet_stats_basic_cpu *bstats = - this_cpu_ptr(sch->cpu_bstats); - u64_stats_update_begin(&bstats->syncp); bstats_update(&bstats->bstats, skb); u64_stats_update_end(&bstats->syncp); } +static inline void qdisc_bstats_cpu_update(struct Qdisc *sch, + const struct sk_buff *skb) +{ + bstats_cpu_update(this_cpu_ptr(sch->cpu_bstats), skb); + +} + static inline void qdisc_bstats_update(struct Qdisc *sch, const struct sk_buff *skb) { @@ -547,16 +551,19 @@ static inline void __qdisc_qstats_drop(struct Qdisc *sch, int count) sch->qstats.drops += count; } -static inline void qdisc_qstats_drop(struct Qdisc *sch) +static inline void qstats_drop_inc(struct gnet_stats_queue *qstats) { - sch->qstats.drops++; + qstats->drops++; } -static inline void qdisc_qstats_drop_cpu(struct Qdisc *sch) +static inline void qdisc_qstats_drop(struct Qdisc *sch) { - struct gnet_stats_queue *qstats = this_cpu_ptr(sch->cpu_qstats); + qstats_drop_inc(&sch->qstats); +} - qstats->drops++; +static inline void qdisc_qstats_cpu_drop(struct Qdisc *sch) +{ + qstats_drop_inc(this_cpu_ptr(sch->cpu_qstats)); } static inline void qdisc_qstats_overlimit(struct Qdisc *sch) diff --git a/net/core/dev.c b/net/core/dev.c index 6778a9999d52..e0d270143fc7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3646,7 +3646,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb, qdisc_skb_cb(skb)->pkt_len = skb->len; skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS); - qdisc_bstats_update_cpu(cl->q, skb); + qdisc_bstats_cpu_update(cl->q, skb); switch (tc_classify(skb, cl, &cl_res)) { case TC_ACT_OK: @@ -3654,7 +3654,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb, skb->tc_index = TC_H_MIN(cl_res.classid); break; case TC_ACT_SHOT: - qdisc_qstats_drop_cpu(cl->q); + qdisc_qstats_cpu_drop(cl->q); case TC_ACT_STOLEN: case TC_ACT_QUEUED: kfree_skb(skb);
qdisc_bstats_update_cpu() and other helpers were added to support percpu stats for qdisc. We want to add percpu stats for tc action, so this patch add common helpers. qdisc_bstats_update_cpu() is renamed to qdisc_bstats_cpu_update() qdisc_qstats_drop_cpu() is renamed to qdisc_qstats_cpu_drop() Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Alexei Starovoitov <ast@plumgrid.com> Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: John Fastabend <john.fastabend@gmail.com> --- include/net/sch_generic.h | 27 +++++++++++++++++---------- net/core/dev.c | 4 ++-- 2 files changed, 19 insertions(+), 12 deletions(-)