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

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

Saeed Mahameed says:

====================
mlx5-updates-2023-04-11

1) Vlad adds the support for linux bridge multicast offload support
   Patches #1 through #9
   Synopsis

Vlad Says:
==============
Implement support of bridge multicast offload in mlx5. Handle port object
attribute SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED notification to toggle multicast
offload and bridge snooping support on bridge. Handle port object
SWITCHDEV_OBJ_ID_PORT_MDB notification to attach a bridge port to MDB.

Steering architecture

Existing offload infrastructure relies on two levels of flow tables - bridge
ingress and egress. For multicast offload the architecture is extended with
additional layer of per-port multicast replication tables. Such tables filter
loopback traffic (so packets are not replicated to their source port) and pop
VLAN headers for "untagged" VLANs. The tables are referenced by the MDB rules in
egress table. MDB egress rule can point to multiple per-port multicast tables,
which causes matching multicast traffic to be replicated to all of them, and,
consecutively, to several bridge ports:

                                                                                                                            +--------+--+
                                                                                    +---------------------------------------> Port 1 |  |
                                                                                    |                                       +-^------+--+
                                                                                    |                                         |
                                                                                    |                                         |
                                       +-----------------------------------------+  |     +---------------------------+       |
                                       | EGRESS table                            |  |  +--> PORT 1 multicast table    |       |
+----------------------------------+   +-----------------------------------------+  |  |  +---------------------------+       |
| INGRESS table                    |   |                                         |  |  |  |                           |       |
+----------------------------------+   | dst_mac=P1,vlan=X -> pop vlan, goto P1  +--+  |  | FG0:                      |       |
|                                  |   | dst_mac=P1,vlan=Y -> pop vlan, goto P1  |     |  | src_port=dst_port -> drop |       |
| src_mac=M1,vlan=X -> goto egress +---> dst_mac=P2,vlan=X -> pop vlan, goto P2  +--+  |  | FG1:                      |       |
| ...                              |   | dst_mac=P2,vlan=Y -> goto P2            |  |  |  | VLAN X -> pop, goto port  |       |
|                                  |   | dst_mac=MDB1,vlan=Y -> goto mcast P1,P2 +-----+  | ...                       |       |
+----------------------------------+   |                                         |  |  |  | VLAN Y -> pop, goto port  +-------+
                                       +-----------------------------------------+  |  |  | FG3:                      |
                                                                                    |  |  | matchall -> goto port     |
                                                                                    |  |  |                           |
                                                                                    |  |  +---------------------------+
                                                                                    |  |
                                                                                    |  |
                                                                                    |  |                                    +--------+--+
                                                                                    +---------------------------------------> Port 2 |  |
                                                                                       |                                    +-^------+--+
                                                                                       |                                      |
                                                                                       |                                      |
                                                                                       |  +---------------------------+       |
                                                                                       +--> PORT 2 multicast table    |       |
                                                                                          +---------------------------+       |
                                                                                          |                           |       |
                                                                                          | FG0:                      |       |
                                                                                          | src_port=dst_port -> drop |       |
                                                                                          | FG1:                      |       |
                                                                                          | VLAN X -> pop, goto port  |       |
                                                                                          | ...                       |       |
                                                                                          |                           |       |
                                                                                          | FG3:                      |       |
                                                                                          | matchall -> goto port     +-------+
                                                                                          |                           |
                                                                                          +---------------------------+

Patches overview:

- Patch 1 adds hardware definition bits for capabilities required to replicate
  multicast packets to multiple per-port tables. These bits are used by
  following patches to only attempt multicast offload if firmware and hardware
  provide necessary support.

- Pathces 2-4 patches are preparations and refactoring.

- Patch 5 implements necessary infrastructure to toggle multicast offload
  via SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED port object attribute notification.
  This also enabled IGMP and MLD snooping.

- Patch 6 implements per-port multicast replication tables. It only supports
  filtering of loopback packets.

- Patch 7 extends per-port multicast tables with VLAN pop support for 'untagged'
  VLANs.

- Patch 8 handles SWITCHDEV_OBJ_ID_PORT_MDB port object notifications. It
  creates MDB replication rules in egress table that can replicate packets to
  multiple per-port multicast tables.

- Patch 9 adds tracepoints for MDB events.

==============

2) Parav Create a new allocation profile for SFs, to save on memory

3) Yevgeny provides some initial patches for upcoming software steering
   support new pattern/arguments type of modify_header actions.

Starting with ConnectX-6 DX, we use a new design of modify_header FW object.
The current modify_header object allows for having only limited number of
these FW objects, which means that we are limited in the number of offloaded
flows that require modify_header action.

As a preparation Yevgeny provides the following 4 patches:
 - Patch 1: Add required mlx5_ifc HW bits
 - Patch 2, 3: Add new WQE type and opcode that is required for pattern/arg
   support and adds appropriate support in dr_send.c
 - Patch 4: Add ICM pool for modify-header-pattern objects and implement
   patterns cache, allowing patterns reuse for different flows

* tag 'mlx5-updates-2023-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: DR, Add modify-header-pattern ICM pool
  net/mlx5: DR, Prepare sending new WQE type
  net/mlx5: Add new WQE for updating flow table
  net/mlx5: Add mlx5_ifc bits for modify header argument
  net/mlx5: DR, Set counter ID on the last STE for STEv1 TX
  net/mlx5: Create a new profile for SFs
  net/mlx5: Bridge, add tracepoints for multicast
  net/mlx5: Bridge, implement mdb offload
  net/mlx5: Bridge, support multicast VLAN pop
  net/mlx5: Bridge, add per-port multicast replication tables
  net/mlx5: Bridge, snoop igmp/mld packets
  net/mlx5: Bridge, extract code to lookup parent bridge of port
  net/mlx5: Bridge, move additional data structures to priv header
  net/mlx5: Bridge, increase bridge tables sizes
  net/mlx5: Add mlx5_ifc definitions for bridge multicast support
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f7d29571 108ff821

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

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ mlx5_core-$(CONFIG_MLX5_ESWITCH) += esw/acl/helper.o \ 
				      esw/acl/egress_lgcy.o esw/acl/egress_ofld.o \

				      esw/acl/ingress_lgcy.o esw/acl/ingress_ofld.o



mlx5_core-$(CONFIG_MLX5_BRIDGE)    += esw/bridge.o en/rep/bridge.o

mlx5_core-$(CONFIG_MLX5_BRIDGE)    += esw/bridge.o esw/bridge_mcast.o en/rep/bridge.o



mlx5_core-$(CONFIG_THERMAL)        += thermal.o

mlx5_core-$(CONFIG_MLX5_MPFS)      += lib/mpfs.o
@@ -112,7 +112,7 @@ mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o 
					steering/dr_ste_v2.o \

					steering/dr_cmd.o steering/dr_fw.o \

					steering/dr_action.o steering/fs_dr.o \

					steering/dr_definer.o \

					steering/dr_definer.o steering/dr_ptrn.o \

					steering/dr_dbg.o lib/smfs.o

#

# SF device

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

