leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfp: flower: check L4 matches on unknown IP protocols

Browse Source 
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: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pieter Jansen van Vuuren 2019-06-13 14:17:09 -07:00 committed by David S. Miller
parent b4a6d9abeb
commit 2a04784594
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/netronome/nfp/flower/offload.c
View File

@ -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); 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 static int
nfp_flower_calc_opt_layer(struct flow_match_enc_opts *enc_opts, nfp_flower_calc_opt_layer(struct flow_match_enc_opts *enc_opts,
u32 *key_layer_two, int *key_size) 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) { if (basic.mask && basic.mask->ip_proto) {
/* Ethernet type is present in the key. */
switch (basic.key->ip_proto) { switch (basic.key->ip_proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: 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 /* Other ip proto - we need check the masks for the
* remainder of the key to ensure we can offload. * remainder of the key to ensure we can offload.
*/ */
return -EOPNOTSUPP; if (nfp_flower_check_higher_than_l3(flow))
return -EOPNOTSUPP;
break;
} }
} }