All of lore.kernel.org
 help / color / mirror / Atom feed
From: "ira.weiny" <ira.weiny@intel.com>
To: Michael Wang <yun.wang@profitbricks.com>
Cc: Roland Dreier <roland@kernel.org>,
	Sean Hefty <sean.hefty@intel.com>,
	linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
	hal@dev.mellanox.co.il, Tom Tucker <tom@opengridcomputing.com>,
	Steve Wise <swise@opengridcomputing.com>,
	Hoang-Nam Nguyen <hnguyen@de.ibm.com>,
	Christoph Raisch <raisch@de.ibm.com>,
	Mike Marciniszyn <infinipath@intel.com>,
	Eli Cohen <eli@mellanox.com>,
	Faisal Latif <faisal.latif@intel.com>,
	Jack Morgenstein <jackm@dev.mellanox.co.il>,
	Or Gerlitz <ogerlitz@mellanox.com>,
	Haggai Eran <haggaie@mellanox.com>, Tom Talpey <tom@talpey.com>,
	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	Doug Ledford <dledford@redhat.com>
Subject: Re: [PATCH v5 01/27] IB/Verbs: Implement new callback query_transport()
Date: Tue, 21 Apr 2015 20:04:44 -0400	[thread overview]
Message-ID: <20150422000443.GB15893@phlsvsds.ph.intel.com> (raw)
In-Reply-To: <5534B981.1030302@profitbricks.com>

On Mon, Apr 20, 2015 at 10:32:01AM +0200, Michael Wang wrote:
> 
> Add new callback query_transport() and implement for each HW.
> 
> Mapping List:
> 		node-type	link-layer	old-transport	new-transport
> nes		RNIC		ETH		IWARP		IWARP
> amso1100	RNIC		ETH		IWARP		IWARP
> cxgb3   	RNIC		ETH		IWARP		IWARP
> cxgb4   	RNIC		ETH		IWARP		IWARP
> usnic   	USNIC_UDP	ETH		USNIC_UDP	USNIC_UDP
> ocrdma  	IB_CA		ETH		IB		IBOE
> mlx4    	IB_CA		IB/ETH		IB		IB/IBOE
> mlx5    	IB_CA		IB		IB		IB
> ehca    	IB_CA		IB		IB		IB
> ipath   	IB_CA		IB		IB		IB
> mthca   	IB_CA		IB		IB		IB
> qib     	IB_CA		IB		IB		IB
> 
> Cc: Hal Rosenstock <hal@dev.mellanox.co.il>
> Cc: Steve Wise <swise@opengridcomputing.com>
> Cc: Tom Talpey <tom@talpey.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Doug Ledford <dledford@redhat.com>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: Sean Hefty <sean.hefty@intel.com>
> Signed-off-by: Michael Wang <yun.wang@profitbricks.com>

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

