devlink: propagate extack down to health reporter ops

During health reporter operations, driver might want to fill-up
the extack message, so propagate extack down to the health reporter ops.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index e664392dccc0e3580bdb44943b4663894f671562..ff1bc0ec2e7ccea3dffa6b99bb810cfe34704114 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -16,7 +16,8 @@
 #include "bnxt_devlink.h"
 
 static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
-                                    struct devlink_fmsg *fmsg)
+                                    struct devlink_fmsg *fmsg,
+                                    struct netlink_ext_ack *extack)
 {
        struct bnxt *bp = devlink_health_reporter_priv(reporter);
        struct bnxt_fw_health *health = bp->fw_health;
@@ -66,7 +67,8 @@ static const struct devlink_health_reporter_ops bnxt_dl_fw_reporter_ops = {
 };
 
 static int bnxt_fw_reset_recover(struct devlink_health_reporter *reporter,
-                                void *priv_ctx)
+                                void *priv_ctx,
+                                struct netlink_ext_ack *extack)
 {
        struct bnxt *bp = devlink_health_reporter_priv(reporter);
 
@@ -84,7 +86,8 @@ struct devlink_health_reporter_ops bnxt_dl_fw_reset_reporter_ops = {
 };
 
 static int bnxt_fw_fatal_recover(struct devlink_health_reporter *reporter,
-                                void *priv_ctx)
+                                void *priv_ctx,
+                                struct netlink_ext_ack *extack)
 {
        struct bnxt *bp = devlink_health_reporter_priv(reporter);
        struct bnxt_fw_reporter_ctx *fw_reporter_ctx = priv_ctx;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index b860569d4247284d77983aae3c87f6fbcfb339bd..6c72b592315bccb284039895b17060155137e42e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -222,7 +222,8 @@ static int mlx5e_rx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx)
 }
 
 static int mlx5e_rx_reporter_recover(struct devlink_health_reporter *reporter,
-                                    void *context)
+                                    void *context,
+                                    struct netlink_ext_ack *extack)
 {
        struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
        struct mlx5e_err_ctx *err_ctx = context;
@@ -301,7 +302,8 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
 }
 
 static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
-                                     struct devlink_fmsg *fmsg)
+                                     struct devlink_fmsg *fmsg,
+                                     struct netlink_ext_ack *extack)
 {
        struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
        struct mlx5e_params *params = &priv->channels.params;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index bfed558637c2ea9d164ecd509312198195e8b926..b468549e96ffd5e87bed705d6eda6abe77b43962 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -135,7 +135,8 @@ static int mlx5e_tx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx)
 }
 
 static int mlx5e_tx_reporter_recover(struct devlink_health_reporter *reporter,
-                                    void *context)
+                                    void *context,
+                                    struct netlink_ext_ack *extack)
 {
        struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
        struct mlx5e_err_ctx *err_ctx = context;
@@ -205,7 +206,8 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg,
 }
 
 static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
-                                     struct devlink_fmsg *fmsg)
+                                     struct devlink_fmsg *fmsg,
+                                     struct netlink_ext_ack *extack)
 {
        struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);
        struct mlx5e_txqsq *generic_sq = priv->txq2sq[0];

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index d685122d9ff761794a7f89d860a90e25801f29fc..be3c3c704bfc04b3adb4646e7e1d85fb251c6a5e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -390,7 +390,8 @@ static void print_health_info(struct mlx5_core_dev *dev)
 
 static int
 mlx5_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
-                         struct devlink_fmsg *fmsg)
+                         struct devlink_fmsg *fmsg,
+                         struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
        struct mlx5_core_health *health = &dev->priv.health;
