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

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

Merge branch 'tc_flower_offload' 



Amir Vadai says:

====================
sched,mlx5: Offloaded TC flower filter statistics

This patchset introduces counters support for offloaded cls_flower filters.
When the user calls 'tc show -s ..', fl_dump is called.
Before fl_dump() returns the statistics, it calls the NIC driver (using a new
ndo_setup_tc() command - TC_CLSFLOWER_STATS) to read the hardware counters and
update the statistics accordingly. A new TC action op was added (stats_update())
to be used by the NIC driver to update the statistics.

Patchset was applied and tested over commit ed7cbbce ("udp: Resolve NULL pointer
dereference over flow-based vxlan device")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 388665a9 aad7e08d

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o 




mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o   \

		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o   \

		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o

		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o fs_counters.o





mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \

mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \

		en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \

		en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \

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

+138 −171
Original line number Original line Diff line number Diff line
@@ -294,6 +294,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_DESTROY_FLOW_TABLE:

	case MLX5_CMD_OP_DESTROY_FLOW_TABLE:

	case MLX5_CMD_OP_DESTROY_FLOW_GROUP:

	case MLX5_CMD_OP_DESTROY_FLOW_GROUP:

	case MLX5_CMD_OP_DELETE_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_DELETE_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_DEALLOC_FLOW_COUNTER:

		return MLX5_CMD_STAT_OK;

		return MLX5_CMD_STAT_OK;





	case MLX5_CMD_OP_QUERY_HCA_CAP:

	case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -395,6 +396,8 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_FLOW_GROUP:

	case MLX5_CMD_OP_QUERY_FLOW_GROUP:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_QUERY_FLOW_COUNTER:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		*synd = MLX5_DRIVER_SYND;

		return -EIO;

		return -EIO;
@@ -406,178 +409,142 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 




const char *mlx5_command_str(int command)

const char *mlx5_command_str(int command)

{

{

	switch (command) {

#define MLX5_COMMAND_STR_CASE(__cmd) case MLX5_CMD_OP_ ## __cmd: return #__cmd

	case MLX5_CMD_OP_QUERY_HCA_VPORT_CONTEXT:

		return "QUERY_HCA_VPORT_CONTEXT";



	case MLX5_CMD_OP_MODIFY_HCA_VPORT_CONTEXT:

		return "MODIFY_HCA_VPORT_CONTEXT";



	case MLX5_CMD_OP_QUERY_HCA_CAP:

		return "QUERY_HCA_CAP";



	case MLX5_CMD_OP_SET_HCA_CAP:

		return "SET_HCA_CAP";



	case MLX5_CMD_OP_QUERY_ADAPTER:

		return "QUERY_ADAPTER";



	case MLX5_CMD_OP_INIT_HCA:

		return "INIT_HCA";



	case MLX5_CMD_OP_TEARDOWN_HCA:

		return "TEARDOWN_HCA";



	case MLX5_CMD_OP_ENABLE_HCA:

		return "MLX5_CMD_OP_ENABLE_HCA";



	case MLX5_CMD_OP_DISABLE_HCA:

		return "MLX5_CMD_OP_DISABLE_HCA";



	case MLX5_CMD_OP_QUERY_PAGES:

		return "QUERY_PAGES";



	case MLX5_CMD_OP_MANAGE_PAGES:

		return "MANAGE_PAGES";



	case MLX5_CMD_OP_CREATE_MKEY:

		return "CREATE_MKEY";



	case MLX5_CMD_OP_QUERY_MKEY:

		return "QUERY_MKEY";



	case MLX5_CMD_OP_DESTROY_MKEY:

		return "DESTROY_MKEY";



	case MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS:

		return "QUERY_SPECIAL_CONTEXTS";



	case MLX5_CMD_OP_CREATE_EQ:

		return "CREATE_EQ";



	case MLX5_CMD_OP_DESTROY_EQ:

		return "DESTROY_EQ";



	case MLX5_CMD_OP_QUERY_EQ:

		return "QUERY_EQ";



	case MLX5_CMD_OP_CREATE_CQ:

		return "CREATE_CQ";



	case MLX5_CMD_OP_DESTROY_CQ:

		return "DESTROY_CQ";



	case MLX5_CMD_OP_QUERY_CQ:

		return "QUERY_CQ";



	case MLX5_CMD_OP_MODIFY_CQ:

		return "MODIFY_CQ";



	case MLX5_CMD_OP_CREATE_QP:

		return "CREATE_QP";



	case MLX5_CMD_OP_DESTROY_QP:

		return "DESTROY_QP";



	case MLX5_CMD_OP_RST2INIT_QP:

		return "RST2INIT_QP";



	case MLX5_CMD_OP_INIT2RTR_QP:

		return "INIT2RTR_QP";



	case MLX5_CMD_OP_RTR2RTS_QP:

		return "RTR2RTS_QP";



	case MLX5_CMD_OP_RTS2RTS_QP:

		return "RTS2RTS_QP";



	case MLX5_CMD_OP_SQERR2RTS_QP:

		return "SQERR2RTS_QP";



	case MLX5_CMD_OP_2ERR_QP:

		return "2ERR_QP";



	case MLX5_CMD_OP_2RST_QP:

		return "2RST_QP";



	case MLX5_CMD_OP_QUERY_QP:

		return "QUERY_QP";



	case MLX5_CMD_OP_MAD_IFC:

		return "MAD_IFC";



	case MLX5_CMD_OP_INIT2INIT_QP:

		return "INIT2INIT_QP";



	case MLX5_CMD_OP_CREATE_PSV:

		return "CREATE_PSV";



	case MLX5_CMD_OP_DESTROY_PSV:

		return "DESTROY_PSV";



	case MLX5_CMD_OP_CREATE_SRQ:

		return "CREATE_SRQ";



	case MLX5_CMD_OP_DESTROY_SRQ:

		return "DESTROY_SRQ";



	case MLX5_CMD_OP_QUERY_SRQ:

		return "QUERY_SRQ";



	case MLX5_CMD_OP_ARM_RQ:

		return "ARM_RQ";



	case MLX5_CMD_OP_CREATE_XRC_SRQ:

		return "CREATE_XRC_SRQ";



	case MLX5_CMD_OP_DESTROY_XRC_SRQ:

		return "DESTROY_XRC_SRQ";



	case MLX5_CMD_OP_QUERY_XRC_SRQ:

		return "QUERY_XRC_SRQ";



	case MLX5_CMD_OP_ARM_XRC_SRQ:

		return "ARM_XRC_SRQ";



	case MLX5_CMD_OP_ALLOC_PD:

		return "ALLOC_PD";



	case MLX5_CMD_OP_DEALLOC_PD:

		return "DEALLOC_PD";



	case MLX5_CMD_OP_ALLOC_UAR:

		return "ALLOC_UAR";



	case MLX5_CMD_OP_DEALLOC_UAR:

		return "DEALLOC_UAR";



	case MLX5_CMD_OP_ATTACH_TO_MCG:

		return "ATTACH_TO_MCG";



	case MLX5_CMD_OP_DETTACH_FROM_MCG:

		return "DETTACH_FROM_MCG";



	case MLX5_CMD_OP_ALLOC_XRCD:

		return "ALLOC_XRCD";



	case MLX5_CMD_OP_DEALLOC_XRCD:

		return "DEALLOC_XRCD";



	case MLX5_CMD_OP_ACCESS_REG:

		return "MLX5_CMD_OP_ACCESS_REG";



	case MLX5_CMD_OP_SET_WOL_ROL:

		return "SET_WOL_ROL";



	case MLX5_CMD_OP_QUERY_WOL_ROL:

		return "QUERY_WOL_ROL";



	case MLX5_CMD_OP_ADD_VXLAN_UDP_DPORT:

		return "ADD_VXLAN_UDP_DPORT";



	case MLX5_CMD_OP_DELETE_VXLAN_UDP_DPORT:

		return "DELETE_VXLAN_UDP_DPORT";





	switch (command) {

	MLX5_COMMAND_STR_CASE(QUERY_HCA_CAP);

	MLX5_COMMAND_STR_CASE(QUERY_ADAPTER);

	MLX5_COMMAND_STR_CASE(INIT_HCA);

	MLX5_COMMAND_STR_CASE(TEARDOWN_HCA);

	MLX5_COMMAND_STR_CASE(ENABLE_HCA);

	MLX5_COMMAND_STR_CASE(DISABLE_HCA);

	MLX5_COMMAND_STR_CASE(QUERY_PAGES);

	MLX5_COMMAND_STR_CASE(MANAGE_PAGES);

	MLX5_COMMAND_STR_CASE(SET_HCA_CAP);

	MLX5_COMMAND_STR_CASE(QUERY_ISSI);

	MLX5_COMMAND_STR_CASE(SET_ISSI);

	MLX5_COMMAND_STR_CASE(CREATE_MKEY);

	MLX5_COMMAND_STR_CASE(QUERY_MKEY);

	MLX5_COMMAND_STR_CASE(DESTROY_MKEY);

	MLX5_COMMAND_STR_CASE(QUERY_SPECIAL_CONTEXTS);

	MLX5_COMMAND_STR_CASE(PAGE_FAULT_RESUME);

	MLX5_COMMAND_STR_CASE(CREATE_EQ);

	MLX5_COMMAND_STR_CASE(DESTROY_EQ);

	MLX5_COMMAND_STR_CASE(QUERY_EQ);

	MLX5_COMMAND_STR_CASE(GEN_EQE);

	MLX5_COMMAND_STR_CASE(CREATE_CQ);

	MLX5_COMMAND_STR_CASE(DESTROY_CQ);

	MLX5_COMMAND_STR_CASE(QUERY_CQ);

	MLX5_COMMAND_STR_CASE(MODIFY_CQ);

	MLX5_COMMAND_STR_CASE(CREATE_QP);

	MLX5_COMMAND_STR_CASE(DESTROY_QP);

	MLX5_COMMAND_STR_CASE(RST2INIT_QP);

	MLX5_COMMAND_STR_CASE(INIT2RTR_QP);

	MLX5_COMMAND_STR_CASE(RTR2RTS_QP);

	MLX5_COMMAND_STR_CASE(RTS2RTS_QP);

	MLX5_COMMAND_STR_CASE(SQERR2RTS_QP);

	MLX5_COMMAND_STR_CASE(2ERR_QP);

	MLX5_COMMAND_STR_CASE(2RST_QP);

	MLX5_COMMAND_STR_CASE(QUERY_QP);

	MLX5_COMMAND_STR_CASE(SQD_RTS_QP);

	MLX5_COMMAND_STR_CASE(INIT2INIT_QP);

	MLX5_COMMAND_STR_CASE(CREATE_PSV);

	MLX5_COMMAND_STR_CASE(DESTROY_PSV);

	MLX5_COMMAND_STR_CASE(CREATE_SRQ);

	MLX5_COMMAND_STR_CASE(DESTROY_SRQ);

	MLX5_COMMAND_STR_CASE(QUERY_SRQ);

	MLX5_COMMAND_STR_CASE(ARM_RQ);

	MLX5_COMMAND_STR_CASE(CREATE_XRC_SRQ);

	MLX5_COMMAND_STR_CASE(DESTROY_XRC_SRQ);

	MLX5_COMMAND_STR_CASE(QUERY_XRC_SRQ);

	MLX5_COMMAND_STR_CASE(ARM_XRC_SRQ);

	MLX5_COMMAND_STR_CASE(CREATE_DCT);

	MLX5_COMMAND_STR_CASE(DESTROY_DCT);

	MLX5_COMMAND_STR_CASE(DRAIN_DCT);

	MLX5_COMMAND_STR_CASE(QUERY_DCT);

	MLX5_COMMAND_STR_CASE(ARM_DCT_FOR_KEY_VIOLATION);

	MLX5_COMMAND_STR_CASE(QUERY_VPORT_STATE);

	MLX5_COMMAND_STR_CASE(MODIFY_VPORT_STATE);

	MLX5_COMMAND_STR_CASE(QUERY_ESW_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(MODIFY_ESW_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(QUERY_NIC_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(MODIFY_NIC_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(QUERY_ROCE_ADDRESS);

	MLX5_COMMAND_STR_CASE(SET_ROCE_ADDRESS);

	MLX5_COMMAND_STR_CASE(QUERY_HCA_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(MODIFY_HCA_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(QUERY_HCA_VPORT_GID);

	MLX5_COMMAND_STR_CASE(QUERY_HCA_VPORT_PKEY);

	MLX5_COMMAND_STR_CASE(QUERY_VPORT_COUNTER);

	MLX5_COMMAND_STR_CASE(ALLOC_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(DEALLOC_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(ALLOC_PD);

	MLX5_COMMAND_STR_CASE(DEALLOC_PD);

	MLX5_COMMAND_STR_CASE(ALLOC_UAR);

	MLX5_COMMAND_STR_CASE(DEALLOC_UAR);

	MLX5_COMMAND_STR_CASE(CONFIG_INT_MODERATION);

	MLX5_COMMAND_STR_CASE(ACCESS_REG);

	MLX5_COMMAND_STR_CASE(ATTACH_TO_MCG);

	MLX5_COMMAND_STR_CASE(DETTACH_FROM_MCG);

	MLX5_COMMAND_STR_CASE(GET_DROPPED_PACKET_LOG);

	MLX5_COMMAND_STR_CASE(MAD_IFC);

	MLX5_COMMAND_STR_CASE(QUERY_MAD_DEMUX);

	MLX5_COMMAND_STR_CASE(SET_MAD_DEMUX);

	MLX5_COMMAND_STR_CASE(NOP);

	MLX5_COMMAND_STR_CASE(ALLOC_XRCD);

	MLX5_COMMAND_STR_CASE(DEALLOC_XRCD);

	MLX5_COMMAND_STR_CASE(ALLOC_TRANSPORT_DOMAIN);

	MLX5_COMMAND_STR_CASE(DEALLOC_TRANSPORT_DOMAIN);

	MLX5_COMMAND_STR_CASE(QUERY_CONG_STATUS);

	MLX5_COMMAND_STR_CASE(MODIFY_CONG_STATUS);

	MLX5_COMMAND_STR_CASE(QUERY_CONG_PARAMS);

	MLX5_COMMAND_STR_CASE(MODIFY_CONG_PARAMS);

	MLX5_COMMAND_STR_CASE(QUERY_CONG_STATISTICS);

	MLX5_COMMAND_STR_CASE(ADD_VXLAN_UDP_DPORT);

	MLX5_COMMAND_STR_CASE(DELETE_VXLAN_UDP_DPORT);

	MLX5_COMMAND_STR_CASE(SET_L2_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(QUERY_L2_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(DELETE_L2_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(SET_WOL_ROL);

	MLX5_COMMAND_STR_CASE(QUERY_WOL_ROL);

	MLX5_COMMAND_STR_CASE(CREATE_TIR);

	MLX5_COMMAND_STR_CASE(MODIFY_TIR);

	MLX5_COMMAND_STR_CASE(DESTROY_TIR);

	MLX5_COMMAND_STR_CASE(QUERY_TIR);

	MLX5_COMMAND_STR_CASE(CREATE_SQ);

	MLX5_COMMAND_STR_CASE(MODIFY_SQ);

	MLX5_COMMAND_STR_CASE(DESTROY_SQ);

	MLX5_COMMAND_STR_CASE(QUERY_SQ);

	MLX5_COMMAND_STR_CASE(CREATE_RQ);

	MLX5_COMMAND_STR_CASE(MODIFY_RQ);

	MLX5_COMMAND_STR_CASE(DESTROY_RQ);

	MLX5_COMMAND_STR_CASE(QUERY_RQ);

	MLX5_COMMAND_STR_CASE(CREATE_RMP);

	MLX5_COMMAND_STR_CASE(MODIFY_RMP);

	MLX5_COMMAND_STR_CASE(DESTROY_RMP);

	MLX5_COMMAND_STR_CASE(QUERY_RMP);

	MLX5_COMMAND_STR_CASE(CREATE_TIS);

	MLX5_COMMAND_STR_CASE(MODIFY_TIS);

	MLX5_COMMAND_STR_CASE(DESTROY_TIS);

	MLX5_COMMAND_STR_CASE(QUERY_TIS);

	MLX5_COMMAND_STR_CASE(CREATE_RQT);

	MLX5_COMMAND_STR_CASE(MODIFY_RQT);

	MLX5_COMMAND_STR_CASE(DESTROY_RQT);

	MLX5_COMMAND_STR_CASE(QUERY_RQT);

	MLX5_COMMAND_STR_CASE(SET_FLOW_TABLE_ROOT);

	MLX5_COMMAND_STR_CASE(CREATE_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(DESTROY_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(CREATE_FLOW_GROUP);

	MLX5_COMMAND_STR_CASE(DESTROY_FLOW_GROUP);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_GROUP);

	MLX5_COMMAND_STR_CASE(SET_FLOW_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(DELETE_FLOW_TABLE_ENTRY);

	MLX5_COMMAND_STR_CASE(ALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(DEALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_COUNTER);

	default: return "unknown command opcode";

	default: return "unknown command opcode";

	}

	}

}

}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -2154,6 +2154,8 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, 
			return mlx5e_configure_flower(priv, proto, tc->cls_flower);

			return mlx5e_configure_flower(priv, proto, tc->cls_flower);

		case TC_CLSFLOWER_DESTROY:

		case TC_CLSFLOWER_DESTROY:

			return mlx5e_delete_flower(priv, tc->cls_flower);

			return mlx5e_delete_flower(priv, tc->cls_flower);

		case TC_CLSFLOWER_STATS:

			return mlx5e_stats_flower(priv, tc->cls_flower);

		}

		}

	default:

	default:

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;

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

+64 −7
Original line number Original line Diff line number Diff line
@@ -53,13 +53,24 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv, 
						u32 *match_c, u32 *match_v,

						u32 *match_c, u32 *match_v,

						u32 action, u32 flow_tag)

						u32 action, u32 flow_tag)

{

{

	struct mlx5_flow_destination dest = {

	struct mlx5_core_dev *dev = priv->mdev;

		.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE,

	struct mlx5_flow_destination dest = { 0 };

		{.ft = priv->fs.vlan.ft.t},

	struct mlx5_fc *counter = NULL;

	};

	struct mlx5_flow_rule *rule;

	struct mlx5_flow_rule *rule;

	bool table_created = false;

	bool table_created = false;





	if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {

		dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

		dest.ft = priv->fs.vlan.ft.t;

	} else {

		counter = mlx5_fc_create(dev, true);

		if (IS_ERR(counter))

			return ERR_CAST(counter);



		dest.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		dest.counter = counter;

	}



	if (IS_ERR_OR_NULL(priv->fs.tc.t)) {

	if (IS_ERR_OR_NULL(priv->fs.tc.t)) {

		priv->fs.tc.t =

		priv->fs.tc.t =

			mlx5_create_auto_grouped_flow_table(priv->fs.ns,

			mlx5_create_auto_grouped_flow_table(priv->fs.ns,
@@ -70,7 +81,8 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv, 
		if (IS_ERR(priv->fs.tc.t)) {

		if (IS_ERR(priv->fs.tc.t)) {

			netdev_err(priv->netdev,

			netdev_err(priv->netdev,

				   "Failed to create tc offload table\n");

				   "Failed to create tc offload table\n");

			return ERR_CAST(priv->fs.tc.t);

			rule = ERR_CAST(priv->fs.tc.t);

			goto err_create_ft;

		}

		}





		table_created = true;

		table_created = true;
@@ -79,12 +91,20 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv, 
	rule = mlx5_add_flow_rule(priv->fs.tc.t, MLX5_MATCH_OUTER_HEADERS,

	rule = mlx5_add_flow_rule(priv->fs.tc.t, MLX5_MATCH_OUTER_HEADERS,

				  match_c, match_v,

				  match_c, match_v,

				  action, flow_tag,

				  action, flow_tag,

				  action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ? &dest : NULL);

				  &dest);



	if (IS_ERR(rule))

		goto err_add_rule;



	return rule;





	if (IS_ERR(rule) && table_created) {

err_add_rule:

	if (table_created) {

		mlx5_destroy_flow_table(priv->fs.tc.t);

		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

		priv->fs.tc.t = NULL;

	}

	}

err_create_ft:

	mlx5_fc_destroy(dev, counter);





	return rule;

	return rule;

}

}
@@ -92,8 +112,14 @@ static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv, 
static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,

static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,

			      struct mlx5_flow_rule *rule)

			      struct mlx5_flow_rule *rule)

{

{

	struct mlx5_fc *counter = NULL;



	counter = mlx5_flow_rule_counter(rule);



	mlx5_del_flow_rule(rule);

	mlx5_del_flow_rule(rule);





	mlx5_fc_destroy(priv->mdev, counter);



	if (!mlx5e_tc_num_filters(priv)) {

	if (!mlx5e_tc_num_filters(priv)) {

		mlx5_destroy_flow_table(priv->fs.tc.t);

		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

		priv->fs.tc.t = NULL;
@@ -286,6 +312,9 @@ static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 




		if (is_tcf_gact_shot(a)) {

		if (is_tcf_gact_shot(a)) {

			*action |= MLX5_FLOW_CONTEXT_ACTION_DROP;

			*action |= MLX5_FLOW_CONTEXT_ACTION_DROP;

			if (MLX5_CAP_FLOWTABLE(priv->mdev,

					       flow_table_properties_nic_receive.flow_counter))

				*action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;

			continue;

			continue;

		}

		}
@@ -394,6 +423,34 @@ int mlx5e_delete_flower(struct mlx5e_priv *priv, 
	return 0;

	return 0;

}

}





int mlx5e_stats_flower(struct mlx5e_priv *priv,

		       struct tc_cls_flower_offload *f)

{

	struct mlx5e_tc_table *tc = &priv->fs.tc;

	struct mlx5e_tc_flow *flow;

	struct tc_action *a;

	struct mlx5_fc *counter;

	u64 bytes;

	u64 packets;

	u64 lastuse;



	flow = rhashtable_lookup_fast(&tc->ht, &f->cookie,

				      tc->ht_params);

	if (!flow)

		return -EINVAL;



	counter = mlx5_flow_rule_counter(flow->rule);

	if (!counter)

		return 0;



	mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);



	tc_for_each_action(a, f->exts)

		tcf_action_stats_update(a, bytes, packets, lastuse);



	return 0;

}



static const struct rhashtable_params mlx5e_tc_flow_ht_params = {

static const struct rhashtable_params mlx5e_tc_flow_ht_params = {

	.head_offset = offsetof(struct mlx5e_tc_flow, node),

	.head_offset = offsetof(struct mlx5e_tc_flow, node),

	.key_offset = offsetof(struct mlx5e_tc_flow, cookie),

	.key_offset = offsetof(struct mlx5e_tc_flow, cookie),

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol, 
int mlx5e_delete_flower(struct mlx5e_priv *priv,

int mlx5e_delete_flower(struct mlx5e_priv *priv,

			struct tc_cls_flower_offload *f);

			struct tc_cls_flower_offload *f);





int mlx5e_stats_flower(struct mlx5e_priv *priv,

		       struct tc_cls_flower_offload *f);



static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv)

static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv)

{

{

	return atomic_read(&priv->fs.tc.ht.nelems);

	return atomic_read(&priv->fs.tc.ht.nelems);