Commit 36915976 authored by Aurelien Jacquiot's avatar Aurelien Jacquiot Committed by Linus Torvalds

rapidio/rionet: fix deadlock on SMP

Fix deadlocking during concurrent receive and transmit operations on SMP
platforms caused by the use of incorrect lock: on transmit 'tx_lock'
spinlock should be used instead of 'lock' which is used for receive
operation.

This fix is applicable to kernel versions starting from v2.15.
Signed-off-by: default avatarAurelien Jacquiot <a-jacquiot@ti.com>
Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95f27356
...@@ -280,7 +280,7 @@ static void rionet_outb_msg_event(struct rio_mport *mport, void *dev_id, int mbo ...@@ -280,7 +280,7 @@ static void rionet_outb_msg_event(struct rio_mport *mport, void *dev_id, int mbo
struct net_device *ndev = dev_id; struct net_device *ndev = dev_id;
struct rionet_private *rnet = netdev_priv(ndev); struct rionet_private *rnet = netdev_priv(ndev);
spin_lock(&rnet->lock); spin_lock(&rnet->tx_lock);
if (netif_msg_intr(rnet)) if (netif_msg_intr(rnet))
printk(KERN_INFO printk(KERN_INFO
...@@ -299,7 +299,7 @@ static void rionet_outb_msg_event(struct rio_mport *mport, void *dev_id, int mbo ...@@ -299,7 +299,7 @@ static void rionet_outb_msg_event(struct rio_mport *mport, void *dev_id, int mbo
if (rnet->tx_cnt < RIONET_TX_RING_SIZE) if (rnet->tx_cnt < RIONET_TX_RING_SIZE)
netif_wake_queue(ndev); netif_wake_queue(ndev);
spin_unlock(&rnet->lock); spin_unlock(&rnet->tx_lock);
} }
static int rionet_open(struct net_device *ndev) static int rionet_open(struct net_device *ndev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment