1 files changed, 31 insertions, 4 deletions

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 4a2fb94c44cf..e48680efe54a 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -471,6 +471,8 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
 
         if (devlink_nl_put_handle(msg, devlink))
                 goto nla_put_failure;
+        if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink->reload_failed))
+                goto nla_put_failure;
 
         genlmsg_end(msg, hdr);
         return 0;
@@ -2672,12 +2674,32 @@ devlink_resources_validate(struct devlink *devlink,
         return err;
 }
 
+static bool devlink_reload_supported(struct devlink *devlink)
+{
+        return devlink->ops->reload_down && devlink->ops->reload_up;
+}
+
+static void devlink_reload_failed_set(struct devlink *devlink,
+                                      bool reload_failed)
+{
+        if (devlink->reload_failed == reload_failed)
+                return;
+        devlink->reload_failed = reload_failed;
+        devlink_notify(devlink, DEVLINK_CMD_NEW);
+}
+
+bool devlink_is_reload_failed(const struct devlink *devlink)
+{
+        return devlink->reload_failed;
+}
+EXPORT_SYMBOL_GPL(devlink_is_reload_failed);
+
 static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
 {
         struct devlink *devlink = info->user_ptr[0];
         int err;
 
-        if (!devlink->ops->reload)
+        if (!devlink_reload_supported(devlink))
                 return -EOPNOTSUPP;
 
         err = devlink_resources_validate(devlink, NULL, info);
@@ -2685,7 +2707,12 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
                 NL_SET_ERR_MSG_MOD(info->extack, "resources size validation failed");
                 return err;
         }
-        return devlink->ops->reload(devlink, info->extack);
+        err = devlink->ops->reload_down(devlink, info->extack);
+        if (err)
+                return err;
+        err = devlink->ops->reload_up(devlink, info->extack);
+        devlink_reload_failed_set(devlink, !!err);
+        return err;
 }
 
 static int devlink_nl_flash_update_fill(struct sk_buff *msg,
@@ -7150,7 +7177,7 @@ __devlink_param_driverinit_value_set(struct devlink *devlink,
 int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,
                                        union devlink_param_value *init_val)
 {
-        if (!devlink->ops->reload)
+        if (!devlink_reload_supported(devlink))
                 return -EOPNOTSUPP;
 
         return __devlink_param_driverinit_value_get(&devlink->param_list,
@@ -7197,7 +7224,7 @@ int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
 {
         struct devlink *devlink = devlink_port->devlink;
 
-        if (!devlink->ops->reload)
+        if (!devlink_reload_supported(devlink))
                 return -EOPNOTSUPP;
 
         return __devlink_param_driverinit_value_get(&devlink_port->param_list,