From: Jesper Dangaard Brouer <brouer@redhat•com>
To: Jesper Dangaard Brouer <brouer@redhat•com>,
"David S. Miller" <davem@davemloft•net>,
netdev@vger•kernel.org
Cc: Florian Westphal <fw@strlen•de>,
Hannes Frederic Sowa <hannes@stressinduktion•org>,
Daniel Borkmann <dborkman@redhat•com>
Subject: [net-next PATCH 1/3] qdisc: adjustments for API allowing skb list xmits
Date: Tue, 02 Sep 2014 16:35:33 +0200 [thread overview]
Message-ID: <20140902143524.1918.70967.stgit@dragon> (raw)
In-Reply-To: <20140902143254.1918.8419.stgit@dragon>
Minor adjustments for merge commit 53fda7f7f9e (Merge branch 'xmit_list')
that allows us to work with a list of SKBs.
Update code doc to function sch_direct_xmit().
In handle_dev_cpu_collision() use kfree_skb_list() in error handling.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat•com>
---
net/sched/sch_generic.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index a8bf9f9..5b261e9 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -93,7 +93,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
* detect it by checking xmit owner and drop the packet when
* deadloop is detected. Return OK to try the next skb.
*/
- kfree_skb(skb);
+ kfree_skb_list(skb);
net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
dev_queue->dev->name);
ret = qdisc_qlen(q);
@@ -110,9 +110,9 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
}
/*
- * Transmit one skb, and handle the return status as required. Holding the
- * __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this
- * function.
+ * Transmit possibly several skbs, and handle the return status as
+ * required. Holding the __QDISC___STATE_RUNNING bit guarantees that
+ * only one CPU can execute this function.
*
* Returns to the caller:
* 0 - queue is empty or throttled.
next prev parent reply other threads:[~2014-09-02 14:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 14:35 [net-next PATCH 0/3] qdisc bulk dequeuing and utilizing delayed tailptr updates Jesper Dangaard Brouer
2014-09-02 14:35 ` Jesper Dangaard Brouer [this message]
2014-09-02 15:25 ` [net-next PATCH 1/3] qdisc: adjustments for API allowing skb list xmits Eric Dumazet
2014-09-03 10:12 ` [net-next PATCH] qdisc: exit case fixes for skb list handling in qdisc layer Jesper Dangaard Brouer
2014-09-04 3:42 ` David Miller
2014-09-04 5:24 ` Eric Dumazet
2014-09-04 5:39 ` Jesper Dangaard Brouer
2014-09-05 5:41 ` David Miller
2014-09-05 13:42 ` Eric Dumazet
2014-09-02 21:06 ` [net-next PATCH 1/3] qdisc: adjustments for API allowing skb list xmits David Miller
2014-09-02 14:35 ` [net-next PATCH 2/3] qdisc: bulk dequeue support for qdiscs with TCQ_F_ONETXQUEUE Jesper Dangaard Brouer
2014-09-02 15:22 ` Eric Dumazet
2014-09-03 9:31 ` Jesper Dangaard Brouer
2014-09-03 10:23 ` Florian Westphal
2014-09-02 16:14 ` Daniel Borkmann
2014-09-03 12:27 ` Jesper Dangaard Brouer
2014-09-02 14:36 ` [net-next PATCH 3/3] qdisc: sysctl to adjust bulk dequeue limit Jesper Dangaard Brouer
2014-09-02 15:23 ` Jesper Dangaard Brouer
2014-09-02 15:33 ` Daniel Borkmann
2014-09-02 21:20 ` Cong Wang
2014-09-03 0:12 ` Tom Herbert
2014-09-02 18:04 ` [net-next PATCH 0/3] qdisc bulk dequeuing and utilizing delayed tailptr updates Tom Herbert
2014-09-03 12:47 ` Jesper Dangaard Brouer
2014-09-02 21:05 ` David Miller
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=20140902143524.1918.70967.stgit@dragon \
--to=brouer@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dborkman@redhat$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=hannes@stressinduktion$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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