Re: [PATCH net-next v2] net: dsa: b53: Report VLAN table occupancy via devlink

2020-09-09 Thread David Miller
From: Florian Fainelli 
Date: Wed,  9 Sep 2020 10:49:31 -0700

> We already maintain an array of VLANs used by the switch so we can
> simply iterate over it to report the occupancy via devlink.
> 
> Signed-off-by: Florian Fainelli 

Applied.


Re: [PATCH net-next v2] net: dsa: b53: Report VLAN table occupancy via devlink

2020-09-09 Thread Andrew Lunn
On Wed, Sep 09, 2020 at 10:49:31AM -0700, Florian Fainelli wrote:
> We already maintain an array of VLANs used by the switch so we can
> simply iterate over it to report the occupancy via devlink.
> 
> Signed-off-by: Florian Fainelli 

Reviewed-by: Andrew Lunn 

Andrew


[PATCH net-next v2] net: dsa: b53: Report VLAN table occupancy via devlink

2020-09-09 Thread Florian Fainelli
We already maintain an array of VLANs used by the switch so we can
simply iterate over it to report the occupancy via devlink.

Signed-off-by: Florian Fainelli 
---
Changes in v2:

- make count u64
- correct typo: s/PARMA/PARAM/

 drivers/net/dsa/b53/b53_common.c | 60 ++--
 drivers/net/dsa/b53/b53_priv.h   |  1 +
 drivers/net/dsa/bcm_sf2.c|  8 -
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 26fcff85d881..6a5796c32721 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -977,6 +977,54 @@ int b53_get_sset_count(struct dsa_switch *ds, int port, 
int sset)
 }
 EXPORT_SYMBOL(b53_get_sset_count);
 
+enum b53_devlink_resource_id {
+   B53_DEVLINK_PARAM_ID_VLAN_TABLE,
+};
+
+static u64 b53_devlink_vlan_table_get(void *priv)
+{
+   struct b53_device *dev = priv;
+   struct b53_vlan *vl;
+   unsigned int i;
+   u64 count = 0;
+
+   for (i = 0; i < dev->num_vlans; i++) {
+   vl = >vlans[i];
+   if (vl->members)
+   count++;
+   }
+
+   return count;
+}
+
+int b53_setup_devlink_resources(struct dsa_switch *ds)
+{
+   struct devlink_resource_size_params size_params;
+   struct b53_device *dev = ds->priv;
+   int err;
+
+   devlink_resource_size_params_init(_params, dev->num_vlans,
+ dev->num_vlans,
+ 1, DEVLINK_RESOURCE_UNIT_ENTRY);
+
+   err = dsa_devlink_resource_register(ds, "VLAN", dev->num_vlans,
+   B53_DEVLINK_PARAM_ID_VLAN_TABLE,
+   DEVLINK_RESOURCE_ID_PARENT_TOP,
+   _params);
+   if (err)
+   goto out;
+
+   dsa_devlink_resource_occ_get_register(ds,
+ B53_DEVLINK_PARAM_ID_VLAN_TABLE,
+ b53_devlink_vlan_table_get, dev);
+
+   return 0;
+out:
+   dsa_devlink_resources_unregister(ds);
+   return err;
+}
+EXPORT_SYMBOL(b53_setup_devlink_resources);
+
 static int b53_setup(struct dsa_switch *ds)
 {
struct b53_device *dev = ds->priv;
@@ -992,8 +1040,10 @@ static int b53_setup(struct dsa_switch *ds)
b53_reset_mib(dev);
 
ret = b53_apply_config(dev);
-   if (ret)
+   if (ret) {
dev_err(ds->dev, "failed to apply configuration\n");
+   return ret;
+   }
 
/* Configure IMP/CPU port, disable all other ports. Enabled
 * ports will be configured with .port_enable
@@ -1012,7 +1062,12 @@ static int b53_setup(struct dsa_switch *ds)
 */
ds->vlan_filtering_is_global = true;
 
-   return ret;
+   return b53_setup_devlink_resources(ds);
+}
+
+static void b53_teardown(struct dsa_switch *ds)
+{
+   dsa_devlink_resources_unregister(ds);
 }
 
 static void b53_force_link(struct b53_device *dev, int port, int link)
@@ -2141,6 +2196,7 @@ static int b53_get_max_mtu(struct dsa_switch *ds, int 
port)
 static const struct dsa_switch_ops b53_switch_ops = {
.get_tag_protocol   = b53_get_tag_protocol,
.setup  = b53_setup,
+   .teardown   = b53_teardown,
.get_strings= b53_get_strings,
.get_ethtool_stats  = b53_get_ethtool_stats,
.get_sset_count = b53_get_sset_count,
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index e942c60e4365..c55c0a9f1b47 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -328,6 +328,7 @@ void b53_br_set_stp_state(struct dsa_switch *ds, int port, 
u8 state);
 void b53_br_fast_age(struct dsa_switch *ds, int port);
 int b53_br_egress_floods(struct dsa_switch *ds, int port,
 bool unicast, bool multicast);
+int b53_setup_devlink_resources(struct dsa_switch *ds);
 void b53_port_event(struct dsa_switch *ds, int port);
 void b53_phylink_validate(struct dsa_switch *ds, int port,
  unsigned long *supported,
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 3263e8a0ae67..723820603107 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -936,7 +936,12 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
b53_configure_vlan(ds);
bcm_sf2_enable_acb(ds);
 
-   return 0;
+   return b53_setup_devlink_resources(ds);
+}
+
+static void bcm_sf2_sw_teardown(struct dsa_switch *ds)
+{
+   dsa_devlink_resources_unregister(ds);
 }
 
 /* The SWITCH_CORE register space is managed by b53 but operates on a page +
@@ -1073,6 +1078,7 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch 
*ds, int port,
 static const struct dsa_switch_ops bcm_sf2_ops = {
.get_tag_protocol   =