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

Merge tag 'mlx5-updates-2022-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



mlx5-updates-2022-06-29

Chris Mi Says:
==============
Remove dependency between sriov and eswitch mode

Currently, there are three eswitch modes, none, legacy and
switchdev. None is the default mode. And when disabling sriov,
current eswitch mode will be changed to none. This patchset
removes eswitch mode none and also removes dependency between
sriov and eswitch mode. With this patchset, there are two
behavior changes:

Original behavior
-----------------
 - When driver is loaded without sriov enabled, none is the default
   mode. But actually eswitch mode should be either legacy or
   switchdev, so devlink will return unsupported when showing
   eswitch mode.
 - When disabling sriov in either legacy or switchdev mode, eswitch
   mode will be changed to none.

New behavior
------------
 - When driver is loaded, legacy will be the default mode.
 - When disabling sriov in either legacy or switchdev mode, eswitch
   mode will not be changed.

Jianbo Liu Says:
================
Add support offloading police action

This patchset supports offloading police action by flow meter ASO
object in hardware.

The first part is to add interfaces to create and destroy flow meter
ASO object, and modify meter parameters by ACCESS_ASO WQE. As multiple
objects are created at a time, and two meters are in one object,
bitmaps are used manage these meters in one creation.

Then the police action can be mapped to a meter by the action index.
After mlx5e tc action refactoring was merged and post_act table was
added, a simple tc flow with one police action is broken down into two
rules in hardware. One rule with the original match in the original
table, which performs a metadata rewrite and do metering, then jumps
to post_meter table. The second rule is placed in the post_act table
with all the actions left.

The rules in post_meter table match on the meter outcome. If the
outcome is GREEN, we merely jump back to the post_act table for
further processing. Otherwise, the outcome is RED, and we drop the
packet.

The last part is to support flow meter ASO object in sw steering.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e60a041 a8d52b02

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

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
		fs_counters.o fs_ft_pool.o rl.o lag/debugfs.o lag/lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o lib/fs_ttc.o diag/fs_tracepoint.o \

		diag/fw_tracer.o diag/crdump.o devlink.o diag/rsc_dump.o \

		fw_reset.o qos.o lib/tout.o

		fw_reset.o qos.o lib/tout.o lib/aso.o



#

# Netdev basic
@@ -45,7 +45,8 @@ mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en_tc.o en/rep/tc.o en/rep/neigh.o \ 
					esw/indir_table.o en/tc_tun_encap.o \

					en/tc_tun_vxlan.o en/tc_tun_gre.o en/tc_tun_geneve.o \

					en/tc_tun_mplsoudp.o diag/en_tc_tracepoint.o \

					en/tc/post_act.o en/tc/int_port.o

					en/tc/post_act.o en/tc/int_port.o en/tc/meter.o \

					en/tc/post_meter.o



mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en/tc/act/act.o en/tc/act/drop.o en/tc/act/trap.o \

					en/tc/act/accept.o en/tc/act/mark.o en/tc/act/goto.o \
@@ -53,7 +54,7 @@ mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en/tc/act/act.o en/tc/act/drop.o en/tc/a 
					en/tc/act/vlan.o en/tc/act/vlan_mangle.o en/tc/act/mpls.o \

					en/tc/act/mirred.o en/tc/act/mirred_nic.o \

					en/tc/act/ct.o en/tc/act/sample.o en/tc/act/ptype.o \

					en/tc/act/redirect_ingress.o

					en/tc/act/redirect_ingress.o en/tc/act/police.o



ifneq ($(CONFIG_MLX5_TC_CT),)

	mlx5_core-y			     += en/tc_ct.o en/tc/ct_fs_dmfs.o

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct mlx5e_tc_act *tc_acts_fdb[NUM_FLOW_ACTIONS] = { 
	NULL, /* FLOW_ACTION_WAKE, */

	NULL, /* FLOW_ACTION_QUEUE, */

	&mlx5e_tc_act_sample,

	NULL, /* FLOW_ACTION_POLICE, */

	&mlx5e_tc_act_police,

	&mlx5e_tc_act_ct,

	NULL, /* FLOW_ACTION_CT_METADATA, */

	&mlx5e_tc_act_mpls_push,
@@ -106,8 +106,8 @@ mlx5e_tc_act_init_parse_state(struct mlx5e_tc_act_parse_state *parse_state, 
{

	memset(parse_state, 0, sizeof(*parse_state));

	parse_state->flow = flow;

	parse_state->num_actions = flow_action->num_entries;

	parse_state->extack = extack;

	parse_state->flow_action = flow_action;

}



void

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
struct mlx5_flow_attr;



struct mlx5e_tc_act_parse_state {

	unsigned int num_actions;

	struct flow_action *flow_action;

	struct mlx5e_tc_flow *flow;

	struct netlink_ext_ack *extack;

	u32 actions;
@@ -76,6 +76,7 @@ extern struct mlx5e_tc_act mlx5e_tc_act_ct; 
extern struct mlx5e_tc_act mlx5e_tc_act_sample;

extern struct mlx5e_tc_act mlx5e_tc_act_ptype;

extern struct mlx5e_tc_act mlx5e_tc_act_redirect_ingress;

extern struct mlx5e_tc_act mlx5e_tc_act_police;



struct mlx5e_tc_act *

mlx5e_tc_act_get(enum flow_action_id act_id,

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

// Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.



#include "act.h"

#include "en/tc_priv.h"



static bool

tc_act_can_offload_police(struct mlx5e_tc_act_parse_state *parse_state,

			  const struct flow_action_entry *act,

			  int act_index,

			  struct mlx5_flow_attr *attr)

{

	if (mlx5e_policer_validate(parse_state->flow_action, act,

				   parse_state->extack))

		return false;



	return !!mlx5e_get_flow_meters(parse_state->flow->priv->mdev);

}



static int

tc_act_parse_police(struct mlx5e_tc_act_parse_state *parse_state,

		    const struct flow_action_entry *act,

		    struct mlx5e_priv *priv,

		    struct mlx5_flow_attr *attr)

{

	struct mlx5e_flow_meter_params *params;



	params = &attr->meter_attr.params;

	params->index = act->hw_index;

	if (act->police.rate_bytes_ps) {

		params->mode = MLX5_RATE_LIMIT_BPS;

		/* change rate to bits per second */

		params->rate = act->police.rate_bytes_ps << 3;

		params->burst = act->police.burst;

	} else if (act->police.rate_pkt_ps) {

		params->mode = MLX5_RATE_LIMIT_PPS;

		params->rate = act->police.rate_pkt_ps;

		params->burst = act->police.burst_pkt;

	} else {

		return -EOPNOTSUPP;

	}



	attr->action |= MLX5_FLOW_CONTEXT_ACTION_EXECUTE_ASO;

	attr->exe_aso_type = MLX5_EXE_ASO_FLOW_METER;



	return 0;

}



static bool

tc_act_is_multi_table_act_police(struct mlx5e_priv *priv,

				 const struct flow_action_entry *act,

				 struct mlx5_flow_attr *attr)

{

	return true;

}



struct mlx5e_tc_act mlx5e_tc_act_police = {

	.can_offload = tc_act_can_offload_police,

	.parse_action = tc_act_parse_police,

	.is_multi_table_act = tc_act_is_multi_table_act_police,

};

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ tc_act_can_offload_trap(struct mlx5e_tc_act_parse_state *parse_state, 
{

	struct netlink_ext_ack *extack = parse_state->extack;



	if (parse_state->num_actions != 1) {

	if (parse_state->flow_action->num_entries != 1) {

		NL_SET_ERR_MSG_MOD(extack, "action trap is supported as a sole action only");

		return false;

	}