net: dsa: hellcreek: Report tables sizes
cover net: dsa: hellcreek: Report tables sizes
Hi,
Florian, Andrew and Vladimir suggested at some point to use devlink for reporting tables, features and debugging counters instead of using debugfs and printk.
So, start by reporting the VLAN and FDB table sizes.
Thanks,
Kurt
Kurt Kanzenbach (2):
net: dsa: hellcreek: Report VLAN table occupancy
net: dsa: hellcreek: Report FDB table occupancy
drivers/net/dsa/hirschmann/hellcreek.c | 99 ++++++++++++++++++++++++-- drivers/net/dsa/hirschmann/hellcreek.h | 6 ++ 2 files changed, 101 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 net: dsa: hellcreek: Report VLAN table occupancy
The VLAN membership configuration is cached in software already. So, it can be reported via devlink. Add support for it:
|root@tsn:~# devlink resource show platform/ff240000.switch |platform/ff240000.switch: | name VLAN size 4096 occ 4 unit entry dpipe_tables none
--- drivers/net/dsa/hirschmann/hellcreek.c | 59 ++++++++++++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek.h | 5 +++ 2 files changed, 64 insertions(+)
drivers/net/dsa/hirschmann/hellcreek.c +59 -0
@@ -1000,6 +1000,51 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)return ret; } +static u64 hellcreek_devlink_vlan_table_get (void *priv) +{ +struct hellcreek *hellcreek = priv; +u64 count =0 ; +int i; + +mutex_lock (&hellcreek->reg_lock); +for (i =0 ; i <VLAN_N_VID ; ++i) +if (hellcreek->vidmbrcfg[i]) + count++; +mutex_unlock (&hellcreek->reg_lock); + +return count; +} + +static int hellcreek_setup_devlink_resources (struct dsa_switch *ds) +{ +struct devlink_resource_size_params size_params; +struct hellcreek *hellcreek = ds->priv; +int err; + +devlink_resource_size_params_init (&size_params,VLAN_N_VID , +VLAN_N_VID , +1 ,DEVLINK_RESOURCE_UNIT_ENTRY ); + + err =dsa_devlink_resource_register (ds,"VLAN" ,VLAN_N_VID , +HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE , +DEVLINK_RESOURCE_ID_PARENT_TOP , + &size_params); +if (err) + goto out; + +dsa_devlink_resource_occ_get_register (ds, +HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE , + hellcreek_devlink_vlan_table_get, + hellcreek); + +return 0 ; + +out: +dsa_devlink_resources_unregister (ds); + +return err; +} +static int hellcreek_setup (struct dsa_switch *ds) {struct hellcreek *hellcreek = ds->priv;
@@ -1053,9 +1098,22 @@ static int hellcreek_setup(struct dsa_switch *ds)return ret; } +/* Register devlink resources with DSA */ + ret =hellcreek_setup_devlink_resources (ds); +if (ret) { +dev_err (hellcreek->dev, +"Failed to setup devlink resources!\n" ); +return ret; + } +return 0 ; } +static void hellcreek_teardown (struct dsa_switch *ds) +{ +dsa_devlink_resources_unregister (ds); +} +static void hellcreek_phylink_validate (struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state)
@@ -1447,6 +1505,7 @@ static const struct dsa_switch_ops hellcreek_ds_ops = { .port_vlan_del = hellcreek_vlan_del, .port_vlan_filtering = hellcreek_vlan_filtering, .setup = hellcreek_setup, + .teardown = hellcreek_teardown, };static int hellcreek_probe (struct platform_device *pdev)
drivers/net/dsa/hirschmann/hellcreek.h +5 -0
@@ -298,4 +298,9 @@ struct hellcreek {#define dw_to_hellcreek_port (dw) \ container_of(dw, struct hellcreek_port, schedule_work) +/* Devlink resources */ +enum hellcreek_devlink_resource_id { +HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE , +}; +#endif /* _HELLCREEK_H_ */
Signature · 1 line
2.26.2
Re: [PATCH net-next 1/2] net: dsa: hellcreek: Report VLAN table occupancy
Quoted 8 lines · Kurt Kanzenbach
The VLAN membership configuration is cached in software already. So, it can be reported via devlink. Add support for it:
|root@tsn:~# devlink resource show platform/ff240000.switch |platform/ff240000.switch: | name VLAN size 4096 occ 4 unit entry dpipe_tables noneSigned-off-by Kurt Kanzenbach <[email protected]>
Signature · 1 line
Florian
PATCH 2/2 net: dsa: hellcreek: Report FDB table occupancy
In reply to Kurt KanzenbachReport the FDB table size and occupancy via devlink. The actual size depends on the used Hellcreek version:
|root@tsn:~# devlink resource show platform/ff240000.switch |platform/ff240000.switch: | name VLAN size 4096 occ 2 unit entry dpipe_tables none | name FDB size 256 occ 6 unit entry dpipe_tables none
--- drivers/net/dsa/hirschmann/hellcreek.c | 46 ++++++++++++++++++++++---- drivers/net/dsa/hirschmann/hellcreek.h | 1 + 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/net/dsa/hirschmann/hellcreek.c +39 -7
@@ -221,12 +221,11 @@ static void hellcreek_feature_detect(struct hellcreek *hellcreek) features =hellcreek_read (hellcreek,HR_FEABITS0 ); -/* Currently we only detect the size of the FDB table */ +/* Only detect the size of the FDB table. The size and current +* utilization can be queried via devlink. +*/ hellcreek->fdb_entries = ((features &HR_FEABITS0_FDBBINS_MASK ) >>HR_FEABITS0_FDBBINS_SHIFT ) *32 ; - -dev_info (hellcreek->dev,"Feature detect: FDB entries=%zu\n" , - hellcreek->fdb_entries); } static enum dsa_tag_protocol hellcreek_get_tag_protocol(struct dsa_switch *ds,
@@ -1015,20 +1014,48 @@ static u64 hellcreek_devlink_vlan_table_get(void *priv)return count; } +static u64 hellcreek_devlink_fdb_table_get (void *priv) +{ +struct hellcreek *hellcreek = priv; +u64 count =0 ; + +/* Reading this register has side effects. Synchronize against the other +* FDB operations. +*/ +mutex_lock (&hellcreek->reg_lock); + count =hellcreek_read (hellcreek,HR_FDBMAX ); +mutex_unlock (&hellcreek->reg_lock); + +return count; +} +static int hellcreek_setup_devlink_resources (struct dsa_switch *ds) { -struct devlink_resource_size_params size_params; +struct devlink_resource_size_params size_vlan_params; +struct devlink_resource_size_params size_fdb_params;struct hellcreek *hellcreek = ds->priv;int err; -devlink_resource_size_params_init (&size_params,VLAN_N_VID , +devlink_resource_size_params_init (&size_vlan_params,VLAN_N_VID ,VLAN_N_VID ,1 ,DEVLINK_RESOURCE_UNIT_ENTRY ); +devlink_resource_size_params_init (&size_fdb_params, + hellcreek->fdb_entries, + hellcreek->fdb_entries, +1 ,DEVLINK_RESOURCE_UNIT_ENTRY ); + err =dsa_devlink_resource_register (ds,"VLAN" ,VLAN_N_VID ,HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE ,DEVLINK_RESOURCE_ID_PARENT_TOP , - &size_params); + &size_vlan_params); +if (err) + goto out; + + err =dsa_devlink_resource_register (ds,"FDB" , hellcreek->fdb_entries, +HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE , +DEVLINK_RESOURCE_ID_PARENT_TOP , + &size_fdb_params);if (err) goto out;
@@ -1037,6 +1064,11 @@ static int hellcreek_setup_devlink_resources(struct dsa_switch *ds) hellcreek_devlink_vlan_table_get, hellcreek); +dsa_devlink_resource_occ_get_register (ds, +HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE , + hellcreek_devlink_fdb_table_get, + hellcreek); +return 0 ; out:
drivers/net/dsa/hirschmann/hellcreek.h +1 -0
@@ -301,6 +301,7 @@ struct hellcreek {/* Devlink resources */ enum hellcreek_devlink_resource_id {HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE , +HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE , };#endif /* _HELLCREEK_H_ */
Signature · 1 line
2.26.2
Re: [PATCH net-next 2/2] net: dsa: hellcreek: Report FDB table occupancy
Quoted 10 lines · Kurt Kanzenbach
Report the FDB table size and occupancy via devlink. The actual size depends on the used Hellcreek version:
|root@tsn:~# devlink resource show platform/ff240000.switch |platform/ff240000.switch: | name VLAN size 4096 occ 2 unit entry dpipe_tables none | name FDB size 256 occ 6 unit entry dpipe_tables noneSuggested-by Florian Fainelli <[email protected]>Signed-off-by Kurt Kanzenbach <[email protected]>
Signature · 1 line
Florian
Vladimir Oltean
maintainerQuoted 5 lines · Kurt Kanzenbach
Florian, Andrew and Vladimir suggested at some point to use devlink for reporting tables, features and debugging counters instead of using debugfs and printk.
So, start by reporting the VLAN and FDB table sizes.
I don't remember having suggested that, but nonetheless it doesn't seem like a bad idea.
By the way, your email landed in my spam folder, I just noticed the patches by accident on patchwork.
Sorry, I am not competent enough in email headers to tell you the reason why gmail flagged you.
Why is this message in spam?
It is in violation of Google's recommended email sender guidelines.
Quoted 9 lines · Vladimir Oltean
Quoted 5 lines · Kurt Kanzenbach
Florian, Andrew and Vladimir suggested at some point to use devlink for reporting tables, features and debugging counters instead of using debugfs and printk.
So, start by reporting the VLAN and FDB table sizes.
I don't remember having suggested that, but nonetheless it doesn't seem like a bad idea.
If I remember correctly, you also mentioned to use devlink to dump the databases via regions.
Quoted 10 lines
By the way, your email landed in my spam folder, I just noticed the patches by accident on patchwork.
Sorry, I am not competent enough in email headers to tell you the reason why gmail flagged you.
Why is this message in spam?
It is in violation of Google's recommended email sender guidelines.
Thanks. I'll look into my setup.
Thanks,
Kurt
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Sat, 30 Jan 2021 14:59:32 +0100 you wrote:
Hi,
Florian, Andrew and Vladimir suggested at some point to use devlink for reporting tables, features and debugging counters instead of using debugfs and printk.
So, start by reporting the VLAN and FDB table sizes.
[...]
Here is the summary with links:
- [net-next,1/2] net: dsa: hellcreek: Report VLAN table occupancy
https://git.kernel.org/netdev/net-next/c/7f976d5cf16d - [net-next,2/2] net: dsa: hellcreek: Report FDB table occupancy https://git.kernel.org/netdev/net-next/c/8486e83fe1d8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html