From: Krishna Kumar <kumarkr@linux.vnet.ibm.com>
To: davem@davemloft.net, jamal@cyberus.ca,
herbert@gondor.apana.org.au, peter.p.waskiewicz.jr@intel.com,
tgraf@suug.ch, kaber@trash.net, netdev@vger.kernel.org
Subject: [PATCH 2/2] qdisc_restart - couple of optimizations.
Date: Wed, 13 Jun 2007 14:10:49 +0530 [thread overview]
Message-ID: <1181724049.10679.31.camel@localhost.localdomain> (raw)
- netif_queue_stopped need not be called inside qdisc_restart as
it has been called already in qdisc_run() before the first skb
is sent, and in __qdisc_run() after each intermediate skb is
sent (note : we are the only sender, so the queue cannot get
stopped while the tx lock was got in the ~LLTX case).
- BUG_ON((int) q->q.qlen < 0) was a relic from old times when -1
meant more packets are available, and __qdisc_run used to loop
when qdisc_restart() returned -1. During those days, it was
necessary to make sure that qlen is never less than zero, since
__qdisc_run would get into an infinite loop if no packets are on
the queue and this bug in qdisc was there (and worse - no more
skbs could ever get queue'd as we hold the queue lock too). With
Herbert's recent change to return values, this check is not
required. Hopefully Herbert can validate this change. If at all
this is required, it should be added to skb_dequeue (in failure
case), and not to qdisc_qlen.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
---
diff -ruNp org/net/sched/sch_generic.c new/net/sched/sch_generic.c
--- org/net/sched/sch_generic.c 2007-06-11 13:12:11.000000000 +0530
+++ new/net/sched/sch_generic.c 2007-06-11 15:37:48.000000000 +0530
@@ -61,7 +61,6 @@ void qdisc_unlock_tree(struct net_device
static inline int qdisc_qlen(struct Qdisc *q)
{
- BUG_ON((int) q->q.qlen < 0);
return q->q.qlen;
}
@@ -167,9 +166,7 @@ static inline int qdisc_restart(struct n
/* And release queue */
spin_unlock(&dev->queue_lock);
- ret = NETDEV_TX_BUSY;
- if (!netif_queue_stopped(dev))
- ret = dev_hard_start_xmit(skb, dev);
+ ret = dev_hard_start_xmit(skb, dev);
if (!lockless)
netif_tx_unlock(dev);
next reply other threads:[~2007-06-13 8:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-13 8:40 Krishna Kumar [this message]
2007-06-13 17:51 ` [PATCH 2/2] qdisc_restart - couple of optimizations Waskiewicz Jr, Peter P
2007-06-14 4:18 ` Krishna Kumar2
2007-06-14 11:21 ` Herbert Xu
2007-06-14 16:49 ` Waskiewicz Jr, Peter P
2007-06-14 11:19 ` Herbert Xu
2007-06-18 4:54 ` [PATCH 2/2 - rev2] " Krishna Kumar
2007-06-25 2:57 ` 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=1181724049.10679.31.camel@localhost.localdomain \
--to=kumarkr@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=jamal@cyberus.ca \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=peter.p.waskiewicz.jr@intel.com \
--cc=tgraf@suug.ch \
/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