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

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

Merge branch 'mlx5-next' 



Saeed Mahameed says:

====================
Mellanox 100G mlx5 SRIOV switchdev update

This series from Roi and Or further enhances the new SRIOV switchdev mode.

Roi's patches deal with allowing users to configure though devlink
the level of inline headers that the VF should be setting in order for
the eswitch HW to do proper matching. We also enforce that the matching
required for offloaded TC rules is aligned with that level on the PF driver.

Or's patches deals with allowing the user to control on the VF operational
link state through admin directives on the mlx5 VF rep link. Also in this series
is implementation of HW and SW counters for the mlx5 VF rep which is aligned
with the design set by commit a5ea31f5 'Merge branch net-offloaded-stats'.

v1 --> v2:
* constified the net-device param of get offloaded stats ndo in mlxsw
  (pointed by 0-day screaming on us...)
* added Or's Review-by tags for Roi's patches

This series was generated against commit
e796f49d ("net: ieee802154: constify ieee802154_ops structures")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ac32378f de0af0bf

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

+7 −8
Original line number Diff line number Diff line
@@ -150,12 +150,6 @@ static inline int mlx5_max_log_rq_size(int wq_type) 
	}

}



enum {

	MLX5E_INLINE_MODE_L2,

	MLX5E_INLINE_MODE_VPORT_CONTEXT,

	MLX5_INLINE_MODE_NOT_REQUIRED,

};



struct mlx5e_tx_wqe {

	struct mlx5_wqe_ctrl_seg ctrl;

	struct mlx5_wqe_eth_seg  eth;
@@ -874,6 +868,7 @@ int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv); 
void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv);

int mlx5e_attr_get(struct net_device *dev, struct switchdev_attr *attr);

void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);

void mlx5e_update_hw_rep_counters(struct mlx5e_priv *priv);



int mlx5e_create_direct_rqts(struct mlx5e_priv *priv);

void mlx5e_destroy_rqt(struct mlx5e_priv *priv, struct mlx5e_rqt *rqt);
@@ -890,12 +885,16 @@ struct net_device *mlx5e_create_netdev(struct mlx5_core_dev *mdev, 
void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, struct mlx5e_priv *priv);

int mlx5e_attach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev);

void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev);

struct rtnl_link_stats64 *

mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);

u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout);

void mlx5e_add_vxlan_port(struct net_device *netdev,

			  struct udp_tunnel_info *ti);

void mlx5e_del_vxlan_port(struct net_device *netdev,

			  struct udp_tunnel_info *ti);



int mlx5e_get_offload_stats(int attr_id, const struct net_device *dev,

			    void *sp);

bool mlx5e_has_offload_stats(const struct net_device *dev, int attr_id);



bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv);

bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv);

#endif /* __MLX5_EN_H__ */

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

+20 −22
Original line number Diff line number Diff line
@@ -470,16 +470,6 @@ static void mlx5e_rq_free_mpwqe_info(struct mlx5e_rq *rq) 
	kfree(rq->mpwqe.info);

}



static bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv)

{

	struct mlx5_eswitch_rep *rep = (struct mlx5_eswitch_rep *)priv->ppriv;



	if (rep && rep->vport != FDB_UPLINK_VPORT)

		return true;



	return false;

}



static int mlx5e_create_rq(struct mlx5e_channel *c,

			   struct mlx5e_rq_param *param,

			   struct mlx5e_rq *rq)
@@ -967,7 +957,7 @@ static int mlx5e_create_sq(struct mlx5e_channel *c, 
	sq->bf_buf_size = (1 << MLX5_CAP_GEN(mdev, log_bf_reg_size)) / 2;

	sq->max_inline  = param->max_inline;

	sq->min_inline_mode =

		MLX5_CAP_ETH(mdev, wqe_inline_mode) == MLX5E_INLINE_MODE_VPORT_CONTEXT ?

		MLX5_CAP_ETH(mdev, wqe_inline_mode) == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT ?

		param->min_inline_mode : 0;



	err = mlx5e_alloc_sq_db(sq, cpu_to_node(c->cpu));
@@ -2664,7 +2654,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, 
	return mlx5e_setup_tc(dev, tc->tc);

}



