Commit 693dfd5a authored by Erez Shitrit's avatar Erez Shitrit Committed by Doug Ledford
Browse files

IB/mlx5: Enable IPoIB acceleration 



Enable mlx5 IPoIB acceleration by declaring
mlx5_ib_{alloc,free}_rdma_netdev and assigning the mlx5
IPoIB rdma_netdev callbacks.

In addition, this patch brings in sync mlx5's IPoIB parts for net and IB
trees. As a precaution, we disabled IPoIB acceleration by default (in
the mlx5_core Kconfig file).

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 4ac4d584

drivers/infiniband/hw/mlx5/main.c

+22 −0
Original line number Original line Diff line number Diff line
@@ -3530,6 +3530,26 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev, 
	return num_counters;

	return num_counters;

}

}





static struct net_device*

mlx5_ib_alloc_rdma_netdev(struct ib_device *hca,

			  u8 port_num,

			  enum rdma_netdev_t type,

			  const char *name,

			  unsigned char name_assign_type,

			  void (*setup)(struct net_device *))

{

	if (type != RDMA_NETDEV_IPOIB)

		return ERR_PTR(-EOPNOTSUPP);



	return mlx5_rdma_netdev_alloc(to_mdev(hca)->mdev, hca,

				      name, setup);

}



static void mlx5_ib_free_rdma_netdev(struct net_device *netdev)

{

	return mlx5_rdma_netdev_free(netdev);

}



static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

{

{

	struct mlx5_ib_dev *dev;

	struct mlx5_ib_dev *dev;
@@ -3660,6 +3680,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.check_mr_status	= mlx5_ib_check_mr_status;

	dev->ib_dev.check_mr_status	= mlx5_ib_check_mr_status;

	dev->ib_dev.get_port_immutable  = mlx5_port_immutable;

	dev->ib_dev.get_port_immutable  = mlx5_port_immutable;

	dev->ib_dev.get_dev_fw_str      = get_dev_fw_str;

	dev->ib_dev.get_dev_fw_str      = get_dev_fw_str;

	dev->ib_dev.alloc_rdma_netdev	= mlx5_ib_alloc_rdma_netdev;

	dev->ib_dev.free_rdma_netdev	= mlx5_ib_free_rdma_netdev;

	if (mlx5_core_is_pf(mdev)) {

	if (mlx5_core_is_pf(mdev)) {

		dev->ib_dev.get_vf_config	= mlx5_ib_get_vf_config;

		dev->ib_dev.get_vf_config	= mlx5_ib_get_vf_config;

		dev->ib_dev.set_vf_link_state	= mlx5_ib_set_vf_link_state;

		dev->ib_dev.set_vf_link_state	= mlx5_ib_set_vf_link_state;

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,6 @@ config MLX5_CORE_EN_DCB 
config MLX5_CORE_IPOIB

config MLX5_CORE_IPOIB

	bool "Mellanox Technologies ConnectX-4 IPoIB offloads support"

	bool "Mellanox Technologies ConnectX-4 IPoIB offloads support"

	depends on MLX5_CORE_EN

	depends on MLX5_CORE_EN

	default y

	default n

	---help---

	---help---

	  MLX5 IPoIB offloads & acceleration support.
 
	  MLX5 IPoIB offloads & acceleration support.

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

+26 −18
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
 * SOFTWARE.

 * SOFTWARE.

 */

 */





#include <rdma/ib_verbs.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/fs.h>

#include "en.h"

#include "en.h"

#include "ipoib.h"

#include "ipoib.h"
@@ -359,10 +360,10 @@ unlock: 
	return 0;

	return 0;

}

}





#ifdef notusedyet

/* IPoIB RDMA netdev callbacks */

/* IPoIB RDMA netdev callbacks */

static int mlx5i_attach_mcast(struct net_device *netdev, struct ib_device *hca,

static int mlx5i_attach_mcast(struct net_device *netdev, struct ib_device *hca,

			      union ib_gid *gid, u16 lid, int set_qkey)

			      union ib_gid *gid, u16 lid, int set_qkey,

			      u32 qkey)

{

{

	struct mlx5e_priv    *epriv = mlx5i_epriv(netdev);

	struct mlx5e_priv    *epriv = mlx5i_epriv(netdev);

	struct mlx5_core_dev *mdev  = epriv->mdev;

	struct mlx5_core_dev *mdev  = epriv->mdev;
@@ -375,6 +376,12 @@ static int mlx5i_attach_mcast(struct net_device *netdev, struct ib_device *hca, 
		mlx5_core_warn(mdev, "failed attaching QPN 0x%x, MGID %pI6\n",

		mlx5_core_warn(mdev, "failed attaching QPN 0x%x, MGID %pI6\n",

			       ipriv->qp.qpn, gid->raw);

			       ipriv->qp.qpn, gid->raw);





	if (set_qkey) {

		mlx5_core_dbg(mdev, "%s setting qkey 0x%x\n",

			      netdev->name, qkey);

		ipriv->qkey = qkey;

	}



	return err;

	return err;

}

}
@@ -397,15 +404,15 @@ static int mlx5i_detach_mcast(struct net_device *netdev, struct ib_device *hca, 
}

}





static int mlx5i_xmit(struct net_device *dev, struct sk_buff *skb,

static int mlx5i_xmit(struct net_device *dev, struct sk_buff *skb,

	       struct ib_ah *address, u32 dqpn, u32 dqkey)

		      struct ib_ah *address, u32 dqpn)

{

{

	struct mlx5e_priv *epriv = mlx5i_epriv(dev);

	struct mlx5e_priv *epriv = mlx5i_epriv(dev);

	struct mlx5e_txqsq *sq   = epriv->txq2sq[skb_get_queue_mapping(skb)];

	struct mlx5e_txqsq *sq   = epriv->txq2sq[skb_get_queue_mapping(skb)];

	struct mlx5_ib_ah *mah   = to_mah(address);

	struct mlx5_ib_ah *mah   = to_mah(address);

	struct mlx5i_priv *ipriv = epriv->ppriv;





	return mlx5i_sq_xmit(sq, skb, &mah->av, dqpn, dqkey);

	return mlx5i_sq_xmit(sq, skb, &mah->av, dqpn, ipriv->qkey);

}

}

#endif





static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev)

static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev)

{

{
@@ -414,13 +421,13 @@ static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev) 




	if (!MLX5_CAP_GEN(mdev, ipoib_enhanced_offloads)) {

	if (!MLX5_CAP_GEN(mdev, ipoib_enhanced_offloads)) {

		mlx5_core_warn(mdev, "IPoIB enhanced offloads are not supported\n");

		mlx5_core_warn(mdev, "IPoIB enhanced offloads are not supported\n");

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	}

	}





	return 0;

	return 0;

}

}





static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev,

struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev,

					  struct ib_device *ibdev,

					  struct ib_device *ibdev,

					  const char *name,

					  const char *name,

					  void (*setup)(struct net_device *))

					  void (*setup)(struct net_device *))
@@ -430,6 +437,7 @@ static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, 
	struct net_device *netdev;

	struct net_device *netdev;

	struct mlx5i_priv *ipriv;

	struct mlx5i_priv *ipriv;

	struct mlx5e_priv *epriv;

	struct mlx5e_priv *epriv;

	struct rdma_netdev *rn;

	int err;

	int err;





	if (mlx5i_check_required_hca_cap(mdev)) {

	if (mlx5i_check_required_hca_cap(mdev)) {
@@ -464,13 +472,13 @@ static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, 
	mlx5e_attach_netdev(epriv);

	mlx5e_attach_netdev(epriv);

	netif_carrier_off(netdev);

	netif_carrier_off(netdev);





	/* TODO: set rdma_netdev func pointers

	/* set rdma_netdev func pointers */

	 * rn = &ipriv->rn;

	rn = &ipriv->rn;

	 * rn->hca  = ibdev;

	rn->hca  = ibdev;

	 * rn->send = mlx5i_xmit;

	rn->send = mlx5i_xmit;

	 * rn->attach_mcast = mlx5i_attach_mcast;

	rn->attach_mcast = mlx5i_attach_mcast;

	 * rn->detach_mcast = mlx5i_detach_mcast;

	rn->detach_mcast = mlx5i_detach_mcast;

	 */



	return netdev;

	return netdev;





err_free_netdev:

err_free_netdev:
@@ -482,7 +490,7 @@ free_mdev_resources: 
}

}

EXPORT_SYMBOL(mlx5_rdma_netdev_alloc);

EXPORT_SYMBOL(mlx5_rdma_netdev_alloc);





static void mlx5_rdma_netdev_free(struct net_device *netdev)

void mlx5_rdma_netdev_free(struct net_device *netdev)

{

{

	struct mlx5e_priv          *priv    = mlx5i_epriv(netdev);

	struct mlx5e_priv          *priv    = mlx5i_epriv(netdev);

	const struct mlx5e_profile *profile = priv->profile;

	const struct mlx5e_profile *profile = priv->profile;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,7 +40,9 @@ 




/* ipoib rdma netdev's private data structure */

/* ipoib rdma netdev's private data structure */

struct mlx5i_priv {

struct mlx5i_priv {

	struct rdma_netdev rn; /* keep this first */

	struct mlx5_core_qp qp;

	struct mlx5_core_qp qp;

	u32    qkey;

	char  *mlx5e_priv[0];

	char  *mlx5e_priv[0];

};

};

include/linux/mlx5/driver.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -1102,6 +1102,25 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev); 
struct mlx5_uars_page *mlx5_get_uars_page(struct mlx5_core_dev *mdev);

struct mlx5_uars_page *mlx5_get_uars_page(struct mlx5_core_dev *mdev);

void mlx5_put_uars_page(struct mlx5_core_dev *mdev, struct mlx5_uars_page *up);

void mlx5_put_uars_page(struct mlx5_core_dev *mdev, struct mlx5_uars_page *up);





#ifndef CONFIG_MLX5_CORE_IPOIB

static inline

struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev,

					  struct ib_device *ibdev,

					  const char *name,

					  void (*setup)(struct net_device *))

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline void mlx5_rdma_netdev_free(struct net_device *netdev) {}

#else

struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev,

					  struct ib_device *ibdev,

					  const char *name,

					  void (*setup)(struct net_device *));

void mlx5_rdma_netdev_free(struct net_device *netdev);

#endif /* CONFIG_MLX5_CORE_IPOIB */



struct mlx5_profile {

struct mlx5_profile {

	u64	mask;

	u64	mask;

	u8	log_max_qp;

	u8	log_max_qp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE