diff options
| author | Adrien Mazarguil <adrien.mazarguil@6wind.com> | 2018-05-24 16:36:49 +0200 |
|---|---|---|
| committer | Shahaf Shuler <shahafs@mellanox.com> | 2018-05-28 07:50:38 +0200 |
| commit | e89c15b6971e5040296dc69f8739dd629f56a4b2 (patch) | |
| tree | e33faab0b66b959fb6af5b3e7d32df55b0bc910e /drivers/net | |
| parent | f8ad40dc998cfaa5b08d97d813570ec6373dabcc (diff) | |
| download | dpdk-e89c15b6971e5040296dc69f8739dd629f56a4b2.zip dpdk-e89c15b6971e5040296dc69f8739dd629f56a4b2.tar.gz dpdk-e89c15b6971e5040296dc69f8739dd629f56a4b2.tar.xz | |
net/mlx5: fix crash when configure is not called
Although uncommon, applications may destroy a device immediately after
probing it without going through dev_configure() first.
This patch addresses a crash which occurs when mlx5_dev_close() calls
mlx5_mr_release() due to an uninitialized entry in the private structure.
Fixes: 974f1e7ef146 ("net/mlx5: add new memory region support")
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx5/mlx5.c | 7 | ||||
| -rw-r--r-- | drivers/net/mlx5/mlx5_ethdev.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 0066656..dae8474 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -34,6 +34,8 @@ #include <rte_config.h> #include <rte_eal_memconfig.h> #include <rte_kvargs.h> +#include <rte_rwlock.h> +#include <rte_spinlock.h> #include "mlx5.h" #include "mlx5_utils.h" @@ -1191,6 +1193,11 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto port_error; } priv->config.max_verbs_prio = verb_priorities; + /* Add device to memory callback list. */ + rte_rwlock_write_lock(&mlx5_shared_data->mem_event_rwlock); + LIST_INSERT_HEAD(&mlx5_shared_data->mem_event_cb_list, + priv, mem_event_cb); + rte_rwlock_write_unlock(&mlx5_shared_data->mem_event_rwlock); rte_eth_dev_probing_finish(eth_dev); continue; port_error: diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index c52ec6f..f6cebae 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -403,10 +403,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev) /* rte_errno is already set. */ return -rte_errno; } - rte_rwlock_write_lock(&mlx5_shared_data->mem_event_rwlock); - LIST_INSERT_HEAD(&mlx5_shared_data->mem_event_cb_list, - priv, mem_event_cb); - rte_rwlock_write_unlock(&mlx5_shared_data->mem_event_rwlock); return 0; } |