Skip to content

Commit 2e50b26

Browse files
Inbar KarmySaeed Mahameed
authored andcommitted
net/mlx5e: Set page to null in case dma mapping fails
Currently, when dma mapping fails, put_page is called, but the page is not set to null. Later, in the page_reuse treatment in mlx5e_free_rx_descs(), mlx5e_page_release() is called for the second time, improperly doing dma_unmap (for a non-mapped address) and an extra put_page. Prevent this by nullifying the page pointer when dma_map fails. Fixes: accd588 ("net/mlx5e: Introduce RX Page-Reuse") Signed-off-by: Inbar Karmy <[email protected]> Reviewed-by: Tariq Toukan <[email protected]> Cc: [email protected] Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 2a8d606 commit 2e50b26

File tree

1 file changed

+5
-7
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+5
-7
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,22 +215,20 @@ static inline bool mlx5e_rx_cache_get(struct mlx5e_rq *rq,
215215
static inline int mlx5e_page_alloc_mapped(struct mlx5e_rq *rq,
216216
struct mlx5e_dma_info *dma_info)
217217
{
218-
struct page *page;
219-
220218
if (mlx5e_rx_cache_get(rq, dma_info))
221219
return 0;
222220

223-
page = dev_alloc_pages(rq->buff.page_order);
224-
if (unlikely(!page))
221+
dma_info->page = dev_alloc_pages(rq->buff.page_order);
222+
if (unlikely(!dma_info->page))
225223
return -ENOMEM;
226224

227-
dma_info->addr = dma_map_page(rq->pdev, page, 0,
225+
dma_info->addr = dma_map_page(rq->pdev, dma_info->page, 0,
228226
RQ_PAGE_SIZE(rq), rq->buff.map_dir);
229227
if (unlikely(dma_mapping_error(rq->pdev, dma_info->addr))) {
230-
put_page(page);
228+
put_page(dma_info->page);
229+
dma_info->page = NULL;
231230
return -ENOMEM;
232231
}
233-
dma_info->page = page;
234232

235233
return 0;
236234
}

0 commit comments

Comments
 (0)