@@ -491,7 +492,8 @@ mlx5_fw_reporter_heath_buffer_data_put(struct mlx5_core_dev *dev,
 
 static int
 mlx5_fw_reporter_dump(struct devlink_health_reporter *reporter,
-                     struct devlink_fmsg *fmsg, void *priv_ctx)
+                     struct devlink_fmsg *fmsg, void *priv_ctx,
+                     struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
        int err;
@@ -545,7 +547,8 @@ static const struct devlink_health_reporter_ops mlx5_fw_reporter_ops = {
 
 static int
 mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
-                              void *priv_ctx)
+                              void *priv_ctx,
+                              struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
 
@@ -555,7 +558,8 @@ mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,
 #define MLX5_CR_DUMP_CHUNK_SIZE 256
 static int
 mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
-                           struct devlink_fmsg *fmsg, void *priv_ctx)
+                           struct devlink_fmsg *fmsg, void *priv_ctx,
+                           struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
        u32 crdump_size = dev->priv.health.crdump_size;

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 4095657fc23f185ff0ff29ba44f862336960d20c..6bf3b9e0595ae64416be79380fc9abe2523505d6 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -507,11 +507,13 @@ enum devlink_health_reporter_state {
 struct devlink_health_reporter_ops {
        char *name;
        int (*recover)(struct devlink_health_reporter *reporter,
-                      void *priv_ctx);
+                      void *priv_ctx, struct netlink_ext_ack *extack);
        int (*dump)(struct devlink_health_reporter *reporter,
-                   struct devlink_fmsg *fmsg, void *priv_ctx);
+                   struct devlink_fmsg *fmsg, void *priv_ctx,
+                   struct netlink_ext_ack *extack);
        int (*diagnose)(struct devlink_health_reporter *reporter,
-                       struct devlink_fmsg *fmsg);
+                       struct devlink_fmsg *fmsg,
+                       struct netlink_ext_ack *extack);
 };
 
 /**

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 95887462eecfbcf7faf9cabbfb970ea52c03e4cc..97e9a22469295d61ed831c2101dca0905e27ac76 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -4847,7 +4847,7 @@ EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update);
 
 static int
 devlink_health_reporter_recover(struct devlink_health_reporter *reporter,
-                               void *priv_ctx)
+                               void *priv_ctx, struct netlink_ext_ack *extack)
 {
        int err;
 
@@ -4857,7 +4857,7 @@ devlink_health_reporter_recover(struct devlink_health_reporter *reporter,
        if (!reporter->ops->recover)
                return -EOPNOTSUPP;
 
-       err = reporter->ops->recover(reporter, priv_ctx);
+       err = reporter->ops->recover(reporter, priv_ctx, extack);
        if (err)
                return err;
 
@@ -4878,7 +4878,8 @@ devlink_health_dump_clear(struct devlink_health_reporter *reporter)
 }
 
 static int devlink_health_do_dump(struct devlink_health_reporter *reporter,
-                                 void *priv_ctx)
+                                 void *priv_ctx,
+                                 struct netlink_ext_ack *extack)
 {
        int err;
 
@@ -4899,7 +4900,7 @@ static int devlink_health_do_dump(struct devlink_health_reporter *reporter,
                goto dump_err;
 
        err = reporter->ops->dump(reporter, reporter->dump_fmsg,
-                                 priv_ctx);
+                                 priv_ctx, extack);
        if (err)
                goto dump_err;
 
@@ -4946,11 +4947,12 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
 
        mutex_lock(&reporter->dump_lock);
        /* store current dump of current error, for later analysis */
-       devlink_health_do_dump(reporter, priv_ctx);
+       devlink_health_do_dump(reporter, priv_ctx, NULL);
        mutex_unlock(&reporter->dump_lock);
 
        if (reporter->auto_recover)
-               return devlink_health_reporter_recover(reporter, priv_ctx);
+               return devlink_health_reporter_recover(reporter,
+                                                      priv_ctx, NULL);
 
        return 0;
 }
@@ -5188,7 +5190,7 @@ static int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
        if (!reporter)
                return -EINVAL;
 
-       err = devlink_health_reporter_recover(reporter, NULL);
+       err = devlink_health_reporter_recover(reporter, NULL, info->extack);
 
        devlink_health_reporter_put(reporter);
        return err;
@@ -5221,7 +5223,7 @@ static int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
        if (err)
                goto out;
 
-       err = reporter->ops->diagnose(reporter, fmsg);
+       err = reporter->ops->diagnose(reporter, fmsg, info->extack);
        if (err)
                goto out;
 
@@ -5256,7 +5258,7 @@ devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
        }
        mutex_lock(&reporter->dump_lock);
        if (!start) {
-               err = devlink_health_do_dump(reporter, NULL);
+               err = devlink_health_do_dump(reporter, NULL, cb->extack);
                if (err)
                        goto unlock;
                cb->args[1] = reporter->dump_ts;