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

Commit ec1366c2 authored by Oz Shlomo's avatar Oz Shlomo Committed by Saeed Mahameed
Browse files

net/mlx5e: Store eswitch uplink representor state on a dedicated struct 



Currently only a single field in the representor private structure
is relevant for uplink representors.  As a pre-step to allow adding
additional uplink representor fields, introduce uplink representor
private structure.

This is prepration step towards replacing egdev logic with the
indirect block notification mechanism. This patch doesn't change
any functionality.

Signed-off-by: default avatarOz Shlomo <ozsh@mellanox.com>
Reviewed-by: default avatarEli Britstein <elibr@mellanox.com>
Acked-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2f62747c

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

+3 −3
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ mlx5e_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
{

	struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);

	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);



	struct mlx5_rep_uplink_priv *uplink_priv = &rpriv->uplink_priv;

	int err;



	if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
@@ -1258,7 +1258,7 @@ mlx5e_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
		goto err_remove_sqs;



	/* init shared tc flow table */

	err = mlx5e_tc_esw_init(&rpriv->tc_ht);

	err = mlx5e_tc_esw_init(&uplink_priv->tc_ht);

	if (err)

		goto  err_neigh_cleanup;
@@ -1281,7 +1281,7 @@ mlx5e_nic_rep_unload(struct mlx5_eswitch_rep *rep) 
		mlx5e_remove_sqs_fwd_rules(priv);



	/* clean uplink offloaded TC rules, delete shared tc flow table */

	mlx5e_tc_esw_cleanup(&rpriv->tc_ht);

	mlx5e_tc_esw_cleanup(&rpriv->uplink_priv.tc_ht);



	mlx5e_rep_neigh_cleanup(rpriv);

}

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

+8 −1
Original line number Diff line number Diff line
@@ -53,13 +53,20 @@ struct mlx5e_neigh_update_table { 
	unsigned long           min_interval; /* jiffies */

};



struct mlx5_rep_uplink_priv {

	/* Filters DB - instantiated by the uplink representor and shared by

	 * the uplink's VFs

	 */

	struct rhashtable  tc_ht;

};



struct mlx5e_rep_priv {

	struct mlx5_eswitch_rep *rep;

	struct mlx5e_neigh_update_table neigh_update;

	struct net_device      *netdev;

	struct mlx5_flow_handle *vport_rx_rule;

	struct list_head       vport_sqs_list;

	struct rhashtable      tc_ht; /* valid for uplink rep */

	struct mlx5_rep_uplink_priv uplink_priv; /* valid for uplink rep */

};



static inline

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

+1 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,7 @@ static struct rhashtable *get_tc_ht(struct mlx5e_priv *priv) 


	if (MLX5_VPORT_MANAGER(priv->mdev) && esw->mode == SRIOV_OFFLOADS) {

		uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);

		return &uplink_rpriv->tc_ht;

		return &uplink_rpriv->uplink_priv.tc_ht;

	} else

		return &priv->fs.tc.ht;

}