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

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

Merge tag 'mlx5-updates-2019-02-21' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2019-02-21

This series adds some misc updates to mlx5 driver,

1) Eli Britstein, Introduces tunnel entropy control from PCMR register
and fixes GRE key by controlling port tunnel entropy calculation.

2) Eran Ben Elisha, provides some mlx5 fixes to the latest tx devlink health
reporting mechanism.

3) Huy Nguyen, Added the support for ndo bridge_setlink to allow
   VEPA/VEB E-Switch legacy mode configurations.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b55874f1 4b89251d

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \ 
mlx5_core-$(CONFIG_MLX5_EN_ARFS)     += en_arfs.o

mlx5_core-$(CONFIG_MLX5_EN_RXNFC)    += en_fs_ethtool.o

mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o en/port_buffer.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)     += en_rep.o en_tc.o en/tc_tun.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)     += en_rep.o en_tc.o en/tc_tun.o lib/port_tun.o



#

# Core extra

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+17 −5
Original line number Diff line number Diff line
@@ -113,6 +113,18 @@ static int mlx5e_tx_reporter_err_cqe_recover(struct mlx5e_txqsq *sq) 
	return 0;

}



static int mlx5_tx_health_report(struct devlink_health_reporter *tx_reporter,

				 char *err_str,

				 struct mlx5e_tx_err_ctx *err_ctx)

{

	if (IS_ERR_OR_NULL(tx_reporter)) {

		netdev_err(err_ctx->sq->channel->netdev, err_str);

		return err_ctx->recover(err_ctx->sq);

	}



	return devlink_health_report(tx_reporter, err_str, err_ctx);

}



void mlx5e_tx_reporter_err_cqe(struct mlx5e_txqsq *sq)

{

	char err_str[MLX5E_TX_REPORTER_PER_SQ_MAX_LEN];
@@ -122,7 +134,7 @@ void mlx5e_tx_reporter_err_cqe(struct mlx5e_txqsq *sq) 
	err_ctx.recover  = mlx5e_tx_reporter_err_cqe_recover;

	sprintf(err_str, "ERR CQE on SQ: 0x%x", sq->sqn);



	devlink_health_report(sq->channel->priv->tx_reporter, err_str,

	mlx5_tx_health_report(sq->channel->priv->tx_reporter, err_str,

			      &err_ctx);

}
@@ -136,7 +148,7 @@ static int mlx5e_tx_reporter_timeout_recover(struct mlx5e_txqsq *sq) 
		   eq->core.eqn, eq->core.cons_index, eq->core.irqn);



	eqe_count = mlx5_eq_poll_irq_disabled(eq);

	ret = eqe_count ? true : false;

	ret = eqe_count ? false : true;

	if (!eqe_count) {

		clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);

		return ret;
@@ -160,7 +172,7 @@ int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq) 
		sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,

		jiffies_to_usecs(jiffies - sq->txq->trans_start));



	return devlink_health_report(sq->channel->priv->tx_reporter, err_str,

	return mlx5_tx_health_report(sq->channel->priv->tx_reporter, err_str,

				     &err_ctx);

}
@@ -281,11 +293,11 @@ int mlx5e_tx_reporter_create(struct mlx5e_priv *priv) 
		devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,

					       MLX5_REPORTER_TX_GRACEFUL_PERIOD,

					       true, priv);

	if (IS_ERR_OR_NULL(priv->tx_reporter))

	if (IS_ERR(priv->tx_reporter))

		netdev_warn(priv->netdev,

			    "Failed to create tx reporter, err = %ld\n",

			    PTR_ERR(priv->tx_reporter));

	return PTR_ERR_OR_ZERO(priv->tx_reporter);

	return IS_ERR_OR_NULL(priv->tx_reporter);

}



void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv)

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

+59 −6
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/mlx5/fs.h>

#include <net/vxlan.h>

#include <linux/bpf.h>

#include <linux/if_bridge.h>

#include <net/page_pool.h>

#include "eswitch.h"

#include "en.h"
@@ -4173,12 +4174,6 @@ static void mlx5e_tx_timeout(struct net_device *dev) 
	struct mlx5e_priv *priv = netdev_priv(dev);



	netdev_err(dev, "TX timeout detected\n");



	if (IS_ERR_OR_NULL(priv->tx_reporter)) {

		netdev_err_once(priv->netdev, "tx timeout will not be handled, no valid tx reporter\n");

		return;

	}



	queue_work(priv->wq, &priv->tx_timeout_work);

}
@@ -4311,6 +4306,61 @@ static int mlx5e_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	}

}



#ifdef CONFIG_MLX5_ESWITCH

static int mlx5e_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				struct net_device *dev, u32 filter_mask,

				int nlflags)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 mode, setting;

	int err;



	err = mlx5_eswitch_get_vepa(mdev->priv.eswitch, &setting);

	if (err)

		return err;

	mode = setting ? BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB;

	return ndo_dflt_bridge_getlink(skb, pid, seq, dev,

				       mode,

				       0, 0, nlflags, filter_mask, NULL);

}



