iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ehea: Fix kernel deadlock in DLPAR-mem processing

Browse Source 
Port reset operations and memory add/remove operations need to
be serialized to avoid a kernel deadlock. The deadlock is caused
by calling the napi_disable() function twice.
Therefore we have to employ the dlpar_mem_lock in the ehea_reset_port
function as well

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan-Bernd Themann 2010-06-15 05:35:42 +00:00 committed by David S. Miller
parent a91fb143de
commit 099473c16b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ehea/ehea.h
View File

@ -40,7 +40,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ehea" #define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0103" #define DRV_VERSION "EHEA_0105"
/* eHEA capability flags */ /* eHEA capability flags */
#define DLPAR_PORT_ADD_REM 1 #define DLPAR_PORT_ADD_REM 1

8
drivers/net/ehea/ehea_main.c
View File

@ -2860,6 +2860,7 @@ static void ehea_reset_port(struct work_struct *work)
container_of(work, struct ehea_port, reset_task); container_of(work, struct ehea_port, reset_task);
struct net_device *dev = port->netdev; struct net_device *dev = port->netdev;
mutex_lock(&dlpar_mem_lock);
port->resets++; port->resets++;
mutex_lock(&port->port_lock); mutex_lock(&port->port_lock);
netif_stop_queue(dev); netif_stop_queue(dev);
@ -2882,6 +2883,7 @@ static void ehea_reset_port(struct work_struct *work)
netif_wake_queue(dev); netif_wake_queue(dev);
out: out:
mutex_unlock(&port->port_lock); mutex_unlock(&port->port_lock);
mutex_unlock(&dlpar_mem_lock);
} }
static void ehea_rereg_mrs(struct work_struct *work) static void ehea_rereg_mrs(struct work_struct *work)
@ -3543,10 +3545,7 @@ static int ehea_mem_notifier(struct notifier_block *nb,
int ret = NOTIFY_BAD; int ret = NOTIFY_BAD;
struct memory_notify *arg = data; struct memory_notify *arg = data;
if (!mutex_trylock(&dlpar_mem_lock)) { mutex_lock(&dlpar_mem_lock);
ehea_info("ehea_mem_notifier must not be called parallelized");
goto out;
}
switch (action) { switch (action) {
case MEM_CANCEL_OFFLINE: case MEM_CANCEL_OFFLINE:
@ -3575,7 +3574,6 @@ static int ehea_mem_notifier(struct notifier_block *nb,
out_unlock: out_unlock:
mutex_unlock(&dlpar_mem_lock); mutex_unlock(&dlpar_mem_lock);
out:
return ret; return ret;
} }