* [PATCH net-next] nfp: flower: fix masks for tcp and ip flags fields
@ 2019-02-14 22:37 Jakub Kicinski
2019-02-17 23:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Kicinski @ 2019-02-14 22:37 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Pieter Jansen van Vuuren
From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Check mask fields of tcp and ip flags when setting the corresponding mask
flag used in hardware.
Fixes: 8f2566225ae2 ("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>
---
.../net/ethernet/netronome/nfp/flower/match.c | 35 +++++++++++--------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index 1279fa5da9e1..e03c8ef2c28c 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -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;
- }
}
}
--
2.19.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] nfp: flower: fix masks for tcp and ip flags fields
2019-02-14 22:37 [PATCH net-next] nfp: flower: fix masks for tcp and ip flags fields Jakub Kicinski
@ 2019-02-17 23:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-02-17 23:29 UTC (permalink / raw)
To: jakub.kicinski; +Cc: netdev, oss-drivers, pieter.jansenvanvuuren
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Thu, 14 Feb 2019 14:37:16 -0800
> From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
>
> Check mask fields of tcp and ip flags when setting the corresponding mask
> flag used in hardware.
>
> Fixes: 8f2566225ae2 ("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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-17 23:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14 22:37 [PATCH net-next] nfp: flower: fix masks for tcp and ip flags fields Jakub Kicinski
2019-02-17 23:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).