net: mscc: ocelot: use a single VCAP filter for all MRP traps

The MRP assist code installs a VCAP IS2 trapping rule for each port, but
since the key and the action is the same, just the ingress port mask
differs, there isn't any need to do this. We can save some space in the
TCAM by using a single filter and adjusting the ingress port mask.

Reuse the ocelot_trap_add() and ocelot_trap_del() functions for this
purpose.

Now that the cookies are no longer per port, we need to change the
allocation scheme such that MRP traps use a fixed number.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 6039c9c..502e647 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1468,9 +1468,8 @@ ocelot_populate_ipv6_ptp_general_trap_key(struct ocelot_vcap_filter *trap)
        trap->key.ipv6.dport.mask = 0xffff;
 }
 
-static int ocelot_trap_add(struct ocelot *ocelot, int port,
-                          unsigned long cookie,
-                          void (*populate)(struct ocelot_vcap_filter *f))
+int ocelot_trap_add(struct ocelot *ocelot, int port, unsigned long cookie,
+                   void (*populate)(struct ocelot_vcap_filter *f))
 {
        struct ocelot_vcap_block *block_vcap_is2;
        struct ocelot_vcap_filter *trap;
@@ -1515,8 +1514,7 @@ static int ocelot_trap_add(struct ocelot *ocelot, int port,
        return 0;
 }
 
-static int ocelot_trap_del(struct ocelot *ocelot, int port,
-                          unsigned long cookie)
+int ocelot_trap_del(struct ocelot *ocelot, int port, unsigned long cookie)
 {
        struct ocelot_vcap_block *block_vcap_is2;
        struct ocelot_vcap_filter *trap;

diff --git a/drivers/net/ethernet/mscc/ocelot.h b/drivers/net/ethernet/mscc/ocelot.h
index bf4eff6..674043c 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.h
+++ b/drivers/net/ethernet/mscc/ocelot.h
@@ -21,6 +21,7 @@
 #include <soc/mscc/ocelot_dev.h>
 #include <soc/mscc/ocelot_ana.h>
 #include <soc/mscc/ocelot_ptp.h>
+#include <soc/mscc/ocelot_vcap.h>
 #include <soc/mscc/ocelot.h>
 #include "ocelot_rew.h"
 #include "ocelot_qs.h"
@@ -102,6 +103,10 @@ int ocelot_port_devlink_init(struct ocelot *ocelot, int port,
                             enum devlink_port_flavour flavour);
 void ocelot_port_devlink_teardown(struct ocelot *ocelot, int port);
 
+int ocelot_trap_add(struct ocelot *ocelot, int port, unsigned long cookie,
+                   void (*populate)(struct ocelot_vcap_filter *f));
+int ocelot_trap_del(struct ocelot *ocelot, int port, unsigned long cookie);
+
 extern struct notifier_block ocelot_netdevice_nb;
 extern struct notifier_block ocelot_switchdev_nb;
 extern struct notifier_block ocelot_switchdev_blocking_nb;

diff --git a/drivers/net/ethernet/mscc/ocelot_mrp.c b/drivers/net/ethernet/mscc/ocelot_mrp.c
index dc28736..68fa833 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_mrp.c
+++ b/drivers/net/ethernet/mscc/ocelot_mrp.c
@@ -77,37 +77,30 @@ static int ocelot_mrp_redirect_add_vcap(struct ocelot *ocelot, int src_port,
        return err;
 }
 
-static int ocelot_mrp_copy_add_vcap(struct ocelot *ocelot, int port, int prio)
+static void ocelot_populate_mrp_trap_key(struct ocelot_vcap_filter *filter)
 {
        const u8 mrp_mask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
-       struct ocelot_vcap_filter *filter;
-       int err;
-
-       filter = kzalloc(sizeof(*filter), GFP_KERNEL);
-       if (!filter)
-               return -ENOMEM;
 
-       filter->key_type = OCELOT_VCAP_KEY_ETYPE;
-       filter->prio = prio;
-       filter->id.cookie = OCELOT_VCAP_IS2_MRP_TRAP(ocelot, port);
-       filter->id.tc_offload = false;
-       filter->block_id = VCAP_IS2;
-       filter->type = OCELOT_VCAP_FILTER_OFFLOAD;
-       filter->ingress_port_mask = BIT(port);
        /* Here is possible to use control or test dmac because the mask
         * doesn't cover the LSB
         */
        ether_addr_copy(filter->key.etype.dmac.value, mrp_test_dmac);
        ether_addr_copy(filter->key.etype.dmac.mask, mrp_mask);
-       filter->action.mask_mode = OCELOT_MASK_MODE_PERMIT_DENY;
-       filter->action.port_mask = 0x0;
-       filter->action.cpu_copy_ena = true;
+}
 
-       err = ocelot_vcap_filter_add(ocelot, filter, NULL);
-       if (err)
-               kfree(filter);
+static int ocelot_mrp_trap_add(struct ocelot *ocelot, int port)
+{
+       unsigned long cookie = OCELOT_VCAP_IS2_MRP_TRAP(ocelot);
 
-       return err;
+       return ocelot_trap_add(ocelot, port, cookie,
+                              ocelot_populate_mrp_trap_key);
+}
+
+static int ocelot_mrp_trap_del(struct ocelot *ocelot, int port)
+{
+       unsigned long cookie = OCELOT_VCAP_IS2_MRP_TRAP(ocelot);
+
+       return ocelot_trap_del(ocelot, port, cookie);
 }
 
 static void ocelot_mrp_save_mac(struct ocelot *ocelot,
@@ -184,7 +177,7 @@ int ocelot_mrp_add_ring_role(struct ocelot *ocelot, int port,
        ocelot_mrp_save_mac(ocelot, ocelot_port);
 
        if (mrp->ring_role != BR_MRP_RING_ROLE_MRC)
-               return ocelot_mrp_copy_add_vcap(ocelot, port, 1);
+               return ocelot_mrp_trap_add(ocelot, port);
 
        dst_port = ocelot_mrp_find_partner_port(ocelot, ocelot_port);
        if (dst_port == -1)
@@ -194,7 +187,7 @@ int ocelot_mrp_add_ring_role(struct ocelot *ocelot, int port,
        if (err)
                return err;
 
-       err = ocelot_mrp_copy_add_vcap(ocelot, port, 2);
+       err = ocelot_mrp_trap_add(ocelot, port);
        if (err) {
                ocelot_mrp_del_vcap(ocelot,
                                    OCELOT_VCAP_IS2_MRP_REDIRECT(ocelot, port));
@@ -209,7 +202,7 @@ int ocelot_mrp_del_ring_role(struct ocelot *ocelot, int port,
                             const struct switchdev_obj_ring_role_mrp *mrp)
 {
        struct ocelot_port *ocelot_port = ocelot->ports[port];
-       int i;
+       int err, i;
 
        if (!ocelot_port)
                return -EOPNOTSUPP;
@@ -220,8 +213,11 @@ int ocelot_mrp_del_ring_role(struct ocelot *ocelot, int port,
        if (ocelot_port->mrp_ring_id != mrp->ring_id)
                return 0;
 
+       err = ocelot_mrp_trap_del(ocelot, port);
+       if (err)
+               return err;
+
        ocelot_mrp_del_vcap(ocelot, OCELOT_VCAP_IS2_MRP_REDIRECT(ocelot, port));
-       ocelot_mrp_del_vcap(ocelot, OCELOT_VCAP_IS2_MRP_TRAP(ocelot, port));
 
        for (i = 0; i < ocelot->num_phys_ports; ++i) {
                ocelot_port = ocelot->ports[i];

diff --git a/include/soc/mscc/ocelot_vcap.h b/include/soc/mscc/ocelot_vcap.h
index 562bcd9..14ada09 100644 (file)
--- a/include/soc/mscc/ocelot_vcap.h
+++ b/include/soc/mscc/ocelot_vcap.h
@@ -21,8 +21,8 @@
 #define OCELOT_VCAP_IS2_IPV4_EV_PTP_TRAP(ocelot)               ((ocelot)->num_phys_ports + 3)
 #define OCELOT_VCAP_IS2_IPV6_GEN_PTP_TRAP(ocelot)              ((ocelot)->num_phys_ports + 4)
 #define OCELOT_VCAP_IS2_IPV6_EV_PTP_TRAP(ocelot)               ((ocelot)->num_phys_ports + 5)
+#define OCELOT_VCAP_IS2_MRP_TRAP(ocelot)                       ((ocelot)->num_phys_ports + 6)
 #define OCELOT_VCAP_IS2_MRP_REDIRECT(ocelot, port)             (port)
-#define OCELOT_VCAP_IS2_MRP_TRAP(ocelot, port)                 ((ocelot)->num_phys_ports + (port))
 
 /* =================================================================
  *  VCAP Common