net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mq

The sch_mq qdisc creates a sub-qdisc per tx queue which are then
called independently for enqueue and dequeue operations. However
statistics are aggregated and pushed up to the "master" qdisc.

This patch adds support for any of the sub-qdiscs to be per cpu
statistic qdiscs. To handle this case add a check when calculating
stats and aggregate the per cpu stats if needed.

Also exports __gnet_stats_copy_queue() to use as a helper function.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index 304f7aa9cc01f02beea69e23f4f10def92033eb6..0304ba2ae3536c1f4117daea639d8e0955b051be 100644 (file)
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -49,6 +49,9 @@ int gnet_stats_copy_rate_est(struct gnet_dump *d,
 int gnet_stats_copy_queue(struct gnet_dump *d,
                          struct gnet_stats_queue __percpu *cpu_q,
                          struct gnet_stats_queue *q, __u32 qlen);
+void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,
+                            const struct gnet_stats_queue __percpu *cpu_q,
+                            const struct gnet_stats_queue *q, __u32 qlen);
 int gnet_stats_copy_app(struct gnet_dump *d, void *st, int len);
 
 int gnet_stats_finish_copy(struct gnet_dump *d);

diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
index 87f28557b3298f30b1cf79dccf3bc6b761cd6623..b2b2323bdc84c44afc33304d9d2f6a22738f6523 100644 (file)
--- a/net/core/gen_stats.c
+++ b/net/core/gen_stats.c
@@ -252,10 +252,10 @@ __gnet_stats_copy_queue_cpu(struct gnet_stats_queue *qstats,
        }
 }
 
-static void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,
-                                   const struct gnet_stats_queue __percpu *cpu,
-                                   const struct gnet_stats_queue *q,
-                                   __u32 qlen)
+void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,
+                            const struct gnet_stats_queue __percpu *cpu,
+                            const struct gnet_stats_queue *q,
+                            __u32 qlen)
 {
        if (cpu) {
                __gnet_stats_copy_queue_cpu(qstats, cpu);
@@ -269,6 +269,7 @@ static void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,
 
        qstats->qlen = qlen;
 }
+EXPORT_SYMBOL(__gnet_stats_copy_queue);
 
 /**
  * gnet_stats_copy_queue - copy queue statistics into statistics TLV

diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index 213b586a06a0ff4c35f668a42f9217522cc29b5a..bc59f05e1a0f4024289b3a3d14c25b7a335a666e 100644 (file)
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
@@ -17,6 +17,7 @@
 #include <linux/skbuff.h>
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
+#include <net/sch_generic.h>
 
 struct mq_sched {
        struct Qdisc            **qdiscs;
@@ -103,15 +104,25 @@ static int mq_dump(struct Qdisc *sch, struct sk_buff *skb)
        memset(&sch->qstats, 0, sizeof(sch->qstats));
 
        for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+               struct gnet_stats_basic_cpu __percpu *cpu_bstats = NULL;
+               struct gnet_stats_queue __percpu *cpu_qstats = NULL;
+               __u32 qlen = 0;
+
                qdisc = netdev_get_tx_queue(dev, ntx)->qdisc_sleeping;
                spin_lock_bh(qdisc_lock(qdisc));
-               sch->q.qlen             += qdisc->q.qlen;
-               sch->bstats.bytes       += qdisc->bstats.bytes;
-               sch->bstats.packets     += qdisc->bstats.packets;
-               sch->qstats.backlog     += qdisc->qstats.backlog;
-               sch->qstats.drops       += qdisc->qstats.drops;
-               sch->qstats.requeues    += qdisc->qstats.requeues;
-               sch->qstats.overlimits  += qdisc->qstats.overlimits;
+
+               if (qdisc_is_percpu_stats(qdisc)) {
+                       cpu_bstats = qdisc->cpu_bstats;
+                       cpu_qstats = qdisc->cpu_qstats;
+               }
+
+               qlen = qdisc_qlen_sum(qdisc);
+
+               __gnet_stats_copy_basic(NULL, &sch->bstats,
+                                       cpu_bstats, &qdisc->bstats);
+               __gnet_stats_copy_queue(&sch->qstats,
+                                       cpu_qstats, &qdisc->qstats, qlen);
+
                spin_unlock_bh(qdisc_lock(qdisc));
        }
        return 0;