Commit 8e1dcf49 authored by Paul Blakey's avatar Paul Blakey Committed by Saeed Mahameed
Browse files

net/mlx5e: CT: Fix support for GRE tuples 



cited commit removed support for GRE tuples when software steering was enabled.

To bring back support for GRE tuples, add GRE ipv4/ipv6 matchers.

Fixes: 3ee61ebb ("net/mlx5: CT: Add software steering ct flow steering provider")
Signed-off-by: default avatarPaul Blakey <paulb@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 6bbd7230

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

+32 −24
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct mlx5_ct_fs_smfs_matcher { 
};



struct mlx5_ct_fs_smfs_matchers {

	struct mlx5_ct_fs_smfs_matcher smfs_matchers[4];

	struct mlx5_ct_fs_smfs_matcher smfs_matchers[6];

	struct list_head used;

};
@@ -44,7 +44,8 @@ struct mlx5_ct_fs_smfs_rule { 
};



static inline void

mlx5_ct_fs_smfs_fill_mask(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, bool ipv4, bool tcp)

mlx5_ct_fs_smfs_fill_mask(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, bool ipv4, bool tcp,

			  bool gre)

{

	void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria, outer_headers);
@@ -77,7 +78,7 @@ mlx5_ct_fs_smfs_fill_mask(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, bo 
		MLX5_SET_TO_ONES(fte_match_set_lyr_2_4, headers_c, tcp_dport);

		MLX5_SET(fte_match_set_lyr_2_4, headers_c, tcp_flags,

			 ntohs(MLX5_CT_TCP_FLAGS_MASK));

	} else {

	} else if (!gre) {

		MLX5_SET_TO_ONES(fte_match_set_lyr_2_4, headers_c, udp_sport);

		MLX5_SET_TO_ONES(fte_match_set_lyr_2_4, headers_c, udp_dport);

	}
@@ -87,7 +88,7 @@ mlx5_ct_fs_smfs_fill_mask(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, bo 


static struct mlx5dr_matcher *

mlx5_ct_fs_smfs_matcher_create(struct mlx5_ct_fs *fs, struct mlx5dr_table *tbl, bool ipv4,

			       bool tcp, u32 priority)

			       bool tcp, bool gre, u32 priority)

