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

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

Merge tag 'mlx5-shared-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 E-Switch updates 2017-12-19

This series includes updates for mlx5 E-Switch infrastructures,
to be merged into net-next and rdma-next trees.

Mark's patches provide E-Switch refactoring that generalize the mlx5
E-Switch vf representors interfaces and data structures. The serious is
mainly focused on moving ethernet (netdev) specific representors logic out
of E-Switch (eswitch.c) into mlx5e representor module (en_rep.c), which
provides better separation and allows future support for other types of vf
representors (e.g. RDMA).

Gal's patches at the end of this serious, provide a simple syntax fix and
two other patches that handles vport ingress/egress ACL steering name
spaces to be aligned with the Firmware/Hardware specs.

V1->V2:
 - Addressed coding style comments in patches #1 and #7
 - The series is still based on rc4, as now I see net-next is also @rc4.

V2->V3:
 - Fixed compilation warning, reported by Dave.

Please pull and let me know if there's any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8d1666fd 9b93ab98

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

+104 −43
Original line number Diff line number Diff line
@@ -190,6 +190,63 @@ int mlx5e_attr_get(struct net_device *dev, struct switchdev_attr *attr) 
	return 0;

}



static void mlx5e_sqs2vport_stop(struct mlx5_eswitch *esw,

				 struct mlx5_eswitch_rep *rep)

{

	struct mlx5e_rep_sq *rep_sq, *tmp;

	struct mlx5e_rep_priv *rpriv;



	if (esw->mode != SRIOV_OFFLOADS)

		return;



	rpriv = mlx5e_rep_to_rep_priv(rep);

	list_for_each_entry_safe(rep_sq, tmp, &rpriv->vport_sqs_list, list) {

		mlx5_eswitch_del_send_to_vport_rule(rep_sq->send_to_vport_rule);

		list_del(&rep_sq->list);

		kfree(rep_sq);

	}

}



static int mlx5e_sqs2vport_start(struct mlx5_eswitch *esw,

				 struct mlx5_eswitch_rep *rep,

				 u16 *sqns_array, int sqns_num)

{

	struct mlx5_flow_handle *flow_rule;

	struct mlx5e_rep_priv *rpriv;

	struct mlx5e_rep_sq *rep_sq;

	int err;

	int i;



	if (esw->mode != SRIOV_OFFLOADS)

		return 0;



	rpriv = mlx5e_rep_to_rep_priv(rep);

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

		rep_sq = kzalloc(sizeof(*rep_sq), GFP_KERNEL);

		if (!rep_sq) {

			err = -ENOMEM;

			goto out_err;

		}



		/* Add re-inject rule to the PF/representor sqs */

		flow_rule = mlx5_eswitch_add_send_to_vport_rule(esw,

								rep->vport,

								sqns_array[i]);

		if (IS_ERR(flow_rule)) {

			err = PTR_ERR(flow_rule);

			kfree(rep_sq);

			goto out_err;

		}

		rep_sq->send_to_vport_rule = flow_rule;

		list_add(&rep_sq->list, &rpriv->vport_sqs_list);

	}

	return 0;



out_err:

	mlx5e_sqs2vport_stop(esw, rep);

	return err;

}



int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
@@ -210,7 +267,7 @@ int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv) 
			sqs[num_sqs++] = c->sq[tc].sqn;

	}



	err = mlx5_eswitch_sqs2vport_start(esw, rep, sqs, num_sqs);

	err = mlx5e_sqs2vport_start(esw, rep, sqs, num_sqs);

	kfree(sqs);



out:
@@ -225,7 +282,7 @@ void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv) 
	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep = rpriv->rep;



	mlx5_eswitch_sqs2vport_stop(esw, rep);

	mlx5e_sqs2vport_stop(esw, rep);

}



static void mlx5e_rep_neigh_update_init_interval(struct mlx5e_rep_priv *rpriv)
@@ -238,7 +295,7 @@ static void mlx5e_rep_neigh_update_init_interval(struct mlx5e_rep_priv *rpriv) 
#endif

	unsigned long ipv4_interval = NEIGH_VAR(&arp_tbl.parms,

						DELAY_PROBE_TIME);

	struct net_device *netdev = rpriv->rep->netdev;

	struct net_device *netdev = rpriv->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);



	rpriv->neigh_update.min_interval = min_t(unsigned long, ipv6_interval, ipv4_interval);
