linux.git/net/sched, branch v2.6.31

tc: Fix unitialized kernel memory leak

2009-09-03T05:55:17+00:00

Three bytes of uninitialized kernel memory are currently leaked to user

Signed-off-by: Eric Dumazet 
Reviewed-by: Jiri Pirko 
Signed-off-by: David S. Miller

pkt_sched: Revert tasklet_hrtimer changes.

2009-09-02T00:59:25+00:00

These are full of unresolved problems, mainly that conversions don't
work 1-1 from hrtimers to tasklet_hrtimers because unlike hrtimers
tasklets can't be killed from softirq context.

And when a qdisc gets reset, that's exactly what we need to do here.

We'll work this out in the net-next-2.6 tree and if warranted we'll
backport that work to -stable.

This reverts the following 3 changesets:

a2cb6a4dd470d7a64255a10b843b0d188416b78f
("pkt_sched: Fix bogon in tasklet_hrtimer changes.")

38acce2d7983632100a9ff3fd20295f6e34074a8
("pkt_sched: Convert CBQ to tasklet_hrtimer.")

ee5f9757ea17759e1ce5503bdae2b07e48e32af9
("pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer")

Signed-off-by: David S. Miller

pkt_sched: Fix bogon in tasklet_hrtimer changes.

2009-08-25T02:37:05+00:00

Reported by Stephen Rothwell, luckily it's harmless:

net/sched/sch_api.c: In function 'qdisc_watchdog':
net/sched/sch_api.c:460: warning: initialization from incompatible pointer type
net/sched/sch_cbq.c: In function 'cbq_undelay':
net/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type

Signed-off-by: David S. Miller

pkt_sched: Convert CBQ to tasklet_hrtimer.

2009-08-24T01:52:38+00:00

This code expects to run in softirq context, and bare hrtimers
run in hw IRQ context.

Signed-off-by: David S. Miller 
Acked-by: Thomas Gleixner

pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer

2009-08-23T01:09:17+00:00

None of this stuff should execute in hw IRQ context, therefore
use a tasklet_hrtimer so that it runs in softirq context.

Signed-off-by: David S. Miller 
Acked-by: Thomas Gleixner

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: correct off-by-one write allocations reports

2009-06-18T07:29:12+00:00

commit 2b85a34e911bf483c27cfdd124aeb1605145dc80
(net: No more expensive sock_hold()/sock_put() on each tx)
changed initial sk_wmem_alloc value.

We need to take into account this offset when reporting
sk_wmem_alloc to user, in PROC_FS files or various
ioctls (SIOCOUTQ/TIOCOUTQ)

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

pkt_sched: Update drops stats in act_police

2009-06-18T01:56:45+00:00

Action police statistics could be misleading because drops are not
shown when expected.

With feedback from: Jamal Hadi Salim 

Reported-by: Pawel Staszewski 
Signed-off-by: Jarek Poplawski 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15T10:02:23+00:00

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US

2009-06-15T09:31:47+00:00

Let's use TICKS instead of US, so PSCHED_TICKS2NS and PSCHED_NS2TICKS
(like in PSCHED_TICKS_PER_SEC already) to avoid misleading.

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