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

Merge tag 'mlx5-fixes-2021-03-31' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes 2021-03-31

This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9170f13 3ff3874f

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

+2 −2
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ static bool is_ib_supported(struct mlx5_core_dev *dev) 
}



enum {

	MLX5_INTERFACE_PROTOCOL_ETH_REP,

	MLX5_INTERFACE_PROTOCOL_ETH,

	MLX5_INTERFACE_PROTOCOL_ETH_REP,



	MLX5_INTERFACE_PROTOCOL_IB,

	MLX5_INTERFACE_PROTOCOL_IB_REP,

	MLX5_INTERFACE_PROTOCOL_MPIB,

	MLX5_INTERFACE_PROTOCOL_IB,



	MLX5_INTERFACE_PROTOCOL_VNET,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ struct mlx5e_icosq { 
	struct mlx5_wq_cyc         wq;

	void __iomem              *uar_map;

	u32                        sqn;

	u16                        reserved_room;

	unsigned long              state;



	/* control path */

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

+29 −7
Original line number Diff line number Diff line
@@ -185,6 +185,28 @@ mlx5_tc_ct_entry_has_nat(struct mlx5_ct_entry *entry) 
	return !!(entry->tuple_nat_node.next);

}



static int

mlx5_get_label_mapping(struct mlx5_tc_ct_priv *ct_priv,

		       u32 *labels, u32 *id)

{

	if (!memchr_inv(labels, 0, sizeof(u32) * 4)) {

		*id = 0;

		return 0;

	}



	if (mapping_add(ct_priv->labels_mapping, labels, id))

		return -EOPNOTSUPP;



	return 0;

}



static void

mlx5_put_label_mapping(struct mlx5_tc_ct_priv *ct_priv, u32 id)

{

	if (id)

		mapping_remove(ct_priv->labels_mapping, id);

}



static int

mlx5_tc_ct_rule_to_tuple(struct mlx5_ct_tuple *tuple, struct flow_rule *rule)

{
@@ -436,7 +458,7 @@ mlx5_tc_ct_entry_del_rule(struct mlx5_tc_ct_priv *ct_priv, 
	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);

	mapping_remove(ct_priv->labels_mapping, attr->ct_attr.ct_labels_id);

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

	kfree(attr);

}
@@ -639,7 +661,7 @@ mlx5_tc_ct_entry_create_mod_hdr(struct mlx5_tc_ct_priv *ct_priv, 
	if (!meta)

		return -EOPNOTSUPP;



	err = mapping_add(ct_priv->labels_mapping, meta->ct_metadata.labels,

	err = mlx5_get_label_mapping(ct_priv, meta->ct_metadata.labels,

				     &attr->ct_attr.ct_labels_id);

	if (err)

		return -EOPNOTSUPP;
@@ -677,7 +699,7 @@ mlx5_tc_ct_entry_create_mod_hdr(struct mlx5_tc_ct_priv *ct_priv, 


err_mapping:

	dealloc_mod_hdr_actions(&mod_acts);

	mapping_remove(ct_priv->labels_mapping, attr->ct_attr.ct_labels_id);

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

	return err;

}
@@ -745,7 +767,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 
err_rule:

	mlx5e_mod_hdr_detach(ct_priv->dev,

			     ct_priv->mod_hdr_tbl, zone_rule->mh);

	mapping_remove(ct_priv->labels_mapping, attr->ct_attr.ct_labels_id);

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

err_mod_hdr:

	kfree(attr);

err_attr:
@@ -1197,7 +1219,7 @@ void mlx5_tc_ct_match_del(struct mlx5_tc_ct_priv *priv, struct mlx5_ct_attr *ct_ 
	if (!priv || !ct_attr->ct_labels_id)

		return;



	mapping_remove(priv->labels_mapping, ct_attr->ct_labels_id);

	mlx5_put_label_mapping(priv, ct_attr->ct_labels_id);

}



int
@@ -1280,7 +1302,7 @@ mlx5_tc_ct_match_add(struct mlx5_tc_ct_priv *priv, 
		ct_labels[1] = key->ct_labels[1] & mask->ct_labels[1];

		ct_labels[2] = key->ct_labels[2] & mask->ct_labels[2];

		ct_labels[3] = key->ct_labels[3] & mask->ct_labels[3];

		if (mapping_add(priv->labels_mapping, ct_labels, &ct_attr->ct_labels_id))

		if (mlx5_get_label_mapping(priv, ct_labels, &ct_attr->ct_labels_id))

			return -EOPNOTSUPP;

		mlx5e_tc_match_to_reg_match(spec, LABELS_TO_REG, ct_attr->ct_labels_id,

					    MLX5_CT_LABELS_MASK);

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

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ enum { 
	MLX5E_TC_TUNNEL_TYPE_MPLSOUDP,

};



struct mlx5e_encap_key {

	const struct ip_tunnel_key *ip_tun_key;

	struct mlx5e_tc_tunnel     *tc_tunnel;

};



struct mlx5e_tc_tunnel {

	int tunnel_type;

	enum mlx5_flow_match_level match_level;
@@ -44,6 +49,8 @@ struct mlx5e_tc_tunnel { 
			    struct flow_cls_offload *f,

			    void *headers_c,

			    void *headers_v);

	bool (*encap_info_equal)(struct mlx5e_encap_key *a,

				 struct mlx5e_encap_key *b);

};



extern struct mlx5e_tc_tunnel vxlan_tunnel;
@@ -101,6 +108,9 @@ int mlx5e_tc_tun_parse_udp_ports(struct mlx5e_priv *priv, 
				 void *headers_c,

				 void *headers_v);



bool mlx5e_tc_tun_encap_info_equal_generic(struct mlx5e_encap_key *a,

					   struct mlx5e_encap_key *b);



#endif /* CONFIG_MLX5_ESWITCH */



#endif //__MLX5_EN_TC_TUNNEL_H__

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

+9 −14
Original line number Diff line number Diff line
@@ -476,16 +476,11 @@ void mlx5e_detach_decap(struct mlx5e_priv *priv, 
	mlx5e_decap_dealloc(priv, d);

}



struct encap_key {

	const struct ip_tunnel_key *ip_tun_key;

	struct mlx5e_tc_tunnel *tc_tunnel;

};



static int cmp_encap_info(struct encap_key *a,

			  struct encap_key *b)

bool mlx5e_tc_tun_encap_info_equal_generic(struct mlx5e_encap_key *a,

					   struct mlx5e_encap_key *b)

{

	return memcmp(a->ip_tun_key, b->ip_tun_key, sizeof(*a->ip_tun_key)) ||

		a->tc_tunnel->tunnel_type != b->tc_tunnel->tunnel_type;

	return memcmp(a->ip_tun_key, b->ip_tun_key, sizeof(*a->ip_tun_key)) == 0 &&

		a->tc_tunnel->tunnel_type == b->tc_tunnel->tunnel_type;

}



static int cmp_decap_info(struct mlx5e_decap_key *a,
@@ -494,7 +489,7 @@ static int cmp_decap_info(struct mlx5e_decap_key *a, 
	return memcmp(&a->key, &b->key, sizeof(b->key));

}



static int hash_encap_info(struct encap_key *key)

static int hash_encap_info(struct mlx5e_encap_key *key)

{

	return jhash(key->ip_tun_key, sizeof(*key->ip_tun_key),

		     key->tc_tunnel->tunnel_type);
@@ -516,18 +511,18 @@ static bool mlx5e_decap_take(struct mlx5e_decap_entry *e) 
}



static struct mlx5e_encap_entry *

mlx5e_encap_get(struct mlx5e_priv *priv, struct encap_key *key,

mlx5e_encap_get(struct mlx5e_priv *priv, struct mlx5e_encap_key *key,

		uintptr_t hash_key)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct mlx5e_encap_key e_key;

	struct mlx5e_encap_entry *e;

	struct encap_key e_key;



	hash_for_each_possible_rcu(esw->offloads.encap_tbl, e,

				   encap_hlist, hash_key) {

		e_key.ip_tun_key = &e->tun_info->key;

		e_key.tc_tunnel = e->tunnel;

		if (!cmp_encap_info(&e_key, key) &&

		if (e->tunnel->encap_info_equal(&e_key, key) &&

		    mlx5e_encap_take(e))

			return e;

	}
@@ -694,8 +689,8 @@ int mlx5e_attach_encap(struct mlx5e_priv *priv, 
	struct mlx5_flow_attr *attr = flow->attr;

	const struct ip_tunnel_info *tun_info;

	unsigned long tbl_time_before = 0;

	struct encap_key key;

	struct mlx5e_encap_entry *e;

	struct mlx5e_encap_key key;

	bool entry_created = false;

	unsigned short family;

	uintptr_t hash_key;