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

Commit bc95cd8e authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2017-04-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2017-04-22

Sparse and compiler warnings fixes from Stephen Hemminger.

From Roi Dayan and Or Gerlitz, Add devlink and mlx5 support for controlling
E-Switch encapsulation mode, this knob will enable HW support for applying
encapsulation/decapsulation to VF traffic as part of SRIOV e-switch offloading.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 58c4c6a3 8bf3198a

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "en.h"

#include "en_tc.h"

#include "eswitch.h"

#include "ipoib.h"



static inline bool mlx5e_rx_hw_stamp(struct mlx5e_tstamp *tstamp)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/tcp.h>

#include <linux/if_vlan.h>

#include "en.h"

#include "ipoib.h"



#define MLX5E_SQ_NOPS_ROOM  MLX5_SEND_WQE_MAX_WQEBBS

#define MLX5E_SQ_STOP_ROOM (MLX5_SEND_WQE_MAX_WQEBBS +\

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

+5 −0
Original line number Diff line number Diff line
@@ -1806,6 +1806,11 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	esw->enabled_vports = 0;

	esw->mode = SRIOV_NONE;

	esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;

	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;

	else

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;



	dev->priv.eswitch = esw;

	return 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ struct mlx5_esw_offload { 
	DECLARE_HASHTABLE(encap_tbl, 8);

	u8 inline_mode;

	u64 num_flows;

	u8 encap;

};



struct mlx5_eswitch {
@@ -322,6 +323,8 @@ int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode); 
int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode);

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_devlink_eswitch_encap_mode_set(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 *rep);

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

+110 −22
Original line number Diff line number Diff line
@@ -426,31 +426,21 @@ static int esw_add_fdb_miss_rule(struct mlx5_eswitch *esw) 
	return err;

}



#define MAX_PF_SQ 256

#define ESW_OFFLOADS_NUM_GROUPS  4



static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports)

static int esw_create_offloads_fast_fdb_table(struct mlx5_eswitch *esw)

{

	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);

	struct mlx5_flow_table_attr ft_attr = {};

	int table_size, ix, esw_size, err = 0;

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;

	struct mlx5_flow_table *fdb = NULL;

	struct mlx5_flow_group *g;

	u32 *flow_group_in;

	void *match_criteria;

	int esw_size, err = 0;

	u32 flags = 0;



	flow_group_in = mlx5_vzalloc(inlen);

	if (!flow_group_in)

		return -ENOMEM;



	root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_FDB);

	if (!root_ns) {

		esw_warn(dev, "Failed to get FDB flow namespace\n");

		err = -EOPNOTSUPP;

		goto ns_err;

		goto out;

	}



	esw_debug(dev, "Create offloads FDB table, min (max esw size(2^%d), max counters(%d)*groups(%d))\n",
@@ -460,8 +450,7 @@ static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	esw_size = min_t(int, MLX5_CAP_GEN(dev, max_flow_counter) * ESW_OFFLOADS_NUM_GROUPS,

			 1 << MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));



	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))

	if (esw->offloads.encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE)

		flags |= MLX5_FLOW_TABLE_TUNNEL_EN;



	fdb = mlx5_create_auto_grouped_flow_table(root_ns, FDB_FAST_PATH,
@@ -471,10 +460,49 @@ static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	if (IS_ERR(fdb)) {

		err = PTR_ERR(fdb);

		esw_warn(dev, "Failed to create Fast path FDB Table err %d\n", err);

		goto fast_fdb_err;

		goto out;

	}

	esw->fdb_table.fdb = fdb;



out:

	return err;

}



static void esw_destroy_offloads_fast_fdb_table(struct mlx5_eswitch *esw)

{

	mlx5_destroy_flow_table(esw->fdb_table.fdb);

}



#define MAX_PF_SQ 256



static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw, int nvports)

{

	int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;

	struct mlx5_flow_table *fdb = NULL;

	int table_size, ix, err = 0;

	struct mlx5_flow_group *g;

	void *match_criteria;

	u32 *flow_group_in;



	esw_debug(esw->dev, "Create offloads FDB Tables\n");

	flow_group_in = mlx5_vzalloc(inlen);

	if (!flow_group_in)

		return -ENOMEM;



	root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_FDB);

	if (!root_ns) {

		esw_warn(dev, "Failed to get FDB flow namespace\n");

		err = -EOPNOTSUPP;

		goto ns_err;

	}



	err = esw_create_offloads_fast_fdb_table(esw);

	if (err)

		goto fast_fdb_err;



	table_size = nvports + MAX_PF_SQ + 1;



	ft_attr.max_fte = table_size;
@@ -545,18 +573,18 @@ static int esw_create_offloads_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	return err;

}



static void esw_destroy_offloads_fdb_table(struct mlx5_eswitch *esw)

static void esw_destroy_offloads_fdb_tables(struct mlx5_eswitch *esw)

{

	if (!esw->fdb_table.fdb)

		return;



	esw_debug(esw->dev, "Destroy offloads FDB Table\n");

	esw_debug(esw->dev, "Destroy offloads FDB Tables\n");

	mlx5_del_flow_rules(esw->fdb_table.offloads.miss_rule);

	mlx5_destroy_flow_group(esw->fdb_table.offloads.send_to_vport_grp);

	mlx5_destroy_flow_group(esw->fdb_table.offloads.miss_grp);



	mlx5_destroy_flow_table(esw->fdb_table.offloads.fdb);

	mlx5_destroy_flow_table(esw->fdb_table.fdb);

	esw_destroy_offloads_fast_fdb_table(esw);

}



static int esw_create_offloads_table(struct mlx5_eswitch *esw)
@@ -716,7 +744,7 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) 
	mlx5_remove_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	err = esw_create_offloads_fdb_table(esw, nvports);

	err = esw_create_offloads_fdb_tables(esw, nvports);

	if (err)

		goto create_fdb_err;
@@ -753,7 +781,7 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) 
	esw_destroy_offloads_table(esw);



create_ft_err:

	esw_destroy_offloads_fdb_table(esw);

	esw_destroy_offloads_fdb_tables(esw);



create_fdb_err:

	/* enable back PF RoCE */
@@ -799,7 +827,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw, int nvports) 


	esw_destroy_vport_rx_group(esw);

	esw_destroy_offloads_table(esw);

	esw_destroy_offloads_fdb_table(esw);

	esw_destroy_offloads_fdb_tables(esw);

}



static int esw_mode_from_devlink(u16 mode, u16 *mlx5_mode)
@@ -1016,6 +1044,66 @@ int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int nvfs, u8 *mode) 
	return 0;

}



int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;

	int err;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;



	if (encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE &&

	    (!MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) ||

	     !MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap)))

		return -EOPNOTSUPP;



	if (encap && encap != DEVLINK_ESWITCH_ENCAP_MODE_BASIC)

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_LEGACY) {

		esw->offloads.encap = encap;

		return 0;

	}



	if (esw->offloads.encap == encap)

		return 0;



	if (esw->offloads.num_flows > 0) {

		esw_warn(dev, "Can't set encapsulation when flows are configured\n");

		return -EOPNOTSUPP;

	}



	esw_destroy_offloads_fast_fdb_table(esw);



	esw->offloads.encap = encap;

	err = esw_create_offloads_fast_fdb_table(esw);

	if (err) {

		esw_warn(esw->dev, "Failed re-creating fast FDB table, err %d\n", err);

		esw->offloads.encap = !encap;

		(void) esw_create_offloads_fast_fdb_table(esw);

	}

	return err;

}



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

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == SRIOV_NONE)

		return -EOPNOTSUPP;



	*encap = esw->offloads.encap;

	return 0;

}



void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

				     int vport_index,

				     struct mlx5_eswitch_rep *__rep)