mlxsw: acl_flex_actions: Trap all ACL dropped packets to DISCARD_*_ACL traps

Introduce a new set of traps:
DISCARD_INGRESS_ACL and DISCARD_EGRESS_ACL
Set the trap_action from NOP to TRAP which causes the packets dropped
by the TRAP action to be trapped under new trap IDs, depending on the
ingress/egress binding point.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
index b0e58758352848be5880bd8073bd7bc84a3abfbc..424ef26e6cca36cfe9f088b8215c93c6380a478a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
@@ -820,8 +820,10 @@ int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block, bool ingress)
 
        if (IS_ERR(act))
                return PTR_ERR(act);
-       mlxsw_afa_trap_pack(act, MLXSW_AFA_TRAP_TRAP_ACTION_NOP,
-                           MLXSW_AFA_TRAP_FORWARD_ACTION_DISCARD, 0);
+       mlxsw_afa_trap_pack(act, MLXSW_AFA_TRAP_TRAP_ACTION_TRAP,
+                           MLXSW_AFA_TRAP_FORWARD_ACTION_DISCARD,
+                           ingress ? MLXSW_TRAP_ID_DISCARD_INGRESS_ACL :
+                                     MLXSW_TRAP_ID_DISCARD_EGRESS_ACL);
        return 0;
 }
 EXPORT_SYMBOL(mlxsw_afa_block_append_drop);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/trap.h b/drivers/net/ethernet/mellanox/mlxsw/trap.h
index 12e1fa998d42c7706cb487e2521bff4c80f1ee00..eaa521b7561b76940f676b6d37a5cddf8f0c6273 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/trap.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/trap.h
@@ -102,6 +102,8 @@ enum {
        MLXSW_TRAP_ID_ACL1 = 0x1C1,
        /* Multicast trap used for routes with trap-and-forward action */
        MLXSW_TRAP_ID_ACL2 = 0x1C2,
+       MLXSW_TRAP_ID_DISCARD_INGRESS_ACL = 0x1C3,
+       MLXSW_TRAP_ID_DISCARD_EGRESS_ACL = 0x1C4,
 
        MLXSW_TRAP_ID_MAX = 0x1FF
 };