Commit 395ccd6e authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Saeed Mahameed
Browse files

net/mlx5: Add new page type for EC VF pages 



When the embedded cpu supports SRIOV it can be enabled and disabled
independently from the host SRIOV. Track the pages separately so we can
properly wait for returned VF pages.

Signed-off-by: default avatarDaniel Jurgens <danielj@nvidia.com>
Reviewed-by: default avatarWilliam Tu <witu@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent fa3c73ee

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

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ void mlx5_pages_debugfs_init(struct mlx5_core_dev *dev) 


	debugfs_create_u32("fw_pages_total", 0400, pages, &dev->priv.fw_pages);

	debugfs_create_u32("fw_pages_vfs", 0400, pages, &dev->priv.page_counters[MLX5_VF]);

	debugfs_create_u32("fw_pages_ec_vfs", 0400, pages, &dev->priv.page_counters[MLX5_EC_VF]);

	debugfs_create_u32("fw_pages_sfs", 0400, pages, &dev->priv.page_counters[MLX5_SF]);

	debugfs_create_u32("fw_pages_host_pf", 0400, pages, &dev->priv.page_counters[MLX5_HOST_PF]);

	debugfs_create_u32("fw_pages_alloc_failed", 0400, pages, &dev->priv.fw_pages_alloc_failed);

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

+10 −1
Original line number Diff line number Diff line
@@ -79,7 +79,13 @@ static u16 func_id_to_type(struct mlx5_core_dev *dev, u16 func_id, bool ec_funct 
	if (!func_id)

		return mlx5_core_is_ecpf(dev) && !ec_function ? MLX5_HOST_PF : MLX5_PF;



	return func_id <= mlx5_core_max_vfs(dev) ?  MLX5_VF : MLX5_SF;

	if (func_id <= max(mlx5_core_max_vfs(dev), mlx5_core_max_ec_vfs(dev))) {

		if (ec_function)

			return MLX5_EC_VF;

		else

			return MLX5_VF;

	}

	return MLX5_SF;

}



static u32 mlx5_get_ec_function(u32 function)
@@ -730,6 +736,9 @@ int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev) 
	WARN(dev->priv.page_counters[MLX5_HOST_PF],

	     "External host PF FW pages counter is %d after reclaiming all pages\n",

	     dev->priv.page_counters[MLX5_HOST_PF]);

	WARN(dev->priv.page_counters[MLX5_EC_VF],

	     "EC VFs FW pages counter is %d after reclaiming all pages\n",

	     dev->priv.page_counters[MLX5_EC_VF]);



	return 0;

}

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ enum mlx5_func_type { 
	MLX5_VF,

	MLX5_SF,

	MLX5_HOST_PF,

	MLX5_EC_VF,

	MLX5_FUNC_TYPE_NUM,

};