struct rtnl_link_stats64 *

static struct rtnl_link_stats64 *

mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);
@@ -2672,13 +2662,20 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
	struct mlx5e_vport_stats *vstats = &priv->stats.vport;

	struct mlx5e_pport_stats *pstats = &priv->stats.pport;



	if (mlx5e_is_uplink_rep(priv)) {

		stats->rx_packets = PPORT_802_3_GET(pstats, a_frames_received_ok);

		stats->rx_bytes   = PPORT_802_3_GET(pstats, a_octets_received_ok);

		stats->tx_packets = PPORT_802_3_GET(pstats, a_frames_transmitted_ok);

		stats->tx_bytes   = PPORT_802_3_GET(pstats, a_octets_transmitted_ok);

	} else {

		stats->rx_packets = sstats->rx_packets;

		stats->rx_bytes   = sstats->rx_bytes;

		stats->tx_packets = sstats->tx_packets;

		stats->tx_bytes   = sstats->tx_bytes;

		stats->tx_dropped = sstats->tx_queue_dropped;

	}



	stats->rx_dropped = priv->stats.qcnt.rx_out_of_buffer;

	stats->tx_dropped = sstats->tx_queue_dropped;



	stats->rx_length_errors =

		PPORT_802_3_GET(pstats, a_in_range_length_errors) +
@@ -3290,6 +3287,8 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller     = mlx5e_netpoll,

#endif

	.ndo_has_offload_stats	 = mlx5e_has_offload_stats,

	.ndo_get_offload_stats	 = mlx5e_get_offload_stats,

};



static int mlx5e_check_required_hca_cap(struct mlx5_core_dev *mdev)
@@ -3418,14 +3417,13 @@ static void mlx5e_query_min_inline(struct mlx5_core_dev *mdev, 
				   u8 *min_inline_mode)

{

	switch (MLX5_CAP_ETH(mdev, wqe_inline_mode)) {

	case MLX5E_INLINE_MODE_L2:

	case MLX5_CAP_INLINE_MODE_L2:

		*min_inline_mode = MLX5_INLINE_MODE_L2;

		break;

	case MLX5E_INLINE_MODE_VPORT_CONTEXT:

		mlx5_query_nic_vport_min_inline(mdev,

						min_inline_mode);

	case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:

		mlx5_query_nic_vport_min_inline(mdev, 0, min_inline_mode);

		break;

	case MLX5_INLINE_MODE_NOT_REQUIRED:

	case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:

		*min_inline_mode = MLX5_INLINE_MODE_NONE;

		break;

	}

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

+136 −8
Original line number Diff line number Diff line
@@ -72,7 +72,29 @@ static void mlx5e_rep_get_strings(struct net_device *dev, 
	}

}



static void mlx5e_update_sw_rep_counters(struct mlx5e_priv *priv)

static void mlx5e_rep_update_hw_counters(struct mlx5e_priv *priv)

{

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

	struct mlx5_eswitch_rep *rep = priv->ppriv;

	struct rtnl_link_stats64 *vport_stats;

	struct ifla_vf_stats vf_stats;

	int err;



	err = mlx5_eswitch_get_vport_stats(esw, rep->vport, &vf_stats);

	if (err) {

		pr_warn("vport %d error %d reading stats\n", rep->vport, err);

		return;

	}



	vport_stats = &priv->stats.vf_vport;

	/* flip tx/rx as we are reporting the counters for the switch vport */

	vport_stats->rx_packets = vf_stats.tx_packets;

	vport_stats->rx_bytes   = vf_stats.tx_bytes;

	vport_stats->tx_packets = vf_stats.rx_packets;

	vport_stats->tx_bytes   = vf_stats.rx_bytes;

}



static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv)

{

	struct mlx5e_sw_stats *s = &priv->stats.sw;

	struct mlx5e_rq_stats *rq_stats;
@@ -95,6 +117,12 @@ static void mlx5e_update_sw_rep_counters(struct mlx5e_priv *priv) 
	}

}



static void mlx5e_rep_update_stats(struct mlx5e_priv *priv)

{

	mlx5e_rep_update_sw_counters(priv);

	mlx5e_rep_update_hw_counters(priv);

}



