net/mlx5e: E-Switch, Add extack messages to devlink callbacks
authorEli Britstein <elibr@mellanox.com>
Sun, 5 Aug 2018 11:32:33 +0000 (14:32 +0300)
committerSaeed Mahameed <saeedm@mellanox.com>
Wed, 3 Oct 2018 23:17:58 +0000 (16:17 -0700)
Return extack messages for failures in the e-switch devlink callbacks.
Messages provide reasons for not being able to issue the operation.

Signed-off-by: Eli Britstein <elibr@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

index eee34ffcf2428141da42c3a60ec265c114399986..a35a2310f8718f0a7ae67f9859aaae20d41063b0 100644 (file)
@@ -816,24 +816,29 @@ static int esw_offloads_start(struct mlx5_eswitch *esw,
        int err, err1, num_vfs = esw->dev->priv.sriov.num_vfs;
 
        if (esw->mode != SRIOV_LEGACY) {
        int err, err1, num_vfs = esw->dev->priv.sriov.num_vfs;
 
        if (esw->mode != SRIOV_LEGACY) {
-               esw_warn(esw->dev, "Can't set offloads mode, SRIOV legacy not enabled\n");
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Can't set offloads mode, SRIOV legacy not enabled");
                return -EINVAL;
        }
 
        mlx5_eswitch_disable_sriov(esw);
        err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_OFFLOADS);
        if (err) {
                return -EINVAL;
        }
 
        mlx5_eswitch_disable_sriov(esw);
        err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_OFFLOADS);
        if (err) {
-               esw_warn(esw->dev, "Failed setting eswitch to offloads, err %d\n", err);
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Failed setting eswitch to offloads");
                err1 = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);
                err1 = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);
-               if (err1)
-                       esw_warn(esw->dev, "Failed setting eswitch back to legacy, err %d\n", err1);
+               if (err1) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Failed setting eswitch back to legacy");
+               }
        }
        if (esw->offloads.inline_mode == MLX5_INLINE_MODE_NONE) {
                if (mlx5_eswitch_inline_mode_get(esw,
                                                 num_vfs,
                                                 &esw->offloads.inline_mode)) {
                        esw->offloads.inline_mode = MLX5_INLINE_MODE_L2;
        }
        if (esw->offloads.inline_mode == MLX5_INLINE_MODE_NONE) {
                if (mlx5_eswitch_inline_mode_get(esw,
                                                 num_vfs,
                                                 &esw->offloads.inline_mode)) {
                        esw->offloads.inline_mode = MLX5_INLINE_MODE_L2;
-                       esw_warn(esw->dev, "Inline mode is different between vports\n");
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Inline mode is different between vports");
                }
        }
        return err;
                }
        }
        return err;
@@ -982,10 +987,12 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw,
        mlx5_eswitch_disable_sriov(esw);
        err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);
        if (err) {
        mlx5_eswitch_disable_sriov(esw);
        err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);
        if (err) {
-               esw_warn(esw->dev, "Failed setting eswitch to legacy, err %d\n", err);
+               NL_SET_ERR_MSG_MOD(extack, "Failed setting eswitch to legacy");
                err1 = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_OFFLOADS);
                err1 = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_OFFLOADS);
-               if (err1)
-                       esw_warn(esw->dev, "Failed setting eswitch back to offloads, err %d\n", err);
+               if (err1) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Failed setting eswitch back to offloads");
+               }
        }
 
        /* enable back PF RoCE */
        }
 
        /* enable back PF RoCE */
@@ -1151,14 +1158,15 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode,
                        return 0;
                /* fall through */
        case MLX5_CAP_INLINE_MODE_L2:
                        return 0;
                /* fall through */
        case MLX5_CAP_INLINE_MODE_L2:
-               esw_warn(dev, "Inline mode can't be set\n");
+               NL_SET_ERR_MSG_MOD(extack, "Inline mode can't be set");
                return -EOPNOTSUPP;
        case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:
                break;
        }
 
        if (esw->offloads.num_flows > 0) {
                return -EOPNOTSUPP;
        case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:
                break;
        }
 
        if (esw->offloads.num_flows > 0) {
-               esw_warn(dev, "Can't set inline mode when flows are configured\n");
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Can't set inline mode when flows are configured");
                return -EOPNOTSUPP;
        }
 
                return -EOPNOTSUPP;
        }
 
@@ -1169,8 +1177,8 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode,
        for (vport = 1; vport < esw->enabled_vports; vport++) {
                err = mlx5_modify_nic_vport_min_inline(dev, vport, mlx5_mode);
                if (err) {
        for (vport = 1; vport < esw->enabled_vports; vport++) {
                err = mlx5_modify_nic_vport_min_inline(dev, vport, mlx5_mode);
                if (err) {
-                       esw_warn(dev, "Failed to set min inline on vport %d\n",
-                                vport);
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Failed to set min inline on vport");
                        goto revert_inline_mode;
                }
        }
                        goto revert_inline_mode;
                }
        }
@@ -1264,7 +1272,8 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap,
                return 0;
 
        if (esw->offloads.num_flows > 0) {
                return 0;
 
        if (esw->offloads.num_flows > 0) {
-               esw_warn(dev, "Can't set encapsulation when flows are configured\n");
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Can't set encapsulation when flows are configured");
                return -EOPNOTSUPP;
        }
 
                return -EOPNOTSUPP;
        }
 
@@ -1273,7 +1282,8 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap,
        esw->offloads.encap = encap;
        err = esw_create_offloads_fast_fdb_table(esw);
        if (err) {
        esw->offloads.encap = encap;
        err = esw_create_offloads_fast_fdb_table(esw);
        if (err) {
-               esw_warn(esw->dev, "Failed re-creating fast FDB table, err %d\n", err);
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Failed re-creating fast FDB table");
                esw->offloads.encap = !encap;
                (void)esw_create_offloads_fast_fdb_table(esw);
        }
                esw->offloads.encap = !encap;
                (void)esw_create_offloads_fast_fdb_table(esw);
        }