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

Commit 726293f1 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx5e: Save the represntor netdevice as part of the representor 



Replace the representor private data to a net_device pointer holding the
representor netdevice, instead of void pointer holding mlx5e_priv.

It will be used by a new eswitch service function, returning the uplink representor
netdevice.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 718f13e7

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3811,7 +3811,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 
		rep.load = mlx5e_nic_rep_load;

		rep.load = mlx5e_nic_rep_load;

		rep.unload = mlx5e_nic_rep_unload;

		rep.unload = mlx5e_nic_rep_unload;

		rep.vport = FDB_UPLINK_VPORT;

		rep.vport = FDB_UPLINK_VPORT;

		rep.priv_data = priv;

		rep.netdev = netdev;

		mlx5_eswitch_register_vport_rep(esw, 0, &rep);

		mlx5_eswitch_register_vport_rep(esw, 0, &rep);

	}

	}

}

}

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

+8 −7
Original line number Original line Diff line number Diff line
@@ -208,7 +208,8 @@ int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv) 




int mlx5e_nic_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

int mlx5e_nic_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

{

{

	struct mlx5e_priv *priv = rep->priv_data;

	struct net_device *netdev = rep->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);





	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

		return mlx5e_add_sqs_fwd_rules(priv);

		return mlx5e_add_sqs_fwd_rules(priv);
@@ -226,7 +227,8 @@ void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv) 
void mlx5e_nic_rep_unload(struct mlx5_eswitch *esw,

void mlx5e_nic_rep_unload(struct mlx5_eswitch *esw,

			  struct mlx5_eswitch_rep *rep)

			  struct mlx5_eswitch_rep *rep)

{

{

	struct mlx5e_priv *priv = rep->priv_data;

	struct net_device *netdev = rep->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);





	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

		mlx5e_remove_sqs_fwd_rules(priv);

		mlx5e_remove_sqs_fwd_rules(priv);
@@ -555,7 +557,7 @@ int mlx5e_vport_rep_load(struct mlx5_eswitch *esw, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	rep->priv_data = netdev_priv(netdev);

	rep->netdev = netdev;





	err = mlx5e_attach_netdev(esw->dev, netdev);

	err = mlx5e_attach_netdev(esw->dev, netdev);

	if (err) {

	if (err) {
@@ -577,7 +579,7 @@ int mlx5e_vport_rep_load(struct mlx5_eswitch *esw, 
	mlx5e_detach_netdev(esw->dev, netdev);

	mlx5e_detach_netdev(esw->dev, netdev);





err_destroy_netdev:

err_destroy_netdev:

	mlx5e_destroy_netdev(esw->dev, rep->priv_data);

	mlx5e_destroy_netdev(esw->dev, netdev_priv(netdev));





	return err;

	return err;
@@ -586,10 +588,9 @@ int mlx5e_vport_rep_load(struct mlx5_eswitch *esw, 
void mlx5e_vport_rep_unload(struct mlx5_eswitch *esw,

void mlx5e_vport_rep_unload(struct mlx5_eswitch *esw,

			    struct mlx5_eswitch_rep *rep)

			    struct mlx5_eswitch_rep *rep)

{

{

	struct mlx5e_priv *priv = rep->priv_data;

	struct net_device *netdev = rep->netdev;

	struct net_device *netdev = priv->netdev;





	unregister_netdev(netdev);

	unregister_netdev(netdev);

	mlx5e_detach_netdev(esw->dev, netdev);

	mlx5e_detach_netdev(esw->dev, netdev);

	mlx5e_destroy_netdev(esw->dev, priv);

	mlx5e_destroy_netdev(esw->dev, netdev_priv(netdev));

}
 
}

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ struct mlx5_eswitch_rep { 
					 struct mlx5_eswitch_rep *rep);

					 struct mlx5_eswitch_rep *rep);

	u16		       vport;

	u16		       vport;

	u8		       hw_id[ETH_ALEN];

	u8		       hw_id[ETH_ALEN];

	void		      *priv_data;

	struct net_device      *netdev;





	struct mlx5_flow_handle *vport_rx_rule;

	struct mlx5_flow_handle *vport_rx_rule;

	struct list_head       vport_sqs_list;

	struct list_head       vport_sqs_list;
@@ -318,6 +318,7 @@ void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw, 
				     struct mlx5_eswitch_rep *rep);

				     struct mlx5_eswitch_rep *rep);

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport_index);

				       int vport_index);

struct net_device *mlx5_eswitch_get_uplink_netdev(struct mlx5_eswitch *esw);





int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,

int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,

				 struct mlx5_esw_flow_attr *attr);

				 struct mlx5_esw_flow_attr *attr);

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

+11 −1
Original line number Original line Diff line number Diff line
@@ -970,7 +970,7 @@ void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw, 
	rep->load   = __rep->load;

	rep->load   = __rep->load;

	rep->unload = __rep->unload;

	rep->unload = __rep->unload;

	rep->vport  = __rep->vport;

	rep->vport  = __rep->vport;

	rep->priv_data = __rep->priv_data;

	rep->netdev = __rep->netdev;

	ether_addr_copy(rep->hw_id, __rep->hw_id);

	ether_addr_copy(rep->hw_id, __rep->hw_id);





	INIT_LIST_HEAD(&rep->vport_sqs_list);

	INIT_LIST_HEAD(&rep->vport_sqs_list);
@@ -990,3 +990,13 @@ void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw, 




	rep->valid = false;

	rep->valid = false;

}

}



struct net_device *mlx5_eswitch_get_uplink_netdev(struct mlx5_eswitch *esw)

{

#define UPLINK_REP_INDEX 0

	struct mlx5_esw_offload *offloads = &esw->offloads;

	struct mlx5_eswitch_rep *rep;



	rep = &offloads->vport_reps[UPLINK_REP_INDEX];

	return rep->netdev;

}