linux.git/net/core/dev.c, branch v3.3-rc2

net: fix NULL-deref in WARN() in skb_gso_segment()

2012-01-17T20:51:23+00:00

Bug was introduced in commit c8f44affb7244f2ac3e703cab13d55ede27621bb.

Signed-off-by: Michał Mirosław 
Signed-off-by: David S. Miller

net: WARN if skb_checksum_help() is called on skb requiring segmentation

2012-01-17T20:49:03+00:00

skb_checksum_help() has never done anything useful with skbs that
require segmentation.  Setting skb->ip_summed = CHECKSUM_NONE makes
them invalid and provokes a later WARNing in skb_gso_segment().

Passing such an skb to skb_checksum_help() indicates a bug, so we
should warn about it immediately.  Move the warning from
skb_gso_segment() into a shared function, and add gso_type and
gso_size to it.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

net: Use device model to get driver name in skb_gso_segment()

2012-01-17T15:31:12+00:00

ethtool operations generally require the caller to hold RTNL and are
not safe to call in atomic context.  The device model provides this
information for most devices; we'll only lose it for some old ISA
drivers.

Signed-off-by: Ben Hutchings 
Acked-by: Herbert Xu 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-02T18:49:21+00:00

net: net_device flags is an unsigned int

2011-12-01T16:41:48+00:00

commit b00055aacdb ([NET] core: add RFC2863 operstate) changed
net_device flags from unsigned short to unsigned int.

Some core functions still assume its an unsigned short.

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

net/core: fix rollback handler in register_netdevice_notifier

2011-12-01T04:43:07+00:00

Within nested statements, the break statement terminates only the
do, for, switch, or while statement that immediately encloses it,
So replace the break with goto.

Signed-off-by: RongQing.Li 
Signed-off-by: David S. Miller

net: Fix skb_update_prio RCU usage.

2011-11-29T23:25:17+00:00

Change function rcu_dereference to rcu_dereference_bh to avoid warning

[ INFO: suspicious RCU usage. ]
-------------------------------
net/core/dev.c:2459 suspicious rcu_dereference_check() usage!

because we are locking with

rcu_read_lock_bh();

in function dev_queue_xmit(struct sk_buff *skb)

Signed-off-by: Igor Maravic 
Signed-off-by: David S. Miller

bql: Byte queue limits

2011-11-29T17:46:19+00:00

Networking stack support for byte queue limits, uses dynamic queue
limits library.  Byte queue limits are maintained per transmit queue,
and a dql structure has been added to netdev_queue structure for this
purpose.

Configuration of bql is in the tx- sysfs directory for the queue
under the byte_queue_limits directory.  Configuration includes:
limit_min, bql minimum limit
limit_max, bql maximum limit
hold_time, bql slack hold time

Also under the directory are:
limit, current byte limit
inflight, current number of bytes on the queue

Signed-off-by: Tom Herbert 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: Add queue state xoff flag for stack

2011-11-29T17:46:19+00:00

Create separate queue state flags so that either the stack or drivers
can turn on XOFF.  Added a set of functions used in the stack to determine
if a queue is really stopped (either by stack or driver)

Signed-off-by: Tom Herbert 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: dont call jump_label_dec from irq context

2011-11-29T05:26:25+00:00

Igor Maravic reported an error caused by jump_label_dec() being called
from IRQ context :

 BUG: sleeping function called from invalid context at kernel/mutex.c:271
 in_atomic(): 1, irqs_disabled(): 0, pid: 0, name: swapper
 1 lock held by swapper/0:
  #0:  (&n->timer){+.-...}, at: [] call_timer_fn+0x0/0x340
 Pid: 0, comm: swapper Not tainted 3.2.0-rc2-net-next-mpls+ #1
Call Trace:
   [] __might_sleep+0x137/0x1f0
 [] mutex_lock_nested+0x2f/0x370
 [] ? trace_hardirqs_off+0xd/0x10
 [] ? local_clock+0x6f/0x80
 [] ? lock_release_holdtime.part.22+0x15/0x1a0
 [] ? sock_def_write_space+0x59/0x160
 [] ? arp_error_report+0x3e/0x90
 [] atomic_dec_and_mutex_lock+0x5d/0x80
 [] jump_label_dec+0x1d/0x50
 [] net_disable_timestamp+0x15/0x20
 [] sock_disable_timestamp+0x45/0x50
 [] __sk_free+0x80/0x200
 [] ? sk_send_sigurg+0x70/0x70
 [] ? arp_error_report+0x3e/0x90
 [] sock_wfree+0x3a/0x70
 [] skb_release_head_state+0x70/0x120
 [] __kfree_skb+0x16/0x30
 [] kfree_skb+0x49/0x170
 [] arp_error_report+0x3e/0x90
 [] neigh_invalidate+0x89/0xc0
 [] neigh_timer_handler+0x9e/0x2a0
 [] ? neigh_update+0x640/0x640
 [] __do_softirq+0xc8/0x3a0

Since jump_label_{inc|dec} must be called from process context only,
we must defer jump_label_dec() if net_disable_timestamp() is called
from interrupt context.

Reported-by: Igor Maravic 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller