Commit c8fda7d2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5-updates-2022-07-13

1) Support 802.1ad for bridge offloads

Vlad Buslov Says:
=================

Current mlx5 bridge VLAN offload implementation only supports 802.1Q VLAN
Ethernet protocol. That protocol type is assumed by default and
SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification is ignored.

In order to support dynamically setting VLAN protocol handle
SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL notification by flushing FDB and
re-creating VLAN modify header actions with a new protocol. Implement support
for 802.1ad protocol by saving the current VLAN protocol to per-bridge variable
and re-create the necessary flow groups according to its current value (either
use cvlan or svlan flow fields).
==================

2) debugfs to count ongoing FW commands

3) debugfs to query eswitch vport firmware diagnostic counters

4) Add missing meter configuration in flow action

5) Some misc cleanup

* tag 'mlx5-updates-2022-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: Remove the duplicating check for striding RQ when enabling LRO
  net/mlx5e: Move the LRO-XSK check to mlx5e_fix_features
  net/mlx5e: Extend flower police validation
  net/mlx5e: configure meter in flow action
  net/mlx5e: Removed useless code in function
  net/mlx5: Bridge, implement QinQ support
  net/mlx5: Bridge, implement infrastructure for VLAN protocol change
  net/mlx5: Bridge, extract VLAN push/pop actions creation
  net/mlx5: Bridge, rename filter fg to vlan_filter
  net/mlx5: Bridge, refactor groups sizes and indices
  net/mlx5: debugfs, Add num of in-use FW command interface slots
  net/mlx5: Expose vnic diagnostic counters for eswitch managed vports
  net/mlx5: Use software VHCA id when it's supported
  net/mlx5: Introduce ifc bits for using software vhca id
  net/mlx5: Use the bitmap API to allocate bitmaps
====================

Link: https://lore.kernel.org/r/20220713225859.401241-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6e6fbb72 1a550486

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ mlx5_core-$(CONFIG_MLX5_TC_SAMPLE) += en/tc/sample.o 
#

mlx5_core-$(CONFIG_MLX5_ESWITCH)   += eswitch.o eswitch_offloads.o eswitch_offloads_termtbl.o \

				      ecpf.o rdma.o esw/legacy.o \

				      esw/devlink_port.o esw/vporttbl.o esw/qos.o

				      esw/debugfs.o esw/devlink_port.o esw/vporttbl.o esw/qos.o



mlx5_core-$(CONFIG_MLX5_ESWITCH)   += esw/acl/helper.o \

				      esw/acl/egress_lgcy.o esw/acl/egress_ofld.o \

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

+24 −0
Original line number Diff line number Diff line
@@ -166,6 +166,28 @@ static const struct file_operations stats_fops = { 
	.write	= average_write,

};



static ssize_t slots_read(struct file *filp, char __user *buf, size_t count,

			  loff_t *pos)

{

	struct mlx5_cmd *cmd;

	char tbuf[6];

	int weight;

	int field;

	int ret;



	cmd = filp->private_data;

	weight = bitmap_weight(&cmd->bitmask, cmd->max_reg_cmds);

	field = cmd->max_reg_cmds - weight;

	ret = snprintf(tbuf, sizeof(tbuf), "%d\n", field);

	return simple_read_from_buffer(buf, count, pos, tbuf, ret);

}



static const struct file_operations slots_fops = {

	.owner	= THIS_MODULE,

	.open	= simple_open,

	.read	= slots_read,

};



void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd_stats *stats;
@@ -176,6 +198,8 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev) 
	cmd = &dev->priv.dbg.cmdif_debugfs;

	*cmd = debugfs_create_dir("commands", dev->priv.dbg.dbg_root);



	debugfs_create_file("slots_inuse", 0400, *cmd, &dev->cmd, &slots_fops);



	for (i = 0; i < MLX5_CMD_OP_MAX; i++) {

		stats = &dev->cmd.stats[i];

		namep = mlx5_command_str(i);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ mlx5_esw_bridge_port_obj_attr_set(struct net_device *dev, 
		err = mlx5_esw_bridge_vlan_filtering_set(vport_num, esw_owner_vhca_id,

							 attr->u.vlan_filtering, br_offloads);

		break;

	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL:

		err = mlx5_esw_bridge_vlan_proto_set(vport_num,

						     esw_owner_vhca_id,

						     attr->u.vlan_protocol,

						     br_offloads);

		break;

	default:

		err = -EOPNOTSUPP;

	}

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

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ tc_act_can_offload_police(struct mlx5e_tc_act_parse_state *parse_state, 
			  int act_index,

			  struct mlx5_flow_attr *attr)

{

	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(parse_state->extack,

				   "Offload not supported when conform action is not pipe or ok");

		return false;

	}

	if (mlx5e_policer_validate(parse_state->flow_action, act,

				   parse_state->extack))

		return false;

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

+1 −4
Original line number Diff line number Diff line
@@ -742,10 +742,7 @@ mlx5e_ethtool_flow_replace(struct mlx5e_priv *priv, 


	eth_rule->flow_spec = *fs;

	eth_rule->eth_ft = eth_ft;

	if (!eth_ft->ft) {

		err = -EINVAL;

		goto del_ethtool_rule;

	}



	rule = add_ethtool_flow_rule(priv, eth_rule, eth_ft->ft, fs, rss_context);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);