static void mlx5e_rep_get_ethtool_stats(struct net_device *dev,

					struct ethtool_stats *stats, u64 *data)

{
@@ -106,7 +134,7 @@ static void mlx5e_rep_get_ethtool_stats(struct net_device *dev, 


	mutex_lock(&priv->state_lock);

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

		mlx5e_update_sw_rep_counters(priv);

		mlx5e_rep_update_sw_counters(priv);

	mutex_unlock(&priv->state_lock);



	for (i = 0; i < NUM_VPORT_REP_COUNTERS; i++)
@@ -208,6 +236,35 @@ void mlx5e_nic_rep_unload(struct mlx5_eswitch *esw, 
	mlx5e_tc_init(priv);

}



static int mlx5e_rep_open(struct net_device *dev)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_eswitch_rep *rep = priv->ppriv;

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

	int err;



	err = mlx5e_open(dev);

	if (err)

		return err;



	err = mlx5_eswitch_set_vport_state(esw, rep->vport, MLX5_ESW_VPORT_ADMIN_STATE_UP);

	if (!err)

		netif_carrier_on(dev);



	return 0;

}



static int mlx5e_rep_close(struct net_device *dev)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_eswitch_rep *rep = priv->ppriv;

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



	(void)mlx5_eswitch_set_vport_state(esw, rep->vport, MLX5_ESW_VPORT_ADMIN_STATE_DOWN);



	return mlx5e_close(dev);

}



static int mlx5e_rep_get_phys_port_name(struct net_device *dev,

					char *buf, size_t len)

{
@@ -245,19 +302,90 @@ static int mlx5e_rep_ndo_setup_tc(struct net_device *dev, u32 handle, 
	}

}



bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)

{

	struct mlx5_eswitch_rep *rep = (struct mlx5_eswitch_rep *)priv->ppriv;

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



	if (rep && rep->vport == FDB_UPLINK_VPORT && esw->mode == SRIOV_OFFLOADS)

		return true;



	return false;

}



bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv)

{

	struct mlx5_eswitch_rep *rep = (struct mlx5_eswitch_rep *)priv->ppriv;



	if (rep && rep->vport != FDB_UPLINK_VPORT)

		return true;



	return false;

}



bool mlx5e_has_offload_stats(const struct net_device *dev, int attr_id)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	switch (attr_id) {

	case IFLA_OFFLOAD_XSTATS_CPU_HIT:

		if (mlx5e_is_vf_vport_rep(priv) || mlx5e_is_uplink_rep(priv))

			return true;

	}



	return false;

}



static int

mlx5e_get_sw_stats64(const struct net_device *dev,

		     struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_sw_stats *sstats = &priv->stats.sw;



	stats->rx_packets = sstats->rx_packets;

	stats->rx_bytes   = sstats->rx_bytes;

	stats->tx_packets = sstats->tx_packets;

	stats->tx_bytes   = sstats->tx_bytes;



	stats->tx_dropped = sstats->tx_queue_dropped;



	return 0;

}



int mlx5e_get_offload_stats(int attr_id, const struct net_device *dev,

			    void *sp)

{

	switch (attr_id) {

	case IFLA_OFFLOAD_XSTATS_CPU_HIT:

		return mlx5e_get_sw_stats64(dev, sp);

	}



	return -EINVAL;

}



static struct rtnl_link_stats64 *

mlx5e_rep_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	memcpy(stats, &priv->stats.vf_vport, sizeof(*stats));

	return stats;

}



static const struct switchdev_ops mlx5e_rep_switchdev_ops = {

	.switchdev_port_attr_get	= mlx5e_attr_get,

};



static const struct net_device_ops mlx5e_netdev_ops_rep = {

	.ndo_open                = mlx5e_open,

	.ndo_stop                = mlx5e_close,

	.ndo_open                = mlx5e_rep_open,

	.ndo_stop                = mlx5e_rep_close,

	.ndo_start_xmit          = mlx5e_xmit,

	.ndo_get_phys_port_name  = mlx5e_rep_get_phys_port_name,

	.ndo_setup_tc            = mlx5e_rep_ndo_setup_tc,

	.ndo_get_stats64         = mlx5e_get_stats,

	.ndo_udp_tunnel_add	 = mlx5e_add_vxlan_port,

	.ndo_udp_tunnel_del	 = mlx5e_del_vxlan_port,

	.ndo_get_stats64         = mlx5e_rep_get_stats,

	.ndo_has_offload_stats	 = mlx5e_has_offload_stats,

	.ndo_get_offload_stats	 = mlx5e_get_offload_stats,

};



