net: mscc: ocelot: look up the filters in flower_stats() and flower_destroy()

Currently a new filter is created, containing just enough correct
information to be able to call ocelot_vcap_block_find_filter_by_index()
on it.

This will be limiting us in the future, when we'll have more metadata
associated with a filter, which will matter in the stats() and destroy()
callbacks, and which we can't make up on the spot. For example, we'll
start "offloading" some dummy tc filter entries for the TCAM skeleton,
but we won't actually be adding them to the hardware, or to block->rules.
So, it makes sense to avoid deleting those rules too. That's the kind of
thing which is difficult to determine unless we look up the real filter.

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_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
index ae51ec76b9b17a6c43ae0efdea4d692424f10277..0988bc9aaac5d01055d6771918eed35aa7659383 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -234,28 +234,33 @@ EXPORT_SYMBOL_GPL(ocelot_cls_flower_replace);
 int ocelot_cls_flower_destroy(struct ocelot *ocelot, int port,
                              struct flow_cls_offload *f, bool ingress)
 {
-       struct ocelot_vcap_filter filter;
+       struct ocelot_vcap_block *block = &ocelot->block;
+       struct ocelot_vcap_filter *filter;
 
-       filter.prio = f->common.prio;
-       filter.id = f->cookie;
+       filter = ocelot_vcap_block_find_filter_by_id(block, f->cookie);
+       if (!filter)
+               return 0;
 
-       return ocelot_vcap_filter_del(ocelot, &filter);
+       return ocelot_vcap_filter_del(ocelot, filter);
 }
 EXPORT_SYMBOL_GPL(ocelot_cls_flower_destroy);
 
 int ocelot_cls_flower_stats(struct ocelot *ocelot, int port,
                            struct flow_cls_offload *f, bool ingress)
 {
-       struct ocelot_vcap_filter filter;
+       struct ocelot_vcap_block *block = &ocelot->block;
+       struct ocelot_vcap_filter *filter;
        int ret;
 
-       filter.prio = f->common.prio;
-       filter.id = f->cookie;
-       ret = ocelot_vcap_filter_stats_update(ocelot, &filter);
+       filter = ocelot_vcap_block_find_filter_by_id(block, f->cookie);
+       if (!filter)
+               return 0;
+
+       ret = ocelot_vcap_filter_stats_update(ocelot, filter);
        if (ret)
                return ret;
 
-       flow_stats_update(&f->stats, 0x0, filter.stats.pkts, 0, 0x0,
+       flow_stats_update(&f->stats, 0x0, filter->stats.pkts, 0, 0x0,
                          FLOW_ACTION_HW_STATS_IMMEDIATE);
        return 0;
 }

diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index aa6f6a77019961d97d30e94661618f8614debd7d..75eca3457e6e8e4df2acc4d3c7066abcb9fc67f3 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -994,7 +994,7 @@ int ocelot_vcap_filter_stats_update(struct ocelot *ocelot,
                                    struct ocelot_vcap_filter *filter)
 {
        struct ocelot_vcap_block *block = &ocelot->block;
-       struct ocelot_vcap_filter *tmp;
+       struct ocelot_vcap_filter tmp;
        int index;
 
        index = ocelot_vcap_block_get_filter_index(block, filter);
@@ -1004,9 +1004,9 @@ int ocelot_vcap_filter_stats_update(struct ocelot *ocelot,
        vcap_entry_get(ocelot, filter, index);
 
        /* After we get the result we need to clear the counters */
-       tmp = ocelot_vcap_block_find_filter_by_index(block, index);
-       tmp->stats.pkts = 0;
-       is2_entry_set(ocelot, index, tmp);
+       tmp = *filter;
+       tmp.stats.pkts = 0;
+       is2_entry_set(ocelot, index, &tmp);
 
        return 0;
 }