+3 −3
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size, 
	if (in_size <= 16)

		goto cache_miss;



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

	for (i = 0; i < dev->profile.num_cmd_caches; i++) {

		ch = &cmd->cache[i];

		if (in_size > ch->max_inbox_size)

			continue;
@@ -2097,7 +2097,7 @@ static void destroy_msg_cache(struct mlx5_core_dev *dev) 
	struct mlx5_cmd_msg *n;

	int i;



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

	for (i = 0; i < dev->profile.num_cmd_caches; i++) {

		ch = &dev->cmd.cache[i];

		list_for_each_entry_safe(msg, n, &ch->head, list) {

			list_del(&msg->list);
@@ -2127,7 +2127,7 @@ static void create_msg_cache(struct mlx5_core_dev *dev) 
	int k;



	/* Initialize and fill the caches with initial entries */

	for (k = 0; k < MLX5_NUM_COMMAND_CACHES; k++) {

	for (k = 0; k < dev->profile.num_cmd_caches; k++) {

		ch = &cmd->cache[k];

		spin_lock_init(&ch->lock);

		INIT_LIST_HEAD(&ch->head);

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

+16 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ mlx5_esw_bridge_port_obj_add(struct net_device *dev, 
	struct netlink_ext_ack *extack = switchdev_notifier_info_to_extack(&port_obj_info->info);

	const struct switchdev_obj *obj = port_obj_info->obj;

	const struct switchdev_obj_port_vlan *vlan;

	const struct switchdev_obj_port_mdb *mdb;

	u16 vport_num, esw_owner_vhca_id;

	int err;
@@ -235,6 +236,11 @@ mlx5_esw_bridge_port_obj_add(struct net_device *dev, 
		err = mlx5_esw_bridge_port_vlan_add(vport_num, esw_owner_vhca_id, vlan->vid,

						    vlan->flags, br_offloads, extack);

		break;

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		mdb = SWITCHDEV_OBJ_PORT_MDB(obj);

		err = mlx5_esw_bridge_port_mdb_add(dev, vport_num, esw_owner_vhca_id, mdb->addr,

						   mdb->vid, br_offloads, extack);

		break;

	default:

		return -EOPNOTSUPP;

	}
@@ -248,6 +254,7 @@ mlx5_esw_bridge_port_obj_del(struct net_device *dev, 
{

	const struct switchdev_obj *obj = port_obj_info->obj;

	const struct switchdev_obj_port_vlan *vlan;

	const struct switchdev_obj_port_mdb *mdb;

	u16 vport_num, esw_owner_vhca_id;



	if (!mlx5_esw_bridge_rep_vport_num_vhca_id_get(dev, br_offloads->esw, &vport_num,
@@ -261,6 +268,11 @@ mlx5_esw_bridge_port_obj_del(struct net_device *dev, 
		vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);

		mlx5_esw_bridge_port_vlan_del(vport_num, esw_owner_vhca_id, vlan->vid, br_offloads);

		break;

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		mdb = SWITCHDEV_OBJ_PORT_MDB(obj);

		mlx5_esw_bridge_port_mdb_del(dev, vport_num, esw_owner_vhca_id, mdb->addr, mdb->vid,

					     br_offloads);

		break;

	default:

		return -EOPNOTSUPP;

	}
@@ -306,6 +318,10 @@ mlx5_esw_bridge_port_obj_attr_set(struct net_device *dev, 
						     attr->u.vlan_protocol,

						     br_offloads);

		break;

	case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:

		err = mlx5_esw_bridge_mcast_set(vport_num, esw_owner_vhca_id,

						!attr->u.mc_disabled, br_offloads);

		break;

	default:

		err = -EOPNOTSUPP;

	}

drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c

+171 −116
Original line number Diff line number Diff line
@@ -13,66 +13,6 @@ 
#define CREATE_TRACE_POINTS

#include "diag/bridge_tracepoint.h"



#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE 12000

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE 16000

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_FROM 0

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO		\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM	\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO		\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_FROM +	\

	 MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_FROM			\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_FILTER_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_TO			\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_FROM +		\

	 MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_FROM	\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_TO		\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_FROM +	\

	 MLX5_ESW_BRIDGE_INGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM			\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_QINQ_FILTER_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO			\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_FROM +		\

	 MLX5_ESW_BRIDGE_INGRESS_TABLE_UNTAGGED_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE			\

	(MLX5_ESW_BRIDGE_INGRESS_TABLE_MAC_GRP_IDX_TO + 1)

static_assert(MLX5_ESW_BRIDGE_INGRESS_TABLE_SIZE == 64000);



#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE 16000

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE (32000 - 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_FROM 0

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO		\

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_FROM		\

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_TO			\

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_FROM +		\

	 MLX5_ESW_BRIDGE_EGRESS_TABLE_VLAN_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM \

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_QINQ_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO			\

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_FROM +		\

	 MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_SIZE - 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_FROM \

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_MAC_GRP_IDX_TO + 1)

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_TO	\

	MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_FROM

#define MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE			\

	(MLX5_ESW_BRIDGE_EGRESS_TABLE_MISS_GRP_IDX_TO + 1)

static_assert(MLX5_ESW_BRIDGE_EGRESS_TABLE_SIZE == 64000);



#define MLX5_ESW_BRIDGE_SKIP_TABLE_SIZE 0



enum {

	MLX5_ESW_BRIDGE_LEVEL_INGRESS_TABLE,

	MLX5_ESW_BRIDGE_LEVEL_EGRESS_TABLE,

	MLX5_ESW_BRIDGE_LEVEL_SKIP_TABLE,

};



static const struct rhashtable_params fdb_ht_params = {

	.key_offset = offsetof(struct mlx5_esw_bridge_fdb_entry, key),

	.key_len = sizeof(struct mlx5_esw_bridge_fdb_key),
@@ -80,31 +20,6 @@ static const struct rhashtable_params fdb_ht_params = { 
	.automatic_shrinking = true,

};



enum {

	MLX5_ESW_BRIDGE_VLAN_FILTERING_FLAG = BIT(0),

};



struct mlx5_esw_bridge {

	int ifindex;

	int refcnt;

	struct list_head list;

	struct mlx5_esw_bridge_offloads *br_offloads;



	struct list_head fdb_list;

	struct rhashtable fdb_ht;



	struct mlx5_flow_table *egress_ft;

	struct mlx5_flow_group *egress_vlan_fg;

	struct mlx5_flow_group *egress_qinq_fg;

	struct mlx5_flow_group *egress_mac_fg;

	struct mlx5_flow_group *egress_miss_fg;

	struct mlx5_pkt_reformat *egress_miss_pkt_reformat;

	struct mlx5_flow_handle *egress_miss_handle;

	unsigned long ageing_time;

	u32 flags;

	u16 vlan_proto;

};



static void

mlx5_esw_bridge_fdb_offload_notify(struct net_device *dev, const unsigned char *addr, u16 vid,

				   unsigned long val)
@@ -146,7 +61,7 @@ mlx5_esw_bridge_pkt_reformat_vlan_pop_create(struct mlx5_eswitch *esw) 
	return mlx5_packet_reformat_alloc(esw->dev, &reformat_params, MLX5_FLOW_NAMESPACE_FDB);

}



static struct mlx5_flow_table *

struct mlx5_flow_table *

mlx5_esw_bridge_table_create(int max_fte, u32 level, struct mlx5_eswitch *esw)

{

	struct mlx5_flow_table_attr ft_attr = {};
@@ -925,6 +840,10 @@ static struct mlx5_esw_bridge *mlx5_esw_bridge_create(int ifindex, 
	if (err)

		goto err_fdb_ht;



	err = mlx5_esw_bridge_mdb_init(bridge);

	if (err)

		goto err_mdb_ht;



	INIT_LIST_HEAD(&bridge->fdb_list);

	bridge->ifindex = ifindex;

	bridge->refcnt = 1;
@@ -934,6 +853,8 @@ static struct mlx5_esw_bridge *mlx5_esw_bridge_create(int ifindex, 


	return bridge;



err_mdb_ht:

	rhashtable_destroy(&bridge->fdb_ht);

err_fdb_ht:

	mlx5_esw_bridge_egress_table_cleanup(bridge);

err_egress_tbl:
@@ -953,7 +874,9 @@ static void mlx5_esw_bridge_put(struct mlx5_esw_bridge_offloads *br_offloads, 
		return;



	mlx5_esw_bridge_egress_table_cleanup(bridge);

	mlx5_esw_bridge_mcast_disable(bridge);

	list_del(&bridge->list);

	mlx5_esw_bridge_mdb_cleanup(bridge);

	rhashtable_destroy(&bridge->fdb_ht);

	kvfree(bridge);
@@ -993,7 +916,7 @@ static unsigned long mlx5_esw_bridge_port_key_from_data(u16 vport_num, u16 esw_o 
	return vport_num | (unsigned long)esw_owner_vhca_id << sizeof(vport_num) * BITS_PER_BYTE;

}



static unsigned long mlx5_esw_bridge_port_key(struct mlx5_esw_bridge_port *port)

unsigned long mlx5_esw_bridge_port_key(struct mlx5_esw_bridge_port *port)

{

	return mlx5_esw_bridge_port_key_from_data(port->vport_num, port->esw_owner_vhca_id);

}
@@ -1018,6 +941,19 @@ static void mlx5_esw_bridge_port_erase(struct mlx5_esw_bridge_port *port, 
	xa_erase(&br_offloads->ports, mlx5_esw_bridge_port_key(port));

}



static struct mlx5_esw_bridge *

mlx5_esw_bridge_from_port_lookup(u16 vport_num, u16 esw_owner_vhca_id,

				 struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

		return NULL;



	return port->bridge;

}



static void mlx5_esw_bridge_fdb_entry_refresh(struct mlx5_esw_bridge_fdb_entry *entry)

{

	trace_mlx5_esw_bridge_fdb_entry_refresh(entry);
@@ -1166,8 +1102,21 @@ mlx5_esw_bridge_vlan_push_mark_cleanup(struct mlx5_esw_bridge_vlan *vlan, struct 
}



static int

mlx5_esw_bridge_vlan_push_pop_create(u16 vlan_proto, u16 flags, struct mlx5_esw_bridge_vlan *vlan,

				     struct mlx5_eswitch *esw)

mlx5_esw_bridge_vlan_push_pop_fhs_create(u16 vlan_proto, struct mlx5_esw_bridge_port *port,

					 struct mlx5_esw_bridge_vlan *vlan)

{

	return mlx5_esw_bridge_vlan_mcast_init(vlan_proto, port, vlan);

}



static void

mlx5_esw_bridge_vlan_push_pop_fhs_cleanup(struct mlx5_esw_bridge_vlan *vlan)

{

	mlx5_esw_bridge_vlan_mcast_cleanup(vlan);

}



static int

mlx5_esw_bridge_vlan_push_pop_create(u16 vlan_proto, u16 flags, struct mlx5_esw_bridge_port *port,

				     struct mlx5_esw_bridge_vlan *vlan, struct mlx5_eswitch *esw)

{

	int err;
@@ -1185,10 +1134,16 @@ mlx5_esw_bridge_vlan_push_pop_create(u16 vlan_proto, u16 flags, struct mlx5_esw_ 
		err = mlx5_esw_bridge_vlan_pop_create(vlan, esw);

		if (err)

			goto err_vlan_pop;



		err = mlx5_esw_bridge_vlan_push_pop_fhs_create(vlan_proto, port, vlan);

		if (err)

			goto err_vlan_pop_fhs;

	}



	return 0;



err_vlan_pop_fhs:

	mlx5_esw_bridge_vlan_pop_cleanup(vlan, esw);

err_vlan_pop:

	if (vlan->pkt_mod_hdr_push_mark)

		mlx5_esw_bridge_vlan_push_mark_cleanup(vlan, esw);
@@ -1213,7 +1168,7 @@ mlx5_esw_bridge_vlan_create(u16 vlan_proto, u16 vid, u16 flags, struct mlx5_esw_ 
	vlan->flags = flags;

	INIT_LIST_HEAD(&vlan->fdb_list);



	err = mlx5_esw_bridge_vlan_push_pop_create(vlan_proto, flags, vlan, esw);

	err = mlx5_esw_bridge_vlan_push_pop_create(vlan_proto, flags, port, vlan, esw);

	if (err)

		goto err_vlan_push_pop;
@@ -1225,6 +1180,8 @@ mlx5_esw_bridge_vlan_create(u16 vlan_proto, u16 vid, u16 flags, struct mlx5_esw_ 
	return vlan;



err_xa_insert:

	if (vlan->mcast_handle)

		mlx5_esw_bridge_vlan_push_pop_fhs_cleanup(vlan);

	if (vlan->pkt_reformat_pop)

		mlx5_esw_bridge_vlan_pop_cleanup(vlan, esw);

	if (vlan->pkt_mod_hdr_push_mark)
@@ -1242,7 +1199,8 @@ static void mlx5_esw_bridge_vlan_erase(struct mlx5_esw_bridge_port *port, 
	xa_erase(&port->vlans, vlan->vid);

}



static void mlx5_esw_bridge_vlan_flush(struct mlx5_esw_bridge_vlan *vlan,

static void mlx5_esw_bridge_vlan_flush(struct mlx5_esw_bridge_port *port,

				       struct mlx5_esw_bridge_vlan *vlan,

				       struct mlx5_esw_bridge *bridge)

{

	struct mlx5_eswitch *esw = bridge->br_offloads->esw;
@@ -1250,7 +1208,10 @@ static void mlx5_esw_bridge_vlan_flush(struct mlx5_esw_bridge_vlan *vlan, 


	list_for_each_entry_safe(entry, tmp, &vlan->fdb_list, vlan_list)

		mlx5_esw_bridge_fdb_entry_notify_and_cleanup(entry, bridge);

	mlx5_esw_bridge_port_mdb_vlan_flush(port, vlan);



	if (vlan->mcast_handle)

		mlx5_esw_bridge_vlan_push_pop_fhs_cleanup(vlan);

	if (vlan->pkt_reformat_pop)

		mlx5_esw_bridge_vlan_pop_cleanup(vlan, esw);

	if (vlan->pkt_mod_hdr_push_mark)
@@ -1264,7 +1225,7 @@ static void mlx5_esw_bridge_vlan_cleanup(struct mlx5_esw_bridge_port *port, 
					 struct mlx5_esw_bridge *bridge)

{

	trace_mlx5_esw_bridge_vlan_cleanup(vlan);

	mlx5_esw_bridge_vlan_flush(vlan, bridge);

	mlx5_esw_bridge_vlan_flush(port, vlan, bridge);

	mlx5_esw_bridge_vlan_erase(port, vlan);

	kvfree(vlan);

}
@@ -1288,9 +1249,9 @@ static int mlx5_esw_bridge_port_vlans_recreate(struct mlx5_esw_bridge_port *port 
	int err;



	xa_for_each(&port->vlans, i, vlan) {

		mlx5_esw_bridge_vlan_flush(vlan, bridge);

		err = mlx5_esw_bridge_vlan_push_pop_create(bridge->vlan_proto, vlan->flags, vlan,

							   br_offloads->esw);

		mlx5_esw_bridge_vlan_flush(port, vlan, bridge);

		err = mlx5_esw_bridge_vlan_push_pop_create(bridge->vlan_proto, vlan->flags, port,

							   vlan, br_offloads->esw);

		if (err) {

			esw_warn(br_offloads->esw->dev,

				 "Failed to create VLAN=%u(proto=%x) push/pop actions (vport=%u,err=%d)\n",
@@ -1473,33 +1434,32 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, u16 esw_ow 
int mlx5_esw_bridge_ageing_time_set(u16 vport_num, u16 esw_owner_vhca_id, unsigned long ageing_time,

				    struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!bridge)

		return -EINVAL;



	port->bridge->ageing_time = clock_t_to_jiffies(ageing_time);

	bridge->ageing_time = clock_t_to_jiffies(ageing_time);

	return 0;

}



int mlx5_esw_bridge_vlan_filtering_set(u16 vport_num, u16 esw_owner_vhca_id, bool enable,

				       struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;

	bool filtering;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!bridge)

		return -EINVAL;



	bridge = port->bridge;

	filtering = bridge->flags & MLX5_ESW_BRIDGE_VLAN_FILTERING_FLAG;

	if (filtering == enable)

		return 0;



	mlx5_esw_bridge_fdb_flush(bridge);

	mlx5_esw_bridge_mdb_flush(bridge);

	if (enable)

		bridge->flags |= MLX5_ESW_BRIDGE_VLAN_FILTERING_FLAG;

	else
@@ -1511,15 +1471,13 @@ int mlx5_esw_bridge_vlan_filtering_set(u16 vport_num, u16 esw_owner_vhca_id, boo 
int mlx5_esw_bridge_vlan_proto_set(u16 vport_num, u16 esw_owner_vhca_id, u16 proto,

				   struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id,

	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id,

						  br_offloads);

	if (!port)

	if (!bridge)

		return -EINVAL;



	bridge = port->bridge;

	if (bridge->vlan_proto == proto)

		return 0;

	if (proto != ETH_P_8021Q && proto != ETH_P_8021AD) {
@@ -1528,12 +1486,43 @@ int mlx5_esw_bridge_vlan_proto_set(u16 vport_num, u16 esw_owner_vhca_id, u16 pro 
	}



	mlx5_esw_bridge_fdb_flush(bridge);

	mlx5_esw_bridge_mdb_flush(bridge);

	bridge->vlan_proto = proto;

	mlx5_esw_bridge_vlans_recreate(bridge);



	return 0;

}



int mlx5_esw_bridge_mcast_set(u16 vport_num, u16 esw_owner_vhca_id, bool enable,

			      struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_eswitch *esw = br_offloads->esw;

	struct mlx5_esw_bridge *bridge;

	int err = 0;

	bool mcast;



	if (!(MLX5_CAP_ESW_FLOWTABLE((esw)->dev, fdb_multi_path_any_table) ||

	      MLX5_CAP_ESW_FLOWTABLE((esw)->dev, fdb_multi_path_any_table_limit_regc)) ||

	    !MLX5_CAP_ESW_FLOWTABLE((esw)->dev, fdb_uplink_hairpin) ||

	    !MLX5_CAP_ESW_FLOWTABLE_FDB((esw)->dev, ignore_flow_level))

		return -EOPNOTSUPP;



	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!bridge)

		return -EINVAL;



	mcast = bridge->flags & MLX5_ESW_BRIDGE_MCAST_FLAG;

	if (mcast == enable)

		return 0;



	if (enable)

		err = mlx5_esw_bridge_mcast_enable(bridge);

	else

		mlx5_esw_bridge_mcast_disable(bridge);



	return err;

}



static int mlx5_esw_bridge_vport_init(u16 vport_num, u16 esw_owner_vhca_id, u16 flags,

				      struct mlx5_esw_bridge_offloads *br_offloads,

				      struct mlx5_esw_bridge *bridge)
@@ -1551,6 +1540,15 @@ static int mlx5_esw_bridge_vport_init(u16 vport_num, u16 esw_owner_vhca_id, u16 
	port->bridge = bridge;

	port->flags |= flags;

	xa_init(&port->vlans);



	err = mlx5_esw_bridge_port_mcast_init(port);

	if (err) {

		esw_warn(esw->dev,

			 "Failed to initialize port multicast (vport=%u,esw_owner_vhca_id=%u,err=%d)\n",

			 port->vport_num, port->esw_owner_vhca_id, err);

		goto err_port_mcast;

	}



	err = mlx5_esw_bridge_port_insert(port, br_offloads);

	if (err) {

		esw_warn(esw->dev,
@@ -1563,6 +1561,8 @@ static int mlx5_esw_bridge_vport_init(u16 vport_num, u16 esw_owner_vhca_id, u16 
	return 0;



err_port_insert:

	mlx5_esw_bridge_port_mcast_cleanup(port);

err_port_mcast:

	kvfree(port);

	return err;

}
@@ -1580,6 +1580,7 @@ static int mlx5_esw_bridge_vport_cleanup(struct mlx5_esw_bridge_offloads *br_off 


	trace_mlx5_esw_bridge_vport_cleanup(port);

	mlx5_esw_bridge_port_vlans_flush(port, bridge);

	mlx5_esw_bridge_port_mcast_cleanup(port);

	mlx5_esw_bridge_port_erase(port, br_offloads);

	kvfree(port);

	mlx5_esw_bridge_put(br_offloads, bridge);
@@ -1711,14 +1712,12 @@ void mlx5_esw_bridge_fdb_update_used(struct net_device *dev, u16 vport_num, u16 
				     struct switchdev_notifier_fdb_info *fdb_info)

{

	struct mlx5_esw_bridge_fdb_entry *entry;

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!bridge)

		return;



	bridge = port->bridge;

	entry = mlx5_esw_bridge_fdb_lookup(bridge, fdb_info->addr, fdb_info->vid);

	if (!entry) {

		esw_debug(br_offloads->esw->dev,
@@ -1765,14 +1764,12 @@ void mlx5_esw_bridge_fdb_remove(struct net_device *dev, u16 vport_num, u16 esw_o 
{

	struct mlx5_eswitch *esw = br_offloads->esw;

	struct mlx5_esw_bridge_fdb_entry *entry;

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

	bridge = mlx5_esw_bridge_from_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!bridge)

		return;



	bridge = port->bridge;

	entry = mlx5_esw_bridge_fdb_lookup(bridge, fdb_info->addr, fdb_info->vid);

	if (!entry) {

		esw_debug(esw->dev,
@@ -1806,6 +1803,64 @@ void mlx5_esw_bridge_update(struct mlx5_esw_bridge_offloads *br_offloads) 
	}

}



int mlx5_esw_bridge_port_mdb_add(struct net_device *dev, u16 vport_num, u16 esw_owner_vhca_id,

				 const unsigned char *addr, u16 vid,

				 struct mlx5_esw_bridge_offloads *br_offloads,

				 struct netlink_ext_ack *extack)

{

	struct mlx5_esw_bridge_vlan *vlan;

	struct mlx5_esw_bridge_port *port;

	struct mlx5_esw_bridge *bridge;

	int err;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port) {

		esw_warn(br_offloads->esw->dev,

			 "Failed to lookup bridge port to add MDB (MAC=%pM,vport=%u)\n",

			 addr, vport_num);

		NL_SET_ERR_MSG_FMT_MOD(extack,

				       "Failed to lookup bridge port to add MDB (MAC=%pM,vport=%u)\n",

				       addr, vport_num);

		return -EINVAL;

	}



	bridge = port->bridge;

	if (bridge->flags & MLX5_ESW_BRIDGE_VLAN_FILTERING_FLAG && vid) {

		vlan = mlx5_esw_bridge_vlan_lookup(vid, port);

		if (!vlan) {

			esw_warn(br_offloads->esw->dev,

				 "Failed to lookup bridge port vlan metadata to create MDB (MAC=%pM,vid=%u,vport=%u)\n",

				 addr, vid, vport_num);

			NL_SET_ERR_MSG_FMT_MOD(extack,

					       "Failed to lookup bridge port vlan metadata to create MDB (MAC=%pM,vid=%u,vport=%u)\n",

					       addr, vid, vport_num);

			return -EINVAL;

		}

	}



	err = mlx5_esw_bridge_port_mdb_attach(dev, port, addr, vid);

	if (err) {

		NL_SET_ERR_MSG_FMT_MOD(extack, "Failed to add MDB (MAC=%pM,vid=%u,vport=%u)\n",

				       addr, vid, vport_num);

		return err;

	}



	return 0;

}



void mlx5_esw_bridge_port_mdb_del(struct net_device *dev, u16 vport_num, u16 esw_owner_vhca_id,

				  const unsigned char *addr, u16 vid,

				  struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;



	port = mlx5_esw_bridge_port_lookup(vport_num, esw_owner_vhca_id, br_offloads);

	if (!port)

		return;



	mlx5_esw_bridge_port_mdb_detach(dev, port, addr, vid);

}



static void mlx5_esw_bridge_flush(struct mlx5_esw_bridge_offloads *br_offloads)

{

	struct mlx5_esw_bridge_port *port;

drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h

+17 −0
Original line number Diff line number Diff line
@@ -25,12 +25,19 @@ struct mlx5_esw_bridge_offloads { 
	struct delayed_work update_work;



	struct mlx5_flow_table *ingress_ft;

	struct mlx5_flow_group *ingress_igmp_fg;

	struct mlx5_flow_group *ingress_mld_fg;

	struct mlx5_flow_group *ingress_vlan_fg;

	struct mlx5_flow_group *ingress_vlan_filter_fg;

	struct mlx5_flow_group *ingress_qinq_fg;

	struct mlx5_flow_group *ingress_qinq_filter_fg;

	struct mlx5_flow_group *ingress_mac_fg;



	struct mlx5_flow_handle *igmp_handle;

	struct mlx5_flow_handle *mld_query_handle;

	struct mlx5_flow_handle *mld_report_handle;

	struct mlx5_flow_handle *mld_done_handle;



	struct mlx5_flow_table *skip_ft;

};
@@ -64,10 +71,20 @@ int mlx5_esw_bridge_vlan_filtering_set(u16 vport_num, u16 esw_owner_vhca_id, boo 
				       struct mlx5_esw_bridge_offloads *br_offloads);

int mlx5_esw_bridge_vlan_proto_set(u16 vport_num, u16 esw_owner_vhca_id, u16 proto,

				   struct mlx5_esw_bridge_offloads *br_offloads);

int mlx5_esw_bridge_mcast_set(u16 vport_num, u16 esw_owner_vhca_id, bool enable,

			      struct mlx5_esw_bridge_offloads *br_offloads);

int mlx5_esw_bridge_port_vlan_add(u16 vport_num, u16 esw_owner_vhca_id, u16 vid, u16 flags,

				  struct mlx5_esw_bridge_offloads *br_offloads,

				  struct netlink_ext_ack *extack);

void mlx5_esw_bridge_port_vlan_del(u16 vport_num, u16 esw_owner_vhca_id, u16 vid,

				   struct mlx5_esw_bridge_offloads *br_offloads);



int mlx5_esw_bridge_port_mdb_add(struct net_device *dev, u16 vport_num, u16 esw_owner_vhca_id,

				 const unsigned char *addr, u16 vid,

				 struct mlx5_esw_bridge_offloads *br_offloads,

				 struct netlink_ext_ack *extack);

void mlx5_esw_bridge_port_mdb_del(struct net_device *dev, u16 vport_num, u16 esw_owner_vhca_id,

				  const unsigned char *addr, u16 vid,

				  struct mlx5_esw_bridge_offloads *br_offloads);



#endif /* __MLX5_ESW_BRIDGE_H__ */