nfp: fix flower offload metadata flag usage

Hardware has no notion of new or last mask id, instead it makes use of the
message type (i.e. add flow or del flow) in combination with a single bit
in metadata flags to determine when to add or delete a mask id. Previously
we made use of the new or last flags to indicate that a new mask should be
allocated or deallocated, respectively. This incorrect behaviour is fixed
by making use single bit in metadata flags to indicate mask allocation or
deallocation.

Fixes: 43f84b72c50d ("nfp: add metadata to each flow 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/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index c90e72b7ff5ac1d47241fa32bf38d91fcc360ddf..a69ea62e9c9c3a8f198409ad52eefdea3a730db1 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -52,8 +52,7 @@ struct nfp_app;
 #define NFP_FLOWER_MASK_ELEMENT_RS     1
 #define NFP_FLOWER_MASK_HASH_BITS      10
 
-#define NFP_FL_META_FLAG_NEW_MASK      128
-#define NFP_FL_META_FLAG_LAST_MASK     1
+#define NFP_FL_META_FLAG_MANAGE_MASK   BIT(7)
 
 #define NFP_FL_MASK_REUSE_TIME_NS      40000
 #define NFP_FL_MASK_ID_LOCATION                1

diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
index 193520ef23f05af42098fd99ed0e18d9c687804f..db977cf8e9332b27a63bd660c4f96b178e54cd14 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
@@ -282,7 +282,7 @@ nfp_check_mask_add(struct nfp_app *app, char *mask_data, u32 mask_len,
                id = nfp_add_mask_table(app, mask_data, mask_len);
                if (id < 0)
                        return false;
-               *meta_flags |= NFP_FL_META_FLAG_NEW_MASK;
+               *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
        }
        *mask_id = id;
 
@@ -299,6 +299,9 @@ nfp_check_mask_remove(struct nfp_app *app, char *mask_data, u32 mask_len,
        if (!mask_entry)
                return false;
 
+       if (meta_flags)
+               *meta_flags &= ~NFP_FL_META_FLAG_MANAGE_MASK;
+
        *mask_id = mask_entry->mask_id;
        mask_entry->ref_cnt--;
        if (!mask_entry->ref_cnt) {
@@ -306,7 +309,7 @@ nfp_check_mask_remove(struct nfp_app *app, char *mask_data, u32 mask_len,
                nfp_release_mask_id(app, *mask_id);
                kfree(mask_entry);
                if (meta_flags)
-                       *meta_flags |= NFP_FL_META_FLAG_LAST_MASK;
+                       *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
        }
 
        return true;