openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlx5: Fix cleanup flow when DMA mapping fails 

If DMA mapping fails, the driver cleared the object that holds the
previously DMA mapped pages. Fix this by allocating a new object for
the command that reports back to firmware that pages can't be
supplied.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Eli Cohen 2013-10-23 09:53:18 +03:00 committed by Roland Dreier
parent cfd8f1d49b
commit 952f5f6e80
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
View File

@ -181,6 +181,7 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
{ {
struct mlx5_manage_pages_inbox *in; struct mlx5_manage_pages_inbox *in;
struct mlx5_manage_pages_outbox out; struct mlx5_manage_pages_outbox out;
struct mlx5_manage_pages_inbox *nin;
struct page *page; struct page *page;
int inlen; int inlen;
u64 addr; u64 addr;
@ -247,13 +248,20 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
out_alloc: out_alloc:
if (notify_fail) { if (notify_fail) {
memset(in, 0, inlen); nin = kzalloc(sizeof(*nin), GFP_KERNEL);
memset(&out, 0, sizeof(out)); if (!nin) {
in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_MANAGE_PAGES); mlx5_core_warn(dev, "allocation failed\n");
in->hdr.opmod = cpu_to_be16(MLX5_PAGES_CANT_GIVE); goto unmap;
if (mlx5_cmd_exec(dev, in, sizeof(*in), &out, sizeof(out)))
mlx5_core_warn(dev, "\n");
} }
memset(&out, 0, sizeof(out));
nin->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_MANAGE_PAGES);
nin->hdr.opmod = cpu_to_be16(MLX5_PAGES_CANT_GIVE);
if (mlx5_cmd_exec(dev, nin, sizeof(*nin), &out, sizeof(out)))
mlx5_core_warn(dev, "page notify failed\n");
kfree(nin);
}
unmap:
for (i--; i >= 0; i--) { for (i--; i >= 0; i--) {
addr = be64_to_cpu(in->pas[i]); addr = be64_to_cpu(in->pas[i]);
page = remove_page(dev, addr); page = remove_page(dev, addr);