devlink: add trap metadata type for cookie

Allow driver to indicate cookie metadata for registered traps.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 07923e61920653f28cd83243aa23347155c56fce..014a8b3d1499edd3ec4d072537d8567ed56dc576 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -541,6 +541,7 @@ struct devlink_trap_group {
 };
 
 #define DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT   BIT(0)
+#define DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE BIT(1)
 
 /**
  * struct devlink_trap - Immutable packet trap attributes.

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index ae37fd4d194a733adc369a634ebdaafd96850cb6..be2a2948f4529179b3e7258c3b1cbfa9a3f30048 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -252,6 +252,8 @@ enum devlink_trap_type {
 enum {
        /* Trap can report input port as metadata */
        DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
+       /* Trap can report flow action cookie as metadata */
+       DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
 };
 
 enum devlink_attr {

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 0d7c5d3443d26a43765bbcf9c861a27b6d0efb5a..12e6ef749b8a17995f91fdef14e85afbc0d44211 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5540,6 +5540,9 @@ static int devlink_trap_metadata_put(struct sk_buff *msg,
        if ((trap->metadata_cap & DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT) &&
            nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT))
                goto nla_put_failure;
+       if ((trap->metadata_cap & DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE) &&
+           nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE))
+               goto nla_put_failure;
 
        nla_nest_end(msg, attr);