Patch "net/mlx5: Fix cmd error logging for manage pages cmd" has been added to the 5.19-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    net/mlx5: Fix cmd error logging for manage pages cmd

to the 5.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-mlx5-fix-cmd-error-logging-for-manage-pages-cmd.patch
and it can be found in the queue-5.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 84f7dfa5c04d080dcb7c735e1d68b1da2b3d5b85
Author: Roy Novich <royno@xxxxxxxxxx>
Date:   Wed Mar 30 17:59:27 2022 +0300

    net/mlx5: Fix cmd error logging for manage pages cmd
    
    [ Upstream commit 090f3e4f4089ab8041ed7d632c7851c2a42fcc10 ]
    
    When the driver unloads, give/reclaim_pages may fail as PF driver in
    teardown flow, current code will lead to the following kernel log print
    'failed reclaiming pages: err 0'.
    
    Fix it to get same behavior as before the cited commits,
    by calling mlx5_cmd_check before handling error state.
    mlx5_cmd_check will verify if the returned error is an actual error
    needed to be handled by the driver or not and will return an
    appropriate value.
    
    Fixes: 8d564292a166 ("net/mlx5: Remove redundant error on reclaim pages")
    Fixes: 4dac2f10ada0 ("net/mlx5: Remove redundant notify fail on give pages")
    Signed-off-by: Roy Novich <royno@xxxxxxxxxx>
    Reviewed-by: Moshe Shemesh <moshe@xxxxxxxxxx>
    Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index ec76a8b1acc1c..60596357bfc7a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -376,8 +376,8 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
 			goto out_dropped;
 		}
 	}
+	err = mlx5_cmd_check(dev, err, in, out);
 	if (err) {
-		err = mlx5_cmd_check(dev, err, in, out);
 		mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n",
 			       func_id, npages, err);
 		goto out_dropped;
@@ -524,10 +524,13 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
 		dev->priv.reclaim_pages_discard += npages;
 	}
 	/* if triggered by FW event and failed by FW then ignore */
-	if (event && err == -EREMOTEIO)
+	if (event && err == -EREMOTEIO) {
 		err = 0;
+		goto out_free;
+	}
+
+	err = mlx5_cmd_check(dev, err, in, out);
 	if (err) {
-		err = mlx5_cmd_check(dev, err, in, out);
 		mlx5_core_err(dev, "failed reclaiming pages: err %d\n", err);
 		goto out_free;
 	}