Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

devlink: bump the instance index directly when iterating

Browse Source 
commit d772781964415c63759572b917e21c4f7ec08d9f upstream.

xa_find_after() is designed to handle multi-index entries correctly.
If a xarray has two entries one which spans indexes 0-3 and one at
index 4 xa_find_after(0) will return the entry at index 4.

Having to juggle the two callbacks, however, is unnecessary in case
of the devlink xarray, as there is 1:1 relationship with indexes.

Always use xa_find() and increment the index manually.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ Ido: Moved the changes from core.c and devl_internal.h to leftover.c ]
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jakub Kicinski 2023-01-05 22:33:54 -08:00 committed by Greg Kroah-Hartman
parent 031f06fd75
commit eff23e59b7
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
net/devlink/leftover.c
View File

@ -289,15 +289,13 @@ void devl_unlock(struct devlink *devlink)
EXPORT_SYMBOL_GPL(devl_unlock); EXPORT_SYMBOL_GPL(devl_unlock);
static struct devlink * static struct devlink *
devlinks_xa_find_get(struct net *net, unsigned long *indexp, devlinks_xa_find_get(struct net *net, unsigned long *indexp)
void * (*xa_find_fn)(struct xarray *, unsigned long *,
unsigned long, xa_mark_t))
{ {
struct devlink *devlink; struct devlink *devlink = NULL;
rcu_read_lock(); rcu_read_lock();
retry: retry:
devlink = xa_find_fn(&devlinks, indexp, ULONG_MAX, DEVLINK_REGISTERED); devlink = xa_find(&devlinks, indexp, ULONG_MAX, DEVLINK_REGISTERED);
if (!devlink) if (!devlink)
goto unlock; goto unlock;
@ -306,31 +304,20 @@ retry:
* This prevents live-lock of devlink_unregister() wait for completion. * This prevents live-lock of devlink_unregister() wait for completion.
*/ */
if (xa_get_mark(&devlinks, *indexp, DEVLINK_UNREGISTERING)) if (xa_get_mark(&devlinks, *indexp, DEVLINK_UNREGISTERING))
goto retry; goto next;
/* For a possible retry, the xa_find_after() should be always used */
xa_find_fn = xa_find_after;
if (!devlink_try_get(devlink)) if (!devlink_try_get(devlink))
goto retry; goto next;
if (!net_eq(devlink_net(devlink), net)) { if (!net_eq(devlink_net(devlink), net)) {
devlink_put(devlink); devlink_put(devlink);
goto retry; goto next;
} }
unlock: unlock:
rcu_read_unlock(); rcu_read_unlock();
return devlink; return devlink;
} next:
(*indexp)++;
static struct devlink *devlinks_xa_find_get_first(struct net *net, goto retry;
unsigned long *indexp)
{
return devlinks_xa_find_get(net, indexp, xa_find);
}
static struct devlink *devlinks_xa_find_get_next(struct net *net,
unsigned long *indexp)
{
return devlinks_xa_find_get(net, indexp, xa_find_after);
} }
/* Iterate over devlink pointers which were possible to get reference to. /* Iterate over devlink pointers which were possible to get reference to.
@ -338,9 +325,7 @@ static struct devlink *devlinks_xa_find_get_next(struct net *net,
* in loop body in order to release the reference. * in loop body in order to release the reference.
*/ */
#define devlinks_xa_for_each_registered_get(net, index, devlink) \ #define devlinks_xa_for_each_registered_get(net, index, devlink) \
for (index = 0, \ for (index = 0; (devlink = devlinks_xa_find_get(net, &index)); index++)
devlink = devlinks_xa_find_get_first(net, &index); \
devlink; devlink = devlinks_xa_find_get_next(net, &index))
static struct devlink *devlink_get_from_attrs(struct net *net, static struct devlink *devlink_get_from_attrs(struct net *net,
struct nlattr **attrs) struct nlattr **attrs)