* [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
@ 2023-03-24 2:55 Jiapeng Chong
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jiapeng Chong @ 2023-03-24 2:55 UTC (permalink / raw)
To: saeedm
Cc: leon, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, Jiapeng Chong, Abaci Robot
The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'err'.
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c:104 mlx5e_rx_reporter_err_icosq_cqe_recover() warn: missing error code 'err'.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4601
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 b621f735cdc3..b66183204be3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -100,8 +100,10 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx)
goto out;
}
- if (state != MLX5_SQC_STATE_ERR)
+ if (state != MLX5_SQC_STATE_ERR) {
+ err = -EINVAL;
goto out;
+ }
mlx5e_deactivate_rq(rq);
if (xskrq)
--
2.20.1.7.g153144c
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
2023-03-24 2:55 [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover() Jiapeng Chong
@ 2023-03-24 2:55 ` Jiapeng Chong
2023-03-24 12:17 ` Steen.Hegelund
2023-03-29 10:32 ` Leon Romanovsky
2023-03-24 12:16 ` [PATCH 1/2] " Steen.Hegelund
2023-03-29 10:31 ` Leon Romanovsky
2 siblings, 2 replies; 6+ messages in thread
From: Jiapeng Chong @ 2023-03-24 2:55 UTC (permalink / raw)
To: saeedm
Cc: leon, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, Jiapeng Chong, Abaci Robot
The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'err'.
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c:105 mlx5e_tx_reporter_err_cqe_recover() warn: missing error code 'err'.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4600
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 44c1926843a1..5e2e2449668d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -101,8 +101,10 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx)
goto out;
}
- if (state != MLX5_SQC_STATE_ERR)
+ if (state != MLX5_SQC_STATE_ERR) {
+ err = -EINVAL;
goto out;
+ }
mlx5e_tx_disable_queue(sq->txq);
--
2.20.1.7.g153144c
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
2023-03-24 2:55 [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover() Jiapeng Chong
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
@ 2023-03-24 12:16 ` Steen.Hegelund
2023-03-29 10:31 ` Leon Romanovsky
2 siblings, 0 replies; 6+ messages in thread
From: Steen.Hegelund @ 2023-03-24 12:16 UTC (permalink / raw)
To: jiapeng.chong, saeedm
Cc: leon, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, abaci
Hi Jiapeng,
Looks good to me.
On Fri Mar 24, 2023 at 3:55 AM CET, Jiapeng Chong wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'err'.
>
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c:104 mlx5e_rx_reporter_err_icosq_cqe_recover() warn: missing error code 'err'.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4601
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 b621f735cdc3..b66183204be3 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> @@ -100,8 +100,10 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx)
> goto out;
> }
>
> - if (state != MLX5_SQC_STATE_ERR)
> + if (state != MLX5_SQC_STATE_ERR) {
> + err = -EINVAL;
> goto out;
> + }
>
> mlx5e_deactivate_rq(rq);
> if (xskrq)
> --
> 2.20.1.7.g153144c
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
BR
Steen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
@ 2023-03-24 12:17 ` Steen.Hegelund
2023-03-29 10:32 ` Leon Romanovsky
1 sibling, 0 replies; 6+ messages in thread
From: Steen.Hegelund @ 2023-03-24 12:17 UTC (permalink / raw)
To: jiapeng.chong, saeedm
Cc: leon, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, abaci
Hi Jiapeng,
This looks good too.
On Fri Mar 24, 2023 at 3:55 AM CET, Jiapeng Chong wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'err'.
>
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c:105 mlx5e_tx_reporter_err_cqe_recover() warn: missing error code 'err'.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4600
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 44c1926843a1..5e2e2449668d 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> @@ -101,8 +101,10 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx)
> goto out;
> }
>
> - if (state != MLX5_SQC_STATE_ERR)
> + if (state != MLX5_SQC_STATE_ERR) {
> + err = -EINVAL;
> goto out;
> + }
>
> mlx5e_tx_disable_queue(sq->txq);
>
> --
> 2.20.1.7.g153144c
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
BR
Steen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
2023-03-24 2:55 [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover() Jiapeng Chong
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
2023-03-24 12:16 ` [PATCH 1/2] " Steen.Hegelund
@ 2023-03-29 10:31 ` Leon Romanovsky
2 siblings, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2023-03-29 10:31 UTC (permalink / raw)
To: Jiapeng Chong
Cc: saeedm, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, Abaci Robot, Moshe Shemesh
On Fri, Mar 24, 2023 at 10:55:40AM +0800, Jiapeng Chong wrote:
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'err'.
>
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c:104 mlx5e_rx_reporter_err_icosq_cqe_recover() warn: missing error code 'err'.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4601
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 b621f735cdc3..b66183204be3 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
> @@ -100,8 +100,10 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx)
> goto out;
> }
>
> - if (state != MLX5_SQC_STATE_ERR)
> + if (state != MLX5_SQC_STATE_ERR) {
> + err = -EINVAL;
I'm not sure about correctness of this change. SQC is not in error
state, there is nothing to recover here.
Thanks
> goto out;
> + }
>
> mlx5e_deactivate_rq(rq);
> if (xskrq)
> --
> 2.20.1.7.g153144c
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover()
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
2023-03-24 12:17 ` Steen.Hegelund
@ 2023-03-29 10:32 ` Leon Romanovsky
1 sibling, 0 replies; 6+ messages in thread
From: Leon Romanovsky @ 2023-03-29 10:32 UTC (permalink / raw)
To: Jiapeng Chong
Cc: saeedm, davem, edumazet, kuba, pabeni, richardcochran, netdev,
linux-rdma, linux-kernel, Abaci Robot
On Fri, Mar 24, 2023 at 10:55:41AM +0800, Jiapeng Chong wrote:
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'err'.
>
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c:105 mlx5e_tx_reporter_err_cqe_recover() warn: missing error code 'err'.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4600
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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 44c1926843a1..5e2e2449668d 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
> @@ -101,8 +101,10 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx)
> goto out;
> }
>
> - if (state != MLX5_SQC_STATE_ERR)
> + if (state != MLX5_SQC_STATE_ERR) {
> + err = -EINVAL;
Same comment as for patch #1.
> goto out;
> + }
>
> mlx5e_tx_disable_queue(sq->txq);
>
> --
> 2.20.1.7.g153144c
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-29 10:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-24 2:55 [PATCH 1/2] net/mlx5e: Fix missing error code in mlx5e_rx_reporter_err_icosq_cqe_recover() Jiapeng Chong
2023-03-24 2:55 ` [PATCH 2/2] " Jiapeng Chong
2023-03-24 12:17 ` Steen.Hegelund
2023-03-29 10:32 ` Leon Romanovsky
2023-03-24 12:16 ` [PATCH 1/2] " Steen.Hegelund
2023-03-29 10:31 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).