d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix deadlock of link status alarm

Browse Source 
If mlx5_dev_link_status_handler() is executed while canceling the alarm,
deadlock can happen because rte_eal_alarm_cancel() waits for all callbackes
to finish execution and both calls are protected by priv->lock.

Fixes: 198a3c339a8f ("mlx5: handle link status interrupts")
Cc: stable@dpdk.org

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
This commit is contained in:
Yongseok Koh 2018-01-10 09:46:49 -08:00 committed by Ferruh Yigit
parent dd18b06a32
commit 6817ad3871
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/mlx5/mlx5.h
View File

@ -179,6 +179,22 @@ priv_lock(struct priv *priv)
rte_spinlock_lock(&priv->lock);
}
/**
* Try to lock private structure to protect it from concurrent access in the
* control path.
*
* @param priv
* Pointer to private structure.
*
* @return
* 1 if the lock is successfully taken; 0 otherwise.
*/
static inline int
priv_trylock(struct priv *priv)
{
return rte_spinlock_trylock(&priv->lock);
}
/**
* Unlock private structure.
*

13
drivers/net/mlx5/mlx5_ethdev.c
View File

@ -1187,8 +1187,12 @@ mlx5_dev_link_status_handler(void *arg)
struct priv *priv = dev->data->dev_private;
int ret;
priv_lock(priv);
assert(priv->pending_alarm == 1);
while (!priv_trylock(priv)) {
/* Alarm is being canceled. */
if (priv->pending_alarm == 0)
return;
rte_pause();
}
priv->pending_alarm = 0;
ret = priv_link_status_update(priv);
priv_unlock(priv);
@ -1255,9 +1259,10 @@ priv_dev_interrupt_handler_uninstall(struct priv *priv, struct rte_eth_dev *dev)
if (priv->primary_socket)
rte_intr_callback_unregister(&priv->intr_handle_socket,
mlx5_dev_handler_socket, dev);
if (priv->pending_alarm)
if (priv->pending_alarm) {
priv->pending_alarm = 0;
rte_eal_alarm_cancel(mlx5_dev_link_status_handler, dev);
priv->pending_alarm = 0;
}
priv->intr_handle.fd = 0;
priv->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
priv->intr_handle_socket.fd = 0;