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>,
Gal Pressman <gal@nvidia.com>,
Leon Romanovsky <leonro@nvidia.com>
Subject: [net-next V5 09/15] net/mlx5e: Create EN core HW resources for all secondary devices
Date: Tue, 5 Mar 2024 19:02:52 -0800 [thread overview]
Message-ID: <20240306030258.16874-10-saeed@kernel.org> (raw)
In-Reply-To: <20240306030258.16874-1-saeed@kernel.org>
From: Tariq Toukan <tariqt@nvidia.com>
Traffic queues will be created on all devices, including the
secondaries. Create the needed core layer resources for them as well.
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Gal Pressman <gal@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 +
.../net/ethernet/mellanox/mlx5/core/en_main.c | 32 +++++++++++++------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 55c6ace0acd5..6c143088e247 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -60,6 +60,7 @@
#include "lib/clock.h"
#include "en/rx_res.h"
#include "en/selq.h"
+#include "lib/sd.h"
extern const struct net_device_ops mlx5e_netdev_ops;
struct page_pool;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index ef6a342742a2..c6c406c18b54 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -5995,22 +5995,29 @@ static int _mlx5e_resume(struct auxiliary_device *adev)
struct mlx5e_priv *priv = mlx5e_dev->priv;
struct net_device *netdev = priv->netdev;
struct mlx5_core_dev *mdev = edev->mdev;
- int err;
+ struct mlx5_core_dev *pos, *to;
+ int err, i;
if (netif_device_present(netdev))
return 0;
- err = mlx5e_create_mdev_resources(mdev, true);
- if (err)
- return err;
+ mlx5_sd_for_each_dev(i, mdev, pos) {
+ err = mlx5e_create_mdev_resources(pos, true);
+ if (err)
+ goto err_destroy_mdev_res;
+ }
err = mlx5e_attach_netdev(priv);
- if (err) {
- mlx5e_destroy_mdev_resources(mdev);
- return err;
- }
+ if (err)
+ goto err_destroy_mdev_res;
return 0;
+
+err_destroy_mdev_res:
+ to = pos;
+ mlx5_sd_for_each_dev_to(i, mdev, to, pos)
+ mlx5e_destroy_mdev_resources(pos);
+ return err;
}
static int mlx5e_resume(struct auxiliary_device *adev)
@@ -6036,15 +6043,20 @@ static int _mlx5e_suspend(struct auxiliary_device *adev)
struct mlx5e_priv *priv = mlx5e_dev->priv;
struct net_device *netdev = priv->netdev;
struct mlx5_core_dev *mdev = priv->mdev;
+ struct mlx5_core_dev *pos;
+ int i;
if (!netif_device_present(netdev)) {
if (test_bit(MLX5E_STATE_DESTROYING, &priv->state))
- mlx5e_destroy_mdev_resources(mdev);
+ mlx5_sd_for_each_dev(i, mdev, pos)
+ mlx5e_destroy_mdev_resources(pos);
return -ENODEV;
}
mlx5e_detach_netdev(priv);
- mlx5e_destroy_mdev_resources(mdev);
+ mlx5_sd_for_each_dev(i, mdev, pos)
+ mlx5e_destroy_mdev_resources(pos);
+
return 0;
}
--
2.44.0
next prev parent reply other threads:[~2024-03-06 3:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 3:02 [pull request][net-next V5 00/15] mlx5 socket direct (Multi-PF) Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 01/15] net/mlx5: Add MPIR bit in mcam_access_reg Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 02/15] net/mlx5: SD, Introduce SD lib Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 03/15] net/mlx5: SD, Implement basic query and instantiation Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 04/15] net/mlx5: SD, Implement devcom communication and primary election Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 05/15] net/mlx5: SD, Implement steering for primary and secondaries Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 06/15] net/mlx5: SD, Add informative prints in kernel log Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 07/15] net/mlx5: SD, Add debugfs Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 08/15] net/mlx5e: Create single netdev per SD group Saeed Mahameed
2024-03-06 3:02 ` Saeed Mahameed [this message]
2024-03-06 3:02 ` [net-next V5 10/15] net/mlx5e: Let channels be SD-aware Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 11/15] net/mlx5e: Support cross-vhca RSS Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 12/15] net/mlx5e: Support per-mdev queue counter Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 13/15] net/mlx5e: Block TLS device offload on combined SD netdev Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 14/15] net/mlx5: Enable SD feature Saeed Mahameed
2024-03-06 3:02 ` [net-next V5 15/15] Documentation: networking: Add description for multi-pf netdev Saeed Mahameed
2024-03-07 4:53 ` 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=20240306030258.16874-10-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gal@nvidia.com \
--cc=kuba@kernel.org \
--cc=leonro@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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).