Re: [PATCH v5 21/27] IB/Verbs: Use management helper cap_ib_mcast()

[ira.weiny]

On Mon, Apr 20, 2015 at 10:41:14AM +0200, Michael Wang wrote:
> 
> Introduce helper cap_ib_mcast() to help us check if the port of an
> IB device support Infiniband Multicast.
> 
> Cc: Hal Rosenstock <hal@xxxxxxxxxxxxxxxxxx>
> Cc: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> Cc: Tom Talpey <tom@xxxxxxxxxx>
> Cc: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
> Cc: Doug Ledford <dledford@xxxxxxxxxx>
> Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
> Cc: Sean Hefty <sean.hefty@xxxxxxxxx>
> Signed-off-by: Michael Wang <yun.wang@xxxxxxxxxxxxxxxx>

Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>

> ---
>  drivers/infiniband/core/cma.c       |  6 +++---
>  drivers/infiniband/core/multicast.c |  6 +++---
>  include/rdma/ib_verbs.h             | 15 +++++++++++++++
>  3 files changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index 8484ae3..58ec946 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -1028,7 +1028,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_tech_ib(id_priv->cma_dev->device,
> +		if (cap_ib_mcast(id_priv->cma_dev->device,
>  				      id_priv->id.port_num)) {
>  			ib_sa_free_multicast(mc->multicast.ib);
>  			kfree(mc);
> @@ -3342,7 +3342,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
>  	if (rdma_tech_iboe(id->device, id->port_num)) {
>  		kref_init(&mc->mcref);
>  		ret = cma_iboe_join_multicast(id_priv, mc);
> -	} else if (rdma_tech_ib(id->device, id->port_num))
> +	} else if (cap_ib_mcast(id->device, id->port_num))
>  		ret = cma_join_ib_multicast(id_priv, mc);
>  	else
>  		ret = -ENOSYS;
> @@ -3376,7 +3376,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
>  
>  			BUG_ON(id_priv->cma_dev->device != id->device);
>  
> -			if (rdma_tech_ib(id->device, id->port_num)) {
> +			if (cap_ib_mcast(id->device, id->port_num)) {
>  				ib_sa_free_multicast(mc->multicast.ib);
>  				kfree(mc);
>  			} else if (rdma_tech_iboe(id->device, id->port_num))
> diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
> index 24d93f5..bdc1880 100644
> --- a/drivers/infiniband/core/multicast.c
> +++ b/drivers/infiniband/core/multicast.c
> @@ -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_tech_ib(dev->device, event->element.port_num)))
> +	if (WARN_ON(!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_tech_ib(device, dev->start_port + i))
> +		if (!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_tech_ib(device, dev->start_port + i)) {
> +		if (cap_ib_mcast(device, dev->start_port + i)) {
>  			port = &dev->port[i];
>  			deref_port(port);
>  			wait_for_completion(&port->comp);
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index de3a168..6e354df 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -1848,6 +1848,21 @@ static inline int cap_ib_sa(struct ib_device *device, u8 port_num)
>  	return rdma_tech_ib(device, port_num);
>  }
>  
> +/**
> + * 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 0 when port of the device don't support Infiniband
> + * Multicast.
> + */
> +static inline int cap_ib_mcast(struct ib_device *device, u8 port_num)
> +{
> +	return cap_ib_sa(device, port_num);
> +}
> +
>  int ib_query_gid(struct ib_device *device,
>  		 u8 port_num, int index, union ib_gid *gid);
>  
> -- 
> 2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/