Commit 10a193ed authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5: Expose lag operations in header file 



The change is a refactoring step towards a multipath use case.

Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent bb19ad0d

drivers/net/ethernet/mellanox/mlx5/core/lag.c

+8 −48
Original line number Diff line number Diff line
@@ -35,37 +35,7 @@ 
#include <linux/mlx5/vport.h>

#include "mlx5_core.h"

#include "eswitch.h"



enum {

	MLX5_LAG_FLAG_ROCE   = 1 << 0,

	MLX5_LAG_FLAG_SRIOV  = 1 << 1,

};



#define MLX5_LAG_MODE_FLAGS (MLX5_LAG_FLAG_ROCE | MLX5_LAG_FLAG_SRIOV)



struct lag_func {

	struct mlx5_core_dev *dev;

	struct net_device    *netdev;

};



/* Used for collection of netdev event info. */

struct lag_tracker {

	enum   netdev_lag_tx_type           tx_type;

	struct netdev_lag_lower_state_info  netdev_state[MLX5_MAX_PORTS];

	unsigned int is_bonded:1;

};



/* LAG data of a ConnectX card.

 * It serves both its phys functions.

 */

struct mlx5_lag {

	u8                        flags;

	u8                        v2p_map[MLX5_MAX_PORTS];

	struct lag_func           pf[MLX5_MAX_PORTS];

	struct lag_tracker        tracker;

	struct delayed_work       bond_work;

	struct notifier_block     nb;

};

#include "lag.h"



/* General purpose, use for short periods of time.

 * Beware of lock dependencies (preferably, no locks should be acquired
@@ -147,12 +117,7 @@ static int mlx5_cmd_query_cong_counter(struct mlx5_core_dev *dev, 
	return mlx5_cmd_exec(dev, in, sizeof(in), out, out_size);

}



static struct mlx5_lag *mlx5_lag_dev_get(struct mlx5_core_dev *dev)

{

	return dev->priv.lag;

}



static int mlx5_lag_dev_get_netdev_idx(struct mlx5_lag *ldev,

int mlx5_lag_dev_get_netdev_idx(struct mlx5_lag *ldev,

				struct net_device *ndev)

{

	int i;
@@ -174,11 +139,6 @@ static bool __mlx5_lag_is_sriov(struct mlx5_lag *ldev) 
	return !!(ldev->flags & MLX5_LAG_FLAG_SRIOV);

}



static bool __mlx5_lag_is_active(struct mlx5_lag *ldev)

{

	return !!(ldev->flags & MLX5_LAG_MODE_FLAGS);

}



static void mlx5_infer_tx_affinity_mapping(struct lag_tracker *tracker,

					   u8 *port1, u8 *port2)

{
@@ -195,7 +155,7 @@ static void mlx5_infer_tx_affinity_mapping(struct lag_tracker *tracker, 
		*port2 = 1;

}



static void mlx5_modify_lag(struct mlx5_lag *ldev,

void mlx5_modify_lag(struct mlx5_lag *ldev,

		     struct lag_tracker *tracker)

{

	struct mlx5_core_dev *dev0 = ldev->pf[0].dev;
@@ -241,7 +201,7 @@ static int mlx5_create_lag(struct mlx5_lag *ldev, 
	return err;

}



static int mlx5_activate_lag(struct mlx5_lag *ldev,

int mlx5_activate_lag(struct mlx5_lag *ldev,

		      struct lag_tracker *tracker,

		      u8 flags)

{

drivers/net/ethernet/mellanox/mlx5/core/lag.h

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/* Copyright (c) 2019 Mellanox Technologies. */



#ifndef __MLX5_LAG_H__

#define __MLX5_LAG_H__



#include "mlx5_core.h"



enum {

	MLX5_LAG_FLAG_ROCE   = 1 << 0,

	MLX5_LAG_FLAG_SRIOV  = 1 << 1,

};



#define MLX5_LAG_MODE_FLAGS (MLX5_LAG_FLAG_ROCE | MLX5_LAG_FLAG_SRIOV)



struct lag_func {

	struct mlx5_core_dev *dev;

	struct net_device    *netdev;

};



/* Used for collection of netdev event info. */

struct lag_tracker {

	enum   netdev_lag_tx_type           tx_type;

	struct netdev_lag_lower_state_info  netdev_state[MLX5_MAX_PORTS];

	unsigned int is_bonded:1;

};



/* LAG data of a ConnectX card.

 * It serves both its phys functions.

 */

struct mlx5_lag {

	u8                        flags;

	u8                        v2p_map[MLX5_MAX_PORTS];

	struct lag_func           pf[MLX5_MAX_PORTS];

	struct lag_tracker        tracker;

	struct delayed_work       bond_work;

	struct notifier_block     nb;

};



static inline struct mlx5_lag *

mlx5_lag_dev_get(struct mlx5_core_dev *dev)

{

	return dev->priv.lag;

}



static inline bool

__mlx5_lag_is_active(struct mlx5_lag *ldev)

{

	return !!(ldev->flags & MLX5_LAG_MODE_FLAGS);

}



void mlx5_modify_lag(struct mlx5_lag *ldev,

		     struct lag_tracker *tracker);

int mlx5_activate_lag(struct mlx5_lag *ldev,

		      struct lag_tracker *tracker,

		      u8 flags);

int mlx5_lag_dev_get_netdev_idx(struct mlx5_lag *ldev,

				struct net_device *ndev);



#endif /* __MLX5_LAG_H__ */