dpaa2-switch: offload shared block mirror filters when binding to a port

When mirroring rules are added in shared filter blocks, the same
mirroring rule has to be configured on all the switch ports that are
part of the same block.

In case a switch port joins a shared block after mirroring filters have
been already added to it, then all the mirror rules should be offloaded
to the port. The reverse, removal of mirroring rules, has to be done at
block unbind.

For this purpose, the dpaa2_switch_block_offload_mirror() and
dpaa2_switch_block_unoffload_mirror() functions are added and called
upon binding and unbinding a switch port to/from a block.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
index 3c4f5ada12fd533e726300e4656d848a4b411d6e..d6eefbbf163fa1517fe9137be9bb73e1df95185b 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
@@ -803,6 +803,57 @@ int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,
        }
 }
 
+int dpaa2_switch_block_offload_mirror(struct dpaa2_switch_filter_block *block,
+                                     struct ethsw_port_priv *port_priv)
+{
+       struct ethsw_core *ethsw = port_priv->ethsw_data;
+       struct dpaa2_switch_mirror_entry *tmp;
+       int err;
+
+       list_for_each_entry(tmp, &block->mirror_entries, list) {
+               err = dpsw_if_add_reflection(ethsw->mc_io, 0,
+                                            ethsw->dpsw_handle,
+                                            port_priv->idx, &tmp->cfg);
+               if (err)
+                       goto unwind_add;
+       }
+
+       return 0;
+
+unwind_add:
+       list_for_each_entry(tmp, &block->mirror_entries, list)
+               dpsw_if_remove_reflection(ethsw->mc_io, 0,
+                                         ethsw->dpsw_handle,
+                                         port_priv->idx, &tmp->cfg);
+
+       return err;
+}
+
+int dpaa2_switch_block_unoffload_mirror(struct dpaa2_switch_filter_block *block,
+                                       struct ethsw_port_priv *port_priv)
+{
+       struct ethsw_core *ethsw = port_priv->ethsw_data;
+       struct dpaa2_switch_mirror_entry *tmp;
+       int err;
+
+       list_for_each_entry(tmp, &block->mirror_entries, list) {
+               err = dpsw_if_remove_reflection(ethsw->mc_io, 0,
+                                               ethsw->dpsw_handle,
+                                               port_priv->idx, &tmp->cfg);
+               if (err)
+                       goto unwind_remove;
+       }
+
+       return 0;
+
+unwind_remove:
+       list_for_each_entry(tmp, &block->mirror_entries, list)
+               dpsw_if_add_reflection(ethsw->mc_io, 0, ethsw->dpsw_handle,
+                                      port_priv->idx, &tmp->cfg);
+
+       return err;
+}
+
 int dpaa2_switch_cls_matchall_destroy(struct dpaa2_switch_filter_block *block,
                                      struct tc_cls_matchall_offload *cls)
 {

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index 3857d90936235702b8c9ba8bfbe76dfad97f8af4..71129724d9cafa34edb75af44874a2db0493a349 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@ -1229,6 +1229,13 @@ static int dpaa2_switch_port_block_bind(struct ethsw_port_priv *port_priv,
        struct dpaa2_switch_filter_block *old_block = port_priv->filter_block;
        int err;
 
+       /* Offload all the mirror entries found in the block on this new port
+        * joining it.
+        */
+       err = dpaa2_switch_block_offload_mirror(block, port_priv);
+       if (err)
+               return err;
+
        /* If the port is already bound to this ACL table then do nothing. This
         * can happen when this port is the first one to join a tc block
         */
@@ -1256,6 +1263,13 @@ dpaa2_switch_port_block_unbind(struct ethsw_port_priv *port_priv,
        struct dpaa2_switch_filter_block *new_block;
        int err;
 
+       /* Unoffload all the mirror entries found in the block from the
+        * port leaving it.
+        */
+       err = dpaa2_switch_block_unoffload_mirror(block, port_priv);
+       if (err)
+               return err;
+
        /* We are the last port that leaves a block (an ACL table).
         * We'll continue to use this table.
         */

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
index 79e8a40f97f7222c4535a4f9ad83910bae88548d..f69d940f3c5b7fef2d07e7c3ac9e5dffb6cbad7d 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
@@ -253,4 +253,10 @@ int dpaa2_switch_cls_matchall_destroy(struct dpaa2_switch_filter_block *block,
 
 int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *block,
                               struct dpaa2_switch_acl_entry *entry);
+
+int dpaa2_switch_block_offload_mirror(struct dpaa2_switch_filter_block *block,
+                                     struct ethsw_port_priv *port_priv);
+
+int dpaa2_switch_block_unoffload_mirror(struct dpaa2_switch_filter_block *block,
+                                       struct ethsw_port_priv *port_priv);
 #endif /* __ETHSW_H */