From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Aya Levin <ayal@nvidia.com>,
Tariq Toukan <tariqt@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: [net-next V2 08/13] net/mlx5e: Generalize RQ activation
Date: Thu, 25 Mar 2021 19:53:40 -0700 [thread overview]
Message-ID: <20210326025345.456475-9-saeed@kernel.org> (raw)
In-Reply-To: <20210326025345.456475-1-saeed@kernel.org>
From: Aya Levin <ayal@nvidia.com>
Support RQ activation for RQs without an ICOSQ in the main flow, like
existing trap-RQ and like PTP-RQ that will be introduced in the coming
patches in the patchset.
With this patch, remove the wrapper in traps to deactivate the trap-RQ.
Signed-off-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 15 ++-------------
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 ++++-
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
index 987035346cfc..d6e6641e9288 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
@@ -128,16 +128,6 @@ static void mlx5e_destroy_trap_direct_rq_tir(struct mlx5_core_dev *mdev, struct
mlx5e_destroy_tir(mdev, tir);
}
-static void mlx5e_activate_trap_rq(struct mlx5e_rq *rq)
-{
- set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
-}
-
-static void mlx5e_deactivate_trap_rq(struct mlx5e_rq *rq)
-{
- clear_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
-}
-
static void mlx5e_build_trap_params(struct mlx5_core_dev *mdev,
int max_mtu, u16 q_counter,
struct mlx5e_trap *t)
@@ -202,15 +192,14 @@ void mlx5e_close_trap(struct mlx5e_trap *trap)
static void mlx5e_activate_trap(struct mlx5e_trap *trap)
{
napi_enable(&trap->napi);
- mlx5e_activate_trap_rq(&trap->rq);
- napi_schedule(&trap->napi);
+ mlx5e_activate_rq(&trap->rq);
}
void mlx5e_deactivate_trap(struct mlx5e_priv *priv)
{
struct mlx5e_trap *trap = priv->en_trap;
- mlx5e_deactivate_trap_rq(&trap->rq);
+ mlx5e_deactivate_rq(&trap->rq);
napi_disable(&trap->napi);
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 08188b8b2d9e..06df647b2beb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -886,7 +886,10 @@ int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param,
void mlx5e_activate_rq(struct mlx5e_rq *rq)
{
set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
- mlx5e_trigger_irq(rq->icosq);
+ if (rq->icosq)
+ mlx5e_trigger_irq(rq->icosq);
+ else
+ napi_schedule(rq->cq.napi);
}
void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
--
2.30.2
next prev parent reply other threads:[~2021-03-26 2:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 2:53 [pull request][net-next V2 00/13] mlx5 updates 2021-03-24 Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 01/13] net/mlx5e: alloc the correct size for indirection_rqt Saeed Mahameed
2021-03-26 8:45 ` Arnd Bergmann
2021-03-26 22:10 ` patchwork-bot+netdevbpf
2021-03-26 2:53 ` [net-next V2 02/13] net/mlx5e: Pass q_counter indentifier as parameter to rq_param builders Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 03/13] net/mlx5e: Move params logic into its dedicated file Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 04/13] net/mlx5e: Restrict usage of mlx5e_priv in params logic functions Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 05/13] net/mlx5e: Allow creating mpwqe info without channel Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 06/13] net/mlx5: Add helper to set time-stamp translator on a queue Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 07/13] net/mlx5e: Generalize open RQ Saeed Mahameed
2021-03-26 2:53 ` Saeed Mahameed [this message]
2021-03-26 2:53 ` [net-next V2 09/13] net/mlx5e: Generalize close RQ Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 10/13] net/mlx5e: Generalize direct-TIRs and direct-RQTs API Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 11/13] net/mlx5e: Generalize PTP implementation Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 12/13] net/mlx5e: Cleanup PTP Saeed Mahameed
2021-03-26 2:53 ` [net-next V2 13/13] net/mlx5: Fix spelling mistakes in mlx5_core_info message Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210326025345.456475-9-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=ayal@nvidia.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=tariqt@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).