@@ -259,7 +316,7 @@ static void mlx5e_rep_neigh_stats_work(struct work_struct *work) 
{

	struct mlx5e_rep_priv *rpriv = container_of(work, struct mlx5e_rep_priv,

						    neigh_update.neigh_stats_work.work);

	struct net_device *netdev = rpriv->rep->netdev;

	struct net_device *netdev = rpriv->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_neigh_hash_entry *nhe;
@@ -355,7 +412,7 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb, 
	struct mlx5e_rep_priv *rpriv = container_of(nb, struct mlx5e_rep_priv,

						    neigh_update.netevent_nb);

	struct mlx5e_neigh_update_table *neigh_update = &rpriv->neigh_update;

	struct net_device *netdev = rpriv->rep->netdev;

	struct net_device *netdev = rpriv->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_neigh_hash_entry *nhe = NULL;

	struct mlx5e_neigh m_neigh = {};
@@ -483,7 +540,7 @@ static int mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv) 
static void mlx5e_rep_neigh_cleanup(struct mlx5e_rep_priv *rpriv)

{

	struct mlx5e_neigh_update_table *neigh_update = &rpriv->neigh_update;

	struct mlx5e_priv *priv = netdev_priv(rpriv->rep->netdev);

	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);



	unregister_netevent_notifier(&neigh_update->netevent_nb);
@@ -904,7 +961,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
		err = PTR_ERR(flow_rule);

		goto err_destroy_direct_tirs;

	}

	rep->vport_rx_rule = flow_rule;

	rpriv->vport_rx_rule = flow_rule;



	err = mlx5e_tc_init(priv);

	if (err)
@@ -913,7 +970,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
	return 0;



err_del_flow_rule:

	mlx5_del_flow_rules(rep->vport_rx_rule);

	mlx5_del_flow_rules(rpriv->vport_rx_rule);

err_destroy_direct_tirs:

	mlx5e_destroy_direct_tirs(priv);

err_destroy_direct_rqts:
@@ -924,10 +981,9 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv)

{

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep = rpriv->rep;



	mlx5e_tc_cleanup(priv);

	mlx5_del_flow_rules(rep->vport_rx_rule);

	mlx5_del_flow_rules(rpriv->vport_rx_rule);

	mlx5e_destroy_direct_tirs(priv);

	mlx5e_destroy_direct_rqts(priv);

}
@@ -967,10 +1023,10 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
/* e-Switch vport representors */



static int

mlx5e_nic_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

mlx5e_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

	struct mlx5e_priv *priv = netdev_priv(rep->netdev);

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);

	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);



	int err;
@@ -992,10 +1048,10 @@ mlx5e_nic_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
}



static void

mlx5e_nic_rep_unload(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

mlx5e_nic_rep_unload(struct mlx5_eswitch_rep *rep)

{

	struct mlx5e_priv *priv = netdev_priv(rep->netdev);

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);

	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);



	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

		mlx5e_remove_sqs_fwd_rules(priv);
@@ -1008,8 +1064,9 @@ mlx5e_nic_rep_unload(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
}



static int

mlx5e_vport_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

mlx5e_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

	struct mlx5e_rep_priv *uplink_rpriv;

	struct mlx5e_rep_priv *rpriv;

	struct net_device *netdev;

	struct mlx5e_priv *upriv;
@@ -1019,7 +1076,7 @@ mlx5e_vport_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
	if (!rpriv)

		return -ENOMEM;



	netdev = mlx5e_create_netdev(esw->dev, &mlx5e_rep_profile, rpriv);

	netdev = mlx5e_create_netdev(dev, &mlx5e_rep_profile, rpriv);

	if (!netdev) {

		pr_warn("Failed to create representor netdev for vport %d\n",

			rep->vport);
@@ -1027,8 +1084,10 @@ mlx5e_vport_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
		return -EINVAL;

	}



	rep->netdev = netdev;

	rpriv->netdev = netdev;

	rpriv->rep = rep;

	rep->rep_if[REP_ETH].priv = rpriv;

	INIT_LIST_HEAD(&rpriv->vport_sqs_list);



	err = mlx5e_attach_netdev(netdev_priv(netdev));

	if (err) {
@@ -1044,7 +1103,8 @@ mlx5e_vport_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
		goto err_detach_netdev;

	}



	upriv = netdev_priv(mlx5_eswitch_get_uplink_netdev(esw));

	uplink_rpriv = mlx5_eswitch_get_uplink_priv(dev->priv.eswitch, REP_ETH);

	upriv = netdev_priv(uplink_rpriv->netdev);

	err = tc_setup_cb_egdev_register(netdev, mlx5e_setup_tc_block_cb,

					 upriv);

	if (err)
@@ -1076,16 +1136,19 @@ mlx5e_vport_rep_load(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep) 
}



static void

mlx5e_vport_rep_unload(struct mlx5_eswitch *esw, struct mlx5_eswitch_rep *rep)

mlx5e_vport_rep_unload(struct mlx5_eswitch_rep *rep)

{

	struct net_device *netdev = rep->netdev;

	struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);

	struct net_device *netdev = rpriv->netdev;

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5e_rep_priv *uplink_rpriv;

	void *ppriv = priv->ppriv;

	struct mlx5e_priv *upriv;



	unregister_netdev(rep->netdev);

	upriv = netdev_priv(mlx5_eswitch_get_uplink_netdev(esw));

	unregister_netdev(netdev);

	uplink_rpriv = mlx5_eswitch_get_uplink_priv(priv->mdev->priv.eswitch,

						    REP_ETH);

	upriv = netdev_priv(uplink_rpriv->netdev);

	tc_setup_cb_egdev_unregister(netdev, mlx5e_setup_tc_block_cb,

				     upriv);

	mlx5e_rep_neigh_cleanup(rpriv);
@@ -1100,18 +1163,13 @@ static void mlx5e_rep_register_vf_vports(struct mlx5e_priv *priv) 
	struct mlx5_eswitch *esw   = mdev->priv.eswitch;

	int total_vfs = MLX5_TOTAL_VPORTS(mdev);

	int vport;

	u8 mac[ETH_ALEN];



	mlx5_query_nic_vport_mac_address(mdev, 0, mac);



	for (vport = 1; vport < total_vfs; vport++) {

		struct mlx5_eswitch_rep rep;

		struct mlx5_eswitch_rep_if rep_if = {};



		rep.load = mlx5e_vport_rep_load;

		rep.unload = mlx5e_vport_rep_unload;

		rep.vport = vport;

		ether_addr_copy(rep.hw_id, mac);

		mlx5_eswitch_register_vport_rep(esw, vport, &rep);

		rep_if.load = mlx5e_vport_rep_load;

		rep_if.unload = mlx5e_vport_rep_unload;

		mlx5_eswitch_register_vport_rep(esw, vport, &rep_if, REP_ETH);

	}

}
@@ -1123,21 +1181,24 @@ static void mlx5e_rep_unregister_vf_vports(struct mlx5e_priv *priv) 
	int vport;



	for (vport = 1; vport < total_vfs; vport++)

		mlx5_eswitch_unregister_vport_rep(esw, vport);

		mlx5_eswitch_unregister_vport_rep(esw, vport, REP_ETH);

}



void mlx5e_register_vport_reps(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5_eswitch *esw   = mdev->priv.eswitch;

	struct mlx5_eswitch_rep rep;

	struct mlx5_eswitch_rep_if rep_if;

	struct mlx5e_rep_priv *rpriv;



	rpriv = priv->ppriv;

	rpriv->netdev = priv->netdev;



	mlx5_query_nic_vport_mac_address(mdev, 0, rep.hw_id);

	rep.load = mlx5e_nic_rep_load;

	rep.unload = mlx5e_nic_rep_unload;

	rep.vport = FDB_UPLINK_VPORT;

	rep.netdev = priv->netdev;

	mlx5_eswitch_register_vport_rep(esw, 0, &rep); /* UPLINK PF vport*/

	rep_if.load = mlx5e_nic_rep_load;

	rep_if.unload = mlx5e_nic_rep_unload;

	rep_if.priv = rpriv;

	INIT_LIST_HEAD(&rpriv->vport_sqs_list);

	mlx5_eswitch_register_vport_rep(esw, 0, &rep_if, REP_ETH); /* UPLINK PF vport*/



	mlx5e_rep_register_vf_vports(priv); /* VFs vports */

}
@@ -1148,7 +1209,7 @@ void mlx5e_unregister_vport_reps(struct mlx5e_priv *priv) 
	struct mlx5_eswitch *esw   = mdev->priv.eswitch;



	mlx5e_rep_unregister_vf_vports(priv); /* VFs vports */

	mlx5_eswitch_unregister_vport_rep(esw, 0); /* UPLINK PF*/

	mlx5_eswitch_unregister_vport_rep(esw, 0, REP_ETH); /* UPLINK PF*/

}



void *mlx5e_alloc_nic_rep_priv(struct mlx5_core_dev *mdev)

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

+14 −0
Original line number Diff line number Diff line
@@ -56,8 +56,17 @@ struct mlx5e_neigh_update_table { 
struct mlx5e_rep_priv {

	struct mlx5_eswitch_rep *rep;

	struct mlx5e_neigh_update_table neigh_update;

	struct net_device      *netdev;

	struct mlx5_flow_handle *vport_rx_rule;

	struct list_head       vport_sqs_list;

};



static inline

struct mlx5e_rep_priv *mlx5e_rep_to_rep_priv(struct mlx5_eswitch_rep *rep)

{

	return (struct mlx5e_rep_priv *)rep->rep_if[REP_ETH].priv;

}



struct mlx5e_neigh {

	struct net_device *dev;

	union {
@@ -124,6 +133,11 @@ struct mlx5e_encap_entry { 
	int encap_size;

};



struct mlx5e_rep_sq {

	struct mlx5_flow_handle	*send_to_vport_rule;

	struct list_head	 list;

};



void *mlx5e_alloc_nic_rep_priv(struct mlx5_core_dev *mdev);

void mlx5e_register_vport_reps(struct mlx5e_priv *priv);

void mlx5e_unregister_vport_reps(struct mlx5e_priv *priv);

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

+11 −4
Original line number Diff line number Diff line
@@ -617,7 +617,8 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, 
						  FLOW_DISSECTOR_KEY_ENC_PORTS,

						  f->mask);

		struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

		struct net_device *up_dev = mlx5_eswitch_get_uplink_netdev(esw);

		struct mlx5e_rep_priv *uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);

		struct net_device *up_dev = uplink_rpriv->netdev;

		struct mlx5e_priv *up_priv = netdev_priv(up_dev);



		/* Full udp dst port must be given */
@@ -1507,6 +1508,7 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv, 
				   int *out_ttl)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct mlx5e_rep_priv *uplink_rpriv;

	struct rtable *rt;

	struct neighbour *n = NULL;
@@ -1520,9 +1522,10 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv, 
#else

	return -EOPNOTSUPP;

#endif

	uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);

	/* if the egress device isn't on the same HW e-switch, we use the uplink */

	if (!switchdev_port_same_parent_id(priv->netdev, rt->dst.dev))

		*out_dev = mlx5_eswitch_get_uplink_netdev(esw);

		*out_dev = uplink_rpriv->netdev;

	else

		*out_dev = rt->dst.dev;
@@ -1543,6 +1546,7 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, 
				   struct neighbour **out_n,

				   int *out_ttl)

{

	struct mlx5e_rep_priv *uplink_rpriv;

	struct neighbour *n = NULL;

	struct dst_entry *dst;
@@ -1557,9 +1561,10 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, 


	*out_ttl = ip6_dst_hoplimit(dst);



	uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);

	/* if the egress device isn't on the same HW e-switch, we use the uplink */

	if (!switchdev_port_same_parent_id(priv->netdev, dst->dev))

		*out_dev = mlx5_eswitch_get_uplink_netdev(esw);

		*out_dev = uplink_rpriv->netdev;

	else

		*out_dev = dst->dev;

#else
@@ -1859,7 +1864,9 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv, 
			      struct mlx5e_tc_flow *flow)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct net_device *up_dev = mlx5_eswitch_get_uplink_netdev(esw);

	struct mlx5e_rep_priv *uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw,

									   REP_ETH);

	struct net_device *up_dev = uplink_rpriv->netdev;

	unsigned short family = ip_tunnel_info_af(tun_info);

	struct mlx5e_priv *up_priv = netdev_priv(up_dev);

	struct mlx5_esw_flow_attr *attr = flow->esw_attr;

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

+23 −25
Original line number Diff line number Diff line
@@ -867,9 +867,10 @@ static int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, 
	esw_debug(dev, "Create vport[%d] egress ACL log_max_size(%d)\n",

		  vport->vport, MLX5_CAP_ESW_EGRESS_ACL(dev, log_max_ft_size));



	root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_EGRESS);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_EGRESS,

						    vport->vport);

	if (!root_ns) {

		esw_warn(dev, "Failed to get E-Switch egress flow namespace\n");

		esw_warn(dev, "Failed to get E-Switch egress flow namespace for vport (%d)\n", vport->vport);

		return -EOPNOTSUPP;

	}
@@ -984,9 +985,10 @@ static int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
	esw_debug(dev, "Create vport[%d] ingress ACL log_max_size(%d)\n",

		  vport->vport, MLX5_CAP_ESW_INGRESS_ACL(dev, log_max_ft_size));



	root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS,

						    vport->vport);

	if (!root_ns) {

		esw_warn(dev, "Failed to get E-Switch ingress flow namespace\n");

		esw_warn(dev, "Failed to get E-Switch ingress flow namespace for vport (%d)\n", vport->vport);

		return -EOPNOTSUPP;

	}
@@ -1290,7 +1292,7 @@ static int esw_create_tsar(struct mlx5_eswitch *esw) 


	err = mlx5_create_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &tsar_ctx,

						 tsar_ctx,

						 &esw->qos.root_tsar_id);

	if (err) {

		esw_warn(esw->dev, "E-Switch create TSAR failed (%d)\n", err);
@@ -1333,20 +1335,20 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num, 
	if (vport->qos.enabled)

		return -EEXIST;



	MLX5_SET(scheduling_context, &sched_ctx, element_type,

	MLX5_SET(scheduling_context, sched_ctx, element_type,

		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);

	vport_elem = MLX5_ADDR_OF(scheduling_context, &sched_ctx,

	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,

				  element_attributes);

	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);

	MLX5_SET(scheduling_context, &sched_ctx, parent_element_id,

	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,

		 esw->qos.root_tsar_id);

	MLX5_SET(scheduling_context, &sched_ctx, max_average_bw,

	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,

		 initial_max_rate);

	MLX5_SET(scheduling_context, &sched_ctx, bw_share, initial_bw_share);

	MLX5_SET(scheduling_context, sched_ctx, bw_share, initial_bw_share);



	err = mlx5_create_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &sched_ctx,

						 sched_ctx,

						 &vport->qos.esw_tsar_ix);

	if (err) {

		esw_warn(esw->dev, "E-Switch create TSAR vport element failed (vport=%d,err=%d)\n",
@@ -1392,22 +1394,22 @@ static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num, 
	if (!vport->qos.enabled)

		return -EIO;



	MLX5_SET(scheduling_context, &sched_ctx, element_type,

	MLX5_SET(scheduling_context, sched_ctx, element_type,

		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);

	vport_elem = MLX5_ADDR_OF(scheduling_context, &sched_ctx,

	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,

				  element_attributes);

	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);

	MLX5_SET(scheduling_context, &sched_ctx, parent_element_id,

	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,

		 esw->qos.root_tsar_id);

	MLX5_SET(scheduling_context, &sched_ctx, max_average_bw,

	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,

		 max_rate);

	MLX5_SET(scheduling_context, &sched_ctx, bw_share, bw_share);

	MLX5_SET(scheduling_context, sched_ctx, bw_share, bw_share);

	bitmask |= MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW;

	bitmask |= MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_BW_SHARE;



	err = mlx5_modify_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &sched_ctx,

						 sched_ctx,

						 vport->qos.esw_tsar_ix,

						 bitmask);

	if (err) {
@@ -1644,13 +1646,9 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
		goto abort;

	}



	esw->offloads.vport_reps =

		kzalloc(total_vports * sizeof(struct mlx5_eswitch_rep),

			GFP_KERNEL);

	if (!esw->offloads.vport_reps) {

		err = -ENOMEM;

	err = esw_offloads_init_reps(esw);

	if (err)

		goto abort;

	}



	hash_init(esw->offloads.encap_tbl);

	hash_init(esw->offloads.mod_hdr_tbl);
@@ -1681,8 +1679,8 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
abort:

	if (esw->work_queue)

		destroy_workqueue(esw->work_queue);

	esw_offloads_cleanup_reps(esw);

	kfree(esw->vports);

	kfree(esw->offloads.vport_reps);

	kfree(esw);

	return err;

}
@@ -1696,7 +1694,7 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw) 


	esw->dev->priv.eswitch = NULL;

	destroy_workqueue(esw->work_queue);

	kfree(esw->offloads.vport_reps);

	esw_offloads_cleanup_reps(esw);

	kfree(esw->vports);

	kfree(esw);

}

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

+24 −21
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ enum { 
	SRIOV_OFFLOADS

};



enum {

	REP_ETH,

	NUM_REP_TYPES,

};



#ifdef CONFIG_MLX5_ESWITCH



#define MLX5_MAX_UC_PER_VPORT(dev) \
@@ -133,25 +138,21 @@ struct mlx5_eswitch_fdb { 
	};

};



struct mlx5_esw_sq {

	struct mlx5_flow_handle	*send_to_vport_rule;

	struct list_head	 list;

struct mlx5_eswitch_rep;

struct mlx5_eswitch_rep_if {

	int		       (*load)(struct mlx5_core_dev *dev,

				       struct mlx5_eswitch_rep *rep);

	void		       (*unload)(struct mlx5_eswitch_rep *rep);

	void			*priv;

	bool		       valid;

};



struct mlx5_eswitch_rep {

	int		       (*load)(struct mlx5_eswitch *esw,

				       struct mlx5_eswitch_rep *rep);

	void		       (*unload)(struct mlx5_eswitch *esw,

					 struct mlx5_eswitch_rep *rep);

	struct mlx5_eswitch_rep_if rep_if[NUM_REP_TYPES];

	u16		       vport;

	u8		       hw_id[ETH_ALEN];

	struct net_device      *netdev;



	struct mlx5_flow_handle *vport_rx_rule;

	struct list_head       vport_sqs_list;

	u16		       vlan;

	u32		       vlan_refcount;

	bool		       valid;

};



struct mlx5_esw_offload {
@@ -197,6 +198,8 @@ struct mlx5_eswitch { 


void esw_offloads_cleanup(struct mlx5_eswitch *esw, int nvports);

int esw_offloads_init(struct mlx5_eswitch *esw, int nvports);

void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw);

int esw_offloads_init_reps(struct mlx5_eswitch *esw);



/* E-Switch API */

int mlx5_eswitch_init(struct mlx5_core_dev *dev);
@@ -221,6 +224,10 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, 
int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,

				 int vport,

				 struct ifla_vf_stats *vf_stats);

struct mlx5_flow_handle *

mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw, int vport,

				    u32 sqn);

void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule);



struct mlx5_flow_spec;

struct mlx5_esw_flow_attr;
@@ -257,12 +264,6 @@ struct mlx5_esw_flow_attr { 
	struct mlx5e_tc_flow_parse_attr *parse_attr;

};



int mlx5_eswitch_sqs2vport_start(struct mlx5_eswitch *esw,

				 struct mlx5_eswitch_rep *rep,

				 u16 *sqns_array, int sqns_num);

void mlx5_eswitch_sqs2vport_stop(struct mlx5_eswitch *esw,

				 struct mlx5_eswitch_rep *rep);



int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode);

int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode);

int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode);
@@ -272,10 +273,12 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap); 
int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap);

void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

				     int vport_index,

				     struct mlx5_eswitch_rep *rep);

				     struct mlx5_eswitch_rep_if *rep_if,

				     u8 rep_type);

void mlx5_eswitch_unregister_vport_rep(struct mlx5_eswitch *esw,

				       int vport_index);

struct net_device *mlx5_eswitch_get_uplink_netdev(struct mlx5_eswitch *esw);

				       int vport_index,

				       u8 rep_type);

void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type);



int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,

				 struct mlx5_esw_flow_attr *attr);