Commit f33cb7e7 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge 'mlx5-next' into mlx5-devx 



The enhanced devx support series needs commit:
9d43faac ("net/mlx5: Update mlx5_ifc with DEVX UCTX capabilities bits")

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents ffd321e4 9d43faac

drivers/infiniband/hw/mlx5/Makefile

+3 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_MLX5_INFINIBAND)	+= mlx5_ib.o



mlx5_ib-y :=	main.o cq.o doorbell.o qp.o mem.o srq.o mr.o ah.o mad.o gsi.o ib_virt.o cmd.o cong.o

mlx5_ib-y :=	main.o cq.o doorbell.o qp.o mem.o srq_cmd.o \

		srq.o mr.o ah.o mad.o gsi.o ib_virt.o cmd.o \

		cong.o

mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o

mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o

drivers/infiniband/hw/mlx5/cq.c

+2 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <rdma/ib_user_verbs.h>

#include <rdma/ib_cache.h>

#include "mlx5_ib.h"

#include "srq.h"



static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq)

{
@@ -177,8 +178,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 
		struct mlx5_core_srq *msrq = NULL;



		if (qp->ibqp.xrcd) {

			msrq = mlx5_core_get_srq(dev->mdev,

						 be32_to_cpu(cqe->srqn));

			msrq = mlx5_cmd_get_srq(dev, be32_to_cpu(cqe->srqn));

			srq = to_mibsrq(msrq);

		} else {

			srq = to_msrq(qp->ibqp.srq);

drivers/infiniband/hw/mlx5/ib_rep.c

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "ib_rep.h"

#include "srq.h"



static const struct mlx5_ib_profile rep_profile = {

	STAGE_CREATE(MLX5_IB_STAGE_INIT,
@@ -21,6 +22,9 @@ static const struct mlx5_ib_profile rep_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

drivers/infiniband/hw/mlx5/main.c

+155 −57
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "mlx5_ib.h"

#include "ib_rep.h"

#include "cmd.h"

#include "srq.h"

#include <linux/mlx5/fs_helpers.h>

#include <linux/mlx5/accel.h>

#include <rdma/uverbs_std_types.h>
@@ -82,10 +83,13 @@ static char mlx5_version[] = 


struct mlx5_ib_event_work {

	struct work_struct	work;

	struct mlx5_core_dev	*dev;

	void			*context;

	enum mlx5_dev_event	event;

	unsigned long		param;

	union {

		struct mlx5_ib_dev	      *dev;

		struct mlx5_ib_multiport_info *mpi;

	};

	bool			is_slave;

	unsigned int		event;

	void			*param;

};



enum {
@@ -4244,72 +4248,101 @@ static void delay_drop_handler(struct work_struct *work) 
	mutex_unlock(&delay_drop->lock);

}



static void mlx5_ib_handle_event(struct work_struct *_work)

static void handle_general_event(struct mlx5_ib_dev *ibdev, struct mlx5_eqe *eqe,

				 struct ib_event *ibev)

{

	struct mlx5_ib_event_work *work =

		container_of(_work, struct mlx5_ib_event_work, work);

	struct mlx5_ib_dev *ibdev;

	struct ib_event ibev;

	bool fatal = false;

	u8 port = (u8)work->param;



	if (mlx5_core_is_mp_slave(work->dev)) {

		ibdev = mlx5_ib_get_ibdev_from_mpi(work->context);

		if (!ibdev)

			goto out;

	} else {

		ibdev = work->context;

	switch (eqe->sub_type) {

	case MLX5_GENERAL_SUBTYPE_DELAY_DROP_TIMEOUT:

		schedule_work(&ibdev->delay_drop.delay_drop_work);

		break;

	default: /* do nothing */

		return;

	}

}



	switch (work->event) {

	case MLX5_DEV_EVENT_SYS_ERROR:

		ibev.event = IB_EVENT_DEVICE_FATAL;

		mlx5_ib_handle_internal_error(ibdev);

		fatal = true;

		break;

static int handle_port_change(struct mlx5_ib_dev *ibdev, struct mlx5_eqe *eqe,

			      struct ib_event *ibev)

{

	u8 port = (eqe->data.port.port >> 4) & 0xf;



	ibev->element.port_num = port;



	case MLX5_DEV_EVENT_PORT_UP:

	case MLX5_DEV_EVENT_PORT_DOWN:

	case MLX5_DEV_EVENT_PORT_INITIALIZED:

	switch (eqe->sub_type) {

	case MLX5_PORT_CHANGE_SUBTYPE_ACTIVE:

	case MLX5_PORT_CHANGE_SUBTYPE_DOWN:

	case MLX5_PORT_CHANGE_SUBTYPE_INITIALIZED:

		/* In RoCE, port up/down events are handled in

		 * mlx5_netdev_event().

		 */

		if (mlx5_ib_port_link_layer(&ibdev->ib_dev, port) ==

					    IB_LINK_LAYER_ETHERNET)

			goto out;

			return -EINVAL;



		ibev.event = (work->event == MLX5_DEV_EVENT_PORT_UP) ?

		ibev->event = (eqe->sub_type == MLX5_PORT_CHANGE_SUBTYPE_ACTIVE) ?

				IB_EVENT_PORT_ACTIVE : IB_EVENT_PORT_ERR;

		break;



	case MLX5_DEV_EVENT_LID_CHANGE:

		ibev.event = IB_EVENT_LID_CHANGE;

	case MLX5_PORT_CHANGE_SUBTYPE_LID:

		ibev->event = IB_EVENT_LID_CHANGE;

		break;



	case MLX5_DEV_EVENT_PKEY_CHANGE:

		ibev.event = IB_EVENT_PKEY_CHANGE;

	case MLX5_PORT_CHANGE_SUBTYPE_PKEY:

		ibev->event = IB_EVENT_PKEY_CHANGE;

		schedule_work(&ibdev->devr.ports[port - 1].pkey_change_work);

		break;



	case MLX5_DEV_EVENT_GUID_CHANGE:

		ibev.event = IB_EVENT_GID_CHANGE;

	case MLX5_PORT_CHANGE_SUBTYPE_GUID:

		ibev->event = IB_EVENT_GID_CHANGE;

		break;



	case MLX5_DEV_EVENT_CLIENT_REREG:

		ibev.event = IB_EVENT_CLIENT_REREGISTER;

	case MLX5_PORT_CHANGE_SUBTYPE_CLIENT_REREG:

		ibev->event = IB_EVENT_CLIENT_REREGISTER;

		break;

	case MLX5_DEV_EVENT_DELAY_DROP_TIMEOUT:

		schedule_work(&ibdev->delay_drop.delay_drop_work);

	default:

		return -EINVAL;

	}



	return 0;

}



static void mlx5_ib_handle_event(struct work_struct *_work)

{

	struct mlx5_ib_event_work *work =

		container_of(_work, struct mlx5_ib_event_work, work);

	struct mlx5_ib_dev *ibdev;

	struct ib_event ibev;

	bool fatal = false;



	if (work->is_slave) {

		ibdev = mlx5_ib_get_ibdev_from_mpi(work->mpi);

		if (!ibdev)

			goto out;

	} else {

		ibdev = work->dev;

	}



	switch (work->event) {

	case MLX5_DEV_EVENT_SYS_ERROR:

		ibev.event = IB_EVENT_DEVICE_FATAL;

		mlx5_ib_handle_internal_error(ibdev);

		ibev.element.port_num  = (u8)(unsigned long)work->param;

		fatal = true;

		break;

	case MLX5_EVENT_TYPE_PORT_CHANGE:

		if (handle_port_change(ibdev, work->param, &ibev))

			goto out;

		break;

	case MLX5_EVENT_TYPE_GENERAL_EVENT:

		handle_general_event(ibdev, work->param, &ibev);

		/* fall through */

	default:

		goto out;

	}



	ibev.device = &ibdev->ib_dev;

	ibev.element.port_num = port;



	if (!rdma_is_port_valid(&ibdev->ib_dev, port)) {

		mlx5_ib_warn(ibdev, "warning: event on port %d\n", port);

	if (!rdma_is_port_valid(&ibdev->ib_dev, ibev.element.port_num)) {

		mlx5_ib_warn(ibdev, "warning: event on port %d\n",  ibev.element.port_num);

		goto out;

	}
@@ -4322,22 +4355,43 @@ static void mlx5_ib_handle_event(struct work_struct *_work) 
	kfree(work);

}



static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,

			  enum mlx5_dev_event event, unsigned long param)

static int mlx5_ib_event(struct notifier_block *nb,

			 unsigned long event, void *param)

{

	struct mlx5_ib_event_work *work;



	work = kmalloc(sizeof(*work), GFP_ATOMIC);

	if (!work)

		return;

		return NOTIFY_DONE;



	INIT_WORK(&work->work, mlx5_ib_handle_event);

	work->dev = dev;

	work->dev = container_of(nb, struct mlx5_ib_dev, mdev_events);

	work->is_slave = false;

	work->param = param;

	work->context = context;

	work->event = event;



	queue_work(mlx5_ib_event_wq, &work->work);



	return NOTIFY_OK;

}



static int mlx5_ib_event_slave_port(struct notifier_block *nb,

				    unsigned long event, void *param)

{

	struct mlx5_ib_event_work *work;



	work = kmalloc(sizeof(*work), GFP_ATOMIC);

	if (!work)

		return NOTIFY_DONE;



	INIT_WORK(&work->work, mlx5_ib_handle_event);

	work->mpi = container_of(nb, struct mlx5_ib_multiport_info, mdev_events);

	work->is_slave = true;

	work->param = param;

	work->event = event;

	queue_work(mlx5_ib_event_wq, &work->work);



	return NOTIFY_OK;

}



static int set_has_smi_cap(struct mlx5_ib_dev *dev)
@@ -5360,6 +5414,11 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev, 
		spin_unlock(&port->mp.mpi_lock);

		return;

	}



	if (mpi->mdev_events.notifier_call)

		mlx5_notifier_unregister(mpi->mdev, &mpi->mdev_events);

	mpi->mdev_events.notifier_call = NULL;



	mpi->ibdev = NULL;



	spin_unlock(&port->mp.mpi_lock);
@@ -5415,6 +5474,7 @@ static bool mlx5_ib_bind_slave_port(struct mlx5_ib_dev *ibdev, 


	ibdev->port[port_num].mp.mpi = mpi;

	mpi->ibdev = ibdev;

	mpi->mdev_events.notifier_call = NULL;

	spin_unlock(&ibdev->port[port_num].mp.mpi_lock);



	err = mlx5_nic_vport_affiliate_multiport(ibdev->mdev, mpi->mdev);
@@ -5432,6 +5492,9 @@ static bool mlx5_ib_bind_slave_port(struct mlx5_ib_dev *ibdev, 
		goto unbind;

	}



	mpi->mdev_events.notifier_call = mlx5_ib_event_slave_port;

	mlx5_notifier_register(mpi->mdev, &mpi->mdev_events);



	err = mlx5_ib_init_cong_debugfs(ibdev, port_num);

	if (err)

		goto unbind;
@@ -6155,6 +6218,34 @@ static void mlx5_ib_stage_rep_reg_cleanup(struct mlx5_ib_dev *dev) 
	mlx5_ib_unregister_vport_reps(dev);

}



static int mlx5_ib_stage_dev_notifier_init(struct mlx5_ib_dev *dev)

{

	dev->mdev_events.notifier_call = mlx5_ib_event;

	mlx5_notifier_register(dev->mdev, &dev->mdev_events);

	return 0;

}



static void mlx5_ib_stage_dev_notifier_cleanup(struct mlx5_ib_dev *dev)

{

	mlx5_notifier_unregister(dev->mdev, &dev->mdev_events);

}



static int mlx5_ib_stage_devx_init(struct mlx5_ib_dev *dev)

{

	int uid;



	uid = mlx5_ib_devx_create(dev);

	if (uid > 0)

		dev->devx_whitelist_uid = uid;



	return 0;

}

static void mlx5_ib_stage_devx_cleanup(struct mlx5_ib_dev *dev)

{

	if (dev->devx_whitelist_uid)

		mlx5_ib_devx_destroy(dev, dev->devx_whitelist_uid);

}



void __mlx5_ib_remove(struct mlx5_ib_dev *dev,

		      const struct mlx5_ib_profile *profile,

		      int stage)
@@ -6166,8 +6257,6 @@ void __mlx5_ib_remove(struct mlx5_ib_dev *dev, 
			profile->stage[stage].cleanup(dev);

	}



	if (dev->devx_whitelist_uid)

		mlx5_ib_devx_destroy(dev, dev->devx_whitelist_uid);

	ib_dealloc_device((struct ib_device *)dev);

}
@@ -6176,7 +6265,6 @@ void *__mlx5_ib_add(struct mlx5_ib_dev *dev, 
{

	int err;

	int i;

	int uid;



	for (i = 0; i < MLX5_IB_STAGE_MAX; i++) {

		if (profile->stage[i].init) {
@@ -6186,10 +6274,6 @@ void *__mlx5_ib_add(struct mlx5_ib_dev *dev, 
		}

	}



	uid = mlx5_ib_devx_create(dev);

	if (uid > 0)

		dev->devx_whitelist_uid = uid;



	dev->profile = profile;

	dev->ib_active = true;
@@ -6217,9 +6301,15 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_roce_init,

		     mlx5_ib_stage_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_ODP,

		     mlx5_ib_stage_odp_init,

		     mlx5_ib_stage_odp_cleanup),
@@ -6238,6 +6328,9 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,

		     NULL,

		     mlx5_ib_stage_pre_ib_reg_umr_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,

		     mlx5_ib_stage_devx_init,

		     mlx5_ib_stage_devx_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,

		     mlx5_ib_stage_ib_reg_init,

		     mlx5_ib_stage_ib_reg_cleanup),
@@ -6265,9 +6358,15 @@ static const struct mlx5_ib_profile nic_rep_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_ROCE,

		     mlx5_ib_stage_rep_roce_init,

		     mlx5_ib_stage_rep_roce_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_SRQ,

		     mlx5_init_srq_table,

		     mlx5_cleanup_srq_table),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_stage_dev_res_init,

		     mlx5_ib_stage_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_COUNTERS,

		     mlx5_ib_stage_counters_init,

		     mlx5_ib_stage_counters_cleanup),
@@ -6385,7 +6484,6 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) 
static struct mlx5_interface mlx5_ib_interface = {

	.add            = mlx5_ib_add,

	.remove         = mlx5_ib_remove,

	.event          = mlx5_ib_event,

	.protocol	= MLX5_INTERFACE_PROTOCOL_IB,

};

drivers/infiniband/hw/mlx5/mlx5_ib.h

+8 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <linux/mlx5/cq.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/qp.h>

#include <linux/mlx5/srq.h>

#include <linux/mlx5/fs.h>

#include <linux/types.h>

#include <linux/mlx5/transobj.h>
@@ -50,6 +49,8 @@ 
#include <rdma/uverbs_ioctl.h>

#include <rdma/mlx5_user_ioctl_cmds.h>



#include "srq.h"



#define mlx5_ib_dbg(_dev, format, arg...)                                      \

	dev_dbg(&(_dev)->ib_dev.dev, "%s:%d:(pid %d): " format, __func__,      \

		__LINE__, current->pid, ##arg)
@@ -776,13 +777,16 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_CAPS,

	MLX5_IB_STAGE_NON_DEFAULT_CB,

	MLX5_IB_STAGE_ROCE,

	MLX5_IB_STAGE_SRQ,

	MLX5_IB_STAGE_DEVICE_RESOURCES,

	MLX5_IB_STAGE_DEVICE_NOTIFIER,

	MLX5_IB_STAGE_ODP,

	MLX5_IB_STAGE_COUNTERS,

	MLX5_IB_STAGE_CONG_DEBUGFS,

	MLX5_IB_STAGE_UAR,

	MLX5_IB_STAGE_BFREG,

	MLX5_IB_STAGE_PRE_IB_REG_UMR,

	MLX5_IB_STAGE_WHITELIST_UID,

	MLX5_IB_STAGE_IB_REG,

	MLX5_IB_STAGE_POST_IB_REG_UMR,

	MLX5_IB_STAGE_DELAY_DROP,
@@ -807,6 +811,7 @@ struct mlx5_ib_multiport_info { 
	struct list_head list;

	struct mlx5_ib_dev *ibdev;

	struct mlx5_core_dev *mdev;

	struct notifier_block mdev_events;

	struct completion unref_comp;

	u64 sys_image_guid;

	u32 mdev_refcnt;
@@ -893,6 +898,7 @@ struct mlx5_ib_pf_eq { 
struct mlx5_ib_dev {

	struct ib_device		ib_dev;

	struct mlx5_core_dev		*mdev;

	struct notifier_block		mdev_events;

	struct mlx5_roce		roce[MLX5_MAX_PORTS];

	int				num_ports;

	/* serialize update of capability mask
@@ -938,6 +944,7 @@ struct mlx5_ib_dev { 
	u64			sys_image_guid;

	struct mlx5_memic	memic;

	u16			devx_whitelist_uid;

	struct mlx5_srq_table   srq_table;

};



static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)