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

Merge tag 'mlx5-updates-2021-09-24' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2021-09-24

mlx5 misc updates and fixes to net-next branch:

1) Roi Dayan provided some cleanups in mlx5e TC module, and some
   code improvements to fwd/drop actions handling.

2) Tariq, Add TX max rate support for MQPRIO channel mode

3) Dima adds the support for TC egress/ingress offload of macvlan
   interfaces

4) misc cleanup
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents acde891c 05000bbb

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

+1 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ struct mlx5e_umr_wqe { 
	struct mlx5_mtt                inline_mtts[0];

};



extern const char mlx5e_self_tests[][ETH_GSTRING_LEN];



enum mlx5e_priv_flag {

	MLX5E_PFLAG_RX_CQE_BASED_MODER,

	MLX5E_PFLAG_TX_CQE_BASED_MODER,
@@ -916,6 +914,7 @@ void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s) 


void mlx5e_init_l2_addr(struct mlx5e_priv *priv);

int mlx5e_self_test_num(struct mlx5e_priv *priv);

int mlx5e_self_test_fill_strings(struct mlx5e_priv *priv, u8 *data);

void mlx5e_self_test(struct net_device *ndev, struct ethtool_test *etest,

		     u64 *buf);

void mlx5e_set_rx_mode_work(struct work_struct *work);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+16 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <net/dst_metadata.h>

#include <linux/netdevice.h>

#include <linux/if_macvlan.h>

#include <linux/list.h>

#include <linux/rculist.h>

#include <linux/rtnetlink.h>
@@ -409,6 +410,13 @@ static void mlx5e_rep_indr_block_unbind(void *cb_priv) 


static LIST_HEAD(mlx5e_block_cb_list);



static bool mlx5e_rep_macvlan_mode_supported(const struct net_device *dev)

{

	struct macvlan_dev *macvlan = netdev_priv(dev);



	return macvlan->mode == MACVLAN_MODE_PASSTHRU;

}



static int

mlx5e_rep_indr_setup_block(struct net_device *netdev, struct Qdisc *sch,

			   struct mlx5e_rep_priv *rpriv,
@@ -422,8 +430,14 @@ mlx5e_rep_indr_setup_block(struct net_device *netdev, struct Qdisc *sch, 
	struct flow_block_cb *block_cb;



	if (!mlx5e_tc_tun_device_to_offload(priv, netdev) &&

	    !(is_vlan_dev(netdev) && vlan_dev_real_dev(netdev) == rpriv->netdev))

	    !(is_vlan_dev(netdev) && vlan_dev_real_dev(netdev) == rpriv->netdev)) {

		if (!(netif_is_macvlan(netdev) && macvlan_dev_real_dev(netdev) == rpriv->netdev))

			return -EOPNOTSUPP;

		if (!mlx5e_rep_macvlan_mode_supported(netdev)) {

			netdev_warn(netdev, "Offloading ingress filter is supported only with macvlan passthru mode");

			return -EOPNOTSUPP;

		}

	}



	if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;
@@ -647,9 +661,7 @@ static void mlx5e_restore_skb_sample(struct mlx5e_priv *priv, struct sk_buff *sk 
			   "Failed to restore tunnel info for sampled packet\n");

		return;

	}

#if IS_ENABLED(CONFIG_MLX5_TC_SAMPLE)

	mlx5e_tc_sample_skb(skb, mapped_obj);

#endif /* CONFIG_MLX5_TC_SAMPLE */

	mlx5_rep_tc_post_napi_receive(tc_priv);

}

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

+22 −5
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ int mlx5e_rss_obtain_tirn(struct mlx5e_rss *rss, 
	return 0;

}



static void mlx5e_rss_apply(struct mlx5e_rss *rss, u32 *rqns, unsigned int num_rqns)

static int mlx5e_rss_apply(struct mlx5e_rss *rss, u32 *rqns, unsigned int num_rqns)

