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

net/mlx5: fix memory region cleanup

Browse Source 
mlx5 driver has a global list of Memory Regions created by
device, and there is a ml5_mr_release() routine which makes
a memory cleanup at device closing. The head of device MR list
was fetched outside the rwlock protected section. Also some
noticed typos are fixed.

Fixes: 974f1e7ef1 ("net/mlx5: add new memory region support")
Cc: stable@dpdk.org

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
This commit is contained in:
Viacheslav Ovsiienko 2019-04-12 15:45:27 +00:00 committed by Ferruh Yigit
parent 98e91784d9
commit f8753eae84
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,7 +466,7 @@ mr_free(struct mlx5_mr *mr)
} }
/** /**
* Releass resources of detached MR having no online entry. * Release resources of detached MR having no online entry.
* *
* @param dev * @param dev
* Pointer to Ethernet device. * Pointer to Ethernet device.
@ -516,7 +516,7 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list *msl,
} }
/** /**
* Create a new global Memroy Region (MR) for a missing virtual address. * Create a new global Memory Region (MR) for a missing virtual address.
* This API should be called on a secondary process, then a request is sent to * This API should be called on a secondary process, then a request is sent to
* the primary process in order to create a MR for the address. As the global MR * the primary process in order to create a MR for the address. As the global MR
* list is on the shared memory, following LKey lookup should succeed unless the * list is on the shared memory, following LKey lookup should succeed unless the
@ -562,7 +562,7 @@ mlx5_mr_create_secondary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,
} }
/** /**
* Create a new global Memroy Region (MR) for a missing virtual address. * Create a new global Memory Region (MR) for a missing virtual address.
* Register entire virtually contiguous memory chunk around the address. * Register entire virtually contiguous memory chunk around the address.
* This must be called from the primary process. * This must be called from the primary process.
* *
@ -673,7 +673,7 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,
bmp_mem = RTE_PTR_ALIGN_CEIL(mr + 1, RTE_CACHE_LINE_SIZE); bmp_mem = RTE_PTR_ALIGN_CEIL(mr + 1, RTE_CACHE_LINE_SIZE);
mr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size); mr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size);
if (mr->ms_bmp == NULL) { if (mr->ms_bmp == NULL) {
DEBUG("port %u unable to initialize bitamp for a new MR of" DEBUG("port %u unable to initialize bitmap for a new MR of"
" address (%p).", " address (%p).",
dev->data->port_id, (void *)addr); dev->data->port_id, (void *)addr);
rte_errno = EINVAL; rte_errno = EINVAL;
@ -811,7 +811,7 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,
} }
/** /**
* Create a new global Memroy Region (MR) for a missing virtual address. * Create a new global Memory Region (MR) for a missing virtual address.
* This can be called from primary and secondary process. * This can be called from primary and secondary process.
* *
* @param dev * @param dev
@ -1600,7 +1600,7 @@ void
mlx5_mr_release(struct rte_eth_dev *dev) mlx5_mr_release(struct rte_eth_dev *dev)
{ {
struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_mr *mr_next = LIST_FIRST(&priv->mr.mr_list); struct mlx5_mr *mr_next;
/* Remove from memory callback device list. */ /* Remove from memory callback device list. */
rte_rwlock_write_lock(&mlx5_shared_data->mem_event_rwlock); rte_rwlock_write_lock(&mlx5_shared_data->mem_event_rwlock);
@ -1610,6 +1610,7 @@ mlx5_mr_release(struct rte_eth_dev *dev)
mlx5_mr_dump_dev(dev); mlx5_mr_dump_dev(dev);
rte_rwlock_write_lock(&priv->mr.rwlock); rte_rwlock_write_lock(&priv->mr.rwlock);
/* Detach from MR list and move to free list. */ /* Detach from MR list and move to free list. */
mr_next = LIST_FIRST(&priv->mr.mr_list);
while (mr_next != NULL) { while (mr_next != NULL) {
struct mlx5_mr *mr = mr_next; struct mlx5_mr *mr = mr_next;