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

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

Merge tag 'mlx5-updates-2018-10-03' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2018-10-03

mlx5 core driver and ethernet netdev updates, please note there is a small
devlink releated update to allow extack argument to eswitch operations.

From Eli Britstein,
1) devlink: Add extack argument to the eswitch related operations
2) net/mlx5e: E-Switch, return extack messages for failures in the e-switch devlink callbacks
3) net/mlx5e: Add extack messages for TC offload failures

From Eran Ben Elisha,
4) mlx5e: Add counter for aRFS rule insertion failures

From Feras Daoud
5) Fast teardown support for mlx5 device
This change introduces the enhanced version of the "Force teardown" that
allows SW to perform teardown in a faster way without the need to reclaim
all the FW pages.
Fast teardown provides the following advantages:
    1- Fix a FW race condition that could cause command timeout
    2- Avoid moving to polling mode
    3- Close the vport to prevent PCI ACK to be sent without been scatter
    to memory
====================

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

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+2 −1
Original line number Diff line number Diff line
@@ -521,7 +521,8 @@ int bnxt_dl_eswitch_mode_get(struct devlink *devlink, u16 *mode) 
	return 0;

}



int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode)

int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,

			     struct netlink_ext_ack *extack)

{

	struct bnxt *bp = bnxt_get_bp_from_dl(devlink);

	int rc = 0;

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static inline u16 bnxt_vf_rep_get_fid(struct net_device *dev) 


bool bnxt_dev_is_vf_rep(struct net_device *dev);

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

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

int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,

			     struct netlink_ext_ack *extack);



#else

drivers/net/ethernet/cavium/liquidio/lio_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3144,7 +3144,8 @@ liquidio_eswitch_mode_get(struct devlink *devlink, u16 *mode) 
}



static int

liquidio_eswitch_mode_set(struct devlink *devlink, u16 mode)

liquidio_eswitch_mode_set(struct devlink *devlink, u16 mode,

			  struct netlink_ext_ack *extack)

{

	struct lio_devlink_priv *priv;

	struct octeon_device *oct;

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

+5 −2
Original line number Diff line number Diff line
@@ -543,8 +543,11 @@ static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv, 
	rule = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		netdev_err(priv->netdev, "%s: add rule(filter id=%d, rq idx=%d) failed, err=%d\n",

			   __func__, arfs_rule->filter_id, arfs_rule->rxq, err);

		priv->channel_stats[arfs_rule->rxq].rq.arfs_err++;

		mlx5e_dbg(HW, priv,

			  "%s: add rule(filter id=%d, rq idx=%d, ip proto=0x%x) failed,err=%d\n",

			  __func__, arfs_rule->filter_id, arfs_rule->rxq,

			  tuple->ip_proto, err);

	}



out:

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

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static const struct counter_desc sw_stats_desc[] = { 
	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cache_busy) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cache_waive) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_congst_umr) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_arfs_err) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, ch_events) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, ch_poll) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, ch_arm) },
@@ -170,6 +171,7 @@ void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv) 
		s->rx_cache_busy  += rq_stats->cache_busy;

		s->rx_cache_waive += rq_stats->cache_waive;

		s->rx_congst_umr  += rq_stats->congst_umr;

		s->rx_arfs_err    += rq_stats->arfs_err;

		s->ch_events      += ch_stats->events;

		s->ch_poll        += ch_stats->poll;

		s->ch_arm         += ch_stats->arm;
@@ -1161,6 +1163,7 @@ static const struct counter_desc rq_stats_desc[] = { 
	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_busy) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_waive) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, congst_umr) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, arfs_err) },

};



static const struct counter_desc sq_stats_desc[] = {