History

devlink: add trap metadata type for cookie

Allow driver to indicate cookie metadata for registered traps.

Jiri Pirko committed 6 years ago

Commit 85b05891 parent 20084953 files · +6 −0Browse files

Unified · Split

3 files
  1. include/net/devlink.h +1 −0
  2. include/uapi/linux/devlink.h +2 −0
  3. net/core/devlink.c +3 −0
include/net/devlink.h+1−0
@@ -541,6 +541,7 @@ struct devlink_trap_group { · 540 unmodified lines
541541 };
542542
543543 #define DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT BIT(0)
544+#define DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE BIT(1)
544545
545546 /**
546547 * struct devlink_trap - Immutable packet trap attributes.
include/uapi/linux/devlink.h+2−0
@@ -252,6 +252,8 @@ enum devlink_trap_type { · 251 unmodified lines
252252 enum {
253253 /* Trap can report input port as metadata */
254254 DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
255+ /* Trap can report flow action cookie as metadata */
256+ DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
255257 };
256258
257259 enum devlink_attr {
net/core/devlink.c+3−0
@@ -5540,6 +5540,9 @@ static int devlink_trap_metadata_put(struct sk_buff *msg, · 5539 unmodified lines
55405540 if ((trap->metadata_cap & DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT) &&
55415541 nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT))
55425542 goto nla_put_failure;
5543+ if ((trap->metadata_cap & DEVLINK_TRAP_METADATA_TYPE_F_FA_COOKIE) &&
5544+ nla_put_flag(msg, DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE))
5545+ goto nla_put_failure;
55435546
55445547 nla_nest_end(msg, attr);
55455548