22 Aug, 2008
1 commit
-
Since some qdiscs call qdisc_tree_decrease_qlen() (so qdisc_lookup())
without rtnl_lock(), adding and deleting from a qdisc list needs
additional locking. This patch adds global spinlock qdisc_list_lock
and wrapper functions for modifying the list. It is considered as a
temporary solution until hfsc_dequeue(), netem_dequeue() and
tbf_dequeue() (or qdisc_tree_decrease_qlen()) are redone.With feedback from Herbert Xu and David S. Miller.
Signed-off-by: Jarek Poplawski
Acked-by: Herbert Xu
Signed-off-by: David S. Miller
21 Aug, 2008
1 commit
-
dev_deactivate() can skip rescheduling of a qdisc by qdisc_watchdog()
or other timer calling netif_schedule() after dev_queue_deactivate().
We prevent this checking aliveness before scheduling the timer. Since
during deactivation the root qdisc is available only as qdisc_sleeping
additional accessor qdisc_root_sleeping() is created.With feedback from Herbert Xu
Signed-off-by: Jarek Poplawski
Signed-off-by: David S. Miller
19 Aug, 2008
5 commits
-
This reverts commit 1cfa26661a85549063e369e2b40275eeaa7b923c.
qdisc_destroy() runs fully under RTNL again and not from softint any
longer, so this change is no longer needed.Signed-off-by: David S. Miller
-
...Last block local var got just deleted.
Signed-off-by: Ilpo Järvinen
Signed-off-by: David S. Miller -
Based upon reports by Denys Fedoryshchenko, and feedback
and help from Jarek Poplawski and Herbert Xu.We always either:
1) Never made an external reference to this qdisc.
or
2) Did a dev_deactivate() which purged all asynchronous
references.So do not lock the qdisc when we call qdisc_destroy(),
it's illegal anyways as when we drop the lock this is
free'd memory.Signed-off-by: David S. Miller
-
Qdisc locks are initialized in the same function, qdisc_alloc(), so
lockdep can't distinguish tx qdisc lock from rx and reports "possible
recursive locking detected" when both these locks are taken eg. while
using act_mirred with ifb. This looks like a false positive. Anyway,
after this patch these locks will be reported more exactly.Reported-by: Denys Fedoryshchenko
Signed-off-by: Jarek Poplawski
Signed-off-by: David S. Miller -
Based upon initial discovery and patch by Jarek Poplawski.
The qdisc watchdogs can be attached to any qdisc, not just the root,
so make sure we schedule the correct one.CBQ has a similar bug.
Signed-off-by: David S. Miller
18 Aug, 2008
1 commit
-
From: Jarek Poplawski
When we are destroying non-root qdiscs, we need to lock
the root of the qdisc tree not the the qdisc itself.Signed-off-by: David S. Miller
12 Aug, 2008
1 commit
-
Since qdisc_stab_lock is used in qdisc_put_stab(), which is called in
BH context from __qdisc_destroy() RCU callback, softirq safe locking
is needed.Signed-off-by: Jarek Poplawski
Signed-off-by: David S. Miller
09 Aug, 2008
1 commit
-
Based upon bug reports by Stephen Hemminger.
We still had some cases using ->qdisc instead of ->qdisc_sleeping.
Also, qdisc_lookup() should return ingress qdiscs.
Signed-off-by: David S. Miller
08 Aug, 2008
1 commit
-
Bug reported by Stephen Hemminger.
We need to fetch the root from ->qdisc_sleeping not ->qdisc.
Signed-off-by: David S. Miller
07 Aug, 2008
1 commit
-
As noticed by Stephen Hemminger, the root qdisc is denoted by
TC_H_ROOT, not zero.Signed-off-by: David S. Miller
30 Jul, 2008
1 commit
-
Bug report from Steven Jan Springl:
Issuing the following command causes a kernel oops:
tc qdisc add dev eth0 handle ffff: ingressThe problem mostly stems from all of the special case handling of
ingress qdiscs.So, to fix this, do the grafting operation the same way we do for TX
qdiscs. Which means that dev_activate() and dev_deactivate() now do
the "qdisc_sleeping qdisc" transitions on dev->rx_queue too.Future simplifications are possible now, mainly because it is
impossible for dev_queue->{qdisc,qdisc_sleeping} to be NULL. There
are NULL checks all over to handle the ingress qdisc special case
that used to exist before this commit.Signed-off-by: David S. Miller
23 Jul, 2008
1 commit
-
This patch makes the needlessly global qdisc_class_hash_alloc() static.
Signed-off-by: Adrian Bunk
Acked-by: Patrick McHardy
Signed-off-by: David S. Miller
20 Jul, 2008
1 commit
-
Add size table functions for qdiscs and calculate packet size in
qdisc_enqueue().Based on patch by Patrick McHardy
http://marc.info/?l=linux-netdev&m=115201979221729&w=2Signed-off-by: Jussi Kivilinna
Signed-off-by: David S. Miller
19 Jul, 2008
1 commit
-
Idea is from Patrick McHardy.
Instead of managing the list of qdiscs on the device level, manage it
in the root qdisc of a netdev_queue. This solves all kinds of
visibility issues during qdisc destruction.The way to iterate over all qdiscs of a netdev_queue is to visit
the netdev_queue->qdisc, and then traverse it's list.The only special case is to ignore builting qdiscs at the root when
dumping or doing a qdisc_lookup(). That was not needed previously
because builtin qdiscs were not added to the device's qdisc_list.Signed-off-by: David S. Miller
18 Jul, 2008
6 commits
-
Move the destruction of the old queue into qdisc_graft().
When operating on a root qdisc (ie. "parent == NULL"), apply
the operation to all queues. The caller has grabbed a single
implicit reference for this graft, therefore when we apply the
change to more than one queue we must grab additional qdisc
references.Otherwise, we are operating on a class of a specific parent qdisc, and
therefore no multiqueue handling is necessary.Signed-off-by: David S. Miller
-
Lock the root of the qdisc being operated upon.
All explicit references to qdisc_tree_lock() are now gone.
The only remaining uses are via the sch_tree_{lock,unlock}()
and tcf_tree_{lock,unlock}() macros.Signed-off-by: David S. Miller
-
And give it it's own lock.
Signed-off-by: David S. Miller
-
When we have shared qdiscs, packets come out of the qdiscs
for multiple transmit queues.Therefore it doesn't make any sense to schedule the transmit
queue when logically we cannot know ahead of time the TX
queue of the SKB that the qdisc->dequeue() will give us.Just for sanity I added a BUG check to make sure we never
get into a state where the noop_qdisc is scheduled.Signed-off-by: David S. Miller
-
When code wants to lock the qdisc tree state, the logic
operation it's doing is locking the top-level qdisc that
sits of the root of the netdev_queue.Add qdisc_root_lock() to represent this and convert the
easiest cases.In order for this to work out in all cases, we have to
hook up the noop_qdisc to a dummy netdev_queue.Signed-off-by: David S. Miller
-
alloc_netdev_mq() now allocates an array of netdev_queue
structures for TX, based upon the queue_count argument.Furthermore, all accesses to the TX queues are now vectored
through the netdev_get_tx_queue() and netdev_for_each_tx_queue()
interfaces. This makes it easy to grep the tree for all
things that want to get to a TX queue of a net device.Problem spots which are not really multiqueue aware yet, and
only work with one queue, can easily be spotted by grepping
for all netdev_get_tx_queue() calls that pass in a zero index.Signed-off-by: David S. Miller
09 Jul, 2008
9 commits
-
Only plain netif_schedule() remains taking a net_device, mostly as a
compatability item while we transition the rest of these interfaces.Everything else calls netif_schedule_queue() or __netif_schedule(),
both of which take a netdev_queue pointer.Signed-off-by: David S. Miller
-
It is always equal to qdisc->dev_queue->lock
Signed-off-by: David S. Miller
-
Now that our qdisc management is bi-directional, per-queue, and fully
orthogonal, there is no reason to have a special ingress qdisc pointer
in struct net_device.Signed-off-by: David S. Miller
-
Now qdisc, qdisc_sleeping, and qdisc_list also live there.
Signed-off-by: David S. Miller
-
Every qdisc is assosciated with a queue, and in the case of ingress
qdiscs that will now be netdev->rx_queue so using that queue's lock is
the thing to do.Signed-off-by: David S. Miller
-
The lock is now an attribute of the device queue.
One thing to notice is that "suspicious" places
emerge which will need specific training about
multiple queue handling. They are so marked with
explicit "netdev->rx_queue" and "netdev->tx_queue"
references.Signed-off-by: David S. Miller
-
It can be obtained via the netdev_queue. So create a helper routine,
qdisc_dev(), to make the transformations nicer looking.Now, qdisc_alloc() now no longer needs a net_device pointer argument.
Signed-off-by: David S. Miller
-
A netdev_queue is an entity managed by a qdisc.
Currently there is one RX and one TX queue, and a netdev_queue merely
contains a backpointer to the net_device.The Qdisc struct is augmented with a netdev_queue pointer as well.
Eventually the 'dev' Qdisc member will go away and we will have the
resulting hierarchy:net_device --> netdev_queue --> Qdisc
Also, qdisc_alloc() and qdisc_create_dflt() now take a netdev_queue
pointer argument.Signed-off-by: David S. Miller
-
We haven't had netdev->tbusy in many years :)
Signed-off-by: David S. Miller
06 Jul, 2008
1 commit
-
Currently all qdiscs which allow to create classes uses a fixed sized hash
table with size 16 to hash the classes. This causes a large bottleneck
when using thousands of classes and unbound filters.Add helpers for dynamically sized class hashes to fix this. The following
patches will convert the qdiscs to use them.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller
02 Jul, 2008
1 commit
-
Pass double tcf_proto pointers to tcf_destroy_chain() to make it
clear the start of the filter list for more consistency.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller
18 Apr, 2008
1 commit
15 Apr, 2008
1 commit
-
TC_H_MAJ(parentid) for root classes is the same as for ingress, and if
ingress qdisc is created qdisc_lookup() returns its pointer (without
ingress NULL is returned). After this all qdisc_lookups give the same,
and we get endless loop. (I don't know how this could hide for so long
- it should trigger with every leaf class deleted if it's qdisc isn't
empty.)After this fix qdisc_lookup() is omitted both for ingress and root
parents, but looking for root is only wasting a little time here...
Many thanks to Enrico Demarin for finding a test for catching this
bug, which probably bothered quite a lot of admins.Reported-by: Enrico Demarin ,
Signed-off-by: Jarek Poplawski
Acked-by: Patrick McHardy
Signed-off-by: David S. Miller
26 Mar, 2008
1 commit
-
Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.Signed-off-by: YOSHIFUJI Hideaki
29 Jan, 2008
4 commits
-
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Convert packet schedulers to use the netlink API. Unfortunately a gradual
conversion is not possible without breaking compilation in the middle or
adding lots of casts, so this patch converts them all in one step. The
patch has been mostly generated automatically with some minor edits to
at least allow seperate conversion of classifiers and actions.Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller -
Signed-off-by: Patrick McHardy
Signed-off-by: David S. Miller