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

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



Saeed Mahameed says:

====================
mlx5-updates-2020-09-22

This series includes mlx5 updates

1) Add support for Connection Tracking offload in NIC mode.
   Supporting CT offload in NIC mode on Mellanox cards is useful for
   scenarios where the dual port NIC serves as a gateway between 2
   networks and forwards traffic between these networks.

   Since the traffic is not terminated on the host in this case,
   no use of SRIOV VFs and/or switchdev mode is required.

   Today Mellanox NIC cards already support offloading of packet forwarding
   between physical ports without going to the host so combining it with CT
   offloading allows users to create a gateway with forwarding and CT
   (Including NAT) offloading capabilities in non-switchdev mode.

   To support connection tracking in non-Switchdev mode (Single NIC mode),
   we need to make use of the current Connection tracking infrastructure
   implemented on top of E-Switch and the mlx5 generic flow table chains
   APIs, to make it work on non-Eswitch steering domain e.g. NIC RX domain,
   the following was performed:

 1.1) Refactor current flow steering chains infrastructure and
      updates TC nic mode implementation to use flow table chains.
 1.2) Refactor current Connection Tracking (CT) infrastructure to not
      assume E-switch backend, and make the CT layer agnostic to
      underlying steering mode (E-Switch/NIC)
 1.3) Plumbing to support CT offload in NIC mode.

2) Trivial code cleanups.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 54ce00ae 987cd5f0

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ mlx5_core-$(CONFIG_PCI_HYPERV_INTERFACE) += en/hv_vhca_stats.o 
mlx5_core-$(CONFIG_MLX5_ESWITCH)     += lag_mp.o lib/geneve.o lib/port_tun.o \

					en_rep.o en/rep/bond.o en/mod_hdr.o

mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en_tc.o en/rep/tc.o en/rep/neigh.o \

					en/mapping.o esw/chains.o en/tc_tun.o \

					en/mapping.o lib/fs_chains.o en/tc_tun.o \

					en/tc_tun_vxlan.o en/tc_tun_gre.o en/tc_tun_geneve.o \

					en/tc_tun_mplsoudp.o diag/en_tc_tracepoint.o

mlx5_core-$(CONFIG_MLX5_TC_CT)	     += en/tc_ct.o

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

+1 −7
Original line number Diff line number Diff line
@@ -43,19 +43,13 @@ static void mlx5_peer_pf_cleanup(struct mlx5_core_dev *dev) 


int mlx5_ec_init(struct mlx5_core_dev *dev)

{

	int err = 0;



	if (!mlx5_core_is_ecpf(dev))

		return 0;



	/* ECPF shall enable HCA for peer PF in the same way a PF

	 * does this for its VFs.

	 */

	err = mlx5_peer_pf_init(dev);

	if (err)

		return err;



	return 0;

	return mlx5_peer_pf_init(dev);

}



void mlx5_ec_cleanup(struct mlx5_core_dev *dev)

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

+6 −1
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ enum { 
};



struct mlx5e_tc_table {

	/* protects flow table */

	/* Protects the dynamic assignment of the t parameter

	 * which is the nic tc root table.

	 */

	struct mutex			t_lock;

	struct mlx5_flow_table		*t;

	struct mlx5_fs_chains           *chains;



	struct rhashtable               ht;
@@ -24,6 +27,8 @@ struct mlx5e_tc_table { 


	struct notifier_block     netdevice_nb;

	struct netdev_net_notifier	netdevice_nn;



	struct mlx5_tc_ct_priv         *ct;

};



struct mlx5e_flow_table {

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

+10 −12
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "neigh.h"

#include "en_rep.h"

#include "eswitch.h"

#include "esw/chains.h"

#include "lib/fs_chains.h"

#include "en/tc_ct.h"

#include "en/mapping.h"

#include "en/tc_tun.h"
@@ -191,7 +191,7 @@ static int mlx5e_rep_setup_ft_cb(enum tc_setup_type type, void *type_data, 
	case TC_SETUP_CLSFLOWER:

		memcpy(&tmp, f, sizeof(*f));



		if (!mlx5_esw_chains_prios_supported(esw))

		if (!mlx5_chains_prios_supported(esw_chains(esw)))

			return -EOPNOTSUPP;



		/* Re-use tc offload path by moving the ft flow to the
@@ -203,12 +203,12 @@ static int mlx5e_rep_setup_ft_cb(enum tc_setup_type type, void *type_data, 
		 *

		 * We only support chain 0 of FT offload.

		 */

		if (tmp.common.prio >= mlx5_esw_chains_get_prio_range(esw))

		if (tmp.common.prio >= mlx5_chains_get_prio_range(esw_chains(esw)))

			return -EOPNOTSUPP;

		if (tmp.common.chain_index != 0)

			return -EOPNOTSUPP;



		tmp.common.chain_index = mlx5_esw_chains_get_ft_chain(esw);

		tmp.common.chain_index = mlx5_chains_get_nf_ft_chain(esw_chains(esw));

		tmp.common.prio++;

		err = mlx5e_rep_setup_tc_cls_flower(priv, &tmp, flags);

		memcpy(&f->stats, &tmp.stats, sizeof(f->stats));
@@ -378,12 +378,12 @@ static int mlx5e_rep_indr_setup_ft_cb(enum tc_setup_type type, 
		 *

		 * We only support chain 0 of FT offload.

		 */

		if (!mlx5_esw_chains_prios_supported(esw) ||

		    tmp.common.prio >= mlx5_esw_chains_get_prio_range(esw) ||

		if (!mlx5_chains_prios_supported(esw_chains(esw)) ||

		    tmp.common.prio >= mlx5_chains_get_prio_range(esw_chains(esw)) ||

		    tmp.common.chain_index)

			return -EOPNOTSUPP;



		tmp.common.chain_index = mlx5_esw_chains_get_ft_chain(esw);

		tmp.common.chain_index = mlx5_chains_get_nf_ft_chain(esw_chains(esw));

		tmp.common.prio++;

		err = mlx5e_rep_indr_offload(priv->netdev, &tmp, priv, flags);

		memcpy(&f->stats, &tmp.stats, sizeof(f->stats));
@@ -612,7 +612,6 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	struct tc_skb_ext *tc_skb_ext;

	struct mlx5_eswitch *esw;

	struct mlx5e_priv *priv;

	int tunnel_moffset;

	int err;



	reg_c0 = (be32_to_cpu(cqe->sop_drop_qpn) & MLX5E_TC_FLOW_ID_MASK);
@@ -626,7 +625,7 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	priv = netdev_priv(skb->dev);

	esw = priv->mdev->priv.eswitch;



	err = mlx5_eswitch_get_chain_for_tag(esw, reg_c0, &chain);

	err = mlx5_get_chain_for_tag(esw_chains(esw), reg_c0, &chain);

	if (err) {

		netdev_dbg(priv->netdev,

			   "Couldn't find chain for chain tag: %d, err: %d\n",
@@ -647,13 +646,12 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 


		uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);

		uplink_priv = &uplink_rpriv->uplink_priv;

		if (!mlx5e_tc_ct_restore_flow(uplink_priv, skb,

		if (!mlx5e_tc_ct_restore_flow(uplink_priv->ct_priv, skb,

					      zone_restore_id))

			return false;

	}



	tunnel_moffset = mlx5e_tc_attr_to_reg_mappings[TUNNEL_TO_REG].moffset;

	tunnel_id = reg_c1 >> (8 * tunnel_moffset);

	tunnel_id = reg_c1 >> REG_MAPPING_SHIFT(TUNNEL_TO_REG);

	return mlx5e_restore_tunnel(priv, skb, tc_priv, tunnel_id);

#endif /* CONFIG_NET_TC_SKB_EXT */

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

+322 −203

File changed.

Preview size limit exceeded, changes collapsed.