static void mlx5e_build_rep_netdev_priv(struct mlx5_core_dev *mdev,
@@ -407,7 +535,7 @@ static struct mlx5e_profile mlx5e_rep_profile = { 
	.cleanup_rx		= mlx5e_cleanup_rep_rx,

	.init_tx		= mlx5e_init_rep_tx,

	.cleanup_tx		= mlx5e_cleanup_nic_tx,

	.update_stats           = mlx5e_update_sw_rep_counters,

	.update_stats           = mlx5e_rep_update_stats,

	.max_nch		= mlx5e_get_rep_max_num_channels,

	.max_tc			= 1,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ struct mlx5e_stats { 
	struct mlx5e_vport_stats vport;

	struct mlx5e_pport_stats pport;

	struct mlx5e_pcie_stats pcie;

	struct rtnl_link_stats64 vf_vport;

};



static const struct counter_desc mlx5e_pme_status_desc[] = {

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

+44 −2
Original line number Diff line number Diff line
@@ -279,8 +279,10 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, 
	return 0;

}



static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec,

			    struct tc_cls_flower_offload *f)

static int __parse_cls_flower(struct mlx5e_priv *priv,

			      struct mlx5_flow_spec *spec,

			      struct tc_cls_flower_offload *f,

			      u8 *min_inline)

{

	void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,

				       outer_headers);
@@ -289,6 +291,8 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
	u16 addr_type = 0;

	u8 ip_proto = 0;



	*min_inline = MLX5_INLINE_MODE_L2;



	if (f->dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_BASIC) |
@@ -362,6 +366,9 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
			 mask->ip_proto);

		MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,

			 key->ip_proto);



		if (mask->ip_proto)

			*min_inline = MLX5_INLINE_MODE_IP;

	}



	if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
@@ -432,6 +439,9 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
		memcpy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, headers_v,

				    dst_ipv4_dst_ipv6.ipv4_layout.ipv4),

		       &key->dst, sizeof(key->dst));



		if (mask->src || mask->dst)

			*min_inline = MLX5_INLINE_MODE_IP;

	}



	if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {
@@ -457,6 +467,10 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
		memcpy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, headers_v,

				    dst_ipv4_dst_ipv6.ipv6_layout.ipv6),

		       &key->dst, sizeof(key->dst));



		if (ipv6_addr_type(&mask->src) != IPV6_ADDR_ANY ||

		    ipv6_addr_type(&mask->dst) != IPV6_ADDR_ANY)

			*min_inline = MLX5_INLINE_MODE_IP;

	}



	if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_PORTS)) {
@@ -497,11 +511,39 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
				   "Only UDP and TCP transport are supported\n");

			return -EINVAL;

		}



		if (mask->src || mask->dst)

			*min_inline = MLX5_INLINE_MODE_TCP_UDP;

	}



	return 0;

}



static int parse_cls_flower(struct mlx5e_priv *priv,

			    struct mlx5_flow_spec *spec,

			    struct tc_cls_flower_offload *f)

{

	struct mlx5_core_dev *dev = priv->mdev;

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

	struct mlx5_eswitch_rep *rep = priv->ppriv;

	u8 min_inline;

	int err;



	err = __parse_cls_flower(priv, spec, f, &min_inline);



	if (!err && esw->mode == SRIOV_OFFLOADS &&

	    rep->vport != FDB_UPLINK_VPORT) {

		if (min_inline > esw->offloads.inline_mode) {

			netdev_warn(priv->netdev,

				    "Flow is not offloaded due to min inline setting, required %d actual %d\n",

				    min_inline, esw->offloads.inline_mode);

			return -EOPNOTSUPP;

		}

	}



	return err;

}



static int parse_tc_nic_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,

				u32 *action, u32 *flow_tag)

{