Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ffe63e authored by Eli Cohen's avatar Eli Cohen Committed by David S. Miller
Browse files

net/mlx5_core: Fix notification of page supplement error 



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: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be87544d

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

+37 −26
Original line number Diff line number Diff line
@@ -275,12 +275,36 @@ static int alloc_system_page(struct mlx5_core_dev *dev, u16 func_id) 


	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,

		      int notify_fail)

{

	struct mlx5_manage_pages_inbox *in;

	struct mlx5_manage_pages_outbox out;

	struct mlx5_manage_pages_inbox *nin;

	int inlen;

	u64 addr;

	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]);

	in = mlx5_vzalloc(inlen);

	if (!in) {

		err = -ENOMEM;

		mlx5_core_warn(dev, "vzalloc failed %d\n", inlen);

		return -ENOMEM;

		goto out_free;

	}

	memset(&out, 0, sizeof(out));
@@ -316,43 +341,29 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages, 
	if (err) {

		mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n",

			       func_id, npages, err);

		goto out_alloc;

		goto out_4k;

	}

	dev->priv.fw_pages += npages;



	if (out.hdr.status) {

	err = mlx5_cmd_status_to_err(&out.hdr);

	if (err) {

		mlx5_core_warn(dev, "func_id 0x%x, npages %d, status %d\n",

			       func_id, npages, out.hdr.status);

			goto out_alloc;

		}

		goto out_4k;

	}



	mlx5_core_dbg(dev, "err %d\n", err);



	goto out_free;



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);

	}

	kvfree(in);

	return 0;



out_4k:

	for (i--; i >= 0; i--)

		free_4k(dev, be64_to_cpu(in->pas[i]));

out_free:

	kvfree(in);

	if (notify_fail)

		page_notify_fail(dev, func_id);

	return err;

}