linux-toradex.git/include/net/sch_generic.h, branch v2.6.31.7

net: restore gnet_stats_basic to previous definition

2009-08-18T04:33:49+00:00

In 5e140dfc1fe87eae27846f193086724806b33c7d "net: reorder struct Qdisc
for better SMP performance" the definition of struct gnet_stats_basic
changed incompatibly, as copies of this struct are shipped to
userland via netlink.

Restoring old behavior is not welcome, for performance reason.

Fix is to use a private structure for kernel, and
teach gnet_stats_copy_basic() to convert from kernel to user land,
using legacy structure (struct gnet_stats_basic)

Based on a report and initial patch from Michael Spang.

Reported-by: Michael Spang 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: reorder struct Qdisc for better SMP performance

2009-03-20T08:33:32+00:00

dev_queue_xmit() needs to dirty fields "state", "q", "bstats" and "qstats"

On x86_64 arch, they currently span three cache lines, involving more
cache line ping pongs than necessary, making longer holding of queue spinlock.

We can reduce this to one cache line, by grouping all read-mostly fields
at the beginning of structure. (Or should I say, all highly modified fields
at the end :) )

Before patch :

offsetof(struct Qdisc, state)=0x38
offsetof(struct Qdisc, q)=0x48
offsetof(struct Qdisc, bstats)=0x80
offsetof(struct Qdisc, qstats)=0x90
sizeof(struct Qdisc)=0xc8

After patch :

offsetof(struct Qdisc, state)=0x80
offsetof(struct Qdisc, q)=0x88
offsetof(struct Qdisc, bstats)=0xa0
offsetof(struct Qdisc, qstats)=0xac
sizeof(struct Qdisc)=0xc0

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler.

2009-02-01T09:12:42+00:00

Patrick McHardy  suggested:
> How about making this flag and the warning message (in a out-of-line
> function) globally available? Other qdiscs (f.i. HFSC) can't deal with
> inner non-work-conserving qdiscs as well.

This patch uses qdisc->flags field of "suspected" child qdisc.

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Remove qdisc->ops->requeue() etc.

2008-11-14T06:56:30+00:00

After implementing qdisc->ops->peek() and changing sch_netem into
classless qdisc there are no more qdisc->ops->requeue() users. This
patch removes this method with its wrappers (qdisc_requeue()), and
also unused qdisc->requeue structure. There are a few minor fixes of
warnings (htb_enqueue()) and comments btw.

The idea to kill ->requeue() and a similar patch were first developed
by David S. Miller.

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Fix qdisc len in qdisc_peek_dequeued()

2008-11-06T00:02:34+00:00

A packet dequeued and stored as gso_skb in qdisc_peek_dequeued() should
be seen as part of the queue for sch->q.qlen queries until it's really
dequeued with qdisc_dequeue_peeked(), so qlen needs additional updating
in these functions. (Updating qstats.backlog shouldn't matter here.)

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Add peek emulation for non-work-conserving qdiscs.

2008-10-31T07:47:01+00:00

This patch adds qdisc_peek_dequeued() wrapper to emulate peek method
with qdisc->dequeue() and storing "peeked" skb in qdisc->gso_skb until
dequeuing. This is mainly for compatibility reasons not to break some
strange configs because peeking is expected for non-work-conserving
parent qdiscs to query work-conserving child qdiscs.

This implementation requires using qdisc_dequeue_peeked() wrapper
instead of directly calling qdisc->dequeue() for all qdiscs ever
querried with qdisc->ops->peek() or qdisc_peek_dequeued().

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Add ->peek() methods for fifo, prio and SFQ qdiscs.

2008-10-31T07:44:18+00:00

From: Patrick McHardy 

Just as a demonstration how easy adding a peek operation to the
work-conserving qdiscs actually is. It doesn't need to keep or change
any internal state in many cases thanks to the guarantee that the
packet will either be dequeued or, if another packet arrives, the
upper qdisc will immediately ->peek again to reevaluate the state.

(This is only slightly modified Patrick's patch.)

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: sch_generic: Add Qdisc_ops peek() method.

2008-10-31T07:43:45+00:00

Add Qdisc_ops peek() method in order to replace requeuing.

Based on ideas and patches of Herbert Xu, Patrick McHardy and
David S. Miller.

Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Fix handling of gso skbs on requeuing

2008-10-06T16:54:39+00:00

Jay Cliburn noticed and diagnosed a bug triggered in
dev_gso_skb_destructor() after last change from qdisc->gso_skb
to qdisc->requeue list. Since gso_segmented skbs can't be queued
to another list this patch brings back qdisc->gso_skb for them.

Reported-by: Jay Cliburn 
Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

pkt_sched: Make qdisc->gso_skb a list.

2008-09-23T05:15:30+00:00

The idea is that we can use this to get rid of
->requeue().

Signed-off-by: David S. Miller