Commit 2a047845 authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by David S. Miller
Browse files

nfp: flower: check L4 matches on unknown IP protocols 



Matching on fields with a protocol that is unknown to hardware
is not strictly unsupported. Determine if hardware can offload
a filter with an unknown protocol by checking if any L4 fields
are being matched as well.

Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4a6d9ab

drivers/net/ethernet/netronome/nfp/flower/offload.c

+11 −2
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ static bool nfp_flower_check_higher_than_mac(struct tc_cls_flower_offload *f) 
	       flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ICMP);

}



static bool nfp_flower_check_higher_than_l3(struct tc_cls_flower_offload *f)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(f);



	return flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS) ||

	       flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ICMP);

}



static int

nfp_flower_calc_opt_layer(struct flow_match_enc_opts *enc_opts,

			  u32 *key_layer_two, int *key_size)
@@ -297,7 +305,6 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, 
	}



	if (basic.mask && basic.mask->ip_proto) {

		/* Ethernet type is present in the key. */

		switch (basic.key->ip_proto) {

		case IPPROTO_TCP:

		case IPPROTO_UDP:
@@ -311,7 +318,9 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, 
			/* Other ip proto - we need check the masks for the

			 * remainder of the key to ensure we can offload.

			 */

			if (nfp_flower_check_higher_than_l3(flow))

				return -EOPNOTSUPP;

			break;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE