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

net/mlx5: E-Switch, Use xarray for vport number to vport and rep mapping 



Currently vport number to vport and its representor are mapped using an
array and an index.

Vport numbers of different types of functions are not contiguous. Adding
new such discontiguous range using index and number mapping is increasingly
complex and hard to maintain.

Hence, maintain an xarray of vport and rep whose lookup is done based on
the vport number.
Each VF and SF entry is marked with a xarray mark to identify the function
type. Additionally PF and VF needs special handling for legacy inline
mode. They are additionally marked as host function using additional
HOST_FN mark.

Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarVu Pham <vuhuong@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 9f8c7100

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int esw_acl_egress_lgcy_setup(struct mlx5_eswitch *esw, 
	}



	if (!vport->egress.acl) {

		vport->egress.acl = esw_acl_table_create(esw, vport->vport,

		vport->egress.acl = esw_acl_table_create(esw, vport,

							 MLX5_FLOW_NAMESPACE_ESW_EGRESS,

							 table_size);

		if (IS_ERR(vport->egress.acl)) {

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void esw_acl_egress_ofld_groups_destroy(struct mlx5_vport *vport) 
	esw_acl_egress_vlan_grp_destroy(vport);

}



static bool esw_acl_egress_needed(const struct mlx5_eswitch *esw, u16 vport_num)

static bool esw_acl_egress_needed(struct mlx5_eswitch *esw, u16 vport_num)

{

	return mlx5_eswitch_is_vf_vport(esw, vport_num) || mlx5_esw_is_sf_vport(esw, vport_num);

}
@@ -171,7 +171,7 @@ int esw_acl_egress_ofld_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport 
		table_size++;

	if (MLX5_CAP_GEN(esw->dev, prio_tag_required))

		table_size++;

	vport->egress.acl = esw_acl_table_create(esw, vport->vport,

	vport->egress.acl = esw_acl_table_create(esw, vport,

						 MLX5_FLOW_NAMESPACE_ESW_EGRESS, table_size);

	if (IS_ERR(vport->egress.acl)) {

		err = PTR_ERR(vport->egress.acl);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c

+4 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
#include "helper.h"



struct mlx5_flow_table *

esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size)

esw_acl_table_create(struct mlx5_eswitch *esw, struct mlx5_vport *vport, int ns, int size)

{

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;

	struct mlx5_flow_table *acl;

	int acl_supported;

	int vport_index;

	u16 vport_num;

	int err;



	acl_supported = (ns == MLX5_FLOW_NAMESPACE_ESW_INGRESS) ?
@@ -23,11 +23,11 @@ esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size) 
	if (!acl_supported)

		return ERR_PTR(-EOPNOTSUPP);



	vport_num = vport->vport;

	esw_debug(dev, "Create vport[%d] %s ACL table\n", vport_num,

		  ns == MLX5_FLOW_NAMESPACE_ESW_INGRESS ? "ingress" : "egress");



	vport_index = mlx5_eswitch_vport_num_to_index(esw, vport_num);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, ns, vport_index);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, ns, vport->index);

	if (!root_ns) {

		esw_warn(dev, "Failed to get E-Switch root namespace for vport (%d)\n",

			 vport_num);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


/* General acl helper functions */

struct mlx5_flow_table *

esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size);

esw_acl_table_create(struct mlx5_eswitch *esw, struct mlx5_vport *vport, int ns, int size);



/* Egress acl helper functions */

void esw_acl_egress_table_destroy(struct mlx5_vport *vport);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw, 
	}



	if (!vport->ingress.acl) {

		vport->ingress.acl = esw_acl_table_create(esw, vport->vport,

		vport->ingress.acl = esw_acl_table_create(esw, vport,

							  MLX5_FLOW_NAMESPACE_ESW_INGRESS,

							  table_size);

		if (IS_ERR(vport->ingress.acl)) {