> ---
>  drivers/infiniband/core/device.c             |  1 +
>  drivers/infiniband/core/verbs.c              |  4 +++-
>  drivers/infiniband/hw/amso1100/c2_provider.c |  7 +++++++
>  drivers/infiniband/hw/cxgb3/iwch_provider.c  |  7 +++++++
>  drivers/infiniband/hw/cxgb4/provider.c       |  7 +++++++
>  drivers/infiniband/hw/ehca/ehca_hca.c        |  6 ++++++
>  drivers/infiniband/hw/ehca/ehca_iverbs.h     |  3 +++
>  drivers/infiniband/hw/ehca/ehca_main.c       |  1 +
>  drivers/infiniband/hw/ipath/ipath_verbs.c    |  7 +++++++
>  drivers/infiniband/hw/mlx4/main.c            | 10 ++++++++++
>  drivers/infiniband/hw/mlx5/main.c            |  7 +++++++
>  drivers/infiniband/hw/mthca/mthca_provider.c |  7 +++++++
>  drivers/infiniband/hw/nes/nes_verbs.c        |  6 ++++++
>  drivers/infiniband/hw/ocrdma/ocrdma_main.c   |  1 +
>  drivers/infiniband/hw/ocrdma/ocrdma_verbs.c  |  6 ++++++
>  drivers/infiniband/hw/ocrdma/ocrdma_verbs.h  |  3 +++
>  drivers/infiniband/hw/qib/qib_verbs.c        |  7 +++++++
>  drivers/infiniband/hw/usnic/usnic_ib_main.c  |  1 +
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.c |  6 ++++++
>  drivers/infiniband/hw/usnic/usnic_ib_verbs.h |  2 ++
>  include/rdma/ib_verbs.h                      |  7 ++++++-
>  21 files changed, 104 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
> index 18c1ece..a9587c4 100644
> --- a/drivers/infiniband/core/device.c
> +++ b/drivers/infiniband/core/device.c
> @@ -76,6 +76,7 @@ static int ib_device_check_mandatory(struct ib_device *device)
>  	} mandatory_table[] = {
>  		IB_MANDATORY_FUNC(query_device),
>  		IB_MANDATORY_FUNC(query_port),
> +		IB_MANDATORY_FUNC(query_transport),
>  		IB_MANDATORY_FUNC(query_pkey),
>  		IB_MANDATORY_FUNC(query_gid),
>  		IB_MANDATORY_FUNC(alloc_pd),
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index f93eb8d..626c9cf 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -133,14 +133,16 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_
>  	if (device->get_link_layer)
>  		return device->get_link_layer(device, port_num);
>  
> -	switch (rdma_node_get_transport(device->node_type)) {
> +	switch (device->query_transport(device, port_num)) {
>  	case RDMA_TRANSPORT_IB:
>  		return IB_LINK_LAYER_INFINIBAND;
> +	case RDMA_TRANSPORT_IBOE:
>  	case RDMA_TRANSPORT_IWARP:
>  	case RDMA_TRANSPORT_USNIC:
>  	case RDMA_TRANSPORT_USNIC_UDP:
>  		return IB_LINK_LAYER_ETHERNET;
>  	default:
> +		BUG();
>  		return IB_LINK_LAYER_UNSPECIFIED;
>  	}
>  }
> diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
> index bdf3507..d46bbb0 100644
> --- a/drivers/infiniband/hw/amso1100/c2_provider.c
> +++ b/drivers/infiniband/hw/amso1100/c2_provider.c
> @@ -99,6 +99,12 @@ static int c2_query_port(struct ib_device *ibdev,
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +c2_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IWARP;
> +}
> +
>  static int c2_query_pkey(struct ib_device *ibdev,
>  			 u8 port, u16 index, u16 * pkey)
>  {
> @@ -801,6 +807,7 @@ int c2_register_device(struct c2_dev *dev)
>  	dev->ibdev.dma_device = &dev->pcidev->dev;
>  	dev->ibdev.query_device = c2_query_device;
>  	dev->ibdev.query_port = c2_query_port;
> +	dev->ibdev.query_transport = c2_query_transport;
>  	dev->ibdev.query_pkey = c2_query_pkey;
>  	dev->ibdev.query_gid = c2_query_gid;
>  	dev->ibdev.alloc_ucontext = c2_alloc_ucontext;
> diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> index 811b24a..09682e9e 100644
> --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
> +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> @@ -1232,6 +1232,12 @@ static int iwch_query_port(struct ib_device *ibdev,
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +iwch_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IWARP;
> +}
> +
>  static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
>  			char *buf)
>  {
> @@ -1385,6 +1391,7 @@ int iwch_register_device(struct iwch_dev *dev)
>  	dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);
>  	dev->ibdev.query_device = iwch_query_device;
>  	dev->ibdev.query_port = iwch_query_port;
> +	dev->ibdev.query_transport = iwch_query_transport;
>  	dev->ibdev.query_pkey = iwch_query_pkey;
>  	dev->ibdev.query_gid = iwch_query_gid;
>  	dev->ibdev.alloc_ucontext = iwch_alloc_ucontext;
> diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
> index 66bd6a2..a445e0d 100644
> --- a/drivers/infiniband/hw/cxgb4/provider.c
> +++ b/drivers/infiniband/hw/cxgb4/provider.c
> @@ -390,6 +390,12 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port,
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +c4iw_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IWARP;
> +}
> +
>  static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
>  			char *buf)
>  {
> @@ -506,6 +512,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
>  	dev->ibdev.dma_device = &(dev->rdev.lldi.pdev->dev);
>  	dev->ibdev.query_device = c4iw_query_device;
>  	dev->ibdev.query_port = c4iw_query_port;
> +	dev->ibdev.query_transport = c4iw_query_transport;
>  	dev->ibdev.query_pkey = c4iw_query_pkey;
>  	dev->ibdev.query_gid = c4iw_query_gid;
>  	dev->ibdev.alloc_ucontext = c4iw_alloc_ucontext;
> diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
> index 9ed4d25..d5a34a6 100644
> --- a/drivers/infiniband/hw/ehca/ehca_hca.c
> +++ b/drivers/infiniband/hw/ehca/ehca_hca.c
> @@ -242,6 +242,12 @@ query_port1:
>  	return ret;
>  }
>  
> +enum rdma_transport_type
> +ehca_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IB;
> +}
> +
>  int ehca_query_sma_attr(struct ehca_shca *shca,
>  			u8 port, struct ehca_sma_attr *attr)
>  {
> diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h
> index 22f79af..cec945f 100644
> --- a/drivers/infiniband/hw/ehca/ehca_iverbs.h
> +++ b/drivers/infiniband/hw/ehca/ehca_iverbs.h
> @@ -49,6 +49,9 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props);
>  int ehca_query_port(struct ib_device *ibdev, u8 port,
>  		    struct ib_port_attr *props);
>  
> +enum rdma_transport_type
> +ehca_query_transport(struct ib_device *device, u8 port_num);
> +
>  int ehca_query_sma_attr(struct ehca_shca *shca, u8 port,
>  			struct ehca_sma_attr *attr);
>  
> diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
> index cd8d290..60e0a09 100644
> --- a/drivers/infiniband/hw/ehca/ehca_main.c
> +++ b/drivers/infiniband/hw/ehca/ehca_main.c
> @@ -467,6 +467,7 @@ static int ehca_init_device(struct ehca_shca *shca)
>  	shca->ib_device.dma_device          = &shca->ofdev->dev;
>  	shca->ib_device.query_device        = ehca_query_device;
>  	shca->ib_device.query_port          = ehca_query_port;
> +	shca->ib_device.query_transport     = ehca_query_transport;
>  	shca->ib_device.query_gid           = ehca_query_gid;
>  	shca->ib_device.query_pkey          = ehca_query_pkey;
>  	/* shca->in_device.modify_device    = ehca_modify_device    */
> diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
> index 44ea939..58d36e3 100644
> --- a/drivers/infiniband/hw/ipath/ipath_verbs.c
> +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
> @@ -1638,6 +1638,12 @@ static int ipath_query_port(struct ib_device *ibdev,
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +ipath_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IB;
> +}
> +
>  static int ipath_modify_device(struct ib_device *device,
>  			       int device_modify_mask,
>  			       struct ib_device_modify *device_modify)
> @@ -2140,6 +2146,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
>  	dev->query_device = ipath_query_device;
>  	dev->modify_device = ipath_modify_device;
>  	dev->query_port = ipath_query_port;
> +	dev->query_transport = ipath_query_transport;
>  	dev->modify_port = ipath_modify_port;
>  	dev->query_pkey = ipath_query_pkey;
>  	dev->query_gid = ipath_query_gid;
> diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
> index b972c0b..e1424ad 100644
> --- a/drivers/infiniband/hw/mlx4/main.c
> +++ b/drivers/infiniband/hw/mlx4/main.c
> @@ -420,6 +420,15 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port,
>  	return __mlx4_ib_query_port(ibdev, port, props, 0);
>  }
>  
> +static enum rdma_transport_type
> +mlx4_ib_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	struct mlx4_dev *dev = to_mdev(device)->dev;
> +
> +	return dev->caps.port_mask[port_num] == MLX4_PORT_TYPE_IB ?
> +		RDMA_TRANSPORT_IB : RDMA_TRANSPORT_IBOE;
> +}
> +
>  int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
>  			union ib_gid *gid, int netw_view)
>  {
> @@ -2201,6 +2210,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
>  
>  	ibdev->ib_dev.query_device	= mlx4_ib_query_device;
>  	ibdev->ib_dev.query_port	= mlx4_ib_query_port;
> +	ibdev->ib_dev.query_transport	= mlx4_ib_query_transport;
>  	ibdev->ib_dev.get_link_layer	= mlx4_ib_port_link_layer;
>  	ibdev->ib_dev.query_gid		= mlx4_ib_query_gid;
>  	ibdev->ib_dev.query_pkey	= mlx4_ib_query_pkey;
> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
> index cc4ac1e..209c796 100644
> --- a/drivers/infiniband/hw/mlx5/main.c
> +++ b/drivers/infiniband/hw/mlx5/main.c
> @@ -351,6 +351,12 @@ out:
>  	return err;
>  }
>  
> +static enum rdma_transport_type
> +mlx5_ib_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IB;
> +}
> +
>  static int mlx5_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
>  			     union ib_gid *gid)
>  {
> @@ -1336,6 +1342,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
>  
>  	dev->ib_dev.query_device	= mlx5_ib_query_device;
>  	dev->ib_dev.query_port		= mlx5_ib_query_port;
> +	dev->ib_dev.query_transport	= mlx5_ib_query_transport;
>  	dev->ib_dev.query_gid		= mlx5_ib_query_gid;
>  	dev->ib_dev.query_pkey		= mlx5_ib_query_pkey;
>  	dev->ib_dev.modify_device	= mlx5_ib_modify_device;
> diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
> index 415f8e1..67ac6a4 100644
> --- a/drivers/infiniband/hw/mthca/mthca_provider.c
> +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
> @@ -179,6 +179,12 @@ static int mthca_query_port(struct ib_device *ibdev,
>  	return err;
>  }
>  
> +static enum rdma_transport_type
> +mthca_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IB;
> +}
> +
>  static int mthca_modify_device(struct ib_device *ibdev,
>  			       int mask,
>  			       struct ib_device_modify *props)
> @@ -1281,6 +1287,7 @@ int mthca_register_device(struct mthca_dev *dev)
>  	dev->ib_dev.dma_device           = &dev->pdev->dev;
>  	dev->ib_dev.query_device         = mthca_query_device;
>  	dev->ib_dev.query_port           = mthca_query_port;
> +	dev->ib_dev.query_transport      = mthca_query_transport;
>  	dev->ib_dev.modify_device        = mthca_modify_device;
>  	dev->ib_dev.modify_port          = mthca_modify_port;
>  	dev->ib_dev.query_pkey           = mthca_query_pkey;
> diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
> index c0d0296..8df5b61 100644
> --- a/drivers/infiniband/hw/nes/nes_verbs.c
> +++ b/drivers/infiniband/hw/nes/nes_verbs.c
> @@ -606,6 +606,11 @@ static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +nes_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IWARP;
> +}
>  
>  /**
>   * nes_query_pkey
> @@ -3879,6 +3884,7 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
>  	nesibdev->ibdev.dev.parent = &nesdev->pcidev->dev;
>  	nesibdev->ibdev.query_device = nes_query_device;
>  	nesibdev->ibdev.query_port = nes_query_port;
> +	nesibdev->ibdev.query_transport = nes_query_transport;
>  	nesibdev->ibdev.query_pkey = nes_query_pkey;
>  	nesibdev->ibdev.query_gid = nes_query_gid;
>  	nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext;
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 7a2b59a..9f4d182 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -244,6 +244,7 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
>  	/* mandatory verbs. */
>  	dev->ibdev.query_device = ocrdma_query_device;
>  	dev->ibdev.query_port = ocrdma_query_port;
> +	dev->ibdev.query_transport = ocrdma_query_transport;
>  	dev->ibdev.modify_port = ocrdma_modify_port;
>  	dev->ibdev.query_gid = ocrdma_query_gid;
>  	dev->ibdev.get_link_layer = ocrdma_link_layer;
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 8771755..73bace4 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -187,6 +187,12 @@ int ocrdma_query_port(struct ib_device *ibdev,
>  	return 0;
>  }
>  
> +enum rdma_transport_type
> +ocrdma_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IBOE;
> +}
> +
>  int ocrdma_modify_port(struct ib_device *ibdev, u8 port, int mask,
>  		       struct ib_port_modify *props)
>  {
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
> index b8f7853..4a81b63 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
> @@ -41,6 +41,9 @@ int ocrdma_query_port(struct ib_device *, u8 port, struct ib_port_attr *props);
>  int ocrdma_modify_port(struct ib_device *, u8 port, int mask,
>  		       struct ib_port_modify *props);
>  
> +enum rdma_transport_type
> +ocrdma_query_transport(struct ib_device *device, u8 port_num);
> +
>  void ocrdma_get_guid(struct ocrdma_dev *, u8 *guid);
>  int ocrdma_query_gid(struct ib_device *, u8 port,
>  		     int index, union ib_gid *gid);
> diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
> index 4a35998..caad665 100644
> --- a/drivers/infiniband/hw/qib/qib_verbs.c
> +++ b/drivers/infiniband/hw/qib/qib_verbs.c
> @@ -1650,6 +1650,12 @@ static int qib_query_port(struct ib_device *ibdev, u8 port,
>  	return 0;
>  }
>  
> +static enum rdma_transport_type
> +qib_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_IB;
> +}
> +
>  static int qib_modify_device(struct ib_device *device,
>  			     int device_modify_mask,
>  			     struct ib_device_modify *device_modify)
> @@ -2184,6 +2190,7 @@ int qib_register_ib_device(struct qib_devdata *dd)
>  	ibdev->query_device = qib_query_device;
>  	ibdev->modify_device = qib_modify_device;
>  	ibdev->query_port = qib_query_port;
> +	ibdev->query_transport = qib_query_transport;
>  	ibdev->modify_port = qib_modify_port;
>  	ibdev->query_pkey = qib_query_pkey;
>  	ibdev->query_gid = qib_query_gid;
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> index 0d0f986..03ea9f3 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> @@ -360,6 +360,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
>  
>  	us_ibdev->ib_dev.query_device = usnic_ib_query_device;
>  	us_ibdev->ib_dev.query_port = usnic_ib_query_port;
> +	us_ibdev->ib_dev.query_transport = usnic_ib_query_transport;
>  	us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
>  	us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
>  	us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> index 53bd6a2..ff9a5f7 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> @@ -348,6 +348,12 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
>  	return 0;
>  }
>  
> +enum rdma_transport_type
> +usnic_ib_query_transport(struct ib_device *device, u8 port_num)
> +{
> +	return RDMA_TRANSPORT_USNIC_UDP;
> +}
> +
>  int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
>  				int qp_attr_mask,
>  				struct ib_qp_init_attr *qp_init_attr)
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> index bb864f5..0b1633b 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
> @@ -27,6 +27,8 @@ int usnic_ib_query_device(struct ib_device *ibdev,
>  				struct ib_device_attr *props);
>  int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
>  				struct ib_port_attr *props);
> +enum rdma_transport_type
> +usnic_ib_query_transport(struct ib_device *device, u8 port_num);
>  int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
>  				int qp_attr_mask,
>  				struct ib_qp_init_attr *qp_init_attr);
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index 65994a1..d54f91e 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -75,10 +75,13 @@ enum rdma_node_type {
>  };
>  
>  enum rdma_transport_type {
> +	/* legacy for users */
>  	RDMA_TRANSPORT_IB,
>  	RDMA_TRANSPORT_IWARP,
>  	RDMA_TRANSPORT_USNIC,
> -	RDMA_TRANSPORT_USNIC_UDP
> +	RDMA_TRANSPORT_USNIC_UDP,
> +	/* new transport */
> +	RDMA_TRANSPORT_IBOE,
>  };
>  
>  __attribute_const__ enum rdma_transport_type
> @@ -1501,6 +1504,8 @@ struct ib_device {
>  	int		           (*query_port)(struct ib_device *device,
>  						 u8 port_num,
>  						 struct ib_port_attr *port_attr);
> +	enum rdma_transport_type   (*query_transport)(struct ib_device *device,
> +						      u8 port_num);
>  	enum rdma_link_layer	   (*get_link_layer)(struct ib_device *device,
>  						     u8 port_num);
>  	int		           (*query_gid)(struct ib_device *device,
> -- 
> 2.1.0

  reply	other threads:[~2015-04-22  0:04 UTC|newest]

Thread overview: 173+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-20  8:28 [PATCH v5 00/27] IB/Verbs: IB Management Helpers Michael Wang
2015-04-20  8:28 ` Michael Wang
2015-04-20  8:32 ` [PATCH v5 01/27] IB/Verbs: Implement new callback query_transport() Michael Wang
2015-04-22  0:04   ` ira.weiny [this message]
     [not found]   ` <5534B981.1030302-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22 15:02     ` Doug Ledford
2015-04-22 15:02       ` Doug Ledford
     [not found]       ` <1429714975.45956.113.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-04-22 15:21         ` Devesh Sharma
2015-04-22 15:21           ` Devesh Sharma
     [not found]           ` <EE7902D3F51F404C82415C4803930ACD5DC446F3-DWYeeINJQrxExQ8dmkPuX0M9+F4ksjoh@public.gmane.org>
2015-04-22 16:22             ` ira.weiny
2015-04-22 16:22               ` ira.weiny
2015-04-22 16:42           ` Doug Ledford
2015-04-23  7:13         ` Michael Wang
2015-04-23  7:13           ` Michael Wang
2015-04-20  8:33 ` [PATCH v5 03/27] IB/Verbs: Reform IB-core mad/agent/user_mad Michael Wang
2015-04-22  0:05   ` ira.weiny
2015-04-20  8:34 ` [PATCH v5 05/27] IB/Verbs: Reform IB-core sa_query Michael Wang
2015-04-22  0:05   ` ira.weiny
2015-04-20  8:35 ` [PATCH v5 07/27] IB/Verbs: Reform IB-ulp ipoib Michael Wang
     [not found]   ` <5534BA43.6060400-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:06     ` ira.weiny
2015-04-22  0:06       ` ira.weiny
2015-04-20  8:35 ` [PATCH v5 08/27] IB/Verbs: Reform IB-ulp xprtrdma Michael Wang
2015-04-22  0:06   ` ira.weiny
2015-04-20  8:37 ` [PATCH v5 12/27] IB/Verbs: Reform mcast related part in IB-core cma Michael Wang
     [not found]   ` <5534BACF.3080700-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:07     ` ira.weiny
2015-04-22  0:07       ` ira.weiny
2015-04-20  8:38 ` [PATCH v5 14/27] IB/Verbs: Reform cma_acquire_dev() Michael Wang
     [not found]   ` <5534BAFF.5030107-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-21  6:15     ` Devesh Sharma
2015-04-21  6:15       ` Devesh Sharma
2015-04-21  8:08       ` Michael Wang
2015-04-22  0:08     ` ira.weiny
2015-04-22  0:08       ` ira.weiny
2015-04-20  8:39 ` [PATCH v5 16/27] IB/Verbs: Use management helper cap_ib_mad() Michael Wang
2015-04-22  0:09   ` ira.weiny
2015-04-20  8:40 ` [PATCH v5 18/27] IB/Verbs: Use management helper cap_ib_cm() Michael Wang
     [not found]   ` <5534BB64.10402-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:09     ` ira.weiny
2015-04-22  0:09       ` ira.weiny
2015-04-20  8:40 ` [PATCH v5 19/27] IB/Verbs: Use management helper cap_iw_cm() Michael Wang
     [not found]   ` <5534BB7B.4020601-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-20 14:00     ` Steve Wise
2015-04-20 14:00       ` Steve Wise
2015-04-20 15:16       ` Michael Wang
2015-04-20 15:51         ` Tom Tucker
     [not found]           ` <5535209E.3020807-7bPotxP6k4+P2YhJcF5u+vpXobYPEAuW@public.gmane.org>
2015-04-20 16:19             ` Jason Gunthorpe
2015-04-20 16:19               ` Jason Gunthorpe
     [not found]               ` <20150420161927.GB7676-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-04-20 16:39                 ` Tom Tucker
2015-04-20 16:39                   ` Tom Tucker
2015-04-21  7:39             ` Michael Wang
2015-04-21  7:39               ` Michael Wang
     [not found]               ` <5535FE9F.8070809-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-21 15:06                 ` Tom Tucker
2015-04-21 15:06                   ` Tom Tucker
2015-04-22  0:10   ` ira.weiny
     [not found] ` <5534B8C9.506-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-20  8:32   ` [PATCH v5 02/27] IB/Verbs: Implement raw management helpers Michael Wang
2015-04-20  8:32     ` Michael Wang
     [not found]     ` <5534B9A0.9010303-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:05       ` ira.weiny
2015-04-22  0:05         ` ira.weiny
2015-04-20  8:33   ` [PATCH v5 04/27] IB/Verbs: Reform IB-core cm Michael Wang
2015-04-20  8:33     ` Michael Wang
     [not found]     ` <5534B9E9.1020108-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-20 17:04       ` Hal Rosenstock
2015-04-20 17:04         ` Hal Rosenstock
2015-04-21  7:42         ` Michael Wang
2015-04-22  0:05     ` ira.weiny
2015-04-20  8:34   ` [PATCH v5 06/27] IB/Verbs: Reform IB-core multicast Michael Wang
2015-04-20  8:34     ` Michael Wang
2015-04-22  0:06     ` ira.weiny
2015-04-20  8:36   ` [PATCH v5 09/27] IB/Verbs: Reform IB-core verbs/uverbs_cmd/sysfs Michael Wang
2015-04-20  8:36     ` Michael Wang
     [not found]     ` <5534BA7C.2010600-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-21 23:19       ` ira.weiny
2015-04-21 23:19         ` ira.weiny
     [not found]         ` <20150421231958.GA15893-W4f6Xiosr+yv7QzWx2u06xL4W9x8LtSr@public.gmane.org>
2015-04-22  7:38           ` Michael Wang
2015-04-22  7:38             ` Michael Wang
     [not found]             ` <55375011.7010805-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22 16:28               ` ira.weiny
2015-04-22 16:28                 ` ira.weiny
2015-04-23  9:25                 ` Michael Wang
2015-04-20  8:36   ` [PATCH v5 10/27] IB/Verbs: Reform cm related part in IB-core cma/ucm Michael Wang
2015-04-20  8:36     ` Michael Wang
2015-04-22  0:07     ` ira.weiny
2015-04-20  8:37   ` [PATCH v5 11/27] IB/Verbs: Reform route related part in IB-core cma Michael Wang
2015-04-20  8:37     ` Michael Wang
2015-04-22  0:07     ` ira.weiny
2015-04-20  8:38   ` [PATCH v5 13/27] IB/Verbs: Reserve legacy transport type in 'dev_addr' Michael Wang
2015-04-20  8:38     ` Michael Wang
     [not found]     ` <5534BAE8.9010805-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-21  5:58       ` Devesh Sharma
2015-04-21  5:58         ` Devesh Sharma
     [not found]         ` <EE7902D3F51F404C82415C4803930ACD5DC44144-DWYeeINJQrxExQ8dmkPuX0M9+F4ksjoh@public.gmane.org>
2015-04-21  8:05           ` Michael Wang
2015-04-21  8:05             ` Michael Wang
2015-04-22  0:08       ` ira.weiny
2015-04-22  0:08         ` ira.weiny
2015-04-20  8:38   ` [PATCH v5 15/27] IB/Verbs: Reform rest part in IB-core cma Michael Wang
2015-04-20  8:38     ` Michael Wang
     [not found]     ` <5534BB19.9000003-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:08       ` ira.weiny
2015-04-22  0:08         ` ira.weiny
2015-04-20  8:39   ` [PATCH v5 17/27] IB/Verbs: Use management helper cap_ib_smi() Michael Wang
2015-04-20  8:39     ` Michael Wang
2015-04-22  0:09     ` ira.weiny
2015-04-20  8:40   ` [PATCH v5 20/27] IB/Verbs: Use management helper cap_ib_sa() Michael Wang
2015-04-20  8:40     ` Michael Wang
2015-04-22  0:10     ` ira.weiny
2015-04-20  8:41   ` [PATCH v5 21/27] IB/Verbs: Use management helper cap_ib_mcast() Michael Wang
2015-04-20  8:41     ` Michael Wang
2015-04-22  0:10     ` ira.weiny
2015-04-20  8:41   ` [PATCH v5 22/27] IB/Verbs: Use management helper cap_ipoib() Michael Wang
2015-04-20  8:41     ` Michael Wang
2015-04-22  0:11     ` ira.weiny
     [not found]     ` <5534BBC2.4010902-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  5:40       ` Jason Gunthorpe
2015-04-22  5:40         ` Jason Gunthorpe
     [not found]         ` <20150422054058.GB29609-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-04-22  8:49           ` Michael Wang
2015-04-22  8:49             ` Michael Wang
     [not found]             ` <553760A8.2090802-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22 16:45               ` ira.weiny
2015-04-22 16:45                 ` ira.weiny
2015-04-22 16:54                 ` Hefty, Sean
2015-04-23  9:31                 ` Michael Wang
2015-04-22 17:24               ` Jason Gunthorpe
2015-04-22 17:24                 ` Jason Gunthorpe
     [not found]                 ` <20150422172455.GF19500-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-04-23  7:53                   ` Michael Wang
2015-04-23  7:53                     ` Michael Wang
2015-04-20  8:42   ` [PATCH v5 24/27] IB/Verbs: Use management helper cap_af_ib() Michael Wang
2015-04-20  8:42     ` Michael Wang
2015-04-22  0:11     ` ira.weiny
2015-04-20  8:43   ` [PATCH v5 26/27] IB/Verbs: Clean up rdma_ib_or_iboe() Michael Wang
2015-04-20  8:43     ` Michael Wang
     [not found]     ` <5534BC2E.40307-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:12       ` ira.weiny
2015-04-22  0:12         ` ira.weiny
2015-04-20  8:43   ` [PATCH v5 27/27] IB/Verbs: Cleanup rdma_node_get_transport() Michael Wang
2015-04-20  8:43     ` Michael Wang
     [not found]     ` <5534BC47.6080706-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-22  0:13       ` ira.weiny
2015-04-22  0:13         ` ira.weiny
2015-04-21 23:36   ` [PATCH v5 00/27] IB/Verbs: IB Management Helpers Liran Liss
2015-04-21 23:36     ` Liran Liss
     [not found]     ` <DB4PR05MB0863E9CCCD1BEA34F244EE2CB1EF0-xsq7jzH2t6llkovD9u25SNqRiQSDpxhJvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2015-04-22  2:41       ` ira.weiny
2015-04-22  2:41         ` ira.weiny
     [not found]         ` <20150422024123.GA18675-W4f6Xiosr+yv7QzWx2u06xL4W9x8LtSr@public.gmane.org>
2015-04-22  8:32           ` Michael Wang
2015-04-22  8:32             ` Michael Wang
     [not found]         ` <DB4PR05MB086335365371E756B789FE84B1EE0@DB4PR05MB0863.eurprd05.prod.outlook.com>
2015-04-22 16:40           ` Jason Gunthorpe
     [not found]             ` <DB4PR05MB08633B2B2E3BA32752EE8098B1EC0@DB4PR05MB0863.eurprd05.prod.outlook.com>
     [not found]               ` <DB4PR05MB08633B2B2E3BA32752EE8098B1EC0-xsq7jzH2t6llkovD9u25SNqRiQSDpxhJvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2015-04-24 16:42                 ` Jason Gunthorpe
2015-04-24 16:42                   ` Jason Gunthorpe
     [not found]                   ` <20150424164226.GB9305-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-04-27 19:10                     ` ira.weiny
2015-04-27 19:10                       ` ira.weiny
2015-04-22 16:40         ` Hefty, Sean
2015-04-22 16:40           ` Hefty, Sean
2015-04-24 14:49           ` Liran Liss
2015-04-24 14:49             ` Liran Liss
2015-04-22 14:59       ` Doug Ledford
2015-04-22 14:59         ` Doug Ledford
2015-04-22 16:57         ` Jason Gunthorpe
2015-04-23  8:36           ` Michael Wang
     [not found]         ` <1429714792.45956.110.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-04-22 17:10           ` ira.weiny
2015-04-22 17:10             ` ira.weiny
2015-04-23  9:36             ` Michael Wang
     [not found]             ` <DB4PR05MB08630282DEFFFB181A525B67B1EC0@DB4PR05MB0863.eurprd05.prod.outlook.com>
     [not found]               ` <DB4PR05MB08630282DEFFFB181A525B67B1EC0-xsq7jzH2t6llkovD9u25SNqRiQSDpxhJvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2015-04-27 20:58                 ` ira.weiny
2015-04-27 20:58                   ` ira.weiny
2015-04-22 16:46       ` Dave Goodell (dgoodell)
2015-04-22 16:46         ` Dave Goodell (dgoodell)
2015-04-22  8:30     ` Michael Wang
2015-04-22 16:16       ` Liran Liss
2015-04-22 16:16         ` Liran Liss
2015-04-23  7:33         ` Michael Wang
     [not found]           ` <5538A034.4030904-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2015-04-24 14:44             ` Liran Liss
2015-04-24 14:44               ` Liran Liss
     [not found]               ` <DB4PR05MB08635737AF7A40F3F82B7628B1EC0-xsq7jzH2t6llkovD9u25SNqRiQSDpxhJvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2015-04-24 15:07                 ` Michael Wang
2015-04-24 15:07                   ` Michael Wang
2015-04-27 19:22               ` ira.weiny
2015-04-20  8:42 ` [PATCH v5 23/27] IB/Verbs: Use management helper cap_read_multi_sge() Michael Wang
2015-04-22  0:11   ` ira.weiny
2015-04-20  8:43 ` [PATCH v5 25/27] IB/Verbs: Use management helper cap_eth_ah() Michael Wang
2015-04-22  0:11   ` ira.weiny
2015-04-21  5:41 ` [PATCH v5 00/27] IB/Verbs: IB Management Helpers Devesh Sharma
2015-04-21  5:41   ` Devesh Sharma
     [not found]   ` <EE7902D3F51F404C82415C4803930ACD5DC44113-DWYeeINJQrxExQ8dmkPuX0M9+F4ksjoh@public.gmane.org>
2015-04-21  7:46     ` Michael Wang
2015-04-21  7:46       ` Michael Wang
2015-04-21 11:03       ` Devesh Sharma
2015-04-21 11:03         ` Devesh Sharma
2015-04-21 15:56         ` Michael Wang
2015-04-22  0:28 ` ira.weiny
2015-04-22  7:44   ` Michael Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150422000443.GB15893@phlsvsds.ph.intel.com \
    --to=ira.weiny@intel.com \
    --cc=dledford@redhat.com \
    --cc=eli@mellanox.com \
    --cc=faisal.latif@intel.com \
    --cc=haggaie@mellanox.com \
    --cc=hal@dev.mellanox.co.il \
    --cc=hnguyen@de.ibm.com \
    --cc=infinipath@intel.com \
    --cc=jackm@dev.mellanox.co.il \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=ogerlitz@mellanox.com \
    --cc=raisch@de.ibm.com \
    --cc=roland@kernel.org \
    --cc=sean.hefty@intel.com \
    --cc=swise@opengridcomputing.com \
    --cc=tom@opengridcomputing.com \
    --cc=tom@talpey.com \
    --cc=yun.wang@profitbricks.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.