static int mlx5e_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,

				u16 flags, struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_core_dev *mdev = priv->mdev;

	struct nlattr *attr, *br_spec;

	u16 mode = BRIDGE_MODE_UNDEF;

	u8 setting;

	int rem;



	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	if (!br_spec)

		return -EINVAL;



	nla_for_each_nested(attr, br_spec, rem) {

		if (nla_type(attr) != IFLA_BRIDGE_MODE)

			continue;



		if (nla_len(attr) < sizeof(mode))

			return -EINVAL;



		mode = nla_get_u16(attr);

		if (mode > BRIDGE_MODE_VEPA)

			return -EINVAL;



		break;

	}



	if (mode == BRIDGE_MODE_UNDEF)

		return -EINVAL;



	setting = (mode == BRIDGE_MODE_VEPA) ?  1 : 0;

	return mlx5_eswitch_set_vepa(mdev->priv.eswitch, setting);

}

#endif



const struct net_device_ops mlx5e_netdev_ops = {

	.ndo_open                = mlx5e_open,

	.ndo_stop                = mlx5e_close,
@@ -4337,6 +4387,9 @@ const struct net_device_ops mlx5e_netdev_ops = { 
	.ndo_rx_flow_steer	 = mlx5e_rx_flow_steer,

#endif

#ifdef CONFIG_MLX5_ESWITCH

	.ndo_bridge_setlink      = mlx5e_bridge_setlink,

	.ndo_bridge_getlink      = mlx5e_bridge_getlink,



	/* SRIOV E-Switch NDOs */

	.ndo_set_vf_mac          = mlx5e_set_vf_mac,

	.ndo_set_vf_vlan         = mlx5e_set_vf_vlan,

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

+17 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "en_tc.h"

#include "en/tc_tun.h"

#include "fs_core.h"

#include "lib/port_tun.h"



#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \

        max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
@@ -1044,15 +1045,24 @@ static void mlx5e_rep_neigh_entry_destroy(struct mlx5e_priv *priv, 
int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv,

				 struct mlx5e_encap_entry *e)

{

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_rep_uplink_priv *uplink_priv = &rpriv->uplink_priv;

	struct mlx5_tun_entropy *tun_entropy = &uplink_priv->tun_entropy;

	struct mlx5e_neigh_hash_entry *nhe;

	int err;



	err = mlx5_tun_entropy_refcount_inc(tun_entropy, e->reformat_type);

	if (err)

		return err;

	nhe = mlx5e_rep_neigh_entry_lookup(priv, &e->m_neigh);

	if (!nhe) {

		err = mlx5e_rep_neigh_entry_create(priv, e, &nhe);

		if (err)

		if (err) {

			mlx5_tun_entropy_refcount_dec(tun_entropy,

						      e->reformat_type);

			return err;

		}

	}

	list_add(&e->encap_list, &nhe->encap_list);

	return 0;

}
@@ -1060,6 +1070,9 @@ int mlx5e_rep_encap_entry_attach(struct mlx5e_priv *priv, 
void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv,

				  struct mlx5e_encap_entry *e)

{

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_rep_uplink_priv *uplink_priv = &rpriv->uplink_priv;

	struct mlx5_tun_entropy *tun_entropy = &uplink_priv->tun_entropy;

	struct mlx5e_neigh_hash_entry *nhe;



	list_del(&e->encap_list);
@@ -1067,6 +1080,7 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv, 


	if (list_empty(&nhe->encap_list))

		mlx5e_rep_neigh_entry_destroy(priv, nhe);

	mlx5_tun_entropy_refcount_dec(tun_entropy, e->reformat_type);

}



static int mlx5e_vf_rep_open(struct net_device *dev)
@@ -1564,6 +1578,8 @@ static int mlx5e_init_rep_tx(struct mlx5e_priv *priv) 
		if (err)

			goto destroy_tises;



		mlx5_init_port_tun_entropy(&uplink_priv->tun_entropy, priv->mdev);



		/* init indirect block notifications */

		INIT_LIST_HEAD(&uplink_priv->tc_indr_block_priv_list);

		uplink_priv->netdevice_nb.notifier_call = mlx5e_nic_rep_netdevice_event;

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/rhashtable.h>

#include "eswitch.h"

#include "en.h"

#include "lib/port_tun.h"



#ifdef CONFIG_MLX5_ESWITCH

struct mlx5e_neigh_update_table {
@@ -71,6 +72,8 @@ struct mlx5_rep_uplink_priv { 
	 */

	struct list_head	    tc_indr_block_priv_list;

	struct notifier_block	    netdevice_nb;



	struct mlx5_tun_entropy tun_entropy;

};



struct mlx5e_rep_priv {