~hc/RK356X_SDK_RELEASE.git

..	..	@@ -35,11 +35,15 @@
35	35	#include <linux/mlx5/mlx5_ifc.h>
36	36	#include <linux/mlx5/vport.h>
37	37	#include <linux/mlx5/fs.h>
	38	+#include <linux/mlx5/mpfs.h>
	39	+#include "esw/acl/lgcy.h"
38	40	#include "mlx5_core.h"
	41	+#include "lib/eq.h"
39	42	#include "eswitch.h"
40	43	#include "fs_core.h"
41		-
42		-#define UPLINK_VPORT 0xFFFF
	44	+#include "devlink.h"
	45	+#include "ecpf.h"
	46	+#include "en/mod_hdr.h"
43	47
44	48	enum {
45	49	MLX5_ACTION_NONE = 0,
..	..	@@ -51,29 +55,62 @@
51	55	struct vport_addr {
52	56	struct l2addr_node node;
53	57	u8 action;
54		- u32 vport;
	58	+ u16 vport;
55	59	struct mlx5_flow_handle *flow_rule;
56	60	bool mpfs; /* UC MAC was added to MPFs */
57	61	/* A flag indicating that mac was added due to mc promiscuous vport */
58	62	bool mc_promisc;
59	63	};
60	64
61		-enum {
62		- UC_ADDR_CHANGE = BIT(0),
63		- MC_ADDR_CHANGE = BIT(1),
64		- PROMISC_CHANGE = BIT(3),
65		-};
	65	+static void esw_destroy_legacy_fdb_table(struct mlx5_eswitch *esw);
	66	+static void esw_cleanup_vepa_rules(struct mlx5_eswitch *esw);
66	67
67		-/* Vport context events */
68		-#define SRIOV_VPORT_EVENTS (UC_ADDR_CHANGE \| \
69		- MC_ADDR_CHANGE \| \
70		- PROMISC_CHANGE)
	68	+static int mlx5_eswitch_check(const struct mlx5_core_dev *dev)
	69	+{
	70	+ if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
	71	+ return -EOPNOTSUPP;
	72	+
	73	+ if (!MLX5_ESWITCH_MANAGER(dev))
	74	+ return -EOPNOTSUPP;
	75	+
	76	+ return 0;
	77	+}
	78	+
	79	+struct mlx5_eswitch mlx5_devlink_eswitch_get(struct devlink devlink)
	80	+{
	81	+ struct mlx5_core_dev *dev = devlink_priv(devlink);
	82	+ int err;
	83	+
	84	+ err = mlx5_eswitch_check(dev);
	85	+ if (err)
	86	+ return ERR_PTR(err);
	87	+
	88	+ return dev->priv.eswitch;
	89	+}
	90	+
	91	+struct mlx5_vport *__must_check
	92	+mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num)
	93	+{
	94	+ u16 idx;
	95	+
	96	+ if (!esw \|\| !MLX5_CAP_GEN(esw->dev, vport_group_manager))
	97	+ return ERR_PTR(-EPERM);
	98	+
	99	+ idx = mlx5_eswitch_vport_num_to_index(esw, vport_num);
	100	+
	101	+ if (idx > esw->total_vports - 1) {
	102	+ esw_debug(esw->dev, "vport out of range: num(0x%x), idx(0x%x)\n",
	103	+ vport_num, idx);
	104	+ return ERR_PTR(-EINVAL);
	105	+ }
	106	+
	107	+ return &esw->vports[idx];
	108	+}
71	109
72	110	static int arm_vport_context_events_cmd(struct mlx5_core_dev *dev, u16 vport,
73	111	u32 events_mask)
74	112	{
75		- int in[MLX5_ST_SZ_DW(modify_nic_vport_context_in)] = {0};
76		- int out[MLX5_ST_SZ_DW(modify_nic_vport_context_out)] = {0};
	113	+ u32 in[MLX5_ST_SZ_DW(modify_nic_vport_context_in)] = {};
77	114	void *nic_vport_ctx;
78	115
79	116	MLX5_SET(modify_nic_vport_context_in, in,
..	..	@@ -86,36 +123,34 @@
86	123
87	124	MLX5_SET(nic_vport_context, nic_vport_ctx, arm_change_event, 1);
88	125
89		- if (events_mask & UC_ADDR_CHANGE)
	126	+ if (events_mask & MLX5_VPORT_UC_ADDR_CHANGE)
90	127	MLX5_SET(nic_vport_context, nic_vport_ctx,
91	128	event_on_uc_address_change, 1);
92		- if (events_mask & MC_ADDR_CHANGE)
	129	+ if (events_mask & MLX5_VPORT_MC_ADDR_CHANGE)
93	130	MLX5_SET(nic_vport_context, nic_vport_ctx,
94	131	event_on_mc_address_change, 1);
95		- if (events_mask & PROMISC_CHANGE)
	132	+ if (events_mask & MLX5_VPORT_PROMISC_CHANGE)
96	133	MLX5_SET(nic_vport_context, nic_vport_ctx,
97	134	event_on_promisc_change, 1);
98	135
99		- return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
	136	+ return mlx5_cmd_exec_in(dev, modify_nic_vport_context, in);
100	137	}
101	138
102	139	/* E-Switch vport context HW commands */
103		-static int modify_esw_vport_context_cmd(struct mlx5_core_dev *dev, u16 vport,
104		- void *in, int inlen)
	140	+int mlx5_eswitch_modify_esw_vport_context(struct mlx5_core_dev *dev, u16 vport,
	141	+ bool other_vport, void *in)
105	142	{
106		- u32 out[MLX5_ST_SZ_DW(modify_esw_vport_context_out)] = {0};
107		-
108	143	MLX5_SET(modify_esw_vport_context_in, in, opcode,
109	144	MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT);
110	145	MLX5_SET(modify_esw_vport_context_in, in, vport_number, vport);
111		- MLX5_SET(modify_esw_vport_context_in, in, other_vport, 1);
112		- return mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));
	146	+ MLX5_SET(modify_esw_vport_context_in, in, other_vport, other_vport);
	147	+ return mlx5_cmd_exec_in(dev, modify_esw_vport_context, in);
113	148	}
114	149
115		-static int modify_esw_vport_cvlan(struct mlx5_core_dev *dev, u32 vport,
	150	+static int modify_esw_vport_cvlan(struct mlx5_core_dev *dev, u16 vport,
116	151	u16 vlan, u8 qos, u8 set_flags)
117	152	{
118		- u32 in[MLX5_ST_SZ_DW(modify_esw_vport_context_in)] = {0};
	153	+ u32 in[MLX5_ST_SZ_DW(modify_esw_vport_context_in)] = {};
119	154
120	155	if (!MLX5_CAP_ESW(dev, vport_cvlan_strip) \|\|
121	156	!MLX5_CAP_ESW(dev, vport_cvlan_insert_if_not_exist))
..	..	@@ -144,12 +179,12 @@
144	179	MLX5_SET(modify_esw_vport_context_in, in,
145	180	field_select.vport_cvlan_insert, 1);
146	181
147		- return modify_esw_vport_context_cmd(dev, vport, in, sizeof(in));
	182	+ return mlx5_eswitch_modify_esw_vport_context(dev, vport, true, in);
148	183	}
149	184
150	185	/* E-Switch FDB */
151	186	static struct mlx5_flow_handle *
152		-__esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule,
	187	+__esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u16 vport, bool rx_rule,
153	188	u8 mac_c[ETH_ALEN], u8 mac_v[ETH_ALEN])
154	189	{
155	190	int match_header = (is_zero_ether_addr(mac_c) ? 0 :
..	..	@@ -185,7 +220,7 @@
185	220	misc_parameters);
186	221	mc_misc = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
187	222	misc_parameters);
188		- MLX5_SET(fte_match_set_misc, mv_misc, source_port, UPLINK_VPORT);
	223	+ MLX5_SET(fte_match_set_misc, mv_misc, source_port, MLX5_VPORT_UPLINK);
189	224	MLX5_SET_TO_ONES(fte_match_set_misc, mc_misc, source_port);
190	225	}
191	226
..	..	@@ -212,7 +247,7 @@
212	247	}
213	248
214	249	static struct mlx5_flow_handle *
215		-esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u8 mac[ETH_ALEN], u32 vport)
	250	+esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u8 mac[ETH_ALEN], u16 vport)
216	251	{
217	252	u8 mac_c[ETH_ALEN];
218	253
..	..	@@ -221,7 +256,7 @@
221	256	}
222	257
223	258	static struct mlx5_flow_handle *
224		-esw_fdb_set_vport_allmulti_rule(struct mlx5_eswitch *esw, u32 vport)
	259	+esw_fdb_set_vport_allmulti_rule(struct mlx5_eswitch *esw, u16 vport)
225	260	{
226	261	u8 mac_c[ETH_ALEN];
227	262	u8 mac_v[ETH_ALEN];
..	..	@@ -234,7 +269,7 @@
234	269	}
235	270
236	271	static struct mlx5_flow_handle *
237		-esw_fdb_set_vport_promisc_rule(struct mlx5_eswitch *esw, u32 vport)
	272	+esw_fdb_set_vport_promisc_rule(struct mlx5_eswitch *esw, u16 vport)
238	273	{
239	274	u8 mac_c[ETH_ALEN];
240	275	u8 mac_v[ETH_ALEN];
..	..	@@ -242,6 +277,40 @@
242	277	eth_zero_addr(mac_c);
243	278	eth_zero_addr(mac_v);
244	279	return __esw_fdb_set_vport_rule(esw, vport, true, mac_c, mac_v);
	280	+}
	281	+
	282	+enum {
	283	+ LEGACY_VEPA_PRIO = 0,
	284	+ LEGACY_FDB_PRIO,
	285	+};
	286	+
	287	+static int esw_create_legacy_vepa_table(struct mlx5_eswitch *esw)
	288	+{
	289	+ struct mlx5_flow_table_attr ft_attr = {};
	290	+ struct mlx5_core_dev *dev = esw->dev;
	291	+ struct mlx5_flow_namespace *root_ns;
	292	+ struct mlx5_flow_table *fdb;
	293	+ int err;
	294	+
	295	+ root_ns = mlx5_get_fdb_sub_ns(dev, 0);
	296	+ if (!root_ns) {
	297	+ esw_warn(dev, "Failed to get FDB flow namespace\n");
	298	+ return -EOPNOTSUPP;
	299	+ }
	300	+
	301	+ /* num FTE 2, num FG 2 */
	302	+ ft_attr.prio = LEGACY_VEPA_PRIO;
	303	+ ft_attr.max_fte = 2;
	304	+ ft_attr.autogroup.max_num_groups = 2;
	305	+ fdb = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
	306	+ if (IS_ERR(fdb)) {
	307	+ err = PTR_ERR(fdb);
	308	+ esw_warn(dev, "Failed to create VEPA FDB err %d\n", err);
	309	+ return err;
	310	+ }
	311	+ esw->fdb_table.legacy.vepa_fdb = fdb;
	312	+
	313	+ return 0;
245	314	}
246	315
247	316	static int esw_create_legacy_fdb_table(struct mlx5_eswitch *esw)
..	..	@@ -261,7 +330,7 @@
261	330	esw_debug(dev, "Create FDB log_max_size(%d)\n",
262	331	MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));
263	332
264		- root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_FDB);
	333	+ root_ns = mlx5_get_fdb_sub_ns(dev, 0);
265	334	if (!root_ns) {
266	335	esw_warn(dev, "Failed to get FDB flow namespace\n");
267	336	return -EOPNOTSUPP;
..	..	@@ -272,8 +341,8 @@
272	341	return -ENOMEM;
273	342
274	343	table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));
275		-
276	344	ft_attr.max_fte = table_size;
	345	+ ft_attr.prio = LEGACY_FDB_PRIO;
277	346	fdb = mlx5_create_flow_table(root_ns, &ft_attr);
278	347	if (IS_ERR(fdb)) {
279	348	err = PTR_ERR(fdb);
..	..	@@ -332,39 +401,100 @@
332	401	esw->fdb_table.legacy.promisc_grp = g;
333	402
334	403	out:
335		- if (err) {
336		- if (!IS_ERR_OR_NULL(esw->fdb_table.legacy.allmulti_grp)) {
337		- mlx5_destroy_flow_group(esw->fdb_table.legacy.allmulti_grp);
338		- esw->fdb_table.legacy.allmulti_grp = NULL;
339		- }
340		- if (!IS_ERR_OR_NULL(esw->fdb_table.legacy.addr_grp)) {
341		- mlx5_destroy_flow_group(esw->fdb_table.legacy.addr_grp);
342		- esw->fdb_table.legacy.addr_grp = NULL;
343		- }
344		- if (!IS_ERR_OR_NULL(esw->fdb_table.legacy.fdb)) {
345		- mlx5_destroy_flow_table(esw->fdb_table.legacy.fdb);
346		- esw->fdb_table.legacy.fdb = NULL;
347		- }
348		- }
	404	+ if (err)
	405	+ esw_destroy_legacy_fdb_table(esw);
349	406
350	407	kvfree(flow_group_in);
351	408	return err;
352	409	}
353	410
	411	+static void esw_destroy_legacy_vepa_table(struct mlx5_eswitch *esw)
	412	+{
	413	+ esw_debug(esw->dev, "Destroy VEPA Table\n");
	414	+ if (!esw->fdb_table.legacy.vepa_fdb)
	415	+ return;
	416	+
	417	+ mlx5_destroy_flow_table(esw->fdb_table.legacy.vepa_fdb);
	418	+ esw->fdb_table.legacy.vepa_fdb = NULL;
	419	+}
	420	+
354	421	static void esw_destroy_legacy_fdb_table(struct mlx5_eswitch *esw)
355	422	{
	423	+ esw_debug(esw->dev, "Destroy FDB Table\n");
356	424	if (!esw->fdb_table.legacy.fdb)
357	425	return;
358	426
359		- esw_debug(esw->dev, "Destroy FDB Table\n");
360		- mlx5_destroy_flow_group(esw->fdb_table.legacy.promisc_grp);
361		- mlx5_destroy_flow_group(esw->fdb_table.legacy.allmulti_grp);
362		- mlx5_destroy_flow_group(esw->fdb_table.legacy.addr_grp);
	427	+ if (esw->fdb_table.legacy.promisc_grp)
	428	+ mlx5_destroy_flow_group(esw->fdb_table.legacy.promisc_grp);
	429	+ if (esw->fdb_table.legacy.allmulti_grp)
	430	+ mlx5_destroy_flow_group(esw->fdb_table.legacy.allmulti_grp);
	431	+ if (esw->fdb_table.legacy.addr_grp)
	432	+ mlx5_destroy_flow_group(esw->fdb_table.legacy.addr_grp);
363	433	mlx5_destroy_flow_table(esw->fdb_table.legacy.fdb);
	434	+
364	435	esw->fdb_table.legacy.fdb = NULL;
365	436	esw->fdb_table.legacy.addr_grp = NULL;
366	437	esw->fdb_table.legacy.allmulti_grp = NULL;
367	438	esw->fdb_table.legacy.promisc_grp = NULL;
	439	+}
	440	+
	441	+static int esw_create_legacy_table(struct mlx5_eswitch *esw)
	442	+{
	443	+ int err;
	444	+
	445	+ memset(&esw->fdb_table.legacy, 0, sizeof(struct legacy_fdb));
	446	+
	447	+ err = esw_create_legacy_vepa_table(esw);
	448	+ if (err)
	449	+ return err;
	450	+
	451	+ err = esw_create_legacy_fdb_table(esw);
	452	+ if (err)
	453	+ esw_destroy_legacy_vepa_table(esw);
	454	+
	455	+ return err;
	456	+}
	457	+
	458	+static void esw_destroy_legacy_table(struct mlx5_eswitch *esw)
	459	+{
	460	+ esw_cleanup_vepa_rules(esw);
	461	+ esw_destroy_legacy_fdb_table(esw);
	462	+ esw_destroy_legacy_vepa_table(esw);
	463	+}
	464	+
	465	+#define MLX5_LEGACY_SRIOV_VPORT_EVENTS (MLX5_VPORT_UC_ADDR_CHANGE \| \
	466	+ MLX5_VPORT_MC_ADDR_CHANGE \| \
	467	+ MLX5_VPORT_PROMISC_CHANGE)
	468	+
	469	+static int esw_legacy_enable(struct mlx5_eswitch *esw)
	470	+{
	471	+ struct mlx5_vport *vport;
	472	+ int ret, i;
	473	+
	474	+ ret = esw_create_legacy_table(esw);
	475	+ if (ret)
	476	+ return ret;
	477	+
	478	+ mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs)
	479	+ vport->info.link_state = MLX5_VPORT_ADMIN_STATE_AUTO;
	480	+
	481	+ ret = mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_LEGACY_SRIOV_VPORT_EVENTS);
	482	+ if (ret)
	483	+ esw_destroy_legacy_table(esw);
	484	+ return ret;
	485	+}
	486	+
	487	+static void esw_legacy_disable(struct mlx5_eswitch *esw)
	488	+{
	489	+ struct esw_mc_addr *mc_promisc;
	490	+
	491	+ mlx5_eswitch_disable_pf_vf_vports(esw);
	492	+
	493	+ mc_promisc = &esw->mc_promisc;
	494	+ if (mc_promisc->uplink_rule)
	495	+ mlx5_del_flow_rules(mc_promisc->uplink_rule);
	496	+
	497	+ esw_destroy_legacy_table(esw);
368	498	}
369	499
370	500	/* E-Switch vport UC/MC lists management */
..	..	@@ -374,19 +504,19 @@
374	504	static int esw_add_uc_addr(struct mlx5_eswitch esw, struct vport_addr vaddr)
375	505	{
376	506	u8 *mac = vaddr->node.addr;
377		- u32 vport = vaddr->vport;
	507	+ u16 vport = vaddr->vport;
378	508	int err;
379	509
380		- /* Skip mlx5_mpfs_add_mac for PFs,
381		- * it is already done by the PF netdev in mlx5e_execute_l2_action
	510	+ /* Skip mlx5_mpfs_add_mac for eswitch_managers,
	511	+ * it is already done by its netdev in mlx5e_execute_l2_action
382	512	*/
383		- if (!vport)
	513	+ if (mlx5_esw_is_manager_vport(esw, vport))
384	514	goto fdb_add;
385	515
386	516	err = mlx5_mpfs_add_mac(esw->dev, mac);
387	517	if (err) {
388	518	esw_warn(esw->dev,
389		- "Failed to add L2 table mac(%pM) for vport(%d), err(%d)\n",
	519	+ "Failed to add L2 table mac(%pM) for vport(0x%x), err(%d)\n",
390	520	mac, vport, err);
391	521	return err;
392	522	}
..	..	@@ -394,7 +524,7 @@
394	524
395	525	fdb_add:
396	526	/* SRIOV is enabled: Forward UC MAC to vport */
397		- if (esw->fdb_table.legacy.fdb && esw->mode == SRIOV_LEGACY)
	527	+ if (esw->fdb_table.legacy.fdb && esw->mode == MLX5_ESWITCH_LEGACY)
398	528	vaddr->flow_rule = esw_fdb_set_vport_rule(esw, mac, vport);
399	529
400	530	esw_debug(esw->dev, "\tADDED UC MAC: vport[%d] %pM fr(%p)\n",
..	..	@@ -406,13 +536,13 @@
406	536	static int esw_del_uc_addr(struct mlx5_eswitch esw, struct vport_addr vaddr)
407	537	{
408	538	u8 *mac = vaddr->node.addr;
409		- u32 vport = vaddr->vport;
	539	+ u16 vport = vaddr->vport;
410	540	int err = 0;
411	541
412		- /* Skip mlx5_mpfs_del_mac for PFs,
413		- * it is already done by the PF netdev in mlx5e_execute_l2_action
	542	+ /* Skip mlx5_mpfs_del_mac for eswitch managers,
	543	+ * it is already done by its netdev in mlx5e_execute_l2_action
414	544	*/
415		- if (!vport \|\| !vaddr->mpfs)
	545	+ if (!vaddr->mpfs \|\| mlx5_esw_is_manager_vport(esw, vport))
416	546	goto fdb_del;
417	547
418	548	err = mlx5_mpfs_del_mac(esw->dev, mac);
..	..	@@ -435,17 +565,18 @@
435	565	struct esw_mc_addr *esw_mc)
436	566	{
437	567	u8 *mac = vaddr->node.addr;
438		- u32 vport_idx = 0;
	568	+ struct mlx5_vport *vport;
	569	+ u16 i, vport_num;
439	570
440		- for (vport_idx = 0; vport_idx < esw->total_vports; vport_idx++) {
441		- struct mlx5_vport *vport = &esw->vports[vport_idx];
	571	+ mlx5_esw_for_all_vports(esw, i, vport) {
442	572	struct hlist_head *vport_hash = vport->mc_list;
443	573	struct vport_addr *iter_vaddr =
444	574	l2addr_hash_find(vport_hash,
445	575	mac,
446	576	struct vport_addr);
	577	+ vport_num = vport->vport;
447	578	if (IS_ERR_OR_NULL(vport->allmulti_rule) \|\|
448		- vaddr->vport == vport_idx)
	579	+ vaddr->vport == vport_num)
449	580	continue;
450	581	switch (vaddr->action) {
451	582	case MLX5_ACTION_ADD:
..	..	@@ -457,14 +588,14 @@
457	588	if (!iter_vaddr) {
458	589	esw_warn(esw->dev,
459	590	"ALL-MULTI: Failed to add MAC(%pM) to vport[%d] DB\n",
460		- mac, vport_idx);
	591	+ mac, vport_num);
461	592	continue;
462	593	}
463		- iter_vaddr->vport = vport_idx;
	594	+ iter_vaddr->vport = vport_num;
464	595	iter_vaddr->flow_rule =
465	596	esw_fdb_set_vport_rule(esw,
466	597	mac,
467		- vport_idx);
	598	+ vport_num);
468	599	iter_vaddr->mc_promisc = true;
469	600	break;
470	601	case MLX5_ACTION_DEL:
..	..	@@ -482,7 +613,7 @@
482	613	struct hlist_head *hash = esw->mc_table;
483	614	struct esw_mc_addr *esw_mc;
484	615	u8 *mac = vaddr->node.addr;
485		- u32 vport = vaddr->vport;
	616	+ u16 vport = vaddr->vport;
486	617
487	618	if (!esw->fdb_table.legacy.fdb)
488	619	return 0;
..	..	@@ -496,7 +627,7 @@
496	627	return -ENOMEM;
497	628
498	629	esw_mc->uplink_rule = /* Forward MC MAC to Uplink */
499		- esw_fdb_set_vport_rule(esw, mac, UPLINK_VPORT);
	630	+ esw_fdb_set_vport_rule(esw, mac, MLX5_VPORT_UPLINK);
500	631
501	632	/* Add this multicast mac to all the mc promiscuous vports */
502	633	update_allmulti_vports(esw, vaddr, esw_mc);
..	..	@@ -522,7 +653,7 @@
522	653	struct hlist_head *hash = esw->mc_table;
523	654	struct esw_mc_addr *esw_mc;
524	655	u8 *mac = vaddr->node.addr;
525		- u32 vport = vaddr->vport;
	656	+ u16 vport = vaddr->vport;
526	657
527	658	if (!esw->fdb_table.legacy.fdb)
528	659	return 0;
..	..	@@ -561,9 +692,8 @@
561	692
562	693	/* Apply vport UC/MC list to HW l2 table and FDB table */
563	694	static void esw_apply_vport_addr_list(struct mlx5_eswitch *esw,
564		- u32 vport_num, int list_type)
	695	+ struct mlx5_vport *vport, int list_type)
565	696	{
566		- struct mlx5_vport *vport = &esw->vports[vport_num];
567	697	bool is_uc = list_type == MLX5_NVPRT_LIST_TYPE_UC;
568	698	vport_addr_action vport_addr_add;
569	699	vport_addr_action vport_addr_del;
..	..	@@ -596,9 +726,8 @@
596	726
597	727	/* Sync vport UC/MC list from vport context */
598	728	static void esw_update_vport_addr_list(struct mlx5_eswitch *esw,
599		- u32 vport_num, int list_type)
	729	+ struct mlx5_vport *vport, int list_type)
600	730	{
601		- struct mlx5_vport *vport = &esw->vports[vport_num];
602	731	bool is_uc = list_type == MLX5_NVPRT_LIST_TYPE_UC;
603	732	u8 (*mac_list)[ETH_ALEN];
604	733	struct l2addr_node *node;
..	..	@@ -627,12 +756,12 @@
627	756	if (!vport->enabled)
628	757	goto out;
629	758
630		- err = mlx5_query_nic_vport_mac_list(esw->dev, vport_num, list_type,
	759	+ err = mlx5_query_nic_vport_mac_list(esw->dev, vport->vport, list_type,
631	760	mac_list, &size);
632	761	if (err)
633	762	goto out;
634	763	esw_debug(esw->dev, "vport[%d] context update %s list size (%d)\n",
635		- vport_num, is_uc ? "UC" : "MC", size);
	764	+ vport->vport, is_uc ? "UC" : "MC", size);
636	765
637	766	for (i = 0; i < size; i++) {
638	767	if (is_uc && !is_valid_ether_addr(mac_list[i]))
..	..	@@ -670,10 +799,10 @@
670	799	if (!addr) {
671	800	esw_warn(esw->dev,
672	801	"Failed to add MAC(%pM) to vport[%d] DB\n",
673		- mac_list[i], vport_num);
	802	+ mac_list[i], vport->vport);
674	803	continue;
675	804	}
676		- addr->vport = vport_num;
	805	+ addr->vport = vport->vport;
677	806	addr->action = MLX5_ACTION_ADD;
678	807	}
679	808	out:
..	..	@@ -683,9 +812,9 @@
683	812	/* Sync vport UC/MC list from vport context
684	813	* Must be called after esw_update_vport_addr_list
685	814	*/
686		-static void esw_update_vport_mc_promisc(struct mlx5_eswitch *esw, u32 vport_num)
	815	+static void esw_update_vport_mc_promisc(struct mlx5_eswitch *esw,
	816	+ struct mlx5_vport *vport)
687	817	{
688		- struct mlx5_vport *vport = &esw->vports[vport_num];
689	818	struct l2addr_node *node;
690	819	struct vport_addr *addr;
691	820	struct hlist_head *hash;
..	..	@@ -708,32 +837,32 @@
708	837	if (!addr) {
709	838	esw_warn(esw->dev,
710	839	"Failed to add allmulti MAC(%pM) to vport[%d] DB\n",
711		- mac, vport_num);
	840	+ mac, vport->vport);
712	841	continue;
713	842	}
714		- addr->vport = vport_num;
	843	+ addr->vport = vport->vport;
715	844	addr->action = MLX5_ACTION_ADD;
716	845	addr->mc_promisc = true;
717	846	}
718	847	}
719	848
720	849	/* Apply vport rx mode to HW FDB table */
721		-static void esw_apply_vport_rx_mode(struct mlx5_eswitch *esw, u32 vport_num,
	850	+static void esw_apply_vport_rx_mode(struct mlx5_eswitch *esw,
	851	+ struct mlx5_vport *vport,
722	852	bool promisc, bool mc_promisc)
723	853	{
724	854	struct esw_mc_addr *allmulti_addr = &esw->mc_promisc;
725		- struct mlx5_vport *vport = &esw->vports[vport_num];
726	855
727	856	if (IS_ERR_OR_NULL(vport->allmulti_rule) != mc_promisc)
728	857	goto promisc;
729	858
730	859	if (mc_promisc) {
731	860	vport->allmulti_rule =
732		- esw_fdb_set_vport_allmulti_rule(esw, vport_num);
	861	+ esw_fdb_set_vport_allmulti_rule(esw, vport->vport);
733	862	if (!allmulti_addr->uplink_rule)
734	863	allmulti_addr->uplink_rule =
735	864	esw_fdb_set_vport_allmulti_rule(esw,
736		- UPLINK_VPORT);
	865	+ MLX5_VPORT_UPLINK);
737	866	allmulti_addr->refcnt++;
738	867	} else if (vport->allmulti_rule) {
739	868	mlx5_del_flow_rules(vport->allmulti_rule);
..	..	@@ -752,8 +881,8 @@
752	881	return;
753	882
754	883	if (promisc) {
755		- vport->promisc_rule = esw_fdb_set_vport_promisc_rule(esw,
756		- vport_num);
	884	+ vport->promisc_rule =
	885	+ esw_fdb_set_vport_promisc_rule(esw, vport->vport);
757	886	} else if (vport->promisc_rule) {
758	887	mlx5_del_flow_rules(vport->promisc_rule);
759	888	vport->promisc_rule = NULL;
..	..	@@ -761,23 +890,23 @@
761	890	}
762	891
763	892	/* Sync vport rx mode from vport context */
764		-static void esw_update_vport_rx_mode(struct mlx5_eswitch *esw, u32 vport_num)
	893	+static void esw_update_vport_rx_mode(struct mlx5_eswitch *esw,
	894	+ struct mlx5_vport *vport)
765	895	{
766		- struct mlx5_vport *vport = &esw->vports[vport_num];
767	896	int promisc_all = 0;
768	897	int promisc_uc = 0;
769	898	int promisc_mc = 0;
770	899	int err;
771	900
772	901	err = mlx5_query_nic_vport_promisc(esw->dev,
773		- vport_num,
	902	+ vport->vport,
774	903	&promisc_uc,
775	904	&promisc_mc,
776	905	&promisc_all);
777	906	if (err)
778	907	return;
779	908	esw_debug(esw->dev, "vport[%d] context update rx mode promisc_all=%d, all_multi=%d\n",
780		- vport_num, promisc_all, promisc_mc);
	909	+ vport->vport, promisc_all, promisc_mc);
781	910
782	911	if (!vport->info.trusted \|\| !vport->enabled) {
783	912	promisc_uc = 0;
..	..	@@ -785,7 +914,7 @@
785	914	promisc_all = 0;
786	915	}
787	916
788		- esw_apply_vport_rx_mode(esw, vport_num, promisc_all,
	917	+ esw_apply_vport_rx_mode(esw, vport, promisc_all,
789	918	(promisc_all \|\| promisc_mc));
790	919	}
791	920
..	..	@@ -795,32 +924,26 @@
795	924	struct mlx5_eswitch *esw = dev->priv.eswitch;
796	925	u8 mac[ETH_ALEN];
797	926
798		- mlx5_query_nic_vport_mac_address(dev, vport->vport, mac);
	927	+ mlx5_query_nic_vport_mac_address(dev, vport->vport, true, mac);
799	928	esw_debug(dev, "vport[%d] Context Changed: perm mac: %pM\n",
800	929	vport->vport, mac);
801	930
802		- if (vport->enabled_events & UC_ADDR_CHANGE) {
803		- esw_update_vport_addr_list(esw, vport->vport,
804		- MLX5_NVPRT_LIST_TYPE_UC);
805		- esw_apply_vport_addr_list(esw, vport->vport,
806		- MLX5_NVPRT_LIST_TYPE_UC);
	931	+ if (vport->enabled_events & MLX5_VPORT_UC_ADDR_CHANGE) {
	932	+ esw_update_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_UC);
	933	+ esw_apply_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_UC);
807	934	}
808	935
809		- if (vport->enabled_events & MC_ADDR_CHANGE) {
810		- esw_update_vport_addr_list(esw, vport->vport,
811		- MLX5_NVPRT_LIST_TYPE_MC);
812		- }
	936	+ if (vport->enabled_events & MLX5_VPORT_MC_ADDR_CHANGE)
	937	+ esw_update_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_MC);
813	938
814		- if (vport->enabled_events & PROMISC_CHANGE) {
815		- esw_update_vport_rx_mode(esw, vport->vport);
	939	+ if (vport->enabled_events & MLX5_VPORT_PROMISC_CHANGE) {
	940	+ esw_update_vport_rx_mode(esw, vport);
816	941	if (!IS_ERR_OR_NULL(vport->allmulti_rule))
817		- esw_update_vport_mc_promisc(esw, vport->vport);
	942	+ esw_update_vport_mc_promisc(esw, vport);
818	943	}
819	944
820		- if (vport->enabled_events & (PROMISC_CHANGE \| MC_ADDR_CHANGE)) {
821		- esw_apply_vport_addr_list(esw, vport->vport,
822		- MLX5_NVPRT_LIST_TYPE_MC);
823		- }
	945	+ if (vport->enabled_events & (MLX5_VPORT_PROMISC_CHANGE \| MLX5_VPORT_MC_ADDR_CHANGE))
	946	+ esw_apply_vport_addr_list(esw, vport, MLX5_NVPRT_LIST_TYPE_MC);
824	947
825	948	esw_debug(esw->dev, "vport[%d] Context Changed: Done\n", vport->vport);
826	949	if (vport->enabled)
..	..	@@ -839,474 +962,49 @@
839	962	mutex_unlock(&esw->state_lock);
840	963	}
841	964
842		-static int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
843		- struct mlx5_vport *vport)
	965	+static bool element_type_supported(struct mlx5_eswitch *esw, int type)
844	966	{
845		- int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
846		- struct mlx5_flow_group *vlan_grp = NULL;
847		- struct mlx5_flow_group *drop_grp = NULL;
848		- struct mlx5_core_dev *dev = esw->dev;
849		- struct mlx5_flow_namespace *root_ns;
850		- struct mlx5_flow_table *acl;
851		- void *match_criteria;
852		- u32 *flow_group_in;
853		- /* The egress acl table contains 2 rules:
854		- * 1)Allow traffic with vlan_tag=vst_vlan_id
855		- * 2)Drop all other traffic.
856		- */
857		- int table_size = 2;
858		- int err = 0;
	967	+ const struct mlx5_core_dev *dev = esw->dev;
859	968
860		- if (!MLX5_CAP_ESW_EGRESS_ACL(dev, ft_support))
861		- return -EOPNOTSUPP;
862		-
863		- if (!IS_ERR_OR_NULL(vport->egress.acl))
864		- return 0;
865		-
866		- esw_debug(dev, "Create vport[%d] egress ACL log_max_size(%d)\n",
867		- vport->vport, MLX5_CAP_ESW_EGRESS_ACL(dev, log_max_ft_size));
868		-
869		- root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_EGRESS,
870		- vport->vport);
871		- if (!root_ns) {
872		- esw_warn(dev, "Failed to get E-Switch egress flow namespace for vport (%d)\n", vport->vport);
873		- return -EOPNOTSUPP;
	969	+ switch (type) {
	970	+ case SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR:
	971	+ return MLX5_CAP_QOS(dev, esw_element_type) &
	972	+ ELEMENT_TYPE_CAP_MASK_TASR;
	973	+ case SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT:
	974	+ return MLX5_CAP_QOS(dev, esw_element_type) &
	975	+ ELEMENT_TYPE_CAP_MASK_VPORT;
	976	+ case SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT_TC:
	977	+ return MLX5_CAP_QOS(dev, esw_element_type) &
	978	+ ELEMENT_TYPE_CAP_MASK_VPORT_TC;
	979	+ case SCHEDULING_CONTEXT_ELEMENT_TYPE_PARA_VPORT_TC:
	980	+ return MLX5_CAP_QOS(dev, esw_element_type) &
	981	+ ELEMENT_TYPE_CAP_MASK_PARA_VPORT_TC;
874	982	}
875		-
876		- flow_group_in = kvzalloc(inlen, GFP_KERNEL);
877		- if (!flow_group_in)
878		- return -ENOMEM;
879		-
880		- acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
881		- if (IS_ERR(acl)) {
882		- err = PTR_ERR(acl);
883		- esw_warn(dev, "Failed to create E-Switch vport[%d] egress flow Table, err(%d)\n",
884		- vport->vport, err);
885		- goto out;
886		- }
887		-
888		- MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
889		- match_criteria = MLX5_ADDR_OF(create_flow_group_in, flow_group_in, match_criteria);
890		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.cvlan_tag);
891		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.first_vid);
892		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 0);
893		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
894		-
895		- vlan_grp = mlx5_create_flow_group(acl, flow_group_in);
896		- if (IS_ERR(vlan_grp)) {
897		- err = PTR_ERR(vlan_grp);
898		- esw_warn(dev, "Failed to create E-Switch vport[%d] egress allowed vlans flow group, err(%d)\n",
899		- vport->vport, err);
900		- goto out;
901		- }
902		-
903		- memset(flow_group_in, 0, inlen);
904		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 1);
905		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
906		- drop_grp = mlx5_create_flow_group(acl, flow_group_in);
907		- if (IS_ERR(drop_grp)) {
908		- err = PTR_ERR(drop_grp);
909		- esw_warn(dev, "Failed to create E-Switch vport[%d] egress drop flow group, err(%d)\n",
910		- vport->vport, err);
911		- goto out;
912		- }
913		-
914		- vport->egress.acl = acl;
915		- vport->egress.drop_grp = drop_grp;
916		- vport->egress.allowed_vlans_grp = vlan_grp;
917		-out:
918		- kvfree(flow_group_in);
919		- if (err && !IS_ERR_OR_NULL(vlan_grp))
920		- mlx5_destroy_flow_group(vlan_grp);
921		- if (err && !IS_ERR_OR_NULL(acl))
922		- mlx5_destroy_flow_table(acl);
923		- return err;
924		-}
925		-
926		-static void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,
927		- struct mlx5_vport *vport)
928		-{
929		- if (!IS_ERR_OR_NULL(vport->egress.allowed_vlan))
930		- mlx5_del_flow_rules(vport->egress.allowed_vlan);
931		-
932		- if (!IS_ERR_OR_NULL(vport->egress.drop_rule))
933		- mlx5_del_flow_rules(vport->egress.drop_rule);
934		-
935		- vport->egress.allowed_vlan = NULL;
936		- vport->egress.drop_rule = NULL;
937		-}
938		-
939		-static void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,
940		- struct mlx5_vport *vport)
941		-{
942		- if (IS_ERR_OR_NULL(vport->egress.acl))
943		- return;
944		-
945		- esw_debug(esw->dev, "Destroy vport[%d] E-Switch egress ACL\n", vport->vport);
946		-
947		- esw_vport_cleanup_egress_rules(esw, vport);
948		- mlx5_destroy_flow_group(vport->egress.allowed_vlans_grp);
949		- mlx5_destroy_flow_group(vport->egress.drop_grp);
950		- mlx5_destroy_flow_table(vport->egress.acl);
951		- vport->egress.allowed_vlans_grp = NULL;
952		- vport->egress.drop_grp = NULL;
953		- vport->egress.acl = NULL;
954		-}
955		-
956		-static int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
957		- struct mlx5_vport *vport)
958		-{
959		- int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
960		- struct mlx5_core_dev *dev = esw->dev;
961		- struct mlx5_flow_namespace *root_ns;
962		- struct mlx5_flow_table *acl;
963		- struct mlx5_flow_group *g;
964		- void *match_criteria;
965		- u32 *flow_group_in;
966		- /* The ingress acl table contains 4 groups
967		- * (2 active rules at the same time -
968		- * 1 allow rule from one of the first 3 groups.
969		- * 1 drop rule from the last group):
970		- * 1)Allow untagged traffic with smac=original mac.
971		- * 2)Allow untagged traffic.
972		- * 3)Allow traffic with smac=original mac.
973		- * 4)Drop all other traffic.
974		- */
975		- int table_size = 4;
976		- int err = 0;
977		-
978		- if (!MLX5_CAP_ESW_INGRESS_ACL(dev, ft_support))
979		- return -EOPNOTSUPP;
980		-
981		- if (!IS_ERR_OR_NULL(vport->ingress.acl))
982		- return 0;
983		-
984		- esw_debug(dev, "Create vport[%d] ingress ACL log_max_size(%d)\n",
985		- vport->vport, MLX5_CAP_ESW_INGRESS_ACL(dev, log_max_ft_size));
986		-
987		- root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS,
988		- vport->vport);
989		- if (!root_ns) {
990		- esw_warn(dev, "Failed to get E-Switch ingress flow namespace for vport (%d)\n", vport->vport);
991		- return -EOPNOTSUPP;
992		- }
993		-
994		- flow_group_in = kvzalloc(inlen, GFP_KERNEL);
995		- if (!flow_group_in)
996		- return -ENOMEM;
997		-
998		- acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);
999		- if (IS_ERR(acl)) {
1000		- err = PTR_ERR(acl);
1001		- esw_warn(dev, "Failed to create E-Switch vport[%d] ingress flow Table, err(%d)\n",
1002		- vport->vport, err);
1003		- goto out;
1004		- }
1005		- vport->ingress.acl = acl;
1006		-
1007		- match_criteria = MLX5_ADDR_OF(create_flow_group_in, flow_group_in, match_criteria);
1008		-
1009		- MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
1010		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.cvlan_tag);
1011		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.smac_47_16);
1012		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.smac_15_0);
1013		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 0);
1014		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);
1015		-
1016		- g = mlx5_create_flow_group(acl, flow_group_in);
1017		- if (IS_ERR(g)) {
1018		- err = PTR_ERR(g);
1019		- esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged spoofchk flow group, err(%d)\n",
1020		- vport->vport, err);
1021		- goto out;
1022		- }
1023		- vport->ingress.allow_untagged_spoofchk_grp = g;
1024		-
1025		- memset(flow_group_in, 0, inlen);
1026		- MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
1027		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.cvlan_tag);
1028		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 1);
1029		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);
1030		-
1031		- g = mlx5_create_flow_group(acl, flow_group_in);
1032		- if (IS_ERR(g)) {
1033		- err = PTR_ERR(g);
1034		- esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged flow group, err(%d)\n",
1035		- vport->vport, err);
1036		- goto out;
1037		- }
1038		- vport->ingress.allow_untagged_only_grp = g;
1039		-
1040		- memset(flow_group_in, 0, inlen);
1041		- MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
1042		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.smac_47_16);
1043		- MLX5_SET_TO_ONES(fte_match_param, match_criteria, outer_headers.smac_15_0);
1044		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 2);
1045		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 2);
1046		-
1047		- g = mlx5_create_flow_group(acl, flow_group_in);
1048		- if (IS_ERR(g)) {
1049		- err = PTR_ERR(g);
1050		- esw_warn(dev, "Failed to create E-Switch vport[%d] ingress spoofchk flow group, err(%d)\n",
1051		- vport->vport, err);
1052		- goto out;
1053		- }
1054		- vport->ingress.allow_spoofchk_only_grp = g;
1055		-
1056		- memset(flow_group_in, 0, inlen);
1057		- MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 3);
1058		- MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 3);
1059		-
1060		- g = mlx5_create_flow_group(acl, flow_group_in);
1061		- if (IS_ERR(g)) {
1062		- err = PTR_ERR(g);
1063		- esw_warn(dev, "Failed to create E-Switch vport[%d] ingress drop flow group, err(%d)\n",
1064		- vport->vport, err);
1065		- goto out;
1066		- }
1067		- vport->ingress.drop_grp = g;
1068		-
1069		-out:
1070		- if (err) {
1071		- if (!IS_ERR_OR_NULL(vport->ingress.allow_spoofchk_only_grp))
1072		- mlx5_destroy_flow_group(
1073		- vport->ingress.allow_spoofchk_only_grp);
1074		- if (!IS_ERR_OR_NULL(vport->ingress.allow_untagged_only_grp))
1075		- mlx5_destroy_flow_group(
1076		- vport->ingress.allow_untagged_only_grp);
1077		- if (!IS_ERR_OR_NULL(vport->ingress.allow_untagged_spoofchk_grp))
1078		- mlx5_destroy_flow_group(
1079		- vport->ingress.allow_untagged_spoofchk_grp);
1080		- if (!IS_ERR_OR_NULL(vport->ingress.acl))
1081		- mlx5_destroy_flow_table(vport->ingress.acl);
1082		- }
1083		-
1084		- kvfree(flow_group_in);
1085		- return err;
1086		-}
1087		-
1088		-static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,
1089		- struct mlx5_vport *vport)
1090		-{
1091		- if (!IS_ERR_OR_NULL(vport->ingress.drop_rule))
1092		- mlx5_del_flow_rules(vport->ingress.drop_rule);
1093		-
1094		- if (!IS_ERR_OR_NULL(vport->ingress.allow_rule))
1095		- mlx5_del_flow_rules(vport->ingress.allow_rule);
1096		-
1097		- vport->ingress.drop_rule = NULL;
1098		- vport->ingress.allow_rule = NULL;
1099		-}
1100		-
1101		-static void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,
1102		- struct mlx5_vport *vport)
1103		-{
1104		- if (IS_ERR_OR_NULL(vport->ingress.acl))
1105		- return;
1106		-
1107		- esw_debug(esw->dev, "Destroy vport[%d] E-Switch ingress ACL\n", vport->vport);
1108		-
1109		- esw_vport_cleanup_ingress_rules(esw, vport);
1110		- mlx5_destroy_flow_group(vport->ingress.allow_spoofchk_only_grp);
1111		- mlx5_destroy_flow_group(vport->ingress.allow_untagged_only_grp);
1112		- mlx5_destroy_flow_group(vport->ingress.allow_untagged_spoofchk_grp);
1113		- mlx5_destroy_flow_group(vport->ingress.drop_grp);
1114		- mlx5_destroy_flow_table(vport->ingress.acl);
1115		- vport->ingress.acl = NULL;
1116		- vport->ingress.drop_grp = NULL;
1117		- vport->ingress.allow_spoofchk_only_grp = NULL;
1118		- vport->ingress.allow_untagged_only_grp = NULL;
1119		- vport->ingress.allow_untagged_spoofchk_grp = NULL;
1120		-}
1121		-
1122		-static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
1123		- struct mlx5_vport *vport)
1124		-{
1125		- struct mlx5_fc *counter = vport->ingress.drop_counter;
1126		- struct mlx5_flow_destination drop_ctr_dst = {0};
1127		- struct mlx5_flow_destination *dst = NULL;
1128		- struct mlx5_flow_act flow_act = {0};
1129		- struct mlx5_flow_spec *spec;
1130		- int dest_num = 0;
1131		- int err = 0;
1132		- u8 *smac_v;
1133		-
1134		- esw_vport_cleanup_ingress_rules(esw, vport);
1135		-
1136		- if (!vport->info.vlan && !vport->info.qos && !vport->info.spoofchk) {
1137		- esw_vport_disable_ingress_acl(esw, vport);
1138		- return 0;
1139		- }
1140		-
1141		- err = esw_vport_enable_ingress_acl(esw, vport);
1142		- if (err) {
1143		- mlx5_core_warn(esw->dev,
1144		- "failed to enable ingress acl (%d) on vport[%d]\n",
1145		- err, vport->vport);
1146		- return err;
1147		- }
1148		-
1149		- esw_debug(esw->dev,
1150		- "vport[%d] configure ingress rules, vlan(%d) qos(%d)\n",
1151		- vport->vport, vport->info.vlan, vport->info.qos);
1152		-
1153		- spec = kvzalloc(sizeof(*spec), GFP_KERNEL);
1154		- if (!spec) {
1155		- err = -ENOMEM;
1156		- goto out;
1157		- }
1158		-
1159		- if (vport->info.vlan \|\| vport->info.qos)
1160		- MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.cvlan_tag);
1161		-
1162		- if (vport->info.spoofchk) {
1163		- MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.smac_47_16);
1164		- MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.smac_15_0);
1165		- smac_v = MLX5_ADDR_OF(fte_match_param,
1166		- spec->match_value,
1167		- outer_headers.smac_47_16);
1168		- ether_addr_copy(smac_v, vport->info.mac);
1169		- }
1170		-
1171		- spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
1172		- flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW;
1173		- vport->ingress.allow_rule =
1174		- mlx5_add_flow_rules(vport->ingress.acl, spec,
1175		- &flow_act, NULL, 0);
1176		- if (IS_ERR(vport->ingress.allow_rule)) {
1177		- err = PTR_ERR(vport->ingress.allow_rule);
1178		- esw_warn(esw->dev,
1179		- "vport[%d] configure ingress allow rule, err(%d)\n",
1180		- vport->vport, err);
1181		- vport->ingress.allow_rule = NULL;
1182		- goto out;
1183		- }
1184		-
1185		- memset(spec, 0, sizeof(*spec));
1186		- flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;
1187		-
1188		- /* Attach drop flow counter */
1189		- if (counter) {
1190		- flow_act.action \|= MLX5_FLOW_CONTEXT_ACTION_COUNT;
1191		- drop_ctr_dst.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;
1192		- drop_ctr_dst.counter = counter;
1193		- dst = &drop_ctr_dst;
1194		- dest_num++;
1195		- }
1196		- vport->ingress.drop_rule =
1197		- mlx5_add_flow_rules(vport->ingress.acl, spec,
1198		- &flow_act, dst, dest_num);
1199		- if (IS_ERR(vport->ingress.drop_rule)) {
1200		- err = PTR_ERR(vport->ingress.drop_rule);
1201		- esw_warn(esw->dev,
1202		- "vport[%d] configure ingress drop rule, err(%d)\n",
1203		- vport->vport, err);
1204		- vport->ingress.drop_rule = NULL;
1205		- goto out;
1206		- }
1207		-
1208		-out:
1209		- if (err)
1210		- esw_vport_cleanup_ingress_rules(esw, vport);
1211		- kvfree(spec);
1212		- return err;
1213		-}
1214		-
1215		-static int esw_vport_egress_config(struct mlx5_eswitch *esw,
1216		- struct mlx5_vport *vport)
1217		-{
1218		- struct mlx5_fc *counter = vport->egress.drop_counter;
1219		- struct mlx5_flow_destination drop_ctr_dst = {0};
1220		- struct mlx5_flow_destination *dst = NULL;
1221		- struct mlx5_flow_act flow_act = {0};
1222		- struct mlx5_flow_spec *spec;
1223		- int dest_num = 0;
1224		- int err = 0;
1225		-
1226		- esw_vport_cleanup_egress_rules(esw, vport);
1227		-
1228		- if (!vport->info.vlan && !vport->info.qos) {
1229		- esw_vport_disable_egress_acl(esw, vport);
1230		- return 0;
1231		- }
1232		-
1233		- err = esw_vport_enable_egress_acl(esw, vport);
1234		- if (err) {
1235		- mlx5_core_warn(esw->dev,
1236		- "failed to enable egress acl (%d) on vport[%d]\n",
1237		- err, vport->vport);
1238		- return err;
1239		- }
1240		-
1241		- esw_debug(esw->dev,
1242		- "vport[%d] configure egress rules, vlan(%d) qos(%d)\n",
1243		- vport->vport, vport->info.vlan, vport->info.qos);
1244		-
1245		- spec = kvzalloc(sizeof(*spec), GFP_KERNEL);
1246		- if (!spec) {
1247		- err = -ENOMEM;
1248		- goto out;
1249		- }
1250		-
1251		- /* Allowed vlan rule */
1252		- MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.cvlan_tag);
1253		- MLX5_SET_TO_ONES(fte_match_param, spec->match_value, outer_headers.cvlan_tag);
1254		- MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.first_vid);
1255		- MLX5_SET(fte_match_param, spec->match_value, outer_headers.first_vid, vport->info.vlan);
1256		-
1257		- spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
1258		- flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW;
1259		- vport->egress.allowed_vlan =
1260		- mlx5_add_flow_rules(vport->egress.acl, spec,
1261		- &flow_act, NULL, 0);
1262		- if (IS_ERR(vport->egress.allowed_vlan)) {
1263		- err = PTR_ERR(vport->egress.allowed_vlan);
1264		- esw_warn(esw->dev,
1265		- "vport[%d] configure egress allowed vlan rule failed, err(%d)\n",
1266		- vport->vport, err);
1267		- vport->egress.allowed_vlan = NULL;
1268		- goto out;
1269		- }
1270		-
1271		- /* Drop others rule (star rule) */
1272		- memset(spec, 0, sizeof(*spec));
1273		- flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;
1274		-
1275		- /* Attach egress drop flow counter */
1276		- if (counter) {
1277		- flow_act.action \|= MLX5_FLOW_CONTEXT_ACTION_COUNT;
1278		- drop_ctr_dst.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;
1279		- drop_ctr_dst.counter = counter;
1280		- dst = &drop_ctr_dst;
1281		- dest_num++;
1282		- }
1283		- vport->egress.drop_rule =
1284		- mlx5_add_flow_rules(vport->egress.acl, spec,
1285		- &flow_act, dst, dest_num);
1286		- if (IS_ERR(vport->egress.drop_rule)) {
1287		- err = PTR_ERR(vport->egress.drop_rule);
1288		- esw_warn(esw->dev,
1289		- "vport[%d] configure egress drop rule failed, err(%d)\n",
1290		- vport->vport, err);
1291		- vport->egress.drop_rule = NULL;
1292		- }
1293		-out:
1294		- kvfree(spec);
1295		- return err;
	983	+ return false;
1296	984	}
1297	985
1298	986	/* Vport QoS management */
1299		-static int esw_create_tsar(struct mlx5_eswitch *esw)
	987	+static void esw_create_tsar(struct mlx5_eswitch *esw)
1300	988	{
1301	989	u32 tsar_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {0};
1302	990	struct mlx5_core_dev *dev = esw->dev;
	991	+ __be32 *attr;
1303	992	int err;
1304	993
1305	994	if (!MLX5_CAP_GEN(dev, qos) \|\| !MLX5_CAP_QOS(dev, esw_scheduling))
1306		- return 0;
	995	+ return;
	996	+
	997	+ if (!element_type_supported(esw, SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR))
	998	+ return;
1307	999
1308	1000	if (esw->qos.enabled)
1309		- return -EEXIST;
	1001	+ return;
	1002	+
	1003	+ MLX5_SET(scheduling_context, tsar_ctx, element_type,
	1004	+ SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR);
	1005	+
	1006	+ attr = MLX5_ADDR_OF(scheduling_context, tsar_ctx, element_attributes);
	1007	+ *attr = cpu_to_be32(TSAR_ELEMENT_TSAR_TYPE_DWRR << 16);
1310	1008
1311	1009	err = mlx5_create_scheduling_element_cmd(dev,
1312	1010	SCHEDULING_HIERARCHY_E_SWITCH,
..	..	@@ -1314,11 +1012,10 @@
1314	1012	&esw->qos.root_tsar_id);
1315	1013	if (err) {
1316	1014	esw_warn(esw->dev, "E-Switch create TSAR failed (%d)\n", err);
1317		- return err;
	1015	+ return;
1318	1016	}
1319	1017
1320	1018	esw->qos.enabled = true;
1321		- return 0;
1322	1019	}
1323	1020
1324	1021	static void esw_destroy_tsar(struct mlx5_eswitch *esw)
..	..	@@ -1337,11 +1034,11 @@
1337	1034	esw->qos.enabled = false;
1338	1035	}
1339	1036
1340		-static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num,
	1037	+static int esw_vport_enable_qos(struct mlx5_eswitch *esw,
	1038	+ struct mlx5_vport *vport,
1341	1039	u32 initial_max_rate, u32 initial_bw_share)
1342	1040	{
1343	1041	u32 sched_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {0};
1344		- struct mlx5_vport *vport = &esw->vports[vport_num];
1345	1042	struct mlx5_core_dev *dev = esw->dev;
1346	1043	void *vport_elem;
1347	1044	int err = 0;
..	..	@@ -1357,7 +1054,7 @@
1357	1054	SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);
1358	1055	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,
1359	1056	element_attributes);
1360		- MLX5_SET(vport_element, vport_elem, vport_number, vport_num);
	1057	+ MLX5_SET(vport_element, vport_elem, vport_number, vport->vport);
1361	1058	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,
1362	1059	esw->qos.root_tsar_id);
1363	1060	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,
..	..	@@ -1370,7 +1067,7 @@
1370	1067	&vport->qos.esw_tsar_ix);
1371	1068	if (err) {
1372	1069	esw_warn(esw->dev, "E-Switch create TSAR vport element failed (vport=%d,err=%d)\n",
1373		- vport_num, err);
	1070	+ vport->vport, err);
1374	1071	return err;
1375	1072	}
1376	1073
..	..	@@ -1378,10 +1075,10 @@
1378	1075	return 0;
1379	1076	}
1380	1077
1381		-static void esw_vport_disable_qos(struct mlx5_eswitch *esw, int vport_num)
	1078	+static void esw_vport_disable_qos(struct mlx5_eswitch *esw,
	1079	+ struct mlx5_vport *vport)
1382	1080	{
1383		- struct mlx5_vport *vport = &esw->vports[vport_num];
1384		- int err = 0;
	1081	+ int err;
1385	1082
1386	1083	if (!vport->qos.enabled)
1387	1084	return;
..	..	@@ -1391,16 +1088,16 @@
1391	1088	vport->qos.esw_tsar_ix);
1392	1089	if (err)
1393	1090	esw_warn(esw->dev, "E-Switch destroy TSAR vport element failed (vport=%d,err=%d)\n",
1394		- vport_num, err);
	1091	+ vport->vport, err);
1395	1092
1396	1093	vport->qos.enabled = false;
1397	1094	}
1398	1095
1399		-static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num,
	1096	+static int esw_vport_qos_config(struct mlx5_eswitch *esw,
	1097	+ struct mlx5_vport *vport,
1400	1098	u32 max_rate, u32 bw_share)
1401	1099	{
1402	1100	u32 sched_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {0};
1403		- struct mlx5_vport *vport = &esw->vports[vport_num];
1404	1101	struct mlx5_core_dev *dev = esw->dev;
1405	1102	void *vport_elem;
1406	1103	u32 bitmask = 0;
..	..	@@ -1416,7 +1113,7 @@
1416	1113	SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);
1417	1114	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,
1418	1115	element_attributes);
1419		- MLX5_SET(vport_element, vport_elem, vport_number, vport_num);
	1116	+ MLX5_SET(vport_element, vport_elem, vport_number, vport->vport);
1420	1117	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,
1421	1118	esw->qos.root_tsar_id);
1422	1119	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,
..	..	@@ -1432,14 +1129,34 @@
1432	1129	bitmask);
1433	1130	if (err) {
1434	1131	esw_warn(esw->dev, "E-Switch modify TSAR vport element failed (vport=%d,err=%d)\n",
1435		- vport_num, err);
	1132	+ vport->vport, err);
1436	1133	return err;
1437	1134	}
1438	1135
1439	1136	return 0;
1440	1137	}
1441	1138
1442		-static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN])
	1139	+int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,
	1140	+ u32 rate_mbps)
	1141	+{
	1142	+ u32 ctx[MLX5_ST_SZ_DW(scheduling_context)] = {};
	1143	+ struct mlx5_vport *vport;
	1144	+
	1145	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
	1146	+
	1147	+ if (!vport->qos.enabled)
	1148	+ return -EOPNOTSUPP;
	1149	+
	1150	+ MLX5_SET(scheduling_context, ctx, max_average_bw, rate_mbps);
	1151	+
	1152	+ return mlx5_modify_scheduling_element_cmd(esw->dev,
	1153	+ SCHEDULING_HIERARCHY_E_SWITCH,
	1154	+ ctx,
	1155	+ vport->qos.esw_tsar_ix,
	1156	+ MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW);
	1157	+}
	1158	+
	1159	+static void node_guid_gen_from_mac(u64 node_guid, const u8 mac)
1443	1160	{
1444	1161	((u8 *)node_guid)[7] = mac[0];
1445	1162	((u8 *)node_guid)[6] = mac[1];
..	..	@@ -1451,244 +1168,575 @@
1451	1168	((u8 *)node_guid)[0] = mac[5];
1452	1169	}
1453	1170
1454		-static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
1455		- struct mlx5_vport *vport)
	1171	+static int esw_vport_create_legacy_acl_tables(struct mlx5_eswitch *esw,
	1172	+ struct mlx5_vport *vport)
1456	1173	{
1457		- int vport_num = vport->vport;
	1174	+ int ret;
1458	1175
1459		- if (!vport_num)
	1176	+ /* Only non manager vports need ACL in legacy mode */
	1177	+ if (mlx5_esw_is_manager_vport(esw, vport->vport))
	1178	+ return 0;
	1179	+
	1180	+ ret = esw_acl_ingress_lgcy_setup(esw, vport);
	1181	+ if (ret)
	1182	+ goto ingress_err;
	1183	+
	1184	+ ret = esw_acl_egress_lgcy_setup(esw, vport);
	1185	+ if (ret)
	1186	+ goto egress_err;
	1187	+
	1188	+ return 0;
	1189	+
	1190	+egress_err:
	1191	+ esw_acl_ingress_lgcy_cleanup(esw, vport);
	1192	+ingress_err:
	1193	+ return ret;
	1194	+}
	1195	+
	1196	+static int esw_vport_setup_acl(struct mlx5_eswitch *esw,
	1197	+ struct mlx5_vport *vport)
	1198	+{
	1199	+ if (esw->mode == MLX5_ESWITCH_LEGACY)
	1200	+ return esw_vport_create_legacy_acl_tables(esw, vport);
	1201	+ else
	1202	+ return esw_vport_create_offloads_acl_tables(esw, vport);
	1203	+}
	1204	+
	1205	+static void esw_vport_destroy_legacy_acl_tables(struct mlx5_eswitch *esw,
	1206	+ struct mlx5_vport *vport)
	1207	+
	1208	+{
	1209	+ if (mlx5_esw_is_manager_vport(esw, vport->vport))
1460	1210	return;
	1211	+
	1212	+ esw_acl_egress_lgcy_cleanup(esw, vport);
	1213	+ esw_acl_ingress_lgcy_cleanup(esw, vport);
	1214	+}
	1215	+
	1216	+static void esw_vport_cleanup_acl(struct mlx5_eswitch *esw,
	1217	+ struct mlx5_vport *vport)
	1218	+{
	1219	+ if (esw->mode == MLX5_ESWITCH_LEGACY)
	1220	+ esw_vport_destroy_legacy_acl_tables(esw, vport);
	1221	+ else
	1222	+ esw_vport_destroy_offloads_acl_tables(esw, vport);
	1223	+}
	1224	+
	1225	+static int esw_vport_setup(struct mlx5_eswitch esw, struct mlx5_vport vport)
	1226	+{
	1227	+ u16 vport_num = vport->vport;
	1228	+ int flags;
	1229	+ int err;
	1230	+
	1231	+ err = esw_vport_setup_acl(esw, vport);
	1232	+ if (err)
	1233	+ return err;
	1234	+
	1235	+ /* Attach vport to the eswitch rate limiter */
	1236	+ esw_vport_enable_qos(esw, vport, vport->info.max_rate, vport->qos.bw_share);
	1237	+
	1238	+ if (mlx5_esw_is_manager_vport(esw, vport_num))
	1239	+ return 0;
1461	1240
1462	1241	mlx5_modify_vport_admin_state(esw->dev,
1463	1242	MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1464		- vport_num,
	1243	+ vport_num, 1,
1465	1244	vport->info.link_state);
1466		- mlx5_modify_nic_vport_mac_address(esw->dev, vport_num, vport->info.mac);
1467		- mlx5_modify_nic_vport_node_guid(esw->dev, vport_num, vport->info.node_guid);
1468		- modify_esw_vport_cvlan(esw->dev, vport_num, vport->info.vlan, vport->info.qos,
1469		- (vport->info.vlan \|\| vport->info.qos));
1470	1245
1471		- /* Only legacy mode needs ACLs */
1472		- if (esw->mode == SRIOV_LEGACY) {
1473		- esw_vport_ingress_config(esw, vport);
1474		- esw_vport_egress_config(esw, vport);
1475		- }
1476		-}
1477		-
1478		-static void esw_vport_create_drop_counters(struct mlx5_vport *vport)
1479		-{
1480		- struct mlx5_core_dev *dev = vport->dev;
1481		-
1482		- if (MLX5_CAP_ESW_INGRESS_ACL(dev, flow_counter)) {
1483		- vport->ingress.drop_counter = mlx5_fc_create(dev, false);
1484		- if (IS_ERR(vport->ingress.drop_counter)) {
1485		- esw_warn(dev,
1486		- "vport[%d] configure ingress drop rule counter failed\n",
1487		- vport->vport);
1488		- vport->ingress.drop_counter = NULL;
1489		- }
	1246	+ /* Host PF has its own mac/guid. */
	1247	+ if (vport_num) {
	1248	+ mlx5_modify_nic_vport_mac_address(esw->dev, vport_num,
	1249	+ vport->info.mac);
	1250	+ mlx5_modify_nic_vport_node_guid(esw->dev, vport_num,
	1251	+ vport->info.node_guid);
1490	1252	}
1491	1253
1492		- if (MLX5_CAP_ESW_EGRESS_ACL(dev, flow_counter)) {
1493		- vport->egress.drop_counter = mlx5_fc_create(dev, false);
1494		- if (IS_ERR(vport->egress.drop_counter)) {
1495		- esw_warn(dev,
1496		- "vport[%d] configure egress drop rule counter failed\n",
1497		- vport->vport);
1498		- vport->egress.drop_counter = NULL;
1499		- }
1500		- }
	1254	+ flags = (vport->info.vlan \|\| vport->info.qos) ?
	1255	+ SET_VLAN_STRIP \| SET_VLAN_INSERT : 0;
	1256	+ modify_esw_vport_cvlan(esw->dev, vport_num, vport->info.vlan,
	1257	+ vport->info.qos, flags);
	1258	+
	1259	+ return 0;
1501	1260	}
1502	1261
1503		-static void esw_vport_destroy_drop_counters(struct mlx5_vport *vport)
	1262	+/* Don't cleanup vport->info, it's needed to restore vport configuration */
	1263	+static void esw_vport_cleanup(struct mlx5_eswitch esw, struct mlx5_vport vport)
1504	1264	{
1505		- struct mlx5_core_dev *dev = vport->dev;
	1265	+ u16 vport_num = vport->vport;
1506	1266
1507		- if (vport->ingress.drop_counter)
1508		- mlx5_fc_destroy(dev, vport->ingress.drop_counter);
1509		- if (vport->egress.drop_counter)
1510		- mlx5_fc_destroy(dev, vport->egress.drop_counter);
	1267	+ if (!mlx5_esw_is_manager_vport(esw, vport_num))
	1268	+ mlx5_modify_vport_admin_state(esw->dev,
	1269	+ MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
	1270	+ vport_num, 1,
	1271	+ MLX5_VPORT_ADMIN_STATE_DOWN);
	1272	+
	1273	+ esw_vport_disable_qos(esw, vport);
	1274	+ esw_vport_cleanup_acl(esw, vport);
1511	1275	}
1512	1276
1513		-static void esw_enable_vport(struct mlx5_eswitch *esw, int vport_num,
1514		- int enable_events)
	1277	+static int esw_enable_vport(struct mlx5_eswitch *esw, u16 vport_num,
	1278	+ enum mlx5_eswitch_vport_event enabled_events)
1515	1279	{
1516		- struct mlx5_vport *vport = &esw->vports[vport_num];
	1280	+ struct mlx5_vport *vport;
	1281	+ int ret;
	1282	+
	1283	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
1517	1284
1518	1285	mutex_lock(&esw->state_lock);
1519	1286	WARN_ON(vport->enabled);
1520	1287
1521	1288	esw_debug(esw->dev, "Enabling VPORT(%d)\n", vport_num);
1522	1289
1523		- /* Create steering drop counters for ingress and egress ACLs */
1524		- if (vport_num && esw->mode == SRIOV_LEGACY)
1525		- esw_vport_create_drop_counters(vport);
1526		-
1527		- /* Restore old vport configuration */
1528		- esw_apply_vport_conf(esw, vport);
1529		-
1530		- /* Attach vport to the eswitch rate limiter */
1531		- if (esw_vport_enable_qos(esw, vport_num, vport->info.max_rate,
1532		- vport->qos.bw_share))
1533		- esw_warn(esw->dev, "Failed to attach vport %d to eswitch rate limiter", vport_num);
	1290	+ ret = esw_vport_setup(esw, vport);
	1291	+ if (ret)
	1292	+ goto done;
1534	1293
1535	1294	/* Sync with current vport context */
1536		- vport->enabled_events = enable_events;
	1295	+ vport->enabled_events = enabled_events;
1537	1296	vport->enabled = true;
1538	1297
1539		- /* only PF is trusted by default */
1540		- if (!vport_num)
	1298	+ /* Esw manager is trusted by default. Host PF (vport 0) is trusted as well
	1299	+ * in smartNIC as it's a vport group manager.
	1300	+ */
	1301	+ if (mlx5_esw_is_manager_vport(esw, vport_num) \|\|
	1302	+ (!vport_num && mlx5_core_is_ecpf(esw->dev)))
1541	1303	vport->info.trusted = true;
	1304	+
	1305	+ /* External controller host PF has factory programmed MAC.
	1306	+ * Read it from the device.
	1307	+ */
	1308	+ if (mlx5_core_is_ecpf(esw->dev) && vport_num == MLX5_VPORT_PF)
	1309	+ mlx5_query_nic_vport_mac_address(esw->dev, vport_num, true, vport->info.mac);
1542	1310
1543	1311	esw_vport_change_handle_locked(vport);
1544	1312
1545	1313	esw->enabled_vports++;
1546	1314	esw_debug(esw->dev, "Enabled VPORT(%d)\n", vport_num);
	1315	+done:
1547	1316	mutex_unlock(&esw->state_lock);
	1317	+ return ret;
1548	1318	}
1549	1319
1550		-static void esw_disable_vport(struct mlx5_eswitch *esw, int vport_num)
	1320	+static void esw_disable_vport(struct mlx5_eswitch *esw, u16 vport_num)
1551	1321	{
1552		- struct mlx5_vport *vport = &esw->vports[vport_num];
	1322	+ struct mlx5_vport *vport;
1553	1323
	1324	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
	1325	+
	1326	+ mutex_lock(&esw->state_lock);
1554	1327	if (!vport->enabled)
1555		- return;
	1328	+ goto done;
1556	1329
1557	1330	esw_debug(esw->dev, "Disabling vport(%d)\n", vport_num);
1558	1331	/* Mark this vport as disabled to discard new events */
1559	1332	vport->enabled = false;
1560	1333
1561		- synchronize_irq(pci_irq_vector(esw->dev->pdev, MLX5_EQ_VEC_ASYNC));
1562		- /* Wait for current already scheduled events to complete */
1563		- flush_workqueue(esw->work_queue);
1564	1334	/* Disable events from this vport */
1565	1335	arm_vport_context_events_cmd(esw->dev, vport->vport, 0);
1566		- mutex_lock(&esw->state_lock);
1567	1336	/* We don't assume VFs will cleanup after themselves.
1568	1337	* Calling vport change handler while vport is disabled will cleanup
1569	1338	* the vport resources.
1570	1339	*/
1571	1340	esw_vport_change_handle_locked(vport);
1572	1341	vport->enabled_events = 0;
1573		- esw_vport_disable_qos(esw, vport_num);
1574		- if (vport_num && esw->mode == SRIOV_LEGACY) {
1575		- mlx5_modify_vport_admin_state(esw->dev,
1576		- MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1577		- vport_num,
1578		- MLX5_VPORT_ADMIN_STATE_DOWN);
1579		- esw_vport_disable_egress_acl(esw, vport);
1580		- esw_vport_disable_ingress_acl(esw, vport);
1581		- esw_vport_destroy_drop_counters(vport);
1582		- }
	1342	+ esw_apply_vport_rx_mode(esw, vport, false, false);
	1343	+ esw_vport_cleanup(esw, vport);
1583	1344	esw->enabled_vports--;
	1345	+
	1346	+done:
1584	1347	mutex_unlock(&esw->state_lock);
	1348	+}
	1349	+
	1350	+static int eswitch_vport_event(struct notifier_block *nb,
	1351	+ unsigned long type, void *data)
	1352	+{
	1353	+ struct mlx5_eswitch *esw = mlx5_nb_cof(nb, struct mlx5_eswitch, nb);
	1354	+ struct mlx5_eqe *eqe = data;
	1355	+ struct mlx5_vport *vport;
	1356	+ u16 vport_num;
	1357	+
	1358	+ vport_num = be16_to_cpu(eqe->data.vport_change.vport_num);
	1359	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
	1360	+ if (!IS_ERR(vport))
	1361	+ queue_work(esw->work_queue, &vport->vport_change_handler);
	1362	+ return NOTIFY_OK;
	1363	+}
	1364	+
	1365	+/**
	1366	+ * mlx5_esw_query_functions - Returns raw output about functions state
	1367	+ * @dev: Pointer to device to query
	1368	+ *
	1369	+ * mlx5_esw_query_functions() allocates and returns functions changed
	1370	+ * raw output memory pointer from device on success. Otherwise returns ERR_PTR.
	1371	+ * Caller must free the memory using kvfree() when valid pointer is returned.
	1372	+ */
	1373	+const u32 mlx5_esw_query_functions(struct mlx5_core_dev dev)
	1374	+{
	1375	+ int outlen = MLX5_ST_SZ_BYTES(query_esw_functions_out);
	1376	+ u32 in[MLX5_ST_SZ_DW(query_esw_functions_in)] = {};
	1377	+ u32 *out;
	1378	+ int err;
	1379	+
	1380	+ out = kvzalloc(outlen, GFP_KERNEL);
	1381	+ if (!out)
	1382	+ return ERR_PTR(-ENOMEM);
	1383	+
	1384	+ MLX5_SET(query_esw_functions_in, in, opcode,
	1385	+ MLX5_CMD_OP_QUERY_ESW_FUNCTIONS);
	1386	+
	1387	+ err = mlx5_cmd_exec_inout(dev, query_esw_functions, in, out);
	1388	+ if (!err)
	1389	+ return out;
	1390	+
	1391	+ kvfree(out);
	1392	+ return ERR_PTR(err);
	1393	+}
	1394	+
	1395	+static void mlx5_eswitch_event_handlers_register(struct mlx5_eswitch *esw)
	1396	+{
	1397	+ MLX5_NB_INIT(&esw->nb, eswitch_vport_event, NIC_VPORT_CHANGE);
	1398	+ mlx5_eq_notifier_register(esw->dev, &esw->nb);
	1399	+
	1400	+ if (esw->mode == MLX5_ESWITCH_OFFLOADS && mlx5_eswitch_is_funcs_handler(esw->dev)) {
	1401	+ MLX5_NB_INIT(&esw->esw_funcs.nb, mlx5_esw_funcs_changed_handler,
	1402	+ ESW_FUNCTIONS_CHANGED);
	1403	+ mlx5_eq_notifier_register(esw->dev, &esw->esw_funcs.nb);
	1404	+ }
	1405	+}
	1406	+
	1407	+static void mlx5_eswitch_event_handlers_unregister(struct mlx5_eswitch *esw)
	1408	+{
	1409	+ if (esw->mode == MLX5_ESWITCH_OFFLOADS && mlx5_eswitch_is_funcs_handler(esw->dev))
	1410	+ mlx5_eq_notifier_unregister(esw->dev, &esw->esw_funcs.nb);
	1411	+
	1412	+ mlx5_eq_notifier_unregister(esw->dev, &esw->nb);
	1413	+
	1414	+ flush_workqueue(esw->work_queue);
	1415	+}
	1416	+
	1417	+static void mlx5_eswitch_clear_vf_vports_info(struct mlx5_eswitch *esw)
	1418	+{
	1419	+ struct mlx5_vport *vport;
	1420	+ int i;
	1421	+
	1422	+ mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs) {
	1423	+ memset(&vport->qos, 0, sizeof(vport->qos));
	1424	+ memset(&vport->info, 0, sizeof(vport->info));
	1425	+ vport->info.link_state = MLX5_VPORT_ADMIN_STATE_AUTO;
	1426	+ }
1585	1427	}
1586	1428
1587	1429	/* Public E-Switch API */
1588	1430	#define ESW_ALLOWED(esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev))
1589	1431
1590		-
1591		-int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
	1432	+int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,
	1433	+ enum mlx5_eswitch_vport_event enabled_events)
1592	1434	{
1593	1435	int err;
1594		- int i, enabled_events;
1595	1436
1596		- if (!ESW_ALLOWED(esw) \|\|
1597		- !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {
1598		- esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");
	1437	+ err = esw_enable_vport(esw, vport_num, enabled_events);
	1438	+ if (err)
	1439	+ return err;
	1440	+
	1441	+ err = esw_offloads_load_rep(esw, vport_num);
	1442	+ if (err)
	1443	+ goto err_rep;
	1444	+
	1445	+ return err;
	1446	+
	1447	+err_rep:
	1448	+ esw_disable_vport(esw, vport_num);
	1449	+ return err;
	1450	+}
	1451	+
	1452	+void mlx5_eswitch_unload_vport(struct mlx5_eswitch *esw, u16 vport_num)
	1453	+{
	1454	+ esw_offloads_unload_rep(esw, vport_num);
	1455	+ esw_disable_vport(esw, vport_num);
	1456	+}
	1457	+
	1458	+void mlx5_eswitch_unload_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs)
	1459	+{
	1460	+ int i;
	1461	+
	1462	+ mlx5_esw_for_each_vf_vport_num_reverse(esw, i, num_vfs)
	1463	+ mlx5_eswitch_unload_vport(esw, i);
	1464	+}
	1465	+
	1466	+int mlx5_eswitch_load_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs,
	1467	+ enum mlx5_eswitch_vport_event enabled_events)
	1468	+{
	1469	+ int err;
	1470	+ int i;
	1471	+
	1472	+ mlx5_esw_for_each_vf_vport_num(esw, i, num_vfs) {
	1473	+ err = mlx5_eswitch_load_vport(esw, i, enabled_events);
	1474	+ if (err)
	1475	+ goto vf_err;
	1476	+ }
	1477	+
	1478	+ return 0;
	1479	+
	1480	+vf_err:
	1481	+ mlx5_eswitch_unload_vf_vports(esw, i - 1);
	1482	+ return err;
	1483	+}
	1484	+
	1485	+/* mlx5_eswitch_enable_pf_vf_vports() enables vports of PF, ECPF and VFs
	1486	+ * whichever are present on the eswitch.
	1487	+ */
	1488	+int
	1489	+mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,
	1490	+ enum mlx5_eswitch_vport_event enabled_events)
	1491	+{
	1492	+ int ret;
	1493	+
	1494	+ /* Enable PF vport */
	1495	+ ret = mlx5_eswitch_load_vport(esw, MLX5_VPORT_PF, enabled_events);
	1496	+ if (ret)
	1497	+ return ret;
	1498	+
	1499	+ /* Enable ECPF vport */
	1500	+ if (mlx5_ecpf_vport_exists(esw->dev)) {
	1501	+ ret = mlx5_eswitch_load_vport(esw, MLX5_VPORT_ECPF, enabled_events);
	1502	+ if (ret)
	1503	+ goto ecpf_err;
	1504	+ }
	1505	+
	1506	+ /* Enable VF vports */
	1507	+ ret = mlx5_eswitch_load_vf_vports(esw, esw->esw_funcs.num_vfs,
	1508	+ enabled_events);
	1509	+ if (ret)
	1510	+ goto vf_err;
	1511	+ return 0;
	1512	+
	1513	+vf_err:
	1514	+ if (mlx5_ecpf_vport_exists(esw->dev))
	1515	+ mlx5_eswitch_unload_vport(esw, MLX5_VPORT_ECPF);
	1516	+
	1517	+ecpf_err:
	1518	+ mlx5_eswitch_unload_vport(esw, MLX5_VPORT_PF);
	1519	+ return ret;
	1520	+}
	1521	+
	1522	+/* mlx5_eswitch_disable_pf_vf_vports() disables vports of PF, ECPF and VFs
	1523	+ * whichever are previously enabled on the eswitch.
	1524	+ */
	1525	+void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw)
	1526	+{
	1527	+ mlx5_eswitch_unload_vf_vports(esw, esw->esw_funcs.num_vfs);
	1528	+
	1529	+ if (mlx5_ecpf_vport_exists(esw->dev))
	1530	+ mlx5_eswitch_unload_vport(esw, MLX5_VPORT_ECPF);
	1531	+
	1532	+ mlx5_eswitch_unload_vport(esw, MLX5_VPORT_PF);
	1533	+}
	1534	+
	1535	+static void mlx5_eswitch_get_devlink_param(struct mlx5_eswitch *esw)
	1536	+{
	1537	+ struct devlink *devlink = priv_to_devlink(esw->dev);
	1538	+ union devlink_param_value val;
	1539	+ int err;
	1540	+
	1541	+ err = devlink_param_driverinit_value_get(devlink,
	1542	+ MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,
	1543	+ &val);
	1544	+ if (!err) {
	1545	+ esw->params.large_group_num = val.vu32;
	1546	+ } else {
	1547	+ esw_warn(esw->dev,
	1548	+ "Devlink can't get param fdb_large_groups, uses default (%d).\n",
	1549	+ ESW_OFFLOADS_DEFAULT_NUM_GROUPS);
	1550	+ esw->params.large_group_num = ESW_OFFLOADS_DEFAULT_NUM_GROUPS;
	1551	+ }
	1552	+}
	1553	+
	1554	+static void
	1555	+mlx5_eswitch_update_num_of_vfs(struct mlx5_eswitch *esw, int num_vfs)
	1556	+{
	1557	+ const u32 *out;
	1558	+
	1559	+ WARN_ON_ONCE(esw->mode != MLX5_ESWITCH_NONE);
	1560	+
	1561	+ if (num_vfs < 0)
	1562	+ return;
	1563	+
	1564	+ if (!mlx5_core_is_ecpf_esw_manager(esw->dev)) {
	1565	+ esw->esw_funcs.num_vfs = num_vfs;
	1566	+ return;
	1567	+ }
	1568	+
	1569	+ out = mlx5_esw_query_functions(esw->dev);
	1570	+ if (IS_ERR(out))
	1571	+ return;
	1572	+
	1573	+ esw->esw_funcs.num_vfs = MLX5_GET(query_esw_functions_out, out,
	1574	+ host_params_context.host_num_of_vfs);
	1575	+ kvfree(out);
	1576	+}
	1577	+
	1578	+/**
	1579	+ * mlx5_eswitch_enable_locked - Enable eswitch
	1580	+ * @esw: Pointer to eswitch
	1581	+ * @mode: Eswitch mode to enable
	1582	+ * @num_vfs: Enable eswitch for given number of VFs. This is optional.
	1583	+ * Valid value are 0, > 0 and MLX5_ESWITCH_IGNORE_NUM_VFS.
	1584	+ * Caller should pass num_vfs > 0 when enabling eswitch for
	1585	+ * vf vports. Caller should pass num_vfs = 0, when eswitch
	1586	+ * is enabled without sriov VFs or when caller
	1587	+ * is unaware of the sriov state of the host PF on ECPF based
	1588	+ * eswitch. Caller should pass < 0 when num_vfs should be
	1589	+ * completely ignored. This is typically the case when eswitch
	1590	+ * is enabled without sriov regardless of PF/ECPF system.
	1591	+ * mlx5_eswitch_enable_locked() Enables eswitch in either legacy or offloads
	1592	+ * mode. If num_vfs >=0 is provided, it setup VF related eswitch vports.
	1593	+ * It returns 0 on success or error code on failure.
	1594	+ */
	1595	+int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs)
	1596	+{
	1597	+ int err;
	1598	+
	1599	+ lockdep_assert_held(&esw->mode_lock);
	1600	+
	1601	+ if (!MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {
	1602	+ esw_warn(esw->dev, "FDB is not supported, aborting ...\n");
1599	1603	return -EOPNOTSUPP;
1600	1604	}
1601	1605
1602	1606	if (!MLX5_CAP_ESW_INGRESS_ACL(esw->dev, ft_support))
1603		- esw_warn(esw->dev, "E-Switch ingress ACL is not supported by FW\n");
	1607	+ esw_warn(esw->dev, "ingress ACL is not supported by FW\n");
1604	1608
1605	1609	if (!MLX5_CAP_ESW_EGRESS_ACL(esw->dev, ft_support))
1606		- esw_warn(esw->dev, "E-Switch engress ACL is not supported by FW\n");
	1610	+ esw_warn(esw->dev, "engress ACL is not supported by FW\n");
1607	1611
1608		- esw_info(esw->dev, "E-Switch enable SRIOV: nvfs(%d) mode (%d)\n", nvfs, mode);
	1612	+ mlx5_eswitch_get_devlink_param(esw);
	1613	+
	1614	+ mlx5_eswitch_update_num_of_vfs(esw, num_vfs);
	1615	+
	1616	+ esw_create_tsar(esw);
	1617	+
1609	1618	esw->mode = mode;
1610	1619
1611		- if (mode == SRIOV_LEGACY) {
1612		- err = esw_create_legacy_fdb_table(esw);
1613		- } else {
1614		- mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
	1620	+ mlx5_lag_update(esw->dev);
1615	1621
1616		- err = esw_offloads_init(esw, nvfs + 1);
	1622	+ if (mode == MLX5_ESWITCH_LEGACY) {
	1623	+ err = esw_legacy_enable(esw);
	1624	+ } else {
	1625	+ mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
	1626	+ mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
	1627	+ err = esw_offloads_enable(esw);
1617	1628	}
1618	1629
1619	1630	if (err)
1620	1631	goto abort;
1621	1632
1622		- err = esw_create_tsar(esw);
1623		- if (err)
1624		- esw_warn(esw->dev, "Failed to create eswitch TSAR");
	1633	+ mlx5_eswitch_event_handlers_register(esw);
1625	1634
1626		- /* Don't enable vport events when in SRIOV_OFFLOADS mode, since:
1627		- * 1. L2 table (MPFS) is programmed by PF/VF representors netdevs set_rx_mode
1628		- * 2. FDB/Eswitch is programmed by user space tools
1629		- */
1630		- enabled_events = (mode == SRIOV_LEGACY) ? SRIOV_VPORT_EVENTS : 0;
1631		- for (i = 0; i <= nvfs; i++)
1632		- esw_enable_vport(esw, i, enabled_events);
	1635	+ esw_info(esw->dev, "Enable: mode(%s), nvfs(%d), active vports(%d)\n",
	1636	+ mode == MLX5_ESWITCH_LEGACY ? "LEGACY" : "OFFLOADS",
	1637	+ esw->esw_funcs.num_vfs, esw->enabled_vports);
1633	1638
1634		- esw_info(esw->dev, "SRIOV enabled: active vports(%d)\n",
1635		- esw->enabled_vports);
1636	1639	return 0;
1637	1640
1638	1641	abort:
1639		- esw->mode = SRIOV_NONE;
	1642	+ esw->mode = MLX5_ESWITCH_NONE;
1640	1643
1641		- if (mode == SRIOV_OFFLOADS)
	1644	+ if (mode == MLX5_ESWITCH_OFFLOADS) {
1642	1645	mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
1643		-
	1646	+ mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
	1647	+ }
	1648	+ esw_destroy_tsar(esw);
1644	1649	return err;
1645	1650	}
1646	1651
1647		-void mlx5_eswitch_disable_sriov(struct mlx5_eswitch *esw)
	1652	+/**
	1653	+ * mlx5_eswitch_enable - Enable eswitch
	1654	+ * @esw: Pointer to eswitch
	1655	+ * @num_vfs: Enable eswitch swich for given number of VFs.
	1656	+ * Caller must pass num_vfs > 0 when enabling eswitch for
	1657	+ * vf vports.
	1658	+ * mlx5_eswitch_enable() returns 0 on success or error code on failure.
	1659	+ */
	1660	+int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int num_vfs)
1648	1661	{
1649		- struct esw_mc_addr *mc_promisc;
1650		- int old_mode;
1651		- int nvports;
1652		- int i;
	1662	+ int ret;
1653	1663
1654		- if (!ESW_ALLOWED(esw) \|\| esw->mode == SRIOV_NONE)
	1664	+ if (!ESW_ALLOWED(esw))
	1665	+ return 0;
	1666	+
	1667	+ down_write(&esw->mode_lock);
	1668	+ if (esw->mode == MLX5_ESWITCH_NONE) {
	1669	+ ret = mlx5_eswitch_enable_locked(esw, MLX5_ESWITCH_LEGACY, num_vfs);
	1670	+ } else {
	1671	+ enum mlx5_eswitch_vport_event vport_events;
	1672	+
	1673	+ vport_events = (esw->mode == MLX5_ESWITCH_LEGACY) ?
	1674	+ MLX5_LEGACY_SRIOV_VPORT_EVENTS : MLX5_VPORT_UC_ADDR_CHANGE;
	1675	+ ret = mlx5_eswitch_load_vf_vports(esw, num_vfs, vport_events);
	1676	+ if (!ret)
	1677	+ esw->esw_funcs.num_vfs = num_vfs;
	1678	+ }
	1679	+ up_write(&esw->mode_lock);
	1680	+ return ret;
	1681	+}
	1682	+
	1683	+void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)
	1684	+{
	1685	+ int old_mode;
	1686	+
	1687	+ lockdep_assert_held_write(&esw->mode_lock);
	1688	+
	1689	+ if (esw->mode == MLX5_ESWITCH_NONE)
1655	1690	return;
1656	1691
1657		- esw_info(esw->dev, "disable SRIOV: active vports(%d) mode(%d)\n",
1658		- esw->enabled_vports, esw->mode);
	1692	+ esw_info(esw->dev, "Disable: mode(%s), nvfs(%d), active vports(%d)\n",
	1693	+ esw->mode == MLX5_ESWITCH_LEGACY ? "LEGACY" : "OFFLOADS",
	1694	+ esw->esw_funcs.num_vfs, esw->enabled_vports);
1659	1695
1660		- mc_promisc = &esw->mc_promisc;
1661		- nvports = esw->enabled_vports;
	1696	+ mlx5_eswitch_event_handlers_unregister(esw);
1662	1697
1663		- for (i = 0; i < esw->total_vports; i++)
1664		- esw_disable_vport(esw, i);
1665		-
1666		- if (mc_promisc && mc_promisc->uplink_rule)
1667		- mlx5_del_flow_rules(mc_promisc->uplink_rule);
1668		-
1669		- esw_destroy_tsar(esw);
1670		-
1671		- if (esw->mode == SRIOV_LEGACY)
1672		- esw_destroy_legacy_fdb_table(esw);
1673		- else if (esw->mode == SRIOV_OFFLOADS)
1674		- esw_offloads_cleanup(esw, nvports);
	1698	+ if (esw->mode == MLX5_ESWITCH_LEGACY)
	1699	+ esw_legacy_disable(esw);
	1700	+ else if (esw->mode == MLX5_ESWITCH_OFFLOADS)
	1701	+ esw_offloads_disable(esw);
1675	1702
1676	1703	old_mode = esw->mode;
1677		- esw->mode = SRIOV_NONE;
	1704	+ esw->mode = MLX5_ESWITCH_NONE;
1678	1705
1679		- if (old_mode == SRIOV_OFFLOADS)
	1706	+ mlx5_lag_update(esw->dev);
	1707	+
	1708	+ if (old_mode == MLX5_ESWITCH_OFFLOADS) {
1680	1709	mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
	1710	+ mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
	1711	+ }
	1712	+ esw_destroy_tsar(esw);
	1713	+
	1714	+ if (clear_vf)
	1715	+ mlx5_eswitch_clear_vf_vports_info(esw);
	1716	+}
	1717	+
	1718	+void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf)
	1719	+{
	1720	+ if (!ESW_ALLOWED(esw))
	1721	+ return;
	1722	+
	1723	+ down_write(&esw->mode_lock);
	1724	+ mlx5_eswitch_disable_locked(esw, clear_vf);
	1725	+ esw->esw_funcs.num_vfs = 0;
	1726	+ up_write(&esw->mode_lock);
1681	1727	}
1682	1728
1683	1729	int mlx5_eswitch_init(struct mlx5_core_dev *dev)
1684	1730	{
1685		- int total_vports = MLX5_TOTAL_VPORTS(dev);
1686	1731	struct mlx5_eswitch *esw;
1687		- int vport_num;
1688		- int err;
	1732	+ struct mlx5_vport *vport;
	1733	+ int total_vports;
	1734	+ int err, i;
1689	1735
1690	1736	if (!MLX5_VPORT_MANAGER(dev))
1691	1737	return 0;
	1738	+
	1739	+ total_vports = mlx5_eswitch_get_total_vports(dev);
1692	1740
1693	1741	esw_info(dev,
1694	1742	"Total vports %d, per vport: max uc(%d) max mc(%d)\n",
..	..	@@ -1701,6 +1749,8 @@
1701	1749	return -ENOMEM;
1702	1750
1703	1751	esw->dev = dev;
	1752	+ esw->manager_vport = mlx5_eswitch_manager_vport(dev);
	1753	+ esw->first_host_vport = mlx5_eswitch_first_host_vport_num(dev);
1704	1754
1705	1755	esw->work_queue = create_singlethread_workqueue("mlx5_esw_wq");
1706	1756	if (!esw->work_queue) {
..	..	@@ -1715,33 +1765,33 @@
1715	1765	goto abort;
1716	1766	}
1717	1767
	1768	+ esw->total_vports = total_vports;
	1769	+
1718	1770	err = esw_offloads_init_reps(esw);
1719	1771	if (err)
1720	1772	goto abort;
1721	1773
	1774	+ mutex_init(&esw->offloads.encap_tbl_lock);
1722	1775	hash_init(esw->offloads.encap_tbl);
1723		- hash_init(esw->offloads.mod_hdr_tbl);
	1776	+ mutex_init(&esw->offloads.decap_tbl_lock);
	1777	+ hash_init(esw->offloads.decap_tbl);
	1778	+ mlx5e_mod_hdr_tbl_init(&esw->offloads.mod_hdr);
	1779	+ atomic64_set(&esw->offloads.num_flows, 0);
	1780	+ ida_init(&esw->offloads.vport_metadata_ida);
1724	1781	mutex_init(&esw->state_lock);
	1782	+ init_rwsem(&esw->mode_lock);
1725	1783
1726		- for (vport_num = 0; vport_num < total_vports; vport_num++) {
1727		- struct mlx5_vport *vport = &esw->vports[vport_num];
1728		-
1729		- vport->vport = vport_num;
	1784	+ mlx5_esw_for_all_vports(esw, i, vport) {
	1785	+ vport->vport = mlx5_eswitch_index_to_vport_num(esw, i);
1730	1786	vport->info.link_state = MLX5_VPORT_ADMIN_STATE_AUTO;
1731	1787	vport->dev = dev;
1732	1788	INIT_WORK(&vport->vport_change_handler,
1733	1789	esw_vport_change_handler);
1734	1790	}
1735	1791
1736		- esw->total_vports = total_vports;
1737	1792	esw->enabled_vports = 0;
1738		- esw->mode = SRIOV_NONE;
	1793	+ esw->mode = MLX5_ESWITCH_NONE;
1739	1794	esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;
1740		- if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) &&
1741		- MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))
1742		- esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;
1743		- else
1744		- esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
1745	1795
1746	1796	dev->priv.eswitch = esw;
1747	1797	return 0;
..	..	@@ -1764,96 +1814,171 @@
1764	1814	esw->dev->priv.eswitch = NULL;
1765	1815	destroy_workqueue(esw->work_queue);
1766	1816	esw_offloads_cleanup_reps(esw);
	1817	+ mutex_destroy(&esw->state_lock);
	1818	+ ida_destroy(&esw->offloads.vport_metadata_ida);
	1819	+ mlx5e_mod_hdr_tbl_destroy(&esw->offloads.mod_hdr);
	1820	+ mutex_destroy(&esw->offloads.encap_tbl_lock);
	1821	+ mutex_destroy(&esw->offloads.decap_tbl_lock);
1767	1822	kfree(esw->vports);
1768	1823	kfree(esw);
1769	1824	}
1770	1825
1771		-void mlx5_eswitch_vport_event(struct mlx5_eswitch esw, struct mlx5_eqe eqe)
1772		-{
1773		- struct mlx5_eqe_vport_change *vc_eqe = &eqe->data.vport_change;
1774		- u16 vport_num = be16_to_cpu(vc_eqe->vport_num);
1775		- struct mlx5_vport *vport;
1776		-
1777		- if (!esw) {
1778		- pr_warn("MLX5 E-Switch: vport %d got an event while eswitch is not initialized\n",
1779		- vport_num);
1780		- return;
1781		- }
1782		-
1783		- vport = &esw->vports[vport_num];
1784		- if (vport->enabled)
1785		- queue_work(esw->work_queue, &vport->vport_change_handler);
1786		-}
1787		-
1788	1826	/* Vport Administration */
1789		-#define LEGAL_VPORT(esw, vport) (vport >= 0 && vport < esw->total_vports)
1790		-
1791		-int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
1792		- int vport, u8 mac[ETH_ALEN])
	1827	+static int
	1828	+mlx5_esw_set_vport_mac_locked(struct mlx5_eswitch *esw,
	1829	+ struct mlx5_vport evport, const u8 mac)
1793	1830	{
1794		- struct mlx5_vport *evport;
	1831	+ u16 vport_num = evport->vport;
1795	1832	u64 node_guid;
1796	1833	int err = 0;
1797	1834
1798		- if (!esw \|\| !MLX5_CAP_GEN(esw->dev, vport_group_manager))
1799		- return -EPERM;
1800		- if (!LEGAL_VPORT(esw, vport) \|\| is_multicast_ether_addr(mac))
	1835	+ if (is_multicast_ether_addr(mac))
1801	1836	return -EINVAL;
1802		-
1803		- mutex_lock(&esw->state_lock);
1804		- evport = &esw->vports[vport];
1805	1837
1806	1838	if (evport->info.spoofchk && !is_valid_ether_addr(mac))
1807	1839	mlx5_core_warn(esw->dev,
1808	1840	"Set invalid MAC while spoofchk is on, vport(%d)\n",
1809		- vport);
	1841	+ vport_num);
1810	1842
1811		- err = mlx5_modify_nic_vport_mac_address(esw->dev, vport, mac);
	1843	+ err = mlx5_modify_nic_vport_mac_address(esw->dev, vport_num, mac);
1812	1844	if (err) {
1813	1845	mlx5_core_warn(esw->dev,
1814	1846	"Failed to mlx5_modify_nic_vport_mac vport(%d) err=(%d)\n",
1815		- vport, err);
1816		- goto unlock;
	1847	+ vport_num, err);
	1848	+ return err;
1817	1849	}
1818	1850
1819	1851	node_guid_gen_from_mac(&node_guid, mac);
1820		- err = mlx5_modify_nic_vport_node_guid(esw->dev, vport, node_guid);
	1852	+ err = mlx5_modify_nic_vport_node_guid(esw->dev, vport_num, node_guid);
1821	1853	if (err)
1822	1854	mlx5_core_warn(esw->dev,
1823	1855	"Failed to set vport %d node guid, err = %d. RDMA_CM will not function properly for this VF.\n",
1824		- vport, err);
	1856	+ vport_num, err);
1825	1857
1826	1858	ether_addr_copy(evport->info.mac, mac);
1827	1859	evport->info.node_guid = node_guid;
1828		- if (evport->enabled && esw->mode == SRIOV_LEGACY)
1829		- err = esw_vport_ingress_config(esw, evport);
	1860	+ if (evport->enabled && esw->mode == MLX5_ESWITCH_LEGACY)
	1861	+ err = esw_acl_ingress_lgcy_setup(esw, evport);
1830	1862
1831		-unlock:
	1863	+ return err;
	1864	+}
	1865	+
	1866	+int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
	1867	+ u16 vport, const u8 *mac)
	1868	+{
	1869	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
	1870	+ int err = 0;
	1871	+
	1872	+ if (IS_ERR(evport))
	1873	+ return PTR_ERR(evport);
	1874	+
	1875	+ mutex_lock(&esw->state_lock);
	1876	+ err = mlx5_esw_set_vport_mac_locked(esw, evport, mac);
	1877	+ mutex_unlock(&esw->state_lock);
	1878	+ return err;
	1879	+}
	1880	+
	1881	+static bool
	1882	+is_port_function_supported(const struct mlx5_eswitch *esw, u16 vport_num)
	1883	+{
	1884	+ return vport_num == MLX5_VPORT_PF \|\|
	1885	+ mlx5_eswitch_is_vf_vport(esw, vport_num);
	1886	+}
	1887	+
	1888	+int mlx5_devlink_port_function_hw_addr_get(struct devlink *devlink,
	1889	+ struct devlink_port *port,
	1890	+ u8 hw_addr, int hw_addr_len,
	1891	+ struct netlink_ext_ack *extack)
	1892	+{
	1893	+ struct mlx5_eswitch *esw;
	1894	+ struct mlx5_vport *vport;
	1895	+ int err = -EOPNOTSUPP;
	1896	+ u16 vport_num;
	1897	+
	1898	+ esw = mlx5_devlink_eswitch_get(devlink);
	1899	+ if (IS_ERR(esw))
	1900	+ return PTR_ERR(esw);
	1901	+
	1902	+ vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
	1903	+ if (!is_port_function_supported(esw, vport_num))
	1904	+ return -EOPNOTSUPP;
	1905	+
	1906	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
	1907	+ if (IS_ERR(vport)) {
	1908	+ NL_SET_ERR_MSG_MOD(extack, "Invalid port");
	1909	+ return PTR_ERR(vport);
	1910	+ }
	1911	+
	1912	+ mutex_lock(&esw->state_lock);
	1913	+ if (vport->enabled) {
	1914	+ ether_addr_copy(hw_addr, vport->info.mac);
	1915	+ *hw_addr_len = ETH_ALEN;
	1916	+ err = 0;
	1917	+ }
	1918	+ mutex_unlock(&esw->state_lock);
	1919	+ return err;
	1920	+}
	1921	+
	1922	+int mlx5_devlink_port_function_hw_addr_set(struct devlink *devlink,
	1923	+ struct devlink_port *port,
	1924	+ const u8 *hw_addr, int hw_addr_len,
	1925	+ struct netlink_ext_ack *extack)
	1926	+{
	1927	+ struct mlx5_eswitch *esw;
	1928	+ struct mlx5_vport *vport;
	1929	+ int err = -EOPNOTSUPP;
	1930	+ u16 vport_num;
	1931	+
	1932	+ esw = mlx5_devlink_eswitch_get(devlink);
	1933	+ if (IS_ERR(esw)) {
	1934	+ NL_SET_ERR_MSG_MOD(extack, "Eswitch doesn't support set hw_addr");
	1935	+ return PTR_ERR(esw);
	1936	+ }
	1937	+
	1938	+ vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
	1939	+ if (!is_port_function_supported(esw, vport_num)) {
	1940	+ NL_SET_ERR_MSG_MOD(extack, "Port doesn't support set hw_addr");
	1941	+ return -EINVAL;
	1942	+ }
	1943	+ vport = mlx5_eswitch_get_vport(esw, vport_num);
	1944	+ if (IS_ERR(vport)) {
	1945	+ NL_SET_ERR_MSG_MOD(extack, "Invalid port");
	1946	+ return PTR_ERR(vport);
	1947	+ }
	1948	+
	1949	+ mutex_lock(&esw->state_lock);
	1950	+ if (vport->enabled)
	1951	+ err = mlx5_esw_set_vport_mac_locked(esw, vport, hw_addr);
	1952	+ else
	1953	+ NL_SET_ERR_MSG_MOD(extack, "Eswitch vport is disabled");
1832	1954	mutex_unlock(&esw->state_lock);
1833	1955	return err;
1834	1956	}
1835	1957
1836	1958	int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,
1837		- int vport, int link_state)
	1959	+ u16 vport, int link_state)
1838	1960	{
1839		- struct mlx5_vport *evport;
	1961	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
	1962	+ int opmod = MLX5_VPORT_STATE_OP_MOD_ESW_VPORT;
	1963	+ int other_vport = 1;
1840	1964	int err = 0;
1841	1965
1842	1966	if (!ESW_ALLOWED(esw))
1843	1967	return -EPERM;
1844		- if (!LEGAL_VPORT(esw, vport))
1845		- return -EINVAL;
	1968	+ if (IS_ERR(evport))
	1969	+ return PTR_ERR(evport);
1846	1970
	1971	+ if (vport == MLX5_VPORT_UPLINK) {
	1972	+ opmod = MLX5_VPORT_STATE_OP_MOD_UPLINK;
	1973	+ other_vport = 0;
	1974	+ vport = 0;
	1975	+ }
1847	1976	mutex_lock(&esw->state_lock);
1848		- evport = &esw->vports[vport];
1849	1977
1850		- err = mlx5_modify_vport_admin_state(esw->dev,
1851		- MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1852		- vport, link_state);
	1978	+ err = mlx5_modify_vport_admin_state(esw->dev, opmod, vport, other_vport, link_state);
1853	1979	if (err) {
1854		- mlx5_core_warn(esw->dev,
1855		- "Failed to set vport %d link state, err = %d",
1856		- vport, err);
	1980	+ mlx5_core_warn(esw->dev, "Failed to set vport %d link state, opmod = %d, err = %d",
	1981	+ vport, opmod, err);
1857	1982	goto unlock;
1858	1983	}
1859	1984
..	..	@@ -1865,16 +1990,12 @@
1865	1990	}
1866	1991
1867	1992	int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,
1868		- int vport, struct ifla_vf_info *ivi)
	1993	+ u16 vport, struct ifla_vf_info *ivi)
1869	1994	{
1870		- struct mlx5_vport *evport;
	1995	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
1871	1996
1872		- if (!esw \|\| !MLX5_CAP_GEN(esw->dev, vport_group_manager))
1873		- return -EPERM;
1874		- if (!LEGAL_VPORT(esw, vport))
1875		- return -EINVAL;
1876		-
1877		- evport = &esw->vports[vport];
	1997	+ if (IS_ERR(evport))
	1998	+ return PTR_ERR(evport);
1878	1999
1879	2000	memset(ivi, 0, sizeof(*ivi));
1880	2001	ivi->vf = vport - 1;
..	..	@@ -1894,70 +2015,72 @@
1894	2015	}
1895	2016
1896	2017	int __mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,
1897		- int vport, u16 vlan, u8 qos, u8 set_flags)
	2018	+ u16 vport, u16 vlan, u8 qos, u8 set_flags)
1898	2019	{
1899		- struct mlx5_vport *evport;
	2020	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
1900	2021	int err = 0;
1901	2022
1902		- if (!ESW_ALLOWED(esw))
1903		- return -EPERM;
1904		- if (!LEGAL_VPORT(esw, vport) \|\| (vlan > 4095) \|\| (qos > 7))
	2023	+ if (IS_ERR(evport))
	2024	+ return PTR_ERR(evport);
	2025	+ if (vlan > 4095 \|\| qos > 7)
1905	2026	return -EINVAL;
1906		-
1907		- mutex_lock(&esw->state_lock);
1908		- evport = &esw->vports[vport];
1909	2027
1910	2028	err = modify_esw_vport_cvlan(esw->dev, vport, vlan, qos, set_flags);
1911	2029	if (err)
1912		- goto unlock;
	2030	+ return err;
1913	2031
1914	2032	evport->info.vlan = vlan;
1915	2033	evport->info.qos = qos;
1916		- if (evport->enabled && esw->mode == SRIOV_LEGACY) {
1917		- err = esw_vport_ingress_config(esw, evport);
	2034	+ if (evport->enabled && esw->mode == MLX5_ESWITCH_LEGACY) {
	2035	+ err = esw_acl_ingress_lgcy_setup(esw, evport);
1918	2036	if (err)
1919		- goto unlock;
1920		- err = esw_vport_egress_config(esw, evport);
	2037	+ return err;
	2038	+ err = esw_acl_egress_lgcy_setup(esw, evport);
1921	2039	}
1922	2040
1923		-unlock:
1924		- mutex_unlock(&esw->state_lock);
1925	2041	return err;
1926	2042	}
1927	2043
1928	2044	int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,
1929		- int vport, u16 vlan, u8 qos)
	2045	+ u16 vport, u16 vlan, u8 qos)
1930	2046	{
1931	2047	u8 set_flags = 0;
	2048	+ int err;
	2049	+
	2050	+ if (!ESW_ALLOWED(esw))
	2051	+ return -EPERM;
1932	2052
1933	2053	if (vlan \|\| qos)
1934	2054	set_flags = SET_VLAN_STRIP \| SET_VLAN_INSERT;
1935	2055
1936		- return __mlx5_eswitch_set_vport_vlan(esw, vport, vlan, qos, set_flags);
	2056	+ mutex_lock(&esw->state_lock);
	2057	+ err = __mlx5_eswitch_set_vport_vlan(esw, vport, vlan, qos, set_flags);
	2058	+ mutex_unlock(&esw->state_lock);
	2059	+
	2060	+ return err;
1937	2061	}
1938	2062
1939	2063	int mlx5_eswitch_set_vport_spoofchk(struct mlx5_eswitch *esw,
1940		- int vport, bool spoofchk)
	2064	+ u16 vport, bool spoofchk)
1941	2065	{
1942		- struct mlx5_vport *evport;
	2066	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
1943	2067	bool pschk;
1944	2068	int err = 0;
1945	2069
1946	2070	if (!ESW_ALLOWED(esw))
1947	2071	return -EPERM;
1948		- if (!LEGAL_VPORT(esw, vport))
1949		- return -EINVAL;
	2072	+ if (IS_ERR(evport))
	2073	+ return PTR_ERR(evport);
1950	2074
1951	2075	mutex_lock(&esw->state_lock);
1952		- evport = &esw->vports[vport];
1953	2076	pschk = evport->info.spoofchk;
1954	2077	evport->info.spoofchk = spoofchk;
1955	2078	if (pschk && !is_valid_ether_addr(evport->info.mac))
1956	2079	mlx5_core_warn(esw->dev,
1957	2080	"Spoofchk in set while MAC is invalid, vport(%d)\n",
1958	2081	evport->vport);
1959		- if (evport->enabled && esw->mode == SRIOV_LEGACY)
1960		- err = esw_vport_ingress_config(esw, evport);
	2082	+ if (evport->enabled && esw->mode == MLX5_ESWITCH_LEGACY)
	2083	+ err = esw_acl_ingress_lgcy_setup(esw, evport);
1961	2084	if (err)
1962	2085	evport->info.spoofchk = pschk;
1963	2086	mutex_unlock(&esw->state_lock);
..	..	@@ -1965,18 +2088,130 @@
1965	2088	return err;
1966	2089	}
1967	2090
1968		-int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,
1969		- int vport, bool setting)
	2091	+static void esw_cleanup_vepa_rules(struct mlx5_eswitch *esw)
1970	2092	{
1971		- struct mlx5_vport *evport;
	2093	+ if (esw->fdb_table.legacy.vepa_uplink_rule)
	2094	+ mlx5_del_flow_rules(esw->fdb_table.legacy.vepa_uplink_rule);
	2095	+
	2096	+ if (esw->fdb_table.legacy.vepa_star_rule)
	2097	+ mlx5_del_flow_rules(esw->fdb_table.legacy.vepa_star_rule);
	2098	+
	2099	+ esw->fdb_table.legacy.vepa_uplink_rule = NULL;
	2100	+ esw->fdb_table.legacy.vepa_star_rule = NULL;
	2101	+}
	2102	+
	2103	+static int _mlx5_eswitch_set_vepa_locked(struct mlx5_eswitch *esw,
	2104	+ u8 setting)
	2105	+{
	2106	+ struct mlx5_flow_destination dest = {};
	2107	+ struct mlx5_flow_act flow_act = {};
	2108	+ struct mlx5_flow_handle *flow_rule;
	2109	+ struct mlx5_flow_spec *spec;
	2110	+ int err = 0;
	2111	+ void *misc;
	2112	+
	2113	+ if (!setting) {
	2114	+ esw_cleanup_vepa_rules(esw);
	2115	+ return 0;
	2116	+ }
	2117	+
	2118	+ if (esw->fdb_table.legacy.vepa_uplink_rule)
	2119	+ return 0;
	2120	+
	2121	+ spec = kvzalloc(sizeof(*spec), GFP_KERNEL);
	2122	+ if (!spec)
	2123	+ return -ENOMEM;
	2124	+
	2125	+ /* Uplink rule forward uplink traffic to FDB */
	2126	+ misc = MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters);
	2127	+ MLX5_SET(fte_match_set_misc, misc, source_port, MLX5_VPORT_UPLINK);
	2128	+
	2129	+ misc = MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_parameters);
	2130	+ MLX5_SET_TO_ONES(fte_match_set_misc, misc, source_port);
	2131	+
	2132	+ spec->match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS;
	2133	+ dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
	2134	+ dest.ft = esw->fdb_table.legacy.fdb;
	2135	+ flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
	2136	+ flow_rule = mlx5_add_flow_rules(esw->fdb_table.legacy.vepa_fdb, spec,
	2137	+ &flow_act, &dest, 1);
	2138	+ if (IS_ERR(flow_rule)) {
	2139	+ err = PTR_ERR(flow_rule);
	2140	+ goto out;
	2141	+ } else {
	2142	+ esw->fdb_table.legacy.vepa_uplink_rule = flow_rule;
	2143	+ }
	2144	+
	2145	+ /* Star rule to forward all traffic to uplink vport */
	2146	+ memset(&dest, 0, sizeof(dest));
	2147	+ dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
	2148	+ dest.vport.num = MLX5_VPORT_UPLINK;
	2149	+ flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
	2150	+ flow_rule = mlx5_add_flow_rules(esw->fdb_table.legacy.vepa_fdb, NULL,
	2151	+ &flow_act, &dest, 1);
	2152	+ if (IS_ERR(flow_rule)) {
	2153	+ err = PTR_ERR(flow_rule);
	2154	+ goto out;
	2155	+ } else {
	2156	+ esw->fdb_table.legacy.vepa_star_rule = flow_rule;
	2157	+ }
	2158	+
	2159	+out:
	2160	+ kvfree(spec);
	2161	+ if (err)
	2162	+ esw_cleanup_vepa_rules(esw);
	2163	+ return err;
	2164	+}
	2165	+
	2166	+int mlx5_eswitch_set_vepa(struct mlx5_eswitch *esw, u8 setting)
	2167	+{
	2168	+ int err = 0;
	2169	+
	2170	+ if (!esw)
	2171	+ return -EOPNOTSUPP;
1972	2172
1973	2173	if (!ESW_ALLOWED(esw))
1974	2174	return -EPERM;
1975		- if (!LEGAL_VPORT(esw, vport))
1976		- return -EINVAL;
1977	2175
1978	2176	mutex_lock(&esw->state_lock);
1979		- evport = &esw->vports[vport];
	2177	+ if (esw->mode != MLX5_ESWITCH_LEGACY) {
	2178	+ err = -EOPNOTSUPP;
	2179	+ goto out;
	2180	+ }
	2181	+
	2182	+ err = _mlx5_eswitch_set_vepa_locked(esw, setting);
	2183	+
	2184	+out:
	2185	+ mutex_unlock(&esw->state_lock);
	2186	+ return err;
	2187	+}
	2188	+
	2189	+int mlx5_eswitch_get_vepa(struct mlx5_eswitch esw, u8 setting)
	2190	+{
	2191	+ if (!esw)
	2192	+ return -EOPNOTSUPP;
	2193	+
	2194	+ if (!ESW_ALLOWED(esw))
	2195	+ return -EPERM;
	2196	+
	2197	+ if (esw->mode != MLX5_ESWITCH_LEGACY)
	2198	+ return -EOPNOTSUPP;
	2199	+
	2200	+ *setting = esw->fdb_table.legacy.vepa_uplink_rule ? 1 : 0;
	2201	+ return 0;
	2202	+}
	2203	+
	2204	+int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,
	2205	+ u16 vport, bool setting)
	2206	+{
	2207	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
	2208	+
	2209	+ if (!ESW_ALLOWED(esw))
	2210	+ return -EPERM;
	2211	+ if (IS_ERR(evport))
	2212	+ return PTR_ERR(evport);
	2213	+
	2214	+ mutex_lock(&esw->state_lock);
1980	2215	evport->info.trusted = setting;
1981	2216	if (evport->enabled)
1982	2217	esw_vport_change_handle_locked(evport);
..	..	@@ -1992,8 +2227,7 @@
1992	2227	u32 max_guarantee = 0;
1993	2228	int i;
1994	2229
1995		- for (i = 0; i < esw->total_vports; i++) {
1996		- evport = &esw->vports[i];
	2230	+ mlx5_esw_for_all_vports(esw, i, evport) {
1997	2231	if (!evport->enabled \|\| evport->info.min_rate < max_guarantee)
1998	2232	continue;
1999	2233	max_guarantee = evport->info.min_rate;
..	..	@@ -2015,8 +2249,7 @@
2015	2249	int err;
2016	2250	int i;
2017	2251
2018		- for (i = 0; i < esw->total_vports; i++) {
2019		- evport = &esw->vports[i];
	2252	+ mlx5_esw_for_all_vports(esw, i, evport) {
2020	2253	if (!evport->enabled)
2021	2254	continue;
2022	2255	vport_min_rate = evport->info.min_rate;
..	..	@@ -2031,7 +2264,7 @@
2031	2264	if (bw_share == evport->qos.bw_share)
2032	2265	continue;
2033	2266
2034		- err = esw_vport_qos_config(esw, i, vport_max_rate,
	2267	+ err = esw_vport_qos_config(esw, evport, vport_max_rate,
2035	2268	bw_share);
2036	2269	if (!err)
2037	2270	evport->qos.bw_share = bw_share;
..	..	@@ -2042,10 +2275,10 @@
2042	2275	return 0;
2043	2276	}
2044	2277
2045		-int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport,
	2278	+int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, u16 vport,
2046	2279	u32 max_rate, u32 min_rate)
2047	2280	{
2048		- struct mlx5_vport *evport;
	2281	+ struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);
2049	2282	u32 fw_max_bw_share;
2050	2283	u32 previous_min_rate;
2051	2284	bool min_rate_supported;
..	..	@@ -2054,8 +2287,8 @@
2054	2287
2055	2288	if (!ESW_ALLOWED(esw))
2056	2289	return -EPERM;
2057		- if (!LEGAL_VPORT(esw, vport))
2058		- return -EINVAL;
	2290	+ if (IS_ERR(evport))
	2291	+ return PTR_ERR(evport);
2059	2292
2060	2293	fw_max_bw_share = MLX5_CAP_QOS(esw->dev, max_tsar_bw_share);
2061	2294	min_rate_supported = MLX5_CAP_QOS(esw->dev, esw_bw_share) &&
..	..	@@ -2066,7 +2299,6 @@
2066	2299	return -EOPNOTSUPP;
2067	2300
2068	2301	mutex_lock(&esw->state_lock);
2069		- evport = &esw->vports[vport];
2070	2302
2071	2303	if (min_rate == evport->info.min_rate)
2072	2304	goto set_max_rate;
..	..	@@ -2083,7 +2315,7 @@
2083	2315	if (max_rate == evport->info.max_rate)
2084	2316	goto unlock;
2085	2317
2086		- err = esw_vport_qos_config(esw, vport, max_rate, evport->qos.bw_share);
	2318	+ err = esw_vport_qos_config(esw, evport, max_rate, evport->qos.bw_share);
2087	2319	if (!err)
2088	2320	evport->info.max_rate = max_rate;
2089	2321
..	..	@@ -2093,58 +2325,62 @@
2093	2325	}
2094	2326
2095	2327	static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,
2096		- int vport_idx,
	2328	+ struct mlx5_vport *vport,
2097	2329	struct mlx5_vport_drop_stats *stats)
2098	2330	{
2099	2331	struct mlx5_eswitch *esw = dev->priv.eswitch;
2100		- struct mlx5_vport *vport = &esw->vports[vport_idx];
2101	2332	u64 rx_discard_vport_down, tx_discard_vport_down;
2102	2333	u64 bytes = 0;
2103	2334	int err = 0;
2104	2335
2105		- if (!vport->enabled \|\| esw->mode != SRIOV_LEGACY)
	2336	+ if (esw->mode != MLX5_ESWITCH_LEGACY)
2106	2337	return 0;
2107	2338
2108		- if (vport->egress.drop_counter)
2109		- mlx5_fc_query(dev, vport->egress.drop_counter,
	2339	+ mutex_lock(&esw->state_lock);
	2340	+ if (!vport->enabled)
	2341	+ goto unlock;
	2342	+
	2343	+ if (!IS_ERR_OR_NULL(vport->egress.legacy.drop_counter))
	2344	+ mlx5_fc_query(dev, vport->egress.legacy.drop_counter,
2110	2345	&stats->rx_dropped, &bytes);
2111	2346
2112		- if (vport->ingress.drop_counter)
2113		- mlx5_fc_query(dev, vport->ingress.drop_counter,
	2347	+ if (vport->ingress.legacy.drop_counter)
	2348	+ mlx5_fc_query(dev, vport->ingress.legacy.drop_counter,
2114	2349	&stats->tx_dropped, &bytes);
2115	2350
2116	2351	if (!MLX5_CAP_GEN(dev, receive_discard_vport_down) &&
2117	2352	!MLX5_CAP_GEN(dev, transmit_discard_vport_down))
2118		- return 0;
	2353	+ goto unlock;
2119	2354
2120		- err = mlx5_query_vport_down_stats(dev, vport_idx,
	2355	+ err = mlx5_query_vport_down_stats(dev, vport->vport, 1,
2121	2356	&rx_discard_vport_down,
2122	2357	&tx_discard_vport_down);
2123	2358	if (err)
2124		- return err;
	2359	+ goto unlock;
2125	2360
2126	2361	if (MLX5_CAP_GEN(dev, receive_discard_vport_down))
2127	2362	stats->rx_dropped += rx_discard_vport_down;
2128	2363	if (MLX5_CAP_GEN(dev, transmit_discard_vport_down))
2129	2364	stats->tx_dropped += tx_discard_vport_down;
2130	2365
2131		- return 0;
	2366	+unlock:
	2367	+ mutex_unlock(&esw->state_lock);
	2368	+ return err;
2132	2369	}
2133	2370
2134	2371	int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,
2135		- int vport,
	2372	+ u16 vport_num,
2136	2373	struct ifla_vf_stats *vf_stats)
2137	2374	{
	2375	+ struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);
2138	2376	int outlen = MLX5_ST_SZ_BYTES(query_vport_counter_out);
2139		- u32 in[MLX5_ST_SZ_DW(query_vport_counter_in)] = {0};
2140		- struct mlx5_vport_drop_stats stats = {0};
	2377	+ u32 in[MLX5_ST_SZ_DW(query_vport_counter_in)] = {};
	2378	+ struct mlx5_vport_drop_stats stats = {};
2141	2379	int err = 0;
2142	2380	u32 *out;
2143	2381
2144		- if (!ESW_ALLOWED(esw))
2145		- return -EPERM;
2146		- if (!LEGAL_VPORT(esw, vport))
2147		- return -EINVAL;
	2382	+ if (IS_ERR(vport))
	2383	+ return PTR_ERR(vport);
2148	2384
2149	2385	out = kvzalloc(outlen, GFP_KERNEL);
2150	2386	if (!out)
..	..	@@ -2153,12 +2389,10 @@
2153	2389	MLX5_SET(query_vport_counter_in, in, opcode,
2154	2390	MLX5_CMD_OP_QUERY_VPORT_COUNTER);
2155	2391	MLX5_SET(query_vport_counter_in, in, op_mod, 0);
2156		- MLX5_SET(query_vport_counter_in, in, vport_number, vport);
2157		- if (vport)
2158		- MLX5_SET(query_vport_counter_in, in, other_vport, 1);
	2392	+ MLX5_SET(query_vport_counter_in, in, vport_number, vport->vport);
	2393	+ MLX5_SET(query_vport_counter_in, in, other_vport, 1);
2159	2394
2160		- memset(out, 0, outlen);
2161		- err = mlx5_cmd_exec(esw->dev, in, sizeof(in), out, outlen);
	2395	+ err = mlx5_cmd_exec_inout(esw->dev, query_vport_counter, in, out);
2162	2396	if (err)
2163	2397	goto free_out;
2164	2398
..	..	@@ -2214,6 +2448,37 @@
2214	2448
2215	2449	u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)
2216	2450	{
2217		- return ESW_ALLOWED(esw) ? esw->mode : SRIOV_NONE;
	2451	+ return ESW_ALLOWED(esw) ? esw->mode : MLX5_ESWITCH_NONE;
2218	2452	}
2219	2453	EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);
	2454	+
	2455	+enum devlink_eswitch_encap_mode
	2456	+mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
	2457	+{
	2458	+ struct mlx5_eswitch *esw;
	2459	+
	2460	+ esw = dev->priv.eswitch;
	2461	+ return ESW_ALLOWED(esw) ? esw->offloads.encap :
	2462	+ DEVLINK_ESWITCH_ENCAP_MODE_NONE;
	2463	+}
	2464	+EXPORT_SYMBOL(mlx5_eswitch_get_encap_mode);
	2465	+
	2466	+bool mlx5_esw_lag_prereq(struct mlx5_core_dev dev0, struct mlx5_core_dev dev1)
	2467	+{
	2468	+ if ((dev0->priv.eswitch->mode == MLX5_ESWITCH_NONE &&
	2469	+ dev1->priv.eswitch->mode == MLX5_ESWITCH_NONE) \|\|
	2470	+ (dev0->priv.eswitch->mode == MLX5_ESWITCH_OFFLOADS &&
	2471	+ dev1->priv.eswitch->mode == MLX5_ESWITCH_OFFLOADS))
	2472	+ return true;
	2473	+
	2474	+ return false;
	2475	+}
	2476	+
	2477	+bool mlx5_esw_multipath_prereq(struct mlx5_core_dev *dev0,
	2478	+ struct mlx5_core_dev *dev1)
	2479	+{
	2480	+ return (dev0->priv.eswitch->mode == MLX5_ESWITCH_OFFLOADS &&
	2481	+ dev1->priv.eswitch->mode == MLX5_ESWITCH_OFFLOADS);
	2482	+}
	2483	+
	2484	+