Commit af9207ad authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5-updates-2021-05-26

Misc update for mlx5 driver,

1) Clean up patches for lag and SF

2) Reserve bit 31 in steering register C1 for IPSec offload usage

3) Move steering tables pool logic into the steering core and
  increase the maximum table size to 2G entries when software steering
  is enabled.

* tag 'mlx5-updates-2021-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: Fix lag port remapping logic
  net/mlx5: Use boolean arithmetic to evaluate roce_lag
  net/mlx5: Remove unnecessary spin lock protection
  net/mlx5: Cap the maximum flow group size to 16M entries
  net/mlx5: DR, Set max table size to 2G entries
  net/mlx5: Move chains ft pool to be used by all firmware steering
  net/mlx5: Move table size calculation to steering cmd layer
  net/mlx5: Add case for FS_FT_NIC_TX FT in MLX5_CAP_FLOWTABLE_TYPE
  net/mlx5: DR, Remove unused field of send_ring struct
  net/mlx5e: RX, Remove unnecessary check in RX CQE compression handling
  net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet
  net/mlx5e: TC: Reserved bit 31 of REG_C1 for IPsec offload
  net/mlx5e: TC: Use bit counts for register mapping
  net/mlx5: CT: Avoid reusing modify header context for natted entries
  net/mlx5e: CT, Remove newline from ct_dbg call
====================

Link: https://lore.kernel.org/r/20210527185624.694304-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents eefa5311 86136410

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o 
mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o alloc.o port.o mr.o pd.o \

		transobj.o vport.o sriov.o fs_cmd.o fs_core.o pci_irq.o \

		fs_counters.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		fs_counters.o fs_ft_pool.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o diag/fs_tracepoint.o \

		diag/fw_tracer.o diag/crdump.o devlink.o diag/rsc_dump.o \

		fw_reset.o qos.o

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

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static bool mlx5e_restore_skb(struct sk_buff *skb, u32 chain, u32 reg_c1, 
			      struct mlx5e_tc_update_priv *tc_priv)

{

	struct mlx5e_priv *priv = netdev_priv(skb->dev);

	u32 tunnel_id = reg_c1 >> ESW_TUN_OFFSET;

	u32 tunnel_id = (reg_c1 >> ESW_TUN_OFFSET) & TUNNEL_ID_MASK;



