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

Commit 57cbd893 authored by Mark Bloch's avatar Mark Bloch Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Move representors definition to a global scope 



In preparation for IB representors, move representors structs to a global
scope, also expose functions needed for registration, unregistration,
eswitch mode and creating a flow rule to direct traffic from SQs to the
right VF.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 22215908

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -2175,3 +2175,9 @@ int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw, 
	kvfree(out);

	kvfree(out);

	return err;

	return err;

}

}



u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)

{

	return esw->mode;

}

EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);

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

+1 −43
Original line number Original line Diff line number Diff line
@@ -37,19 +37,9 @@ 
#include <linux/if_link.h>

#include <linux/if_link.h>

#include <net/devlink.h>

#include <net/devlink.h>

#include <linux/mlx5/device.h>

#include <linux/mlx5/device.h>

#include <linux/mlx5/eswitch.h>

#include "lib/mpfs.h"

#include "lib/mpfs.h"





enum {

	SRIOV_NONE,

	SRIOV_LEGACY,

	SRIOV_OFFLOADS

};



enum {

	REP_ETH,

	NUM_REP_TYPES,

};



#ifdef CONFIG_MLX5_ESWITCH

#ifdef CONFIG_MLX5_ESWITCH





#define MLX5_MAX_UC_PER_VPORT(dev) \

#define MLX5_MAX_UC_PER_VPORT(dev) \
@@ -145,24 +135,6 @@ struct mlx5_eswitch_fdb { 
	};

	};

};

};





struct mlx5_eswitch_rep;

struct mlx5_eswitch_rep_if {

	int		       (*load)(struct mlx5_core_dev *dev,

				       struct mlx5_eswitch_rep *rep);

	void		       (*unload)(struct mlx5_eswitch_rep *rep);

	void		       *(*get_proto_dev)(struct mlx5_eswitch_rep *rep);

	void			*priv;

	bool		       valid;

};



struct mlx5_eswitch_rep {

	struct mlx5_eswitch_rep_if rep_if[NUM_REP_TYPES];

	u16		       vport;

	u8		       hw_id[ETH_ALEN];

	u16		       vlan;

	u32		       vlan_refcount;

};



struct mlx5_esw_offload {

struct mlx5_esw_offload {

	struct mlx5_flow_table *ft_offloads;

	struct mlx5_flow_table *ft_offloads;

	struct mlx5_flow_group *vport_rx_group;

	struct mlx5_flow_group *vport_rx_group;
@@ -232,9 +204,6 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, 
int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,

int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,

				 int vport,

				 int vport,

				 struct ifla_vf_stats *vf_stats);

				 struct ifla_vf_stats *vf_stats);

struct mlx5_flow_handle *

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw, int vport,

				    u32 sqn);

void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule);

void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule);





struct mlx5_flow_spec;

struct mlx5_flow_spec;
@@ -279,18 +248,7 @@ int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode); 
int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int nvfs, u8 *mode);

int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int nvfs, u8 *mode);

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap);

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap);

void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

				     int vport_index,

				     struct mlx5_eswitch_rep_if *rep_if,

				     u8 rep_type);

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport_index,

				       u8 rep_type);

void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type);

void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type);

void *mlx5_eswitch_get_proto_dev(struct mlx5_eswitch *esw,

				 int vport,

				 u8 rep_type);

void *mlx5_eswitch_uplink_get_proto_dev(struct mlx5_eswitch *esw, u8 rep_type);





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

+12 −0
Original line number Original line Diff line number Diff line
@@ -338,6 +338,7 @@ mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw, int vport, u32 sqn 
	kvfree(spec);

	kvfree(spec);

	return flow_rule;

	return flow_rule;

}

}

EXPORT_SYMBOL(mlx5_eswitch_add_send_to_vport_rule);





void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule)

void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule)

{

{
@@ -1165,6 +1166,7 @@ void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw, 




	rep_if->valid = true;

	rep_if->valid = true;

}

}

EXPORT_SYMBOL(mlx5_eswitch_register_vport_rep);





void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport_index, u8 rep_type)

				       int vport_index, u8 rep_type)
@@ -1179,6 +1181,7 @@ void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw, 




	rep->rep_if[rep_type].valid = false;

	rep->rep_if[rep_type].valid = false;

}

}

EXPORT_SYMBOL(mlx5_eswitch_unregister_vport_rep);





void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type)

void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type)

{

{
@@ -1207,8 +1210,17 @@ void *mlx5_eswitch_get_proto_dev(struct mlx5_eswitch *esw, 
		return rep->rep_if[rep_type].get_proto_dev(rep);

		return rep->rep_if[rep_type].get_proto_dev(rep);

	return NULL;

	return NULL;

}

}

EXPORT_SYMBOL(mlx5_eswitch_get_proto_dev);





void *mlx5_eswitch_uplink_get_proto_dev(struct mlx5_eswitch *esw, u8 rep_type)

void *mlx5_eswitch_uplink_get_proto_dev(struct mlx5_eswitch *esw, u8 rep_type)

{

{

	return mlx5_eswitch_get_proto_dev(esw, UPLINK_REP_INDEX, rep_type);

	return mlx5_eswitch_get_proto_dev(esw, UPLINK_REP_INDEX, rep_type);

}

}

EXPORT_SYMBOL(mlx5_eswitch_uplink_get_proto_dev);



struct mlx5_eswitch_rep *mlx5_eswitch_vport_rep(struct mlx5_eswitch *esw,

						int vport)

{

	return &esw->offloads.vport_reps[vport];

}

EXPORT_SYMBOL(mlx5_eswitch_vport_rep);

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -43,12 +43,6 @@ 
#define DRIVER_NAME "mlx5_core"

#define DRIVER_NAME "mlx5_core"

#define DRIVER_VERSION "5.0-0"

#define DRIVER_VERSION "5.0-0"





#define MLX5_TOTAL_VPORTS(mdev) (1 + pci_sriov_get_totalvfs(mdev->pdev))

#define MLX5_VPORT_MANAGER(mdev) \

	(MLX5_CAP_GEN(mdev, vport_group_manager) && \

	(MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && \

	 mlx5_core_is_pf(mdev))



extern uint mlx5_core_debug_mask;

extern uint mlx5_core_debug_mask;





#define mlx5_core_dbg(__dev, format, ...)				\

#define mlx5_core_dbg(__dev, format, ...)				\

include/linux/mlx5/driver.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -1224,6 +1224,12 @@ static inline int mlx5_core_is_pf(struct mlx5_core_dev *dev) 
	return !(dev->priv.pci_dev_data & MLX5_PCI_DEV_IS_VF);

	return !(dev->priv.pci_dev_data & MLX5_PCI_DEV_IS_VF);

}

}





#define MLX5_TOTAL_VPORTS(mdev) (1 + pci_sriov_get_totalvfs((mdev)->pdev))

#define MLX5_VPORT_MANAGER(mdev) \

	(MLX5_CAP_GEN(mdev, vport_group_manager) && \

	 (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && \

	 mlx5_core_is_pf(mdev))



static inline int mlx5_get_gid_table_len(u16 param)

static inline int mlx5_get_gid_table_len(u16 param)

{

{

	if (param > 4) {

	if (param > 4) {