Allow DSA drivers to make use of devlink port regions, via simple wrappers.
Signed-off-by: Andrew Lunn <and...@lunn.ch> --- include/net/dsa.h | 5 +++++ net/core/devlink.c | 3 +-- net/dsa/dsa.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index d16057c5987a..01da896b2998 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -665,6 +665,11 @@ struct devlink_region * dsa_devlink_region_create(struct dsa_switch *ds, const struct devlink_region_ops *ops, u32 region_max_snapshots, u64 region_size); +struct devlink_region * +dsa_devlink_port_region_create(struct dsa_switch *ds, + int port, + const struct devlink_port_region_ops *ops, + u32 region_max_snapshots, u64 region_size); void dsa_devlink_region_destroy(struct devlink_region *region); struct dsa_port *dsa_port_from_netdev(struct net_device *netdev); diff --git a/net/core/devlink.c b/net/core/devlink.c index 66469cdcdc1e..4701ec17f3da 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -4292,7 +4292,6 @@ static int devlink_nl_cmd_region_get_port_dumpit(struct sk_buff *msg, } out: - mutex_unlock(&devlink_mutex); return err; } @@ -4330,7 +4329,7 @@ static int devlink_nl_cmd_region_get_devlink_dumpit(struct sk_buff *msg, } out: - mutex_unlock(&devlink_mutex); + mutex_unlock(&devlink->lock); return err; } diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 5c18c0214aac..97fcabdeccec 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -414,6 +414,20 @@ dsa_devlink_region_create(struct dsa_switch *ds, } EXPORT_SYMBOL_GPL(dsa_devlink_region_create); +struct devlink_region * +dsa_devlink_port_region_create(struct dsa_switch *ds, + int port, + const struct devlink_port_region_ops *ops, + u32 region_max_snapshots, u64 region_size) +{ + struct dsa_port *dp = dsa_to_port(ds, port); + + return devlink_port_region_create(&dp->devlink_port, ops, + region_max_snapshots, + region_size); +} +EXPORT_SYMBOL_GPL(dsa_devlink_port_region_create); + void dsa_devlink_region_destroy(struct devlink_region *region) { devlink_region_destroy(region); -- 2.28.0