	if (chain) {

		struct mlx5_rep_uplink_priv *uplink_priv;

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

+42 −16
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "en_tc.h"

#include "en_rep.h"



#define MLX5_CT_ZONE_BITS (mlx5e_tc_attr_to_reg_mappings[ZONE_TO_REG].mlen * 8)

#define MLX5_CT_ZONE_BITS (mlx5e_tc_attr_to_reg_mappings[ZONE_TO_REG].mlen)

#define MLX5_CT_ZONE_MASK GENMASK(MLX5_CT_ZONE_BITS - 1, 0)

#define MLX5_CT_STATE_ESTABLISHED_BIT BIT(1)

#define MLX5_CT_STATE_TRK_BIT BIT(2)
@@ -32,11 +32,11 @@ 
#define MLX5_CT_STATE_RELATED_BIT BIT(5)

#define MLX5_CT_STATE_INVALID_BIT BIT(6)



#define MLX5_FTE_ID_BITS (mlx5e_tc_attr_to_reg_mappings[FTEID_TO_REG].mlen * 8)

#define MLX5_FTE_ID_BITS (mlx5e_tc_attr_to_reg_mappings[FTEID_TO_REG].mlen)

#define MLX5_FTE_ID_MAX GENMASK(MLX5_FTE_ID_BITS - 1, 0)

#define MLX5_FTE_ID_MASK MLX5_FTE_ID_MAX



#define MLX5_CT_LABELS_BITS (mlx5e_tc_attr_to_reg_mappings[LABELS_TO_REG].mlen * 8)

#define MLX5_CT_LABELS_BITS (mlx5e_tc_attr_to_reg_mappings[LABELS_TO_REG].mlen)

#define MLX5_CT_LABELS_MASK GENMASK(MLX5_CT_LABELS_BITS - 1, 0)



#define ct_dbg(fmt, args...)\
@@ -150,6 +150,11 @@ struct mlx5_ct_entry { 
	unsigned long flags;

};



static void

mlx5_tc_ct_entry_destroy_mod_hdr(struct mlx5_tc_ct_priv *ct_priv,

				 struct mlx5_flow_attr *attr,

				 struct mlx5e_mod_hdr_handle *mh);



static const struct rhashtable_params cts_ht_params = {

	.head_offset = offsetof(struct mlx5_ct_entry, node),

	.key_offset = offsetof(struct mlx5_ct_entry, cookie),
@@ -458,8 +463,7 @@ mlx5_tc_ct_entry_del_rule(struct mlx5_tc_ct_priv *ct_priv, 
	ct_dbg("Deleting ct entry rule in zone %d", entry->tuple.zone);



	mlx5_tc_rule_delete(netdev_priv(ct_priv->netdev), zone_rule->rule, attr);

	mlx5e_mod_hdr_detach(ct_priv->dev,

			     ct_priv->mod_hdr_tbl, zone_rule->mh);

	mlx5_tc_ct_entry_destroy_mod_hdr(ct_priv, zone_rule->attr, zone_rule->mh);

	mlx5_put_label_mapping(ct_priv, attr->ct_attr.ct_labels_id);

	kfree(attr);

}
@@ -686,6 +690,17 @@ mlx5_tc_ct_entry_create_mod_hdr(struct mlx5_tc_ct_priv *ct_priv, 
	if (err)

		goto err_mapping;



	if (nat) {

		attr->modify_hdr = mlx5_modify_header_alloc(ct_priv->dev, ct_priv->ns_type,

							    mod_acts.num_actions,

							    mod_acts.actions);

		if (IS_ERR(attr->modify_hdr)) {

			err = PTR_ERR(attr->modify_hdr);

			goto err_mapping;

		}



		*mh = NULL;

	} else {

		*mh = mlx5e_mod_hdr_attach(ct_priv->dev,

					   ct_priv->mod_hdr_tbl,

					   ct_priv->ns_type,
@@ -695,6 +710,7 @@ mlx5_tc_ct_entry_create_mod_hdr(struct mlx5_tc_ct_priv *ct_priv, 
			goto err_mapping;

		}

		attr->modify_hdr = mlx5e_mod_hdr_get(*mh);

	}



	dealloc_mod_hdr_actions(&mod_acts);

	return 0;
@@ -705,6 +721,17 @@ mlx5_tc_ct_entry_create_mod_hdr(struct mlx5_tc_ct_priv *ct_priv, 
	return err;

}



static void

mlx5_tc_ct_entry_destroy_mod_hdr(struct mlx5_tc_ct_priv *ct_priv,

				 struct mlx5_flow_attr *attr,

				 struct mlx5e_mod_hdr_handle *mh)

{

	if (mh)

		mlx5e_mod_hdr_detach(ct_priv->dev, ct_priv->mod_hdr_tbl, mh);

	else

		mlx5_modify_header_dealloc(ct_priv->dev, attr->modify_hdr);

}



static int

mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv,

			  struct flow_rule *flow_rule,
@@ -767,8 +794,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 
	return 0;



err_rule:

	mlx5e_mod_hdr_detach(ct_priv->dev,

			     ct_priv->mod_hdr_tbl, zone_rule->mh);

	mlx5_tc_ct_entry_destroy_mod_hdr(ct_priv, zone_rule->attr, zone_rule->mh);

	mlx5_put_label_mapping(ct_priv, attr->ct_attr.ct_labels_id);

err_mod_hdr:

	kfree(attr);
@@ -918,7 +944,7 @@ mlx5_tc_ct_shared_counter_get(struct mlx5_tc_ct_priv *ct_priv, 
	}



	if (rev_entry && refcount_inc_not_zero(&rev_entry->counter->refcount)) {

		ct_dbg("Using shared counter entry=0x%p rev=0x%p\n", entry, rev_entry);

		ct_dbg("Using shared counter entry=0x%p rev=0x%p", entry, rev_entry);

		shared_counter = rev_entry->counter;

		spin_unlock_bh(&ct_priv->ht_lock);

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

+11 −12
Original line number Diff line number Diff line
@@ -33,15 +33,15 @@ struct mlx5_ct_attr { 
#define zone_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_2,\

	.moffset = 0,\

	.mlen = 2,\

	.mlen = 16,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_2) + 2,\

				 misc_parameters_2.metadata_reg_c_2),\

}



#define ctstate_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_2,\

	.moffset = 2,\

	.mlen = 2,\

	.moffset = 16,\

	.mlen = 16,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_2),\

}
@@ -49,7 +49,7 @@ struct mlx5_ct_attr { 
#define mark_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_3,\

	.moffset = 0,\

	.mlen = 4,\

	.mlen = 32,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_3),\

}
@@ -57,7 +57,7 @@ struct mlx5_ct_attr { 
#define labels_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_4,\

	.moffset = 0,\

	.mlen = 4,\

	.mlen = 32,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_4),\

}
@@ -65,7 +65,7 @@ struct mlx5_ct_attr { 
#define fteid_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_5,\

	.moffset = 0,\

	.mlen = 4,\

	.mlen = 32,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_5),\

}
@@ -73,20 +73,19 @@ struct mlx5_ct_attr { 
#define zone_restore_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_1,\

	.moffset = 0,\

	.mlen = (ESW_ZONE_ID_BITS / 8),\

	.mlen = ESW_ZONE_ID_BITS,\

	.soffset = MLX5_BYTE_OFF(fte_match_param,\

				 misc_parameters_2.metadata_reg_c_1) + 3,\

				 misc_parameters_2.metadata_reg_c_1),\

}



