Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a31ad3b0 authored by Michael Wang's avatar Michael Wang Committed by Doug Ledford
Browse files

IB/Verbs: Use management helper rdma_cap_ib_mcast() 



Introduce helper rdma_cap_ib_mcast() to help us check if the port of an
IB device support Infiniband Multicast.

Signed-off-by: default avatarMichael Wang <yun.wang@profitbricks.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent fe53ba2f

drivers/infiniband/core/cma.c

+3 −3
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static void cma_leave_mc_groups(struct rdma_id_private *id_priv) 
		mc = container_of(id_priv->mc_list.next,

				  struct cma_multicast, list);

		list_del(&mc->list);

		if (rdma_protocol_ib(id_priv->cma_dev->device,

		if (rdma_cap_ib_mcast(id_priv->cma_dev->device,

				      id_priv->id.port_num)) {

			ib_sa_free_multicast(mc->multicast.ib);

			kfree(mc);
@@ -3328,7 +3328,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, 
	if (rdma_protocol_iboe(id->device, id->port_num)) {

		kref_init(&mc->mcref);

		ret = cma_iboe_join_multicast(id_priv, mc);

	} else if (rdma_protocol_ib(id->device, id->port_num))

	} else if (rdma_cap_ib_mcast(id->device, id->port_num))

		ret = cma_join_ib_multicast(id_priv, mc);

	else

		ret = -ENOSYS;
@@ -3362,7 +3362,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr) 


			BUG_ON(id_priv->cma_dev->device != id->device);



			if (rdma_protocol_ib(id->device, id->port_num)) {

			if (rdma_cap_ib_mcast(id->device, id->port_num)) {

				ib_sa_free_multicast(mc->multicast.ib);

				kfree(mc);

			} else if (rdma_protocol_iboe(id->device, id->port_num))

drivers/infiniband/core/multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static void mcast_event_handler(struct ib_event_handler *handler, 
	int index;



	dev = container_of(handler, struct mcast_device, event_handler);

	if (WARN_ON(!rdma_protocol_ib(dev->device, event->element.port_num)))

	if (WARN_ON(!rdma_cap_ib_mcast(dev->device, event->element.port_num)))

		return;



	index = event->element.port_num - dev->start_port;
@@ -820,7 +820,7 @@ static void mcast_add_one(struct ib_device *device) 
	}



	for (i = 0; i <= dev->end_port - dev->start_port; i++) {

		if (!rdma_protocol_ib(device, dev->start_port + i))

		if (!rdma_cap_ib_mcast(device, dev->start_port + i))

			continue;

		port = &dev->port[i];

		port->dev = dev;
@@ -858,7 +858,7 @@ static void mcast_remove_one(struct ib_device *device) 
	flush_workqueue(mcast_wq);



	for (i = 0; i <= dev->end_port - dev->start_port; i++) {

		if (rdma_protocol_ib(device, dev->start_port + i)) {

		if (rdma_cap_ib_mcast(device, dev->start_port + i)) {

			port = &dev->port[i];

			deref_port(port);

			wait_for_completion(&port->comp);

include/rdma/ib_verbs.h

+15 −0
Original line number Diff line number Diff line
@@ -1849,6 +1849,21 @@ static inline bool rdma_cap_ib_sa(struct ib_device *device, u8 port_num) 
	return rdma_protocol_ib(device, port_num);

}



/**

 * rdma_cap_ib_mcast - Check if the port of device has the capability Infiniband

 * Multicast.

 *

 * @device: Device to be checked

 * @port_num: Port number of the device

 *

 * Return false when port of the device don't support Infiniband

 * Multicast.

 */

static inline bool rdma_cap_ib_mcast(struct ib_device *device, u8 port_num)

{

	return rdma_cap_ib_sa(device, port_num);

}



int ib_query_gid(struct ib_device *device,

		 u8 port_num, int index, union ib_gid *gid);