From: Cosmin Ratiu <[email protected]> Upcoming code will need to obtain a reference to locked nested-in devlink instances. Add helpers to lock, obtain an already locked reference and unlock/unref the nested-in instance.
Signed-off-by: Cosmin Ratiu <[email protected]> Reviewed-by: Carolina Jubran <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Signed-off-by: Tariq Toukan <[email protected]> --- net/devlink/core.c | 42 +++++++++++++++++++++++++++++++++++++ net/devlink/devl_internal.h | 3 +++ 2 files changed, 45 insertions(+) diff --git a/net/devlink/core.c b/net/devlink/core.c index eeb6a71f5f56..db11248df712 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -67,6 +67,48 @@ static void __devlink_rel_put(struct devlink_rel *rel) devlink_rel_free(rel); } +struct devlink *devlink_nested_in_get_lock(struct devlink_rel *rel) +{ + struct devlink *devlink; + + if (!rel) + return NULL; + devlink = devlinks_xa_get(rel->nested_in.devlink_index); + if (!devlink) + return NULL; + devl_lock(devlink); + if (devl_is_registered(devlink)) + return devlink; + devl_unlock(devlink); + devlink_put(devlink); + return NULL; +} + +/* Returns the nested in devlink object and validates its lock is held. */ +struct devlink *devlink_nested_in_get_locked(struct devlink_rel *rel) +{ + struct devlink *devlink; + unsigned long index; + + if (!rel) + return NULL; + index = rel->nested_in.devlink_index; + devlink = xa_find(&devlinks, &index, index, DEVLINK_REGISTERED); + if (devlink) + devl_assert_locked(devlink); + return devlink; +} + +void devlink_nested_in_put_unlock(struct devlink_rel *rel) +{ + struct devlink *devlink = devlink_nested_in_get_locked(rel); + + if (devlink) { + devl_unlock(devlink); + devlink_put(devlink); + } +} + static void devlink_rel_nested_in_notify_work(struct work_struct *work) { struct devlink_rel *rel = container_of(work, struct devlink_rel, diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index 7dfb7cdd2d23..3b4364677b18 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -136,6 +136,9 @@ typedef void devlink_rel_notify_cb_t(struct devlink *devlink, u32 obj_index); typedef void devlink_rel_cleanup_cb_t(struct devlink *devlink, u32 obj_index, u32 rel_index); +struct devlink *devlink_nested_in_get_lock(struct devlink_rel *rel); +struct devlink *devlink_nested_in_get_locked(struct devlink_rel *rel); +void devlink_nested_in_put_unlock(struct devlink_rel *rel); void devlink_rel_nested_in_clear(u32 rel_index); int devlink_rel_nested_in_add(u32 *rel_index, u32 devlink_index, u32 obj_index, devlink_rel_notify_cb_t *notify_cb, -- 2.44.0
