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 07/15] net/mlx5e: Allow creating mpwqe info without channel
Date: Wed, 24 Mar 2021 22:04:30 -0700 [thread overview]
Message-ID: <20210325050438.261511-8-saeed@kernel.org> (raw)
In-Reply-To: <20210325050438.261511-1-saeed@kernel.org>
From: Aya Levin <ayal@nvidia•com>
Change the signature of mlx5e_rq_alloc_mpwqe_info from receiving channel
pointer to receive the NUMA node. This allows creating mpwqe_info in
context of different channels types.
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_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index fe98f7d7921f..4ffe42641a2e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -214,18 +214,17 @@ static inline void mlx5e_build_umr_wqe(struct mlx5e_rq *rq,
ucseg->mkey_mask = cpu_to_be64(MLX5_MKEY_MASK_FREE);
}
-static int mlx5e_rq_alloc_mpwqe_info(struct mlx5e_rq *rq,
- struct mlx5e_channel *c)
+static int mlx5e_rq_alloc_mpwqe_info(struct mlx5e_rq *rq, int node)
{
int wq_sz = mlx5_wq_ll_get_size(&rq->mpwqe.wq);
rq->mpwqe.info = kvzalloc_node(array_size(wq_sz,
sizeof(*rq->mpwqe.info)),
- GFP_KERNEL, cpu_to_node(c->cpu));
+ GFP_KERNEL, node);
if (!rq->mpwqe.info)
return -ENOMEM;
- mlx5e_build_umr_wqe(rq, &c->icosq, &rq->mpwqe.umr_wqe);
+ mlx5e_build_umr_wqe(rq, rq->icosq, &rq->mpwqe.umr_wqe);
return 0;
}
@@ -459,7 +458,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
goto err_rq_drop_page;
rq->mkey_be = cpu_to_be32(rq->umr_mkey.key);
- err = mlx5e_rq_alloc_mpwqe_info(rq, c);
+ err = mlx5e_rq_alloc_mpwqe_info(rq, cpu_to_node(c->cpu));
if (err)
goto err_rq_mkey;
break;
--
2.30.2
next prev parent reply other threads:[~2021-03-25 5:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 5:04 [pull request][net-next 00/15] mlx5 updates 2021-03-24 Saeed Mahameed
2021-03-25 5:04 ` [net-next 01/15] net/mlx5e: Enforce minimum value check for ICOSQ size Saeed Mahameed
2021-03-25 5:04 ` [net-next 02/15] net/mlx5: DR, Fix potential shift wrapping of 32-bit value in STEv1 getter Saeed Mahameed
2021-03-25 5:04 ` [net-next 03/15] net/mlx5e: alloc the correct size for indirection_rqt Saeed Mahameed
2021-03-25 5:04 ` [net-next 04/15] net/mlx5e: Pass q_counter indentifier as parameter to rq_param builders Saeed Mahameed
2021-03-25 5:04 ` [net-next 05/15] net/mlx5e: Move params logic into its dedicated file Saeed Mahameed
2021-03-25 23:44 ` David Miller
2021-03-25 5:04 ` [net-next 06/15] net/mlx5e: Restrict usage of mlx5e_priv in params logic functions Saeed Mahameed
2021-03-25 5:04 ` Saeed Mahameed [this message]
2021-03-25 5:04 ` [net-next 08/15] net/mlx5: Add helper to set time-stamp translator on a queue Saeed Mahameed
2021-03-25 5:04 ` [net-next 09/15] net/mlx5e: Generalize open RQ Saeed Mahameed
2021-03-25 5:04 ` [net-next 10/15] net/mlx5e: Generalize RQ activation Saeed Mahameed
2021-03-25 5:04 ` [net-next 11/15] net/mlx5e: Generalize close RQ Saeed Mahameed
2021-03-25 5:04 ` [net-next 12/15] net/mlx5e: Generalize direct-TIRs and direct-RQTs API Saeed Mahameed
2021-03-25 5:04 ` [net-next 13/15] net/mlx5e: Generalize PTP implementation Saeed Mahameed
2021-03-25 5:04 ` [net-next 14/15] net/mlx5e: Cleanup PTP Saeed Mahameed
2021-03-25 5:04 ` [net-next 15/15] net/mlx5: Fix spelling mistakes in mlx5_core_info message Saeed Mahameed
2021-03-25 23:43 ` [pull request][net-next 00/15] mlx5 updates 2021-03-24 David Miller
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=20210325050438.261511-8-saeed@kernel.org \
--to=saeed@kernel$(echo .)org \
--cc=ayal@nvidia$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=saeedm@nvidia$(echo .)com \
--cc=tariqt@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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