From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>,
netdev@vger.kernel.org, Tariq Toukan <tariqt@nvidia.com>,
Eli Cohen <elic@nvidia.com>, Shay Drory <shayd@nvidia.com>
Subject: [PATCH net-next 12/14] net/mlx5: Refactor calculation of required completion vectors
Date: Sun, 19 Feb 2023 22:14:40 -0800 [thread overview]
Message-ID: <20230220061442.403092-13-saeed@kernel.org> (raw)
In-Reply-To: <20230220061442.403092-1-saeed@kernel.org>
From: Eli Cohen <elic@nvidia.com>
Move the calculation to a separate function. We will add more
functionality to it in a follow up patch.
Signed-off-by: Eli Cohen <elic@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/eq.c | 28 +++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 1f68ba60986b..cfbdb822cd73 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -1113,26 +1113,34 @@ void mlx5_core_eq_free_irqs(struct mlx5_core_dev *dev)
#define MLX5_MAX_ASYNC_EQS 3
#endif
-int mlx5_eq_table_create(struct mlx5_core_dev *dev)
+static int get_num_eqs(struct mlx5_core_dev *dev)
{
struct mlx5_eq_table *eq_table = dev->priv.eq_table;
- int num_eqs = MLX5_CAP_GEN(dev, max_num_eqs) ?
+ int max_dev_eqs;
+ int max_eqs_sf;
+ int num_eqs;
+
+ max_dev_eqs = MLX5_CAP_GEN(dev, max_num_eqs) ?
MLX5_CAP_GEN(dev, max_num_eqs) :
1 << MLX5_CAP_GEN(dev, log_max_eq);
- int max_eqs_sf;
- int err;
- eq_table->num_comp_eqs =
- min_t(int,
- mlx5_irq_table_get_num_comp(eq_table->irq_table),
- num_eqs - MLX5_MAX_ASYNC_EQS);
+ num_eqs = min_t(int, mlx5_irq_table_get_num_comp(eq_table->irq_table),
+ max_dev_eqs - MLX5_MAX_ASYNC_EQS);
if (mlx5_core_is_sf(dev)) {
max_eqs_sf = min_t(int, MLX5_COMP_EQS_PER_SF,
mlx5_irq_table_get_sfs_vec(eq_table->irq_table));
- eq_table->num_comp_eqs = min_t(int, eq_table->num_comp_eqs,
- max_eqs_sf);
+ num_eqs = min_t(int, num_eqs, max_eqs_sf);
}
+ return num_eqs;
+}
+
+int mlx5_eq_table_create(struct mlx5_core_dev *dev)
+{
+ struct mlx5_eq_table *eq_table = dev->priv.eq_table;
+ int err;
+
+ eq_table->num_comp_eqs = get_num_eqs(dev);
err = create_async_eqs(dev);
if (err) {
mlx5_core_err(dev, "Failed to create async EQs\n");
--
2.39.1
next prev parent reply other threads:[~2023-02-20 6:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 6:14 [PATCH net-next 00/14] mlx5 dynamic msix Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 01/14] lib: cpu_rmap: Avoid use after free on rmap->obj array entries Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 02/14] lib: cpu_rmap: Use allocator for rmap entries Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 03/14] lib: cpu_rmap: Add irq_cpu_rmap_remove to complement irq_cpu_rmap_add Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 04/14] net/mlx5e: Coding style fix, add empty line Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 05/14] net/mlx5: Fix wrong comment Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 06/14] net/mlx5: Modify struct mlx5_irq to use struct msi_map Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 07/14] net/mlx5: Use newer affinity descriptor Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 08/14] net/mlx5: Improve naming of pci function vectors Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 09/14] net/mlx5: Refactor completion irq request/release code Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 10/14] net/mlx5: Use dynamic msix vectors allocation Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 11/14] net/mlx5: Move devlink registration before mlx5_load Saeed Mahameed
2023-02-20 6:14 ` Saeed Mahameed [this message]
2023-02-20 6:14 ` [PATCH net-next 13/14] net/mlx5: Use one completion vector if eth is disabled Saeed Mahameed
2023-02-20 6:14 ` [PATCH net-next 14/14] net/mlx5: Provide external API for allocating vectors Saeed Mahameed
2023-02-21 0:51 ` [PATCH net-next 00/14] mlx5 dynamic msix Jakub Kicinski
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=20230220061442.403092-13-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=elic@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedm@nvidia.com \
--cc=shayd@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).