nfp: flower: ensure TCP flags can be placed in IPv6 frame

Previously we did not ensure tcp flags have a place to be stored
when using IPv6. We correct this by including IPv6 key layer when
we match tcp flags and the IPv6 key layer has not been included
already.

Fixes: 07e1671cfca5 ("nfp: flower: refactor shared ip header in match offload")
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>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 2f49eb7..67e576f 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -345,13 +345,29 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
                    !(tcp_flags & (TCPHDR_FIN | TCPHDR_SYN | TCPHDR_RST)))
                        return -EOPNOTSUPP;
 
-               /* We need to store TCP flags in the IPv4 key space, thus
-                * we need to ensure we include a IPv4 key layer if we have
-                * not done so already.
+               /* We need to store TCP flags in the either the IPv4 or IPv6 key
+                * space, thus we need to ensure we include a IPv4/IPv6 key
+                * layer if we have not done so already.
                 */
-               if (!(key_layer & NFP_FLOWER_LAYER_IPV4)) {
-                       key_layer |= NFP_FLOWER_LAYER_IPV4;
-                       key_size += sizeof(struct nfp_flower_ipv4);
+               if (!key_basic)
+                       return -EOPNOTSUPP;
+
+               if (!(key_layer & NFP_FLOWER_LAYER_IPV4) &&
+                   !(key_layer & NFP_FLOWER_LAYER_IPV6)) {
+                       switch (key_basic->n_proto) {
+                       case cpu_to_be16(ETH_P_IP):
+                               key_layer |= NFP_FLOWER_LAYER_IPV4;
+                               key_size += sizeof(struct nfp_flower_ipv4);
+                               break;
+
+                       case cpu_to_be16(ETH_P_IPV6):
+                               key_layer |= NFP_FLOWER_LAYER_IPV6;
+                               key_size += sizeof(struct nfp_flower_ipv6);
+                               break;
+
+                       default:
+                               return -EOPNOTSUPP;
+                       }
                }
        }