* [PATCH] mlx5: simplify EQ interrupt polling logic
@ 2024-10-23 20:51 Caleb Sander Mateos
2024-10-24 16:59 ` Tariq Toukan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Caleb Sander Mateos @ 2024-10-23 20:51 UTC (permalink / raw)
To: Saeed Mahameed, Leon Romanovsky, Tariq Toukan, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Caleb Sander Mateos, netdev, linux-rdma, linux-kernel
Use a while loop in mlx5_eq_comp_int() and mlx5_eq_async_int() to
clarify the EQE polling logic. This consolidates the next_eqe_sw() calls
for the first and subequent iterations. It also avoids a goto. Turn the
num_eqes < MLX5_EQ_POLLING_BUDGET check into a break condition.
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
---
drivers/net/ethernet/mellanox/mlx5/core/eq.c | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 68cb86b37e56..859dcf09b770 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -114,15 +114,11 @@ static int mlx5_eq_comp_int(struct notifier_block *nb,
struct mlx5_eq *eq = &eq_comp->core;
struct mlx5_eqe *eqe;
int num_eqes = 0;
u32 cqn = -1;
- eqe = next_eqe_sw(eq);
- if (!eqe)
- goto out;
-
- do {
+ while ((eqe = next_eqe_sw(eq))) {
struct mlx5_core_cq *cq;
/* Make sure we read EQ entry contents after we've
* checked the ownership bit.
*/
@@ -140,13 +136,14 @@ static int mlx5_eq_comp_int(struct notifier_block *nb,
"Completion event for bogus CQ 0x%x\n", cqn);
}
++eq->cons_index;
- } while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
+ if (++num_eqes >= MLX5_EQ_POLLING_BUDGET)
+ break;
+ }
-out:
eq_update_ci(eq, 1);
if (cqn != -1)
tasklet_schedule(&eq_comp->tasklet_ctx.task);
@@ -213,15 +210,11 @@ static int mlx5_eq_async_int(struct notifier_block *nb,
eqt = dev->priv.eq_table;
recovery = action == ASYNC_EQ_RECOVER;
mlx5_eq_async_int_lock(eq_async, recovery, &flags);
- eqe = next_eqe_sw(eq);
- if (!eqe)
- goto out;
-
- do {
+ while ((eqe = next_eqe_sw(eq))) {
/*
* Make sure we read EQ entry contents after we've
* checked the ownership bit.
*/
dma_rmb();
@@ -229,13 +222,14 @@ static int mlx5_eq_async_int(struct notifier_block *nb,
atomic_notifier_call_chain(&eqt->nh[eqe->type], eqe->type, eqe);
atomic_notifier_call_chain(&eqt->nh[MLX5_EVENT_TYPE_NOTIFY_ANY], eqe->type, eqe);
++eq->cons_index;
- } while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
+ if (++num_eqes >= MLX5_EQ_POLLING_BUDGET)
+ break;
+ }
-out:
eq_update_ci(eq, 1);
mlx5_eq_async_int_unlock(eq_async, recovery, &flags);
return unlikely(recovery) ? num_eqes : 0;
}
--
2.45.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mlx5: simplify EQ interrupt polling logic
2024-10-23 20:51 [PATCH] mlx5: simplify EQ interrupt polling logic Caleb Sander Mateos
@ 2024-10-24 16:59 ` Tariq Toukan
2024-10-25 9:03 ` Simon Horman
2024-10-30 0:29 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Tariq Toukan @ 2024-10-24 16:59 UTC (permalink / raw)
To: Caleb Sander Mateos, Saeed Mahameed, Leon Romanovsky,
Tariq Toukan, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-rdma, linux-kernel
On 23/10/2024 23:51, Caleb Sander Mateos wrote:
> Use a while loop in mlx5_eq_comp_int() and mlx5_eq_async_int() to
> clarify the EQE polling logic. This consolidates the next_eqe_sw() calls
> for the first and subequent iterations. It also avoids a goto. Turn the
> num_eqes < MLX5_EQ_POLLING_BUDGET check into a break condition.
>
> Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/eq.c | 22 +++++++-------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> index 68cb86b37e56..859dcf09b770 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> @@ -114,15 +114,11 @@ static int mlx5_eq_comp_int(struct notifier_block *nb,
> struct mlx5_eq *eq = &eq_comp->core;
> struct mlx5_eqe *eqe;
> int num_eqes = 0;
> u32 cqn = -1;
>
> - eqe = next_eqe_sw(eq);
> - if (!eqe)
> - goto out;
> -
> - do {
> + while ((eqe = next_eqe_sw(eq))) {
> struct mlx5_core_cq *cq;
>
> /* Make sure we read EQ entry contents after we've
> * checked the ownership bit.
> */
> @@ -140,13 +136,14 @@ static int mlx5_eq_comp_int(struct notifier_block *nb,
> "Completion event for bogus CQ 0x%x\n", cqn);
> }
>
> ++eq->cons_index;
>
> - } while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
> + if (++num_eqes >= MLX5_EQ_POLLING_BUDGET)
> + break;
> + }
>
> -out:
> eq_update_ci(eq, 1);
>
> if (cqn != -1)
> tasklet_schedule(&eq_comp->tasklet_ctx.task);
>
> @@ -213,15 +210,11 @@ static int mlx5_eq_async_int(struct notifier_block *nb,
> eqt = dev->priv.eq_table;
>
> recovery = action == ASYNC_EQ_RECOVER;
> mlx5_eq_async_int_lock(eq_async, recovery, &flags);
>
> - eqe = next_eqe_sw(eq);
> - if (!eqe)
> - goto out;
> -
> - do {
> + while ((eqe = next_eqe_sw(eq))) {
> /*
> * Make sure we read EQ entry contents after we've
> * checked the ownership bit.
> */
> dma_rmb();
> @@ -229,13 +222,14 @@ static int mlx5_eq_async_int(struct notifier_block *nb,
> atomic_notifier_call_chain(&eqt->nh[eqe->type], eqe->type, eqe);
> atomic_notifier_call_chain(&eqt->nh[MLX5_EVENT_TYPE_NOTIFY_ANY], eqe->type, eqe);
>
> ++eq->cons_index;
>
> - } while ((++num_eqes < MLX5_EQ_POLLING_BUDGET) && (eqe = next_eqe_sw(eq)));
> + if (++num_eqes >= MLX5_EQ_POLLING_BUDGET)
> + break;
> + }
>
> -out:
> eq_update_ci(eq, 1);
> mlx5_eq_async_int_unlock(eq_async, recovery, &flags);
>
> return unlikely(recovery) ? num_eqes : 0;
> }
LGTM.
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mlx5: simplify EQ interrupt polling logic
2024-10-23 20:51 [PATCH] mlx5: simplify EQ interrupt polling logic Caleb Sander Mateos
2024-10-24 16:59 ` Tariq Toukan
@ 2024-10-25 9:03 ` Simon Horman
2024-10-30 0:29 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2024-10-25 9:03 UTC (permalink / raw)
To: Caleb Sander Mateos
Cc: Saeed Mahameed, Leon Romanovsky, Tariq Toukan, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
netdev, linux-rdma, linux-kernel
On Wed, Oct 23, 2024 at 02:51:12PM -0600, Caleb Sander Mateos wrote:
> Use a while loop in mlx5_eq_comp_int() and mlx5_eq_async_int() to
> clarify the EQE polling logic. This consolidates the next_eqe_sw() calls
> for the first and subequent iterations. It also avoids a goto. Turn the
> num_eqes < MLX5_EQ_POLLING_BUDGET check into a break condition.
>
> Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mlx5: simplify EQ interrupt polling logic
2024-10-23 20:51 [PATCH] mlx5: simplify EQ interrupt polling logic Caleb Sander Mateos
2024-10-24 16:59 ` Tariq Toukan
2024-10-25 9:03 ` Simon Horman
@ 2024-10-30 0:29 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2024-10-30 0:29 UTC (permalink / raw)
To: Caleb Sander Mateos
Cc: Saeed Mahameed, Leon Romanovsky, Tariq Toukan, Andrew Lunn,
David S. Miller, Eric Dumazet, Paolo Abeni, netdev, linux-rdma,
linux-kernel
On Wed, 23 Oct 2024 14:51:12 -0600 Caleb Sander Mateos wrote:
> Use a while loop in mlx5_eq_comp_int() and mlx5_eq_async_int() to
> clarify the EQE polling logic. This consolidates the next_eqe_sw() calls
> for the first and subequent iterations. It also avoids a goto. Turn the
> num_eqes < MLX5_EQ_POLLING_BUDGET check into a break condition.
Applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-30 0:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-23 20:51 [PATCH] mlx5: simplify EQ interrupt polling logic Caleb Sander Mateos
2024-10-24 16:59 ` Tariq Toukan
2024-10-25 9:03 ` Simon Horman
2024-10-30 0:29 ` Jakub Kicinski
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).