devlink: extend devlink_trap_report() to accept cookie and pass

Add cookie argument to devlink_trap_report() allowing driver to pass in
the user cookie. Pass on the cookie down to drop monitor code.

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/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
index 04f2445f6d4303989b74ed4b367ac332fe15c3ee..a55577a50e9056dd3c62fcd700fdc1b4ea534a41 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
@@ -71,7 +71,7 @@ static void mlxsw_sp_rx_drop_listener(struct sk_buff *skb, u8 local_port,
        in_devlink_port = mlxsw_core_port_devlink_port_get(mlxsw_sp->core,
                                                           local_port);
        skb_push(skb, ETH_HLEN);
-       devlink_trap_report(devlink, skb, trap_ctx, in_devlink_port);
+       devlink_trap_report(devlink, skb, trap_ctx, in_devlink_port, NULL);
        consume_skb(skb);
 }
 
@@ -95,7 +95,7 @@ static void mlxsw_sp_rx_exception_listener(struct sk_buff *skb, u8 local_port,
        in_devlink_port = mlxsw_core_port_devlink_port_get(mlxsw_sp->core,
                                                           local_port);
        skb_push(skb, ETH_HLEN);
-       devlink_trap_report(devlink, skb, trap_ctx, in_devlink_port);
+       devlink_trap_report(devlink, skb, trap_ctx, in_devlink_port, NULL);
        skb_pull(skb, ETH_HLEN);
        skb->offload_fwd_mark = 1;
        netif_receive_skb(skb);

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index d7706a0346f2bd87e315fa3beb13037bebe76637..aa17533c06e12ff1c51b3a616bf5acd4a50e37b3 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -385,7 +385,7 @@ static void nsim_dev_trap_report(struct nsim_dev_port *nsim_dev_port)
                 */
                local_bh_disable();
                devlink_trap_report(devlink, skb, nsim_trap_item->trap_ctx,
-                                   &nsim_dev_port->devlink_port);
+                                   &nsim_dev_port->devlink_port, NULL);
                local_bh_enable();
                consume_skb(skb);
        }

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 014a8b3d1499edd3ec4d072537d8567ed56dc576..c9ca86b054bc712de3099a946d910c5e6f04824d 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -16,6 +16,7 @@
 #include <linux/workqueue.h>
 #include <linux/refcount.h>
 #include <net/net_namespace.h>
+#include <net/flow_offload.h>
 #include <uapi/linux/devlink.h>
 
 struct devlink_ops;
@@ -1050,9 +1051,9 @@ int devlink_traps_register(struct devlink *devlink,
 void devlink_traps_unregister(struct devlink *devlink,
                              const struct devlink_trap *traps,
                              size_t traps_count);
-void devlink_trap_report(struct devlink *devlink,
-                        struct sk_buff *skb, void *trap_ctx,
-                        struct devlink_port *in_devlink_port);
+void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,
+                        void *trap_ctx, struct devlink_port *in_devlink_port,
+                        const struct flow_action_cookie *fa_cookie);
 void *devlink_trap_ctx_priv(void *trap_ctx);
 
 #if IS_ENABLED(CONFIG_NET_DEVLINK)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 12e6ef749b8a17995f91fdef14e85afbc0d44211..49706031ab45f89677651a751f515c50dde96233 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -8205,12 +8205,14 @@ devlink_trap_stats_update(struct devlink_stats __percpu *trap_stats,
 static void
 devlink_trap_report_metadata_fill(struct net_dm_hw_metadata *hw_metadata,
                                  const struct devlink_trap_item *trap_item,
-                                 struct devlink_port *in_devlink_port)
+                                 struct devlink_port *in_devlink_port,
+                                 const struct flow_action_cookie *fa_cookie)
 {
        struct devlink_trap_group_item *group_item = trap_item->group_item;
 
        hw_metadata->trap_group_name = group_item->group->name;
        hw_metadata->trap_name = trap_item->trap->name;
+       hw_metadata->fa_cookie = fa_cookie;
 
        spin_lock(&in_devlink_port->type_lock);
        if (in_devlink_port->type == DEVLINK_PORT_TYPE_ETH)
@@ -8224,9 +8226,12 @@ devlink_trap_report_metadata_fill(struct net_dm_hw_metadata *hw_metadata,
  * @skb: Trapped packet.
  * @trap_ctx: Trap context.
  * @in_devlink_port: Input devlink port.
+ * @fa_cookie: Flow action cookie. Could be NULL.
  */
 void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,
-                        void *trap_ctx, struct devlink_port *in_devlink_port)
+                        void *trap_ctx, struct devlink_port *in_devlink_port,
+                        const struct flow_action_cookie *fa_cookie)
+
 {
        struct devlink_trap_item *trap_item = trap_ctx;
        struct net_dm_hw_metadata hw_metadata = {};
@@ -8235,7 +8240,7 @@ void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,
        devlink_trap_stats_update(trap_item->group_item->stats, skb->len);
 
        devlink_trap_report_metadata_fill(&hw_metadata, trap_item,
-                                         in_devlink_port);
+                                         in_devlink_port, fa_cookie);
        net_dm_hw_report(skb, &hw_metadata);
 }
 EXPORT_SYMBOL_GPL(devlink_trap_report);