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

Merge tag 'mlx5-fixes-2018-07-18' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2018-07-18

The following series provides fixes to mlx5 core and net device driver.

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

For -stable v4.7
    net/mlx5e: Don't allow aRFS for encapsulated packets
    net/mlx5e: Fix quota counting in aRFS expire flow

For -stable v4.15
    net/mlx5e: Only allow offloading decap egress (egdev) flows
    net/mlx5e: Refine ets validation function
    net/mlx5: Adjust clock overflow work period

For -stable v4.17
    net/mlx5: E-Switch, UBSAN fix undefined behavior in mlx5_eswitch_mode
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f1d66bf9 7e29392e

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size, 
	int i;



	buf->size = size;

	buf->npages = 1 << get_order(size);

	buf->npages = DIV_ROUND_UP(size, PAGE_SIZE);

	buf->page_shift = PAGE_SHIFT;

	buf->frags = kcalloc(buf->npages, sizeof(struct mlx5_buf_list),

			     GFP_KERNEL);

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

+5 −2
Original line number Diff line number Diff line
@@ -381,14 +381,14 @@ static void arfs_may_expire_flow(struct mlx5e_priv *priv) 
	HLIST_HEAD(del_list);

	spin_lock_bh(&priv->fs.arfs.arfs_lock);

	mlx5e_for_each_arfs_rule(arfs_rule, htmp, priv->fs.arfs.arfs_tables, i, j) {

		if (quota++ > MLX5E_ARFS_EXPIRY_QUOTA)

			break;

		if (!work_pending(&arfs_rule->arfs_work) &&

		    rps_may_expire_flow(priv->netdev,

					arfs_rule->rxq, arfs_rule->flow_id,

					arfs_rule->filter_id)) {

			hlist_del_init(&arfs_rule->hlist);

			hlist_add_head(&arfs_rule->hlist, &del_list);

			if (quota++ > MLX5E_ARFS_EXPIRY_QUOTA)

				break;

		}

	}

	spin_unlock_bh(&priv->fs.arfs.arfs_lock);
@@ -711,6 +711,9 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
	    skb->protocol != htons(ETH_P_IPV6))

		return -EPROTONOSUPPORT;



	if (skb->encapsulation)

		return -EPROTONOSUPPORT;



	arfs_t = arfs_get_table(arfs, arfs_get_ip_proto(skb), skb->protocol);

	if (!arfs_t)

		return -EPROTONOSUPPORT;

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

+8 −9
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets) 
}



static int mlx5e_dbcnl_validate_ets(struct net_device *netdev,

				    struct ieee_ets *ets)

				    struct ieee_ets *ets,

				    bool zero_sum_allowed)

{

	bool have_ets_tc = false;

	int bw_sum = 0;
@@ -300,6 +301,7 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev, 
	}



	if (have_ets_tc && bw_sum != 100) {

		if (bw_sum || (!bw_sum && !zero_sum_allowed))

			netdev_err(netdev,

				   "Failed to validate ETS: BW sum is illegal\n");

		return -EINVAL;
@@ -316,7 +318,7 @@ static int mlx5e_dcbnl_ieee_setets(struct net_device *netdev, 
	if (!MLX5_CAP_GEN(priv->mdev, ets))

		return -EOPNOTSUPP;



	err = mlx5e_dbcnl_validate_ets(netdev, ets);

	err = mlx5e_dbcnl_validate_ets(netdev, ets, false);

	if (err)

		return err;
@@ -642,12 +644,9 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev) 
			  ets.prio_tc[i]);

	}



	err = mlx5e_dbcnl_validate_ets(netdev, &ets);

	if (err) {

		netdev_err(netdev,

			   "%s, Failed to validate ETS: %d\n", __func__, err);

	err = mlx5e_dbcnl_validate_ets(netdev, &ets, true);

	if (err)

		goto out;

	}



	err = mlx5e_dcbnl_ieee_setets_core(priv, &ets);

	if (err) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,10 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
	else

		actions = flow->nic_attr->action;



	if (flow->flags & MLX5E_TC_FLOW_EGRESS &&

	    !(actions & MLX5_FLOW_CONTEXT_ACTION_DECAP))

		return false;



	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		return modify_header_match_supported(&parse_attr->spec, exts);

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

+1 −1
Original line number Diff line number Diff line
@@ -2216,6 +2216,6 @@ free_out: 


u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)

{

	return esw->mode;

	return ESW_ALLOWED(esw) ? esw->mode : SRIOV_NONE;

}

EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE