Commit ba5d8f72 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Fix setting ec_function bit in MANAGE_PAGES 



When ECPF is a page supplier, reclaim pages missed to honor the
ec_function bit provided by the firmware. It always used the ec_function
to true during driver unload flow for ECPF. This is incorrect.

Honor the ec_function bit provided by device during page allocation
request event.

Fixes: d6945242 ("net/mlx5: Hold pages RB tree per VF")
Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Signed-off-by: default avatarDaniel Jurgens <danielj@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 9a92fe1d

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

+17 −5
Original line number Diff line number Diff line
@@ -82,6 +82,16 @@ static u16 func_id_to_type(struct mlx5_core_dev *dev, u16 func_id, bool ec_funct 
	return func_id <= mlx5_core_max_vfs(dev) ?  MLX5_VF : MLX5_SF;

}



static u32 mlx5_get_ec_function(u32 function)

{

	return function >> 16;

}



static u32 mlx5_get_func_id(u32 function)

{

	return function & 0xffff;

}



static struct rb_root *page_root_per_function(struct mlx5_core_dev *dev, u32 function)

{

	struct rb_root *root;
@@ -665,20 +675,22 @@ static int optimal_reclaimed_pages(void) 
}



static int mlx5_reclaim_root_pages(struct mlx5_core_dev *dev,

				   struct rb_root *root, u16 func_id)

				   struct rb_root *root, u32 function)

{

	u64 recl_pages_to_jiffies = msecs_to_jiffies(mlx5_tout_ms(dev, RECLAIM_PAGES));

	unsigned long end = jiffies + recl_pages_to_jiffies;



	while (!RB_EMPTY_ROOT(root)) {

		u32 ec_function = mlx5_get_ec_function(function);

		u32 function_id = mlx5_get_func_id(function);

		int nclaimed;

		int err;



		err = reclaim_pages(dev, func_id, optimal_reclaimed_pages(),

				    &nclaimed, false, mlx5_core_is_ecpf(dev));

		err = reclaim_pages(dev, function_id, optimal_reclaimed_pages(),

				    &nclaimed, false, ec_function);

		if (err) {

			mlx5_core_warn(dev, "failed reclaiming pages (%d) for func id 0x%x\n",

				       err, func_id);

			mlx5_core_warn(dev, "reclaim_pages err (%d) func_id=0x%x ec_func=0x%x\n",

				       err, function_id, ec_function);

			return err;

		}