#define nic_zone_restore_to_reg_ct {\

	.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_B,\

	.moffset = 2,\

	.mlen = (ESW_ZONE_ID_BITS / 8),\

	.moffset = 16,\

	.mlen = ESW_ZONE_ID_BITS,\

}



#define REG_MAPPING_MLEN(reg) (mlx5e_tc_attr_to_reg_mappings[reg].mlen)

#define REG_MAPPING_MOFFSET(reg) (mlx5e_tc_attr_to_reg_mappings[reg].moffset)

#define REG_MAPPING_SHIFT(reg) (REG_MAPPING_MOFFSET(reg) * 8)



#if IS_ENABLED(CONFIG_MLX5_TC_CT)

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

+5 −3
Original line number Diff line number Diff line
@@ -1310,7 +1310,8 @@ static void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
	if (rep->vlan && skb_vlan_tag_present(skb))

		skb_vlan_pop(skb);



	if (!mlx5e_rep_tc_update_skb(cqe, skb, &tc_priv)) {

	if (unlikely(!mlx5_ipsec_is_rx_flow(cqe) &&

		     !mlx5e_rep_tc_update_skb(cqe, skb, &tc_priv))) {

		dev_kfree_skb_any(skb);

		goto free_wqe;

	}
@@ -1367,7 +1368,8 @@ static void mlx5e_handle_rx_cqe_mpwrq_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 


	mlx5e_complete_rx_cqe(rq, cqe, cqe_bcnt, skb);



	if (!mlx5e_rep_tc_update_skb(cqe, skb, &tc_priv)) {

	if (unlikely(!mlx5_ipsec_is_rx_flow(cqe) &&

		     !mlx5e_rep_tc_update_skb(cqe, skb, &tc_priv))) {

		dev_kfree_skb_any(skb);

		goto mpwrq_cqe_out;

	}
@@ -1558,7 +1560,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) 


	if (rq->cqd.left) {

		work_done += mlx5e_decompress_cqes_cont(rq, cqwq, 0, budget);

		if (rq->cqd.left || work_done >= budget)

		if (work_done >= budget)

			goto out;

	}