netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Fastabend <john.fastabend@gmail.com>
To: eric.dumazet@gmail.com
Cc: netdev@vger.kernel.org, john.fastabend@gmail.com
Subject: [RFC PATCH v2 05/17] net: sched: a dflt qdisc may be used with per cpu stats
Date: Tue, 02 May 2017 08:37:39 -0700	[thread overview]
Message-ID: <20170502153739.9304.36714.stgit@john-Precision-Tower-5810> (raw)
In-Reply-To: <20170502153518.9304.17904.stgit@john-Precision-Tower-5810>

Enable dflt qdisc support for per cpu stats before this patch a dflt
qdisc was required to use the global statistics qstats and bstats.

This adds a static flags field to qdisc_ops that is propagated
into qdisc->flags in qdisc allocate call. This allows the allocation
block to completely allocate the qdisc object so we don't have
dangling allocations after qdisc init.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
 include/net/sch_generic.h |    1 +
 net/sched/sch_generic.c   |   16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 9531b81..83952af 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -172,6 +172,7 @@ struct Qdisc_ops {
 	const struct Qdisc_class_ops	*cl_ops;
 	char			id[IFNAMSIZ];
 	int			priv_size;
+	unsigned int		static_flags;
 
 	int 			(*enqueue)(struct sk_buff *skb,
 					   struct Qdisc *sch,
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 2f66b1f..8a03738 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -625,6 +625,19 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
 	qdisc_skb_head_init(&sch->q);
 	spin_lock_init(&sch->q.lock);
 
+	if (ops->static_flags & TCQ_F_CPUSTATS) {
+		sch->cpu_bstats =
+			netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
+		if (!sch->cpu_bstats)
+			goto errout1;
+
+		sch->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
+		if (!sch->cpu_qstats) {
+			free_percpu(sch->cpu_bstats);
+			goto errout1;
+		}
+	}
+
 	spin_lock_init(&sch->busylock);
 	lockdep_set_class(&sch->busylock,
 			  dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
@@ -634,6 +647,7 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
 			  dev->qdisc_running_key ?: &qdisc_running_key);
 
 	sch->ops = ops;
+	sch->flags = ops->static_flags;
 	sch->enqueue = ops->enqueue;
 	sch->dequeue = ops->dequeue;
 	sch->dev_queue = dev_queue;
@@ -641,6 +655,8 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
 	atomic_set(&sch->refcnt, 1);
 
 	return sch;
+errout1:
+	kfree(p);
 errout:
 	return ERR_PTR(err);
 }

  parent reply	other threads:[~2017-05-02 15:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-02 15:36 [RFC PATCH v2 00/17] latest qdisc patch series John Fastabend
2017-05-02 15:36 ` [RFC PATCH v2 01/17] net: sched: cleanup qdisc_run and __qdisc_run semantics John Fastabend
2017-05-02 15:36 ` [RFC PATCH v2 02/17] net: sched: allow qdiscs to handle locking John Fastabend
2017-05-02 15:37 ` [RFC PATCH v2 03/17] net: sched: remove remaining uses for qdisc_qlen in xmit path John Fastabend
2017-05-02 15:37 ` [RFC PATCH v2 04/17] net: sched: provide per cpu qstat helpers John Fastabend
2017-05-02 15:37 ` John Fastabend [this message]
2017-05-02 15:38 ` [RFC PATCH v2 06/17] net: sched: explicit locking in gso_cpu fallback John Fastabend
2017-05-02 15:38 ` [RFC PATCH v2 07/17] net: sched: drop qdisc_reset from dev_graft_qdisc John Fastabend
2017-05-02 20:00   ` Jesper Dangaard Brouer
2017-05-02 15:38 ` [RFC PATCH v2 08/17] net: sched: support skb_bad_tx with lockless qdisc John Fastabend
2017-05-02 15:39 ` [RFC PATCH v2 09/17] net: sched: check for frozen queue before skb_bad_txq check John Fastabend
2017-05-02 15:39 ` [RFC PATCH v2 10/17] net: sched: qdisc_qlen for per cpu logic John Fastabend
2017-05-02 15:39 ` [RFC PATCH v2 11/17] net: sched: helper to sum qlen John Fastabend
2017-05-02 15:39 ` [RFC PATCH v2 12/17] net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mq John Fastabend
2017-06-19  9:21   ` huaixin chang
2017-05-02 15:40 ` [RFC PATCH v2 13/17] net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio John Fastabend
2017-05-02 15:40 ` [RFC PATCH v2 14/17] net: skb_array: expose peek API John Fastabend
2017-06-06  3:10   ` Michael S. Tsirkin
2017-05-02 15:40 ` [RFC PATCH v2 15/17] net: sched: pfifo_fast use skb_array John Fastabend
2017-05-02 15:41 ` [RFC PATCH v2 16/17] net: skb_array additions for unlocked consumer John Fastabend
2017-05-02 15:41 ` [RFC PATCH v2 17/17] net: sched: lock once per bulk dequeue John Fastabend
2017-06-06  4:30 ` [RFC PATCH v2 00/17] latest qdisc patch series Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170502153739.9304.36714.stgit@john-Precision-Tower-5810 \
    --to=john.fastabend@gmail.com \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).