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

Commit 9deb2241 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5: E-Switch, Set the vport when registering the uplink rep 



Set the vport value in the PF entry to be that of the uplink so
we can use it blindly over the tc / eswitch offload code without
translating it each time we deal with the uplink representor.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53e89941

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

+3 −3
Original line number Diff line number Diff line
@@ -3726,9 +3726,9 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 
		mlx5_query_nic_vport_mac_address(mdev, 0, rep.hw_id);

		rep.load = mlx5e_nic_rep_load;

		rep.unload = mlx5e_nic_rep_unload;

		rep.vport = 0;

		rep.vport = FDB_UPLINK_VPORT;

		rep.priv_data = priv;

		mlx5_eswitch_register_vport_rep(esw, &rep);

		mlx5_eswitch_register_vport_rep(esw, 0, &rep);

	}

}
@@ -3867,7 +3867,7 @@ static void mlx5e_register_vport_rep(struct mlx5_core_dev *mdev) 
		rep.unload = mlx5e_vport_rep_unload;

		rep.vport = vport;

		ether_addr_copy(rep.hw_id, mac);

		mlx5_eswitch_register_vport_rep(esw, &rep);

		mlx5_eswitch_register_vport_rep(esw, vport, &rep);

	}

}

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

+2 −8
Original line number Diff line number Diff line
@@ -120,10 +120,7 @@ static struct mlx5_flow_rule *mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	struct mlx5_eswitch_rep *rep = priv->ppriv;

	u32 src_vport;



	if (rep->vport) /* set source vport for the flow */

	src_vport = rep->vport;

	else

		src_vport = FDB_UPLINK_VPORT;



	return mlx5_eswitch_add_offloaded_rule(esw, spec, action, src_vport, dst_vport);

}
@@ -399,9 +396,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 


			out_priv = netdev_priv(out_dev);

			out_rep  = out_priv->ppriv;

			if (out_rep->vport == 0)

				*dest_vport = FDB_UPLINK_VPORT;

			else

			*dest_vport = out_rep->vport;

			*action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

			continue;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+2 −1
Original line number Diff line number Diff line
@@ -254,9 +254,10 @@ void mlx5_eswitch_sqs2vport_stop(struct mlx5_eswitch *esw, 
int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode);

int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode);

void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

				     int vport_index,

				     struct mlx5_eswitch_rep *rep);

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport);

				       int vport_index);



#define MLX5_DEBUG_ESWITCH_MASK BIT(3)

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

+13 −14
Original line number Diff line number Diff line
@@ -144,16 +144,12 @@ int mlx5_eswitch_sqs2vport_start(struct mlx5_eswitch *esw, 
{

	struct mlx5_flow_rule *flow_rule;

	struct mlx5_esw_sq *esw_sq;

	int vport;

	int err;

	int i;



	if (esw->mode != SRIOV_OFFLOADS)

		return 0;



	vport = rep->vport == 0 ?

		FDB_UPLINK_VPORT : rep->vport;



	for (i = 0; i < sqns_num; i++) {

		esw_sq = kzalloc(sizeof(*esw_sq), GFP_KERNEL);

		if (!esw_sq) {
@@ -163,7 +159,7 @@ int mlx5_eswitch_sqs2vport_start(struct mlx5_eswitch *esw, 


		/* Add re-inject rule to the PF/representor sqs */

		flow_rule = mlx5_eswitch_add_send_to_vport_rule(esw,

								vport,

								rep->vport,

								sqns_array[i]);

		if (IS_ERR(flow_rule)) {

			err = PTR_ERR(flow_rule);
@@ -620,27 +616,30 @@ int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode) 
}



void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

				     struct mlx5_eswitch_rep *rep)

				     int vport_index,

				     struct mlx5_eswitch_rep *__rep)

{

	struct mlx5_esw_offload *offloads = &esw->offloads;

	struct mlx5_eswitch_rep *rep;



	rep = &offloads->vport_reps[vport_index];



	memcpy(&offloads->vport_reps[rep->vport], rep,

	       sizeof(struct mlx5_eswitch_rep));

	memcpy(rep, __rep, sizeof(struct mlx5_eswitch_rep));



	INIT_LIST_HEAD(&offloads->vport_reps[rep->vport].vport_sqs_list);

	offloads->vport_reps[rep->vport].valid = true;

	INIT_LIST_HEAD(&rep->vport_sqs_list);

	rep->valid = true;

}



void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport)

				       int vport_index)

{

	struct mlx5_esw_offload *offloads = &esw->offloads;

	struct mlx5_eswitch_rep *rep;



	rep = &offloads->vport_reps[vport];

	rep = &offloads->vport_reps[vport_index];



	if (esw->mode == SRIOV_OFFLOADS && esw->vports[vport].enabled)

	if (esw->mode == SRIOV_OFFLOADS && esw->vports[vport_index].enabled)

		rep->unload(esw, rep);



	offloads->vport_reps[vport].valid = false;

	rep->valid = false;

}