{

	struct mlx5dr_matcher *dr_matcher;

	struct mlx5_flow_spec *spec;
@@ -96,7 +97,7 @@ mlx5_ct_fs_smfs_matcher_create(struct mlx5_ct_fs *fs, struct mlx5dr_table *tbl, 
	if (!spec)

		return ERR_PTR(-ENOMEM);



	mlx5_ct_fs_smfs_fill_mask(fs, spec, ipv4, tcp);

	mlx5_ct_fs_smfs_fill_mask(fs, spec, ipv4, tcp, gre);

	spec->match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS_2 | MLX5_MATCH_OUTER_HEADERS;



	dr_matcher = mlx5_smfs_matcher_create(tbl, priority, spec);
@@ -108,7 +109,7 @@ mlx5_ct_fs_smfs_matcher_create(struct mlx5_ct_fs *fs, struct mlx5dr_table *tbl, 
}



static struct mlx5_ct_fs_smfs_matcher *

mlx5_ct_fs_smfs_matcher_get(struct mlx5_ct_fs *fs, bool nat, bool ipv4, bool tcp)

mlx5_ct_fs_smfs_matcher_get(struct mlx5_ct_fs *fs, bool nat, bool ipv4, bool tcp, bool gre)

{

	struct mlx5_ct_fs_smfs *fs_smfs = mlx5_ct_fs_priv(fs);

	struct mlx5_ct_fs_smfs_matcher *m, *smfs_matcher;
@@ -119,7 +120,7 @@ mlx5_ct_fs_smfs_matcher_get(struct mlx5_ct_fs *fs, bool nat, bool ipv4, bool tcp 
	int prio;



	matchers = nat ? &fs_smfs->matchers_nat : &fs_smfs->matchers;

	smfs_matcher = &matchers->smfs_matchers[ipv4 * 2 + tcp];

	smfs_matcher = &matchers->smfs_matchers[ipv4 * 3 + tcp * 2 + gre];



	if (refcount_inc_not_zero(&smfs_matcher->ref))

		return smfs_matcher;
@@ -145,11 +146,11 @@ mlx5_ct_fs_smfs_matcher_get(struct mlx5_ct_fs *fs, bool nat, bool ipv4, bool tcp 
	}



	tbl = nat ? fs_smfs->ct_nat_tbl : fs_smfs->ct_tbl;

	dr_matcher = mlx5_ct_fs_smfs_matcher_create(fs, tbl, ipv4, tcp, prio);

	dr_matcher = mlx5_ct_fs_smfs_matcher_create(fs, tbl, ipv4, tcp, gre, prio);

	if (IS_ERR(dr_matcher)) {

		netdev_warn(fs->netdev,

			    "ct_fs_smfs: failed to create matcher (nat %d, ipv4 %d, tcp %d), err: %ld\n",

			    nat, ipv4, tcp, PTR_ERR(dr_matcher));

			    "ct_fs_smfs: failed to create matcher (nat %d, ipv4 %d, tcp %d, gre %d), err: %ld\n",

			    nat, ipv4, tcp, gre, PTR_ERR(dr_matcher));



		smfs_matcher = ERR_CAST(dr_matcher);

		goto out_unlock;
@@ -222,16 +223,17 @@ mlx5_ct_fs_smfs_destroy(struct mlx5_ct_fs *fs) 
static inline bool

mlx5_tc_ct_valid_used_dissector_keys(const u32 used_keys)

{

#define DISSECTOR_BIT(name) BIT(FLOW_DISSECTOR_KEY_ ## name)

	const u32 basic_keys = DISSECTOR_BIT(BASIC) | DISSECTOR_BIT(CONTROL) |

			       DISSECTOR_BIT(PORTS) | DISSECTOR_BIT(META);

	const u32 ipv4_tcp = basic_keys | DISSECTOR_BIT(IPV4_ADDRS) | DISSECTOR_BIT(TCP);

	const u32 ipv4_udp = basic_keys | DISSECTOR_BIT(IPV4_ADDRS);

	const u32 ipv6_tcp = basic_keys | DISSECTOR_BIT(IPV6_ADDRS) | DISSECTOR_BIT(TCP);

	const u32 ipv6_udp = basic_keys | DISSECTOR_BIT(IPV6_ADDRS);

#define DISS_BIT(name) BIT(FLOW_DISSECTOR_KEY_ ## name)

	const u32 basic_keys = DISS_BIT(BASIC) | DISS_BIT(CONTROL) | DISS_BIT(META);

	const u32 ipv4_tcp = basic_keys | DISS_BIT(IPV4_ADDRS) | DISS_BIT(PORTS) | DISS_BIT(TCP);

	const u32 ipv6_tcp = basic_keys | DISS_BIT(IPV6_ADDRS) | DISS_BIT(PORTS) | DISS_BIT(TCP);

	const u32 ipv4_udp = basic_keys | DISS_BIT(IPV4_ADDRS) | DISS_BIT(PORTS);

	const u32 ipv6_udp = basic_keys | DISS_BIT(IPV6_ADDRS) | DISS_BIT(PORTS);

	const u32 ipv4_gre = basic_keys | DISS_BIT(IPV4_ADDRS);

	const u32 ipv6_gre = basic_keys | DISS_BIT(IPV6_ADDRS);



	return (used_keys == ipv4_tcp || used_keys == ipv4_udp || used_keys == ipv6_tcp ||

		used_keys == ipv6_udp);

		used_keys == ipv6_udp || used_keys == ipv4_gre || used_keys == ipv6_gre);

}



static bool
@@ -254,20 +256,24 @@ mlx5_ct_fs_smfs_ct_validate_flow_rule(struct mlx5_ct_fs *fs, struct flow_rule *f 
	flow_rule_match_control(flow_rule, &control);

	flow_rule_match_ipv4_addrs(flow_rule, &ipv4_addrs);

	flow_rule_match_ipv6_addrs(flow_rule, &ipv6_addrs);

	if (basic.key->ip_proto != IPPROTO_GRE)

		flow_rule_match_ports(flow_rule, &ports);

	if (basic.key->ip_proto == IPPROTO_TCP)

		flow_rule_match_tcp(flow_rule, &tcp);



	if (basic.mask->n_proto != htons(0xFFFF) ||

	    (basic.key->n_proto != htons(ETH_P_IP) && basic.key->n_proto != htons(ETH_P_IPV6)) ||

	    basic.mask->ip_proto != 0xFF ||

	    (basic.key->ip_proto != IPPROTO_UDP && basic.key->ip_proto != IPPROTO_TCP)) {

	    (basic.key->ip_proto != IPPROTO_UDP && basic.key->ip_proto != IPPROTO_TCP &&

	     basic.key->ip_proto != IPPROTO_GRE)) {

		ct_dbg("rule uses unexpected basic match (n_proto 0x%04x/0x%04x, ip_proto 0x%02x/0x%02x)",

		       ntohs(basic.key->n_proto), ntohs(basic.mask->n_proto),

		       basic.key->ip_proto, basic.mask->ip_proto);

		return false;

	}



	if (ports.mask->src != htons(0xFFFF) || ports.mask->dst != htons(0xFFFF)) {

	if (basic.key->ip_proto != IPPROTO_GRE &&

	    (ports.mask->src != htons(0xFFFF) || ports.mask->dst != htons(0xFFFF))) {

		ct_dbg("rule uses ports match (src 0x%04x, dst 0x%04x)",

		       ports.mask->src, ports.mask->dst);

		return false;
@@ -291,7 +297,7 @@ mlx5_ct_fs_smfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, 
	struct mlx5dr_action *actions[5];

	struct mlx5dr_rule *rule;

	int num_actions = 0, err;

	bool nat, tcp, ipv4;

	bool nat, tcp, ipv4, gre;



	if (!mlx5_ct_fs_smfs_ct_validate_flow_rule(fs, flow_rule))

		return ERR_PTR(-EOPNOTSUPP);
@@ -314,8 +320,10 @@ mlx5_ct_fs_smfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec, 
	ipv4 = mlx5e_tc_get_ip_version(spec, true) == 4;

	tcp = MLX5_GET(fte_match_param, spec->match_value,

		       outer_headers.ip_protocol) == IPPROTO_TCP;

	gre = MLX5_GET(fte_match_param, spec->match_value,

		       outer_headers.ip_protocol) == IPPROTO_GRE;



	smfs_matcher = mlx5_ct_fs_smfs_matcher_get(fs, nat, ipv4, tcp);

	smfs_matcher = mlx5_ct_fs_smfs_matcher_get(fs, nat, ipv4, tcp, gre);

	if (IS_ERR(smfs_matcher)) {

		err = PTR_ERR(smfs_matcher);

		goto err_matcher;