net/mlx5: Use mlx5_eswitch_is_vf_vport() for IPsec VF checks

IPsec eswitch offload operations and the enabled_ipsec_vf_count counter
are intended for VF vports only. Replace the MLX5_VPORT_HOST_PF checks
with mlx5_eswitch_is_vf_vport() to properly identify VF vports, as
preparation for adding another type of PF vports.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260518071356.345723-4-tariqt@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
index 4811b60ea430151a3ccf8a2f668570df1a4c962a..b830ccd91e62738ecfc4f885acbb673b428e5911 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
@@ -209,7 +209,7 @@ static int esw_ipsec_vf_offload_set_bytype(struct mlx5_eswitch *esw, struct mlx5
        struct mlx5_core_dev *dev = esw->dev;
        int err;
 
-       if (vport->vport == MLX5_VPORT_HOST_PF)
+       if (!mlx5_eswitch_is_vf_vport(esw, vport->vport))
                return -EOPNOTSUPP;
 
        if (type == MLX5_ESW_VPORT_IPSEC_CRYPTO_OFFLOAD) {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 8b62dde7eb706bb352189de5207c81c411111d21..9a7de7c9a667bde5e3e0de08877b2784b9584de7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -958,7 +958,7 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
        /* Sync with current vport context */
        vport->enabled_events = enabled_events;
        vport->enabled = true;
-       if (vport->vport != MLX5_VPORT_HOST_PF &&
+       if (mlx5_eswitch_is_vf_vport(esw, vport_num) &&
            (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled))
                esw->enabled_ipsec_vf_count++;
 
@@ -1020,7 +1020,7 @@ void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
                mlx5_esw_vport_vhca_id_unmap(esw, vport);
        }
 
-       if (vport->vport != MLX5_VPORT_HOST_PF &&
+       if (mlx5_eswitch_is_vf_vport(esw, vport_num) &&
            (vport->info.ipsec_crypto_enabled || vport->info.ipsec_packet_enabled))
                esw->enabled_ipsec_vf_count--;