linux.git/net/core, branch v3.14-rc5

netdevice: move netdev_cap_txqueue for shared usage to header

2014-02-17T05:36:34+00:00

In order to allow users to invoke netdev_cap_txqueue, it needs to
be moved into netdevice.h header file. While at it, also add kernel
doc header to document the API.

Signed-off-by: Daniel Borkmann 
Signed-off-by: David S. Miller

netdevice: add queue selection fallback handler for ndo_select_queue

2014-02-17T05:36:34+00:00

Add a new argument for ndo_select_queue() callback that passes a
fallback handler. This gets invoked through netdev_pick_tx();
fallback handler is currently __netdev_pick_tx() as most drivers
invoke this function within their customized implementation in
case for skbs that don't need any special handling. This fallback
handler can then be replaced on other call-sites with different
queue selection methods (e.g. in packet sockets, pktgen etc).

This also has the nice side-effect that __netdev_pick_tx() is
then only invoked from netdev_pick_tx() and export of that
function to modules can be undone.

Suggested-by: David S. Miller 
Signed-off-by: Daniel Borkmann 
Signed-off-by: David S. Miller

net: core: introduce netif_skb_dev_features

2014-02-13T22:17:02+00:00

Will be used by upcoming ipv4 forward path change that needs to
determine feature mask using skb->dst->dev instead of skb->dev.

Signed-off-by: Florian Westphal 
Signed-off-by: David S. Miller

net: correct error path in rtnl_newlink()

2014-02-13T22:08:29+00:00

I saw the following BUG when ->newlink() fails in rtnl_newlink():

[   40.240058] kernel BUG at net/core/dev.c:6438!

this is due to free_netdev() is not supposed to be called before
netdev is completely unregistered, therefore it is not correct
to call free_netdev() here, at least for ops->newlink!=NULL case,
many drivers call it in ->destructor so that rtnl_unlock() will
take care of it, we probably don't need to do anything here.

Cc: David S. Miller 
Cc: Eric Dumazet 
Signed-off-by: Cong Wang 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

net: fix 'ip rule' iif/oif device rename

2014-02-10T03:02:52+00:00

ip rules with iif/oif references do not update:
(detach/attach) across interface renames.

Signed-off-by: Maciej Żenczykowski 
CC: Willem de Bruijn 
CC: Eric Dumazet 
CC: Chris Davis 
CC: Carlo Contavalli 

Google-Bug-Id: 12936021
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: Mark functions as static in core/dev.c

2014-02-10T01:32:49+00:00

Mark functions as static in core/dev.c because they are not used outside
this file.

This eliminates the following warning in core/dev.c:
net/core/dev.c:2806:5: warning: no previous prototype for ‘__dev_queue_xmit’ [-Wmissing-prototypes]
net/core/dev.c:4640:5: warning: no previous prototype for ‘netdev_adjacent_sysfs_add’ [-Wmissing-prototypes]
net/core/dev.c:4650:6: warning: no previous prototype for ‘netdev_adjacent_sysfs_del’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria 
Reviewed-by: Josh Triplett 
Reviewed-by: Veaceslav Falico 
Signed-off-by: David S. Miller

net: use __GFP_NORETRY for high order allocations

2014-02-07T05:28:06+00:00

sock_alloc_send_pskb() & sk_page_frag_refill()
have a loop trying high order allocations to prepare
skb with low number of fragments as this increases performance.

Problem is that under memory pressure/fragmentation, this can
trigger OOM while the intent was only to try the high order
allocations, then fallback to order-0 allocations.

We had various reports from unexpected regressions.

According to David, setting __GFP_NORETRY should be fine,
as the asynchronous compaction is still enabled, and this
will prevent OOM from kicking as in :

CFSClientEventm invoked oom-killer: gfp_mask=0x42d0, order=3, oom_adj=0,
oom_score_adj=0, oom_score_badness=2 (enabled),memcg_scoring=disabled
CFSClientEventm

Call Trace:
 [] dump_header+0xe1/0x23e
 [] oom_kill_process+0x6a/0x323
 [] out_of_memory+0x4b3/0x50d
 [] __alloc_pages_may_oom+0xa2/0xc7
 [] __alloc_pages_nodemask+0x1002/0x17f0
 [] alloc_pages_current+0x103/0x2b0
 [] sk_page_frag_refill+0x8f/0x160
 [] tcp_sendmsg+0x560/0xee0
 [] inet_sendmsg+0x67/0x100
 [] __sock_sendmsg_nosec+0x6c/0x90
 [] sock_sendmsg+0xc5/0xf0
 [] __sys_sendmsg+0x136/0x430
 [] sys_sendmsg+0x88/0x110
 [] system_call_fastpath+0x16/0x1b
Out of Memory: Kill process 2856 (bash) score 9999 or sacrifice child

Signed-off-by: Eric Dumazet 
Acked-by: David Rientjes 
Acked-by: "Eric W. Biederman" 
Signed-off-by: David S. Miller

netpoll: fix netconsole IPv6 setup

2014-02-07T05:28:06+00:00

Currently, to make netconsole start over IPv6, the source address
needs to be specified. Without a source address, netpoll_parse_options
assumes we're setting up over IPv4 and the destination IPv6 address is
rejected.

Check if the IP version has been forced by a source address before
checking for a version mismatch when parsing the destination address.

Signed-off-by: Sabrina Dubroca 
Acked-by: Cong Wang 
Signed-off-by: David S. Miller

rtnetlink: fix oops in rtnl_link_get_slave_info_data_size

2014-02-05T04:28:51+00:00

We should check whether rtnetlink link operations
are defined before calling get_slave_size().

Without this, the following oops can occur when
adding a tap device to OVS.

[   87.839553] BUG: unable to handle kernel NULL pointer dereference at 00000000000000a8
[   87.839595] IP: [] if_nlmsg_size+0xf0/0x220
[...]
[   87.840651] Call Trace:
[   87.840664]  [] ? rtmsg_ifinfo+0x2b/0x100
[   87.840688]  [] ? __netdev_adjacent_dev_insert+0x150/0x1a0
[   87.840718]  [] ? rtnetlink_event+0x30/0x40
[   87.840742]  [] ? notifier_call_chain+0x44/0x70
[   87.840768]  [] ? __netdev_upper_dev_link+0x3c6/0x3f0
[   87.840798]  [] ? netdev_create+0xcc/0x160 [openvswitch]
[   87.840828]  [] ? ovs_vport_add+0x4a/0xd0 [openvswitch]
[   87.840857]  [] ? new_vport+0x9/0x50 [openvswitch]
[   87.840884]  [] ? ovs_vport_cmd_new+0x11e/0x210 [openvswitch]
[   87.840915]  [] ? genl_family_rcv_msg+0x19a/0x360
[   87.840941]  [] ? genl_family_rcv_msg+0x360/0x360
[   87.840967]  [] ? genl_rcv_msg+0x79/0xc0
[   87.840991]  [] ? __kmalloc_reserve.isra.25+0x29/0x80
[   87.841018]  [] ? netlink_rcv_skb+0xa9/0xc0
[   87.841042]  [] ? genl_rcv+0x1f/0x30
[   87.841064]  [] ? netlink_unicast+0xe8/0x1e0
[   87.841088]  [] ? netlink_sendmsg+0x31a/0x750
[   87.841113]  [] ? sock_sendmsg+0x86/0xc0
[   87.841136]  [] ? __netdev_update_features+0x4d/0x200
[   87.841163]  [] ? ethtool_get_value+0x2e/0x50
[   87.841188]  [] ? ___sys_sendmsg+0x359/0x370
[   87.841212]  [] ? dev_ioctl+0x1a6/0x5c0
[   87.841236]  [] ? autoremove_wake_function+0x30/0x30
[   87.841264]  [] ? sock_do_ioctl+0x3d/0x50
[   87.841288]  [] ? sock_ioctl+0x1e8/0x2c0
[   87.841312]  [] ? do_vfs_ioctl+0x2cf/0x4b0
[   87.841335]  [] ? __sys_sendmsg+0x39/0x70
[   87.841362]  [] ? system_call_fastpath+0x16/0x1b
[   87.841386] Code: c0 74 10 48 89 ef ff d0 83 c0 07 83 e0 fc 48 98 49 01 c7 48 89 ef e8 d0 d6 fe ff 48 85 c0 0f 84 df 00 00 00 48 8b 90 08 07 00 00 <48> 8b 8a a8 00 00 00 31 d2 48 85 c9 74 0c 48 89 ee 48 89 c7 ff
[   87.841529] RIP  [] if_nlmsg_size+0xf0/0x220
[   87.841555]  RSP 
[   87.841569] CR2: 00000000000000a8
[   87.851442] ---[ end trace e42ab217691b4fc2 ]---

Signed-off-by: Fernando Luis Vazquez Cao 
Acked-by: Jiri Pirko 
Signed-off-by: David S. Miller

net: Fix warning on make htmldocs caused by skbuff.c

2014-01-29T02:06:06+00:00

This patch fixed following Warning while executing "make htmldocs".

Warning(/net/core/skbuff.c:2164): No description found for parameter 'from'
Warning(/net/core/skbuff.c:2164): Excess function parameter 'source'
description in 'skb_zerocopy'
Replace "@source" with "@from" fixed the warning.

Signed-off-by: Masanari Iida 
Signed-off-by: David S. Miller