AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

nfp: flower: fix masks for tcp and ip flags fields

Browse Source 
Check mask fields of tcp and ip flags when setting the corresponding mask
flag used in hardware.

Fixes: 8f2566225a ("flow_offload: add flow_rule and flow_match")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: John Hurley <john.hurley@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-02-14 14:37:16 -08:00 committed by David S. Miller
parent eaec2efbe4
commit 0496743b20
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/ethernet/netronome/nfp/flower/match.c
View File

@ -172,46 +172,51 @@ nfp_flower_compile_ip_ext(struct nfp_flower_ip_ext *ext,
}
if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_TCP)) {
u16 tcp_flags, tcp_flags_mask;
struct flow_match_tcp match;
u16 tcp_flags;
flow_rule_match_tcp(rule, &match);
tcp_flags = be16_to_cpu(match.key->flags);
tcp_flags_mask = be16_to_cpu(match.mask->flags);
if (tcp_flags & TCPHDR_FIN) {
if (tcp_flags & TCPHDR_FIN)
ext->flags |= NFP_FL_TCP_FLAG_FIN;
if (tcp_flags_mask & TCPHDR_FIN)
msk->flags |= NFP_FL_TCP_FLAG_FIN;
}
if (tcp_flags & TCPHDR_SYN) {
if (tcp_flags & TCPHDR_SYN)
ext->flags |= NFP_FL_TCP_FLAG_SYN;
if (tcp_flags_mask & TCPHDR_SYN)
msk->flags |= NFP_FL_TCP_FLAG_SYN;
}
if (tcp_flags & TCPHDR_RST) {
if (tcp_flags & TCPHDR_RST)
ext->flags |= NFP_FL_TCP_FLAG_RST;
if (tcp_flags_mask & TCPHDR_RST)
msk->flags |= NFP_FL_TCP_FLAG_RST;
}
if (tcp_flags & TCPHDR_PSH) {
if (tcp_flags & TCPHDR_PSH)
ext->flags |= NFP_FL_TCP_FLAG_PSH;
if (tcp_flags_mask & TCPHDR_PSH)
msk->flags |= NFP_FL_TCP_FLAG_PSH;
}
if (tcp_flags & TCPHDR_URG) {
if (tcp_flags & TCPHDR_URG)
ext->flags |= NFP_FL_TCP_FLAG_URG;
if (tcp_flags_mask & TCPHDR_URG)
msk->flags |= NFP_FL_TCP_FLAG_URG;
}
}
if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {
struct flow_match_control match;
flow_rule_match_control(rule, &match);
if (match.key->flags & FLOW_DIS_IS_FRAGMENT) {
if (match.key->flags & FLOW_DIS_IS_FRAGMENT)
ext->flags |= NFP_FL_IP_FRAGMENTED;
if (match.mask->flags & FLOW_DIS_IS_FRAGMENT)
msk->flags |= NFP_FL_IP_FRAGMENTED;
}
if (match.key->flags & FLOW_DIS_FIRST_FRAG) {
if (match.key->flags & FLOW_DIS_FIRST_FRAG)
ext->flags |= NFP_FL_IP_FRAG_FIRST;
if (match.mask->flags & FLOW_DIS_FIRST_FRAG)
msk->flags |= NFP_FL_IP_FRAG_FIRST;
}
}
}