devlink: Fix devlink parallel commands processing
BugLink: https://bugs.launchpad.net/bugs/2060097 [ Upstream commit d7d75124965aee23e5e4421d78376545cf070b0a ] Commit870c7ad4a5("devlink: protect devlink->dev by the instance lock") added devlink instance locking inside a loop that iterates over all the registered devlink instances on the machine in the pre-doit phase. This can lead to serialization of devlink commands over different devlink instances. For example: While the first devlink instance is executing firmware flash, all commands to other devlink instances on the machine are forced to wait until the first devlink finishes. Therefore, in the pre-doit phase, take the devlink instance lock only for the devlink instance the command is targeting. Devlink layer is taking a reference on the devlink instance, ensuring the devlink->dev pointer is valid. This reference taking was introduced by commita380687200("devlink: take device reference for devlink object"). Without this commit, it would not be safe to access devlink->dev lockless. Fixes:870c7ad4a5("devlink: protect devlink->dev by the instance lock") Signed-off-by: Shay Drory <shayd@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit d394d076ed52b71eabff7a11e0ad36489a466431) Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
committed by
Roxana Nicolescu
parent
4b8642c688
commit
d8b8e5a65a
@@ -193,12 +193,13 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs,
|
||||
devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);
|
||||
|
||||
devlinks_xa_for_each_registered_get(net, index, devlink) {
|
||||
devl_dev_lock(devlink, dev_lock);
|
||||
if (devl_is_registered(devlink) &&
|
||||
strcmp(devlink->dev->bus->name, busname) == 0 &&
|
||||
strcmp(dev_name(devlink->dev), devname) == 0)
|
||||
return devlink;
|
||||
devl_dev_unlock(devlink, dev_lock);
|
||||
if (strcmp(devlink->dev->bus->name, busname) == 0 &&
|
||||
strcmp(dev_name(devlink->dev), devname) == 0) {
|
||||
devl_dev_lock(devlink, dev_lock);
|
||||
if (devl_is_registered(devlink))
|
||||
return devlink;
|
||||
devl_dev_unlock(devlink, dev_lock);
|
||||
}
|
||||
devlink_put(devlink);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user