{

	int err;
@@ -399,6 +399,7 @@ static void mlx5e_rss_apply(struct mlx5e_rss *rss, u32 *rqns, unsigned int num_r 
	if (err)

		mlx5e_rss_warn(rss->mdev, "Failed to redirect RQT %#x to channels: err = %d\n",

			       mlx5e_rqt_get_rqtn(&rss->rqt), err);

	return err;

}



void mlx5e_rss_enable(struct mlx5e_rss *rss, u32 *rqns, unsigned int num_rqns)
@@ -490,6 +491,14 @@ int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, 
{

	bool changed_indir = false;

	bool changed_hash = false;

	struct mlx5e_rss *old_rss;

	int err = 0;



	old_rss = mlx5e_rss_alloc();

	if (!old_rss)

		return -ENOMEM;



	*old_rss = *rss;



	if (hfunc && *hfunc != rss->hash.hfunc) {

		switch (*hfunc) {
@@ -497,7 +506,8 @@ int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, 
		case ETH_RSS_HASH_TOP:

			break;

		default:

			return -EINVAL;

			err = -EINVAL;

			goto out;

		}

		changed_hash = true;

		changed_indir = true;
@@ -520,13 +530,20 @@ int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, 
			rss->indir.table[i] = indir[i];

	}



	if (changed_indir && rss->enabled)

		mlx5e_rss_apply(rss, rqns, num_rqns);

	if (changed_indir && rss->enabled) {

		err = mlx5e_rss_apply(rss, rqns, num_rqns);

		if (err) {

			*rss = *old_rss;

			goto out;

		}

	}



	if (changed_hash)

		mlx5e_rss_update_tirs(rss);



	return 0;

out:

	mlx5e_rss_free(old_rss);

	return err;

}



struct mlx5e_rss_params_hash mlx5e_rss_get_hash(struct mlx5e_rss *rss)

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

+27 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ struct mlx5e_sample_attr { 
	struct mlx5e_sample_flow *sample_flow;

};



#if IS_ENABLED(CONFIG_MLX5_TC_SAMPLE)



void mlx5e_tc_sample_skb(struct sk_buff *skb, struct mlx5_mapped_obj *mapped_obj);



struct mlx5_flow_handle *
@@ -38,4 +40,29 @@ mlx5e_tc_sample_init(struct mlx5_eswitch *esw, struct mlx5e_post_act *post_act); 
void

mlx5e_tc_sample_cleanup(struct mlx5e_tc_psample *tc_psample);



#else /* CONFIG_MLX5_TC_SAMPLE */



static inline struct mlx5_flow_handle *

mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample,

			struct mlx5_flow_spec *spec,

			struct mlx5_flow_attr *attr,

			u32 tunnel_id)

{ return ERR_PTR(-EOPNOTSUPP); }



static inline void

mlx5e_tc_sample_unoffload(struct mlx5e_tc_psample *tc_psample,

			  struct mlx5_flow_handle *rule,

			  struct mlx5_flow_attr *attr) {}



static inline struct mlx5e_tc_psample *

mlx5e_tc_sample_init(struct mlx5_eswitch *esw, struct mlx5e_post_act *post_act)

{ return ERR_PTR(-EOPNOTSUPP); }



static inline void

mlx5e_tc_sample_cleanup(struct mlx5e_tc_psample *tc_psample) {}



static inline void

mlx5e_tc_sample_skb(struct sk_buff *skb, struct mlx5_mapped_obj *mapped_obj) {}



#endif /* CONFIG_MLX5_TC_SAMPLE */

#endif /* __MLX5_EN_TC_SAMPLE_H__ */

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

+1 −3
Original line number Diff line number Diff line
@@ -267,9 +267,7 @@ void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, u32 stringset, u8 *data) 
		break;



	case ETH_SS_TEST:

		for (i = 0; i < mlx5e_self_test_num(priv); i++)

			strcpy(data + i * ETH_GSTRING_LEN,

			       mlx5e_self_tests[i]);

		mlx5e_self_test_fill_strings(priv, data);

		break;



	case ETH_SS_STATS: