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>,
Leon Romanovsky <leonro@nvidia.com>,
linux-rdma@vger.kernel.org, Shay Drory <shayd@nvidia.com>,
Mark Bloch <mbloch@nvidia.com>
Subject: [net-next 01/15] RDMA/mlx5: Free second uplink ib port
Date: Tue, 6 Jun 2023 00:12:05 -0700 [thread overview]
Message-ID: <20230606071219.483255-2-saeed@kernel.org> (raw)
In-Reply-To: <20230606071219.483255-1-saeed@kernel.org>
From: Shay Drory <shayd@nvidia.com>
The cited patch introduce ib port for the slave device uplink in
case of multiport eswitch. However, this ib port didn't perform
anything when unloaded.
Unload the new ib port properly.
Fixes: 27f9e0ccb6da ("net/mlx5: Lag, Add single RDMA device in multiport mode")
Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/infiniband/hw/mlx5/ib_rep.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index ddcfc116b19a..a4db22fe1883 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -126,7 +126,7 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)
!mlx5_lag_is_master(mdev)) {
struct mlx5_core_dev *peer_mdev;
- if (rep->vport == MLX5_VPORT_UPLINK)
+ if (rep->vport == MLX5_VPORT_UPLINK && !mlx5_lag_is_mpesw(mdev))
return;
peer_mdev = mlx5_lag_get_peer_mdev(mdev);
vport_index += mlx5_eswitch_get_total_vports(peer_mdev);
@@ -146,6 +146,9 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)
struct mlx5_core_dev *peer_mdev;
struct mlx5_eswitch *esw;
+ if (mlx5_lag_is_shared_fdb(mdev) && !mlx5_lag_is_master(mdev))
+ return;
+
if (mlx5_lag_is_shared_fdb(mdev)) {
peer_mdev = mlx5_lag_get_peer_mdev(mdev);
esw = peer_mdev->priv.eswitch;
--
2.40.1
next prev parent reply other threads:[~2023-06-06 7:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 7:12 [pull request][net-next 00/15] mlx5 updates 2023-06-06 Saeed Mahameed
2023-06-06 7:12 ` Saeed Mahameed [this message]
2023-06-06 7:12 ` [net-next 02/15] {net/RDMA}/mlx5: introduce lag_for_each_peer Saeed Mahameed
2023-06-06 7:12 ` [net-next 03/15] net/mlx5: LAG, check if all eswitches are paired for shared FDB Saeed Mahameed
2023-06-06 7:12 ` [net-next 04/15] net/mlx5: LAG, generalize handling of " Saeed Mahameed
2023-06-06 7:12 ` [net-next 05/15] net/mlx5: LAG, change mlx5_shared_fdb_supported() to static Saeed Mahameed
2023-06-06 7:12 ` [net-next 06/15] net/mlx5: LAG, block multipath LAG in case ldev have more than 2 ports Saeed Mahameed
2023-06-06 7:12 ` [net-next 07/15] net/mlx5: LAG, block multiport eswitch " Saeed Mahameed
2023-06-06 7:12 ` [net-next 08/15] net/mlx5: Enable 4 ports VF LAG Saeed Mahameed
2023-06-06 7:12 ` [net-next 09/15] net/mlx5e: RX, Log error when page_pool size is too large Saeed Mahameed
2023-06-07 16:24 ` Alexander Lobakin
2023-06-07 16:40 ` Dragos Tatulea
2023-06-06 7:12 ` [net-next 10/15] net/mlx5e: Expose catastrophic steering error counters Saeed Mahameed
2023-06-06 7:12 ` [net-next 11/15] net/mlx5e: Remove RX page cache leftovers Saeed Mahameed
2023-06-06 7:12 ` [net-next 12/15] net/mlx5e: TC, refactor access to hash key Saeed Mahameed
2023-06-06 7:12 ` [net-next 13/15] net/mlx5: Skip inline mode check after mlx5_eswitch_enable_locked() failure Saeed Mahameed
2023-06-07 5:01 ` Jakub Kicinski
2023-06-07 14:10 ` Jason Gunthorpe
2023-06-07 16:19 ` Jakub Kicinski
2023-06-07 23:18 ` Jason Gunthorpe
2023-06-07 15:46 ` Jiri Pirko
2023-06-07 16:22 ` Jakub Kicinski
2023-06-06 7:12 ` [net-next 14/15] mlx5/core: E-Switch, Allocate ECPF vport if it's an eswitch manager Saeed Mahameed
2023-06-06 7:12 ` [net-next 15/15] net/mlx5e: simplify condition after napi budget handling change 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=20230606071219.483255-2-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=mbloch@nvidia.com \
--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).