devlink: Hold the instance lock in health callbacks

Let the core take the devlink instance lock around health callbacks and remove the now redundant locking in the drivers. Signed-off-by: Moshe Shemesh <moshe@nvidia.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
pop-os · Jul 29, 2022 · c90005b · c90005b
1 parent d3dbdc9
commit c90005b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -622,14 +622,8 @@ mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
  struct netlink_ext_ack *extack)
 {
  struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
- struct devlink *devlink = priv_to_devlink(dev);
- int ret;
 
- devl_lock(devlink);
- ret = mlx5_health_try_recover(dev);
- devl_unlock(devlink);
-
- return ret;
+ return mlx5_health_try_recover(dev);
 }
 
 static int

diff --git a/net/core/devlink.c b/net/core/devlink.c
@@ -7757,6 +7757,7 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
  enum devlink_health_reporter_state prev_health_state;
  struct devlink *devlink = reporter->devlink;
  unsigned long recover_ts_threshold;
+ int ret;
 
  /* write a log message of the current error */
  WARN_ON(!msg);
@@ -7790,11 +7791,14 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
  mutex_unlock(&reporter->dump_lock);
  }
 
- if (reporter->auto_recover)
- return devlink_health_reporter_recover(reporter,
- priv_ctx, NULL);
+ if (!reporter->auto_recover)
+ return 0;
 
- return 0;
+ devl_lock(devlink);
+ ret = devlink_health_reporter_recover(reporter, priv_ctx, NULL);
+ devl_unlock(devlink);
+
+ return ret;
 }
 EXPORT_SYMBOL_GPL(devlink_health_report);
 
@@ -9469,33 +9473,29 @@ static const struct genl_small_ops devlink_nl_ops[] = {
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_get_doit,
  .dumpit = devlink_nl_cmd_health_reporter_get_dumpit,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  /* can be retrieved by unprivileged users */
  },
  {
  .cmd = DEVLINK_CMD_HEALTH_REPORTER_SET,
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_set_doit,
  .flags = GENL_ADMIN_PERM,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  },
  {
  .cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_recover_doit,
  .flags = GENL_ADMIN_PERM,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  },
  {
  .cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_diagnose_doit,
  .flags = GENL_ADMIN_PERM,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  },
  {
  .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
@@ -9509,16 +9509,14 @@ static const struct genl_small_ops devlink_nl_ops[] = {
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_dump_clear_doit,
  .flags = GENL_ADMIN_PERM,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  },
  {
  .cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST,
  .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
  .doit = devlink_nl_cmd_health_reporter_test_doit,
  .flags = GENL_ADMIN_PERM,
- .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT |
- DEVLINK_NL_FLAG_NO_LOCK,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
  },
  {
  .cmd = DEVLINK_CMD_FLASH_UPDATE,