evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/mlx5_core: Fix notification of page supplement error

Browse source 
Some errors did not result with notifying firmware that the page request
could not be fulfilled. Fix this and put the notification logic into a
separate function.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eli Cohen 2015-09-25 10:49:13 +03:00 • committed by David S. Miller
parent be87544de8
commit a8ffe63e60
1 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
View file

@ -275,12 +275,36 @@ out_alloc:
return err; return err;
} }
static void page_notify_fail(struct mlx5_core_dev *dev, u16 func_id)
{
struct mlx5_manage_pages_inbox *in;
struct mlx5_manage_pages_outbox out;
int err;
in = kzalloc(sizeof(*in), GFP_KERNEL);
if (!in)
return;
memset(&out, 0, sizeof(out));
in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_MANAGE_PAGES);
in->hdr.opmod = cpu_to_be16(MLX5_PAGES_CANT_GIVE);
in->func_id = cpu_to_be16(func_id);
err = mlx5_cmd_exec(dev, in, sizeof(*in), &out, sizeof(out));
if (!err)
err = mlx5_cmd_status_to_err(&out.hdr);
if (err)
mlx5_core_warn(dev, "page notify failed\n");
kfree(in);
}
static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages, static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
int notify_fail) int notify_fail)
{ {
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;
int inlen; int inlen;
u64 addr; u64 addr;
int err; int err;
@ -289,8 +313,9 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
inlen = sizeof(*in) + npages * sizeof(in->pas[0]); inlen = sizeof(*in) + npages * sizeof(in->pas[0]);
in = mlx5_vzalloc(inlen); in = mlx5_vzalloc(inlen);
if (!in) { if (!in) {
err = -ENOMEM;
mlx5_core_warn(dev, "vzalloc failed %d\n", inlen); mlx5_core_warn(dev, "vzalloc failed %d\n", inlen);
return -ENOMEM; goto out_free;
} }
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
@ -316,43 +341,29 @@ retry:
if (err) { if (err) {
mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n", mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n",
func_id, npages, err); func_id, npages, err);
goto out_alloc; goto out_4k;
} }
dev->priv.fw_pages += npages; dev->priv.fw_pages += npages;
if (out.hdr.status) { err = mlx5_cmd_status_to_err(&out.hdr);
err = mlx5_cmd_status_to_err(&out.hdr); if (err) {
if (err) { mlx5_core_warn(dev, "func_id 0x%x, npages %d, status %d\n",
mlx5_core_warn(dev, "func_id 0x%x, npages %d, status %d\n", func_id, npages, out.hdr.status);
func_id, npages, out.hdr.status); goto out_4k;
goto out_alloc;
}
} }
mlx5_core_dbg(dev, "err %d\n", err); mlx5_core_dbg(dev, "err %d\n", err);
goto out_free; kvfree(in);
return 0;
out_alloc:
if (notify_fail) {
nin = kzalloc(sizeof(*nin), GFP_KERNEL);
if (!nin) {
mlx5_core_warn(dev, "allocation failed\n");
goto out_4k;
}
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);
}
out_4k: out_4k:
for (i--; i >= 0; i--) for (i--; i >= 0; i--)
free_4k(dev, be64_to_cpu(in->pas[i])); free_4k(dev, be64_to_cpu(in->pas[i]));
out_free: out_free:
kvfree(in); kvfree(in);
if (notify_fail)
page_notify_fail(dev, func_id);
return err; return err;
} }