Commit 406493a5 authored by Vu Pham's avatar Vu Pham Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Dedicated metadata for uplink vport 



Uplink vport must have a dedicated metadata with vhca_id
being part of the metadata.

Fixes: 133dcfc5 ("net/mlx5: E-Switch, Alloc and free unique metadata for match")
Signed-off-by: default avatarVu Pham <vuhuong@mellanox.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4e9a9ef7

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

+1 −4
Original line number Diff line number Diff line
@@ -1908,9 +1908,6 @@ void mlx5_esw_match_metadata_free(struct mlx5_eswitch *esw, u32 metadata) 
static int esw_offloads_vport_metadata_setup(struct mlx5_eswitch *esw,

					     struct mlx5_vport *vport)

{

	if (vport->vport == MLX5_VPORT_UPLINK)

		return 0;



	vport->default_metadata = mlx5_esw_match_metadata_alloc(esw);

	vport->metadata = vport->default_metadata;

	return vport->metadata ? 0 : -ENOSPC;
@@ -1919,7 +1916,7 @@ static int esw_offloads_vport_metadata_setup(struct mlx5_eswitch *esw, 
static void esw_offloads_vport_metadata_cleanup(struct mlx5_eswitch *esw,

						struct mlx5_vport *vport)

{

	if (vport->vport == MLX5_VPORT_UPLINK || !vport->default_metadata)

	if (!vport->default_metadata)

		return;



	WARN_ON(vport->metadata != vport->default_metadata);