linux-stable.git/net/sched, branch v4.7

net/sched/sch_htb: clamp xstats tokens to fit into 32-bit int

2016-07-19T05:44:31+00:00

In kernel HTB keeps tokens in signed 64-bit in nanoseconds. In netlink
protocol these values are converted into pshed ticks (64ns for now) and
truncated to 32-bit. In struct tc_htb_xstats fields "tokens" and "ctokens"
are declared as unsigned 32-bit but they could be negative thus tool 'tc'
prints them as signed. Big values loose higher bits and/or become negative.

This patch clamps tokens in xstat into range from INT_MIN to INT_MAX.
In this way it's easier to understand what's going on here.

Signed-off-by: Konstantin Khlebnikov 
Signed-off-by: David S. Miller

net_sched: fix mirrored packets checksum

2016-07-01T20:19:34+00:00

Similar to commit 9b368814b336 ("net: fix bridge multicast packet checksum validation")
we need to fixup the checksum for CHECKSUM_COMPLETE when
pushing skb on RX path. Otherwise we get similar splats.

Cc: Jamal Hadi Salim 
Cc: Tom Herbert 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

netem: fix a use after free

2016-06-23T19:07:44+00:00

If the packet was dropped by lower qdisc, then we must not
access it later.

Save qdisc_pkt_len(skb) in a temp variable.

Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Signed-off-by: Eric Dumazet 
Cc: WANG Cong 
Cc: Jamal Hadi Salim 
Cc: Stephen Hemminger 
Signed-off-by: David S. Miller

act_ife: acquire ife_mod_lock before reading ifeoplist

2016-06-23T16:02:36+00:00

Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

act_ife: only acquire tcf_lock for existing actions

2016-06-23T16:02:36+00:00

Alexey reported that we have GFP_KERNEL allocation when
holding the spinlock tcf_lock. Actually we don't have
to take that spinlock for all the cases, especially
for the new one we just create. To modify the existing
actions, we still need this spinlock to make sure
the whole update is atomic.

For net-next, we can get rid of this spinlock because
we already hold the RTNL lock on slow path, and on fast
path we can use RCU to protect the metalist.

Joint work with Jamal.

Reported-by: Alexey Khoroshilov 
Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

htb: call qdisc_root with rcu read lock held

2016-06-15T21:42:46+00:00

saw a debug splat:
net/include/net/sch_generic.h:287 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 1, debug_locks = 0
 2 locks held by kworker/2:1/710:
  #0:  ("events"){.+.+.+}, at: []
  #1:  ((&q->work)){+.+...}, at: [] process_one_work+0x14d/0x690
Workqueue: events htb_work_func
Call Trace:
 [] dump_stack+0x85/0xc2
 [] lockdep_rcu_suspicious+0xe7/0x120
 [] htb_work_func+0x67/0x70

Signed-off-by: Florian Westphal 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller

net sched actions: bug fix dumping actions directly didnt produce NLMSG_DONE

2016-06-15T21:02:53+00:00

This refers to commands to direct action access as follows:

sudo tc actions add action drop index 12
sudo tc actions add action pipe index 10

And then dumping them like so:
sudo tc actions ls action gact

iproute2 worked because it depended on absence of TCA_ACT_TAB TLV
as end of message.
This fix has been tested with iproute2 and is backward compatible.

Signed-off-by: Jamal Hadi Salim 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller

act_ipt: fix a bind refcnt leak

2016-06-15T19:31:35+00:00

And avoid calling tcf_hash_check() twice.

Fixes: a57f19d30b2d ("net sched: ipt action fix late binding")
Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

net_sched: prio: insure proper transactional behavior

2016-06-15T19:29:54+00:00

Now prio_init() can return -ENOMEM, it also has to make sure
any allocated qdiscs are freed, since the caller (qdisc_create()) wont
call ->destroy() handler for us.

More generally, we want a transactional behavior for "tc qdisc
change ...", so prio_tune() should not make modifications if
any error is returned.

It means that we must validate parameters and allocate missing qdisc(s)
before taking root qdisc lock exactly once, to not leave the prio qdisc
in an intermediate state.

Fixes: cbdf45116478 ("net_sched: prio: properly report out of memory errors")
Signed-off-by: Eric Dumazet 
Reported-by: Cong Wang 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller

net_sched: fix pfifo_head_drop behavior vs backlog

2016-06-14T21:17:58+00:00

When the qdisc is full, we drop a packet at the head of the queue,
queue the current skb and return NET_XMIT_CN

Now we track backlog on upper qdiscs, we need to call
qdisc_tree_reduce_backlog(), even if the qlen did not change.

Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Signed-off-by: Eric Dumazet 
Cc: WANG Cong 
Cc: Jamal Hadi Salim 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller