linux-toradex.git/net/core/netpoll.c, branch v3.10.30

netpoll: Fix missing TXQ unlock and and OOPS.

2014-01-15T23:28:50+00:00

[ Upstream commit aca5f58f9ba803ec8c2e6bcf890db17589e8dfcc ]

The VLAN tag handling code in netpoll_send_skb_on_dev() has two problems.

1) It exits without unlocking the TXQ.

2) It then tries to queue a NULL skb to npinfo->txq.

Reported-by: Ahmed Tamrawi 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

netpoll: fix NULL pointer dereference in netpoll_cleanup

2013-10-13T23:08:29+00:00

[ Upstream commit d0fe8c888b1fd1a2f84b9962cabcb98a70988aec ]

I've been hitting a NULL ptr deref while using netconsole because the
np->dev check and the pointer manipulation in netpoll_cleanup are done
without rtnl and the following sequence happens when having a netconsole
over a vlan and we remove the vlan while disabling the netconsole:
	CPU 1					CPU2
					removes vlan and calls the notifier
enters store_enabled(), calls
netdev_cleanup which checks np->dev
and then waits for rtnl
					executes the netconsole netdev
					release notifier making np->dev
					== NULL and releases rtnl
continues to dereference a member of
np->dev which at this point is == NULL

Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_reply

2013-10-13T23:08:29+00:00

[ Upstream commit b0dd663b60944a3ce86430fa35549fb37968bda0 ]

The received ARP request type in the Ethernet packet head is ETH_P_ARP other than ETH_P_IP.

[ Bug introduced by commit b7394d2429c198b1da3d46ac39192e891029ec0f
  ("netpoll: prepare for ipv6") ]

Signed-off-by: Sonic Zhang 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

netpoll: inverted down_trylock() test

2013-05-06T15:06:52+00:00

The return value is reversed from mutex_trylock().

Signed-off-by: Dan Carpenter 
Signed-off-by: David S. Miller

netpoll: convert mutex into a semaphore

2013-05-01T19:00:24+00:00

Bart Van Assche recently reported a warning to me:

  [] warn_slowpath_common+0x7f/0xc0
[] warn_slowpath_null+0x1a/0x20
[] mutex_trylock+0x16d/0x180
[] netpoll_poll_dev+0x49/0xc30
[] ? __alloc_skb+0x82/0x2a0
[] netpoll_send_skb_on_dev+0x265/0x410
[] netpoll_send_udp+0x28a/0x3a0
[] ? write_msg+0x53/0x110 [netconsole]
[] write_msg+0xcf/0x110 [netconsole]
[] call_console_drivers.constprop.17+0xa1/0x1c0
[] console_unlock+0x2d6/0x450
[] vprintk_emit+0x1ee/0x510
[] printk+0x4d/0x4f
[] scsi_print_command+0x7d/0xe0 [scsi_mod]

This resulted from my commit ca99ca14c which introduced a mutex_trylock
operation in a path that could execute in interrupt context.  When mutex
debugging is enabled, the above warns the user when we are in fact
exectuting in interrupt context
interrupt context.

After some discussion, It seems that a semaphore is the proper mechanism to use
here.  While mutexes are defined to be unusable in interrupt context, no such
condition exists for semaphores (save for the fact that the non blocking api
calls, like up and down_trylock must be used when in irq context).

Signed-off-by: Neil Horman 
Reported-by: Bart Van Assche 
CC: Bart Van Assche 
CC: David Miller 
CC: netdev@vger.kernel.org
Signed-off-by: David S. Miller

net: vlan: add protocol argument to packet tagging functions

2013-04-19T18:46:06+00:00

Add a protocol argument to the VLAN packet tagging functions. In case of HW
tagging, we need that protocol available in the ndo_start_xmit functions,
so it is stored in a new field in the skb. The new field fits into a hole
(on 64 bit) and doesn't increase the sks's size.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*

2013-04-19T18:45:26+00:00

Rename the hardware VLAN acceleration features to include "CTAG" to indicate
that they only support CTAGs. Follow up patches will introduce 802.1ad
server provider tagging (STAGs) and require the distinction for hardware not
supporting acclerating both.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

netpoll: use DEFINE_STATIC_SRCU() to define netpoll_srcu

2013-03-17T16:42:43+00:00

DEFINE_STATIC_SRCU() defines srcu struct and do init at build time.

Signed-off-by: Lai Jiangshan 
Signed-off-by: David S. Miller

netpoll: fix smatch warnings in netpoll core code

2013-02-13T16:56:46+00:00

Dan Carpenter contacted me with some notes regarding some smatch warnings in the
netpoll code, some of which I introduced with my recent netpoll locking fixes,
some which were there prior.   Specifically they were:

net-next/net/core/netpoll.c:243 netpoll_poll_dev() warn: inconsistent
  returns mutex:&ni->dev_lock: locked (213,217) unlocked (210,243)
net-next/net/core/netpoll.c:706 netpoll_neigh_reply() warn: potential
  pointer math issue ('skb_transport_header(send_skb)' is a 128 bit pointer)

This patch corrects the locking imbalance (the first error), and adds some
parenthesis to correct the second error.  Tested by myself. Applies to net-next

Signed-off-by: Neil Horman 
CC: Dan Carpenter 
CC: "David S. Miller" 
Signed-off-by: David S. Miller

netpoll: cleanup sparse warnings

2013-02-12T00:19:58+00:00

With my recent commit I introduced two sparse warnings.  Looking closer there
were a few more in the same file, so I fixed them all up.  Basic rcu pointer
dereferencing suff.

I've validated these changes using CONFIG_PROVE_RCU while starting and stopping
netconsole repeatedly in bonded and non-bonded configurations

Signed-off-by: Neil Horman 
CC: fengguang.wu@intel.com
CC: David Miller 
CC: eric.dumazet@gmail.com

Signed-off-by: David S. Miller