Skip to content

Commit

Permalink
net/mlx5e: Create single netdev per SD group
Browse files Browse the repository at this point in the history
Integrate the SD library calls into the auxiliary_driver ops in
preparation for creating a single netdev for the multiple PFs belonging
to the same SD group.

SD is still disabled at this stage. It is enabled by a downstream patch
when all needed parts are implemented.

The netdev is created whenever the SD group, with all its participants,
are ready. It is later destroyed whenever any of the participating PFs
drops.

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Gal Pressman <gal@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
  • Loading branch information
Tariq Toukan authored and Saeed Mahameed committed Mar 7, 2024
1 parent 4375130 commit 381978d
Showing 1 changed file with 62 additions and 7 deletions.
69 changes: 62 additions & 7 deletions drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
#include "qos.h"
#include "en/trap.h"
#include "lib/devcom.h"
#include "lib/sd.h"

bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev, u8 page_shift,
enum mlx5e_mpwrq_umr_mode umr_mode)
Expand Down Expand Up @@ -5987,7 +5988,7 @@ void mlx5e_destroy_netdev(struct mlx5e_priv *priv)
free_netdev(netdev);
}

static int mlx5e_resume(struct auxiliary_device *adev)
static int _mlx5e_resume(struct auxiliary_device *adev)
{
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5e_dev *mlx5e_dev = auxiliary_get_drvdata(adev);
Expand All @@ -6012,6 +6013,23 @@ static int mlx5e_resume(struct auxiliary_device *adev)
return 0;
}

static int mlx5e_resume(struct auxiliary_device *adev)
{
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5_core_dev *mdev = edev->mdev;
struct auxiliary_device *actual_adev;
int err;

err = mlx5_sd_init(mdev);
if (err)
return err;

actual_adev = mlx5_sd_get_adev(mdev, adev, edev->idx);
if (actual_adev)
return _mlx5e_resume(actual_adev);
return 0;
}

static int _mlx5e_suspend(struct auxiliary_device *adev)
{
struct mlx5e_dev *mlx5e_dev = auxiliary_get_drvdata(adev);
Expand All @@ -6032,7 +6050,17 @@ static int _mlx5e_suspend(struct auxiliary_device *adev)

static int mlx5e_suspend(struct auxiliary_device *adev, pm_message_t state)
{
return _mlx5e_suspend(adev);
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5_core_dev *mdev = edev->mdev;
struct auxiliary_device *actual_adev;
int err = 0;

actual_adev = mlx5_sd_get_adev(mdev, adev, edev->idx);
if (actual_adev)
err = _mlx5e_suspend(actual_adev);

mlx5_sd_cleanup(mdev);
return err;
}

static int _mlx5e_probe(struct auxiliary_device *adev)
Expand Down Expand Up @@ -6078,9 +6106,9 @@ static int _mlx5e_probe(struct auxiliary_device *adev)
goto err_destroy_netdev;
}

err = mlx5e_resume(adev);
err = _mlx5e_resume(adev);
if (err) {
mlx5_core_err(mdev, "mlx5e_resume failed, %d\n", err);
mlx5_core_err(mdev, "_mlx5e_resume failed, %d\n", err);
goto err_profile_cleanup;
}

Expand Down Expand Up @@ -6111,15 +6139,29 @@ static int _mlx5e_probe(struct auxiliary_device *adev)
static int mlx5e_probe(struct auxiliary_device *adev,
const struct auxiliary_device_id *id)
{
return _mlx5e_probe(adev);
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5_core_dev *mdev = edev->mdev;
struct auxiliary_device *actual_adev;
int err;

err = mlx5_sd_init(mdev);
if (err)
return err;

actual_adev = mlx5_sd_get_adev(mdev, adev, edev->idx);
if (actual_adev)
return _mlx5e_probe(actual_adev);
return 0;
}

static void mlx5e_remove(struct auxiliary_device *adev)
static void _mlx5e_remove(struct auxiliary_device *adev)
{
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5e_dev *mlx5e_dev = auxiliary_get_drvdata(adev);
struct mlx5e_priv *priv = mlx5e_dev->priv;
struct mlx5_core_dev *mdev = edev->mdev;

mlx5_core_uplink_netdev_set(priv->mdev, NULL);
mlx5_core_uplink_netdev_set(mdev, NULL);
mlx5e_dcbnl_delete_app(priv);
unregister_netdev(priv->netdev);
_mlx5e_suspend(adev);
Expand All @@ -6129,6 +6171,19 @@ static void mlx5e_remove(struct auxiliary_device *adev)
mlx5e_destroy_devlink(mlx5e_dev);
}

static void mlx5e_remove(struct auxiliary_device *adev)
{
struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);
struct mlx5_core_dev *mdev = edev->mdev;
struct auxiliary_device *actual_adev;

actual_adev = mlx5_sd_get_adev(mdev, adev, edev->idx);
if (actual_adev)
_mlx5e_remove(actual_adev);

mlx5_sd_cleanup(mdev);
}

static const struct auxiliary_device_id mlx5e_id_table[] = {
{ .name = MLX5_ADEV_NAME ".eth", },
{},
Expand Down

0 comments on commit 381978d

Please sign in to comment.