redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

IB/Verbs: Implement new callback query_protocol()

Browse source 
Add new callback query_protocol() and implement for each HW.

Mapping List:
		node-type	link-layer	transport	protocol
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

Signed-off-by: Michael Wang <yun.wang@profitbricks.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Tested-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Michael Wang 2015-05-05 14:50:18 +02:00 committed by Doug Ledford
parent e26081808e
commit 6b90a6d66b
20 changed files with 104 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/infiniband/core/device.c
View file

@ -76,6 +76,7 @@ static int ib_device_check_mandatory(struct ib_device *device)
} mandatory_table[] = { } mandatory_table[] = {
IB_MANDATORY_FUNC(query_device), IB_MANDATORY_FUNC(query_device),
IB_MANDATORY_FUNC(query_port), IB_MANDATORY_FUNC(query_port),
IB_MANDATORY_FUNC(query_protocol),
IB_MANDATORY_FUNC(query_pkey), IB_MANDATORY_FUNC(query_pkey),
IB_MANDATORY_FUNC(query_gid), IB_MANDATORY_FUNC(query_gid),
IB_MANDATORY_FUNC(alloc_pd), IB_MANDATORY_FUNC(alloc_pd),

7
drivers/infiniband/hw/amso1100/c2_provider.c
View file

@ -99,6 +99,12 @@ static int c2_query_port(struct ib_device *ibdev,
return 0; return 0;
} }
static enum rdma_protocol_type
c2_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IWARP;
}
static int c2_query_pkey(struct ib_device *ibdev, static int c2_query_pkey(struct ib_device *ibdev,
u8 port, u16 index, u16 * pkey) 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.dma_device = &dev->pcidev->dev;
dev->ibdev.query_device = c2_query_device; dev->ibdev.query_device = c2_query_device;
dev->ibdev.query_port = c2_query_port; dev->ibdev.query_port = c2_query_port;
dev->ibdev.query_protocol = c2_query_protocol;
dev->ibdev.query_pkey = c2_query_pkey; dev->ibdev.query_pkey = c2_query_pkey;
dev->ibdev.query_gid = c2_query_gid; dev->ibdev.query_gid = c2_query_gid;
dev->ibdev.alloc_ucontext = c2_alloc_ucontext; dev->ibdev.alloc_ucontext = c2_alloc_ucontext;

7
drivers/infiniband/hw/cxgb3/iwch_provider.c
View file

@ -1232,6 +1232,12 @@ static int iwch_query_port(struct ib_device *ibdev,
return 0; return 0;
} }
static enum rdma_protocol_type
iwch_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IWARP;
}
static ssize_t show_rev(struct device *dev, struct device_attribute *attr, static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
char *buf) 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.dma_device = &(dev->rdev.rnic_info.pdev->dev);
dev->ibdev.query_device = iwch_query_device; dev->ibdev.query_device = iwch_query_device;
dev->ibdev.query_port = iwch_query_port; dev->ibdev.query_port = iwch_query_port;
dev->ibdev.query_protocol = iwch_query_protocol;
dev->ibdev.query_pkey = iwch_query_pkey; dev->ibdev.query_pkey = iwch_query_pkey;
dev->ibdev.query_gid = iwch_query_gid; dev->ibdev.query_gid = iwch_query_gid;
dev->ibdev.alloc_ucontext = iwch_alloc_ucontext; dev->ibdev.alloc_ucontext = iwch_alloc_ucontext;

7
drivers/infiniband/hw/cxgb4/provider.c
View file

@ -390,6 +390,12 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port,
return 0; return 0;
} }
static enum rdma_protocol_type
c4iw_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IWARP;
}
static ssize_t show_rev(struct device *dev, struct device_attribute *attr, static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
char *buf) 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.dma_device = &(dev->rdev.lldi.pdev->dev);
dev->ibdev.query_device = c4iw_query_device; dev->ibdev.query_device = c4iw_query_device;
dev->ibdev.query_port = c4iw_query_port; dev->ibdev.query_port = c4iw_query_port;
dev->ibdev.query_protocol = c4iw_query_protocol;
dev->ibdev.query_pkey = c4iw_query_pkey; dev->ibdev.query_pkey = c4iw_query_pkey;
dev->ibdev.query_gid = c4iw_query_gid; dev->ibdev.query_gid = c4iw_query_gid;
dev->ibdev.alloc_ucontext = c4iw_alloc_ucontext; dev->ibdev.alloc_ucontext = c4iw_alloc_ucontext;

6
drivers/infiniband/hw/ehca/ehca_hca.c
View file

@ -242,6 +242,12 @@ query_port1:
return ret; return ret;
} }
enum rdma_protocol_type
ehca_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IB;
}
int ehca_query_sma_attr(struct ehca_shca *shca, int ehca_query_sma_attr(struct ehca_shca *shca,
u8 port, struct ehca_sma_attr *attr) u8 port, struct ehca_sma_attr *attr)
{ {

3
drivers/infiniband/hw/ehca/ehca_iverbs.h
View file

@ -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, int ehca_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props); struct ib_port_attr *props);
enum rdma_protocol_type
ehca_query_protocol(struct ib_device *device, u8 port_num);
int ehca_query_sma_attr(struct ehca_shca *shca, u8 port, int ehca_query_sma_attr(struct ehca_shca *shca, u8 port,
struct ehca_sma_attr *attr); struct ehca_sma_attr *attr);

1
drivers/infiniband/hw/ehca/ehca_main.c
View file

@ -467,6 +467,7 @@ static int ehca_init_device(struct ehca_shca *shca)
shca->ib_device.dma_device = &shca->ofdev->dev; shca->ib_device.dma_device = &shca->ofdev->dev;
shca->ib_device.query_device = ehca_query_device; shca->ib_device.query_device = ehca_query_device;
shca->ib_device.query_port = ehca_query_port; shca->ib_device.query_port = ehca_query_port;
shca->ib_device.query_protocol = ehca_query_protocol;
shca->ib_device.query_gid = ehca_query_gid; shca->ib_device.query_gid = ehca_query_gid;
shca->ib_device.query_pkey = ehca_query_pkey; shca->ib_device.query_pkey = ehca_query_pkey;
/* shca->in_device.modify_device = ehca_modify_device */ /* shca->in_device.modify_device = ehca_modify_device */

7
drivers/infiniband/hw/ipath/ipath_verbs.c
View file

@ -1638,6 +1638,12 @@ static int ipath_query_port(struct ib_device *ibdev,
return 0; return 0;
} }
static enum rdma_protocol_type
ipath_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IB;
}
static int ipath_modify_device(struct ib_device *device, static int ipath_modify_device(struct ib_device *device,
int device_modify_mask, int device_modify_mask,
struct ib_device_modify *device_modify) 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->query_device = ipath_query_device;
dev->modify_device = ipath_modify_device; dev->modify_device = ipath_modify_device;
dev->query_port = ipath_query_port; dev->query_port = ipath_query_port;
dev->query_protocol = ipath_query_protocol;
dev->modify_port = ipath_modify_port; dev->modify_port = ipath_modify_port;
dev->query_pkey = ipath_query_pkey; dev->query_pkey = ipath_query_pkey;
dev->query_gid = ipath_query_gid; dev->query_gid = ipath_query_gid;

10
drivers/infiniband/hw/mlx4/main.c
View file

@ -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); return __mlx4_ib_query_port(ibdev, port, props, 0);
} }
static enum rdma_protocol_type
mlx4_ib_query_protocol(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_PROTOCOL_IB : RDMA_PROTOCOL_IBOE;
}
int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index, int __mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
union ib_gid *gid, int netw_view) 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_device = mlx4_ib_query_device;
ibdev->ib_dev.query_port = mlx4_ib_query_port; ibdev->ib_dev.query_port = mlx4_ib_query_port;
ibdev->ib_dev.query_protocol = mlx4_ib_query_protocol;
ibdev->ib_dev.get_link_layer = mlx4_ib_port_link_layer; ibdev->ib_dev.get_link_layer = mlx4_ib_port_link_layer;
ibdev->ib_dev.query_gid = mlx4_ib_query_gid; ibdev->ib_dev.query_gid = mlx4_ib_query_gid;
ibdev->ib_dev.query_pkey = mlx4_ib_query_pkey; ibdev->ib_dev.query_pkey = mlx4_ib_query_pkey;

7
drivers/infiniband/hw/mlx5/main.c
View file

@ -262,6 +262,12 @@ out:
return err; return err;
} }
static enum rdma_protocol_type
mlx5_ib_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IB;
}
static int mlx5_ib_query_gid(struct ib_device *ibdev, u8 port, int index, static int mlx5_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
union ib_gid *gid) union ib_gid *gid)
{ {
@ -1244,6 +1250,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
dev->ib_dev.query_device = mlx5_ib_query_device; dev->ib_dev.query_device = mlx5_ib_query_device;
dev->ib_dev.query_port = mlx5_ib_query_port; dev->ib_dev.query_port = mlx5_ib_query_port;
dev->ib_dev.query_protocol = mlx5_ib_query_protocol;
dev->ib_dev.query_gid = mlx5_ib_query_gid; dev->ib_dev.query_gid = mlx5_ib_query_gid;
dev->ib_dev.query_pkey = mlx5_ib_query_pkey; dev->ib_dev.query_pkey = mlx5_ib_query_pkey;
dev->ib_dev.modify_device = mlx5_ib_modify_device; dev->ib_dev.modify_device = mlx5_ib_modify_device;

7
drivers/infiniband/hw/mthca/mthca_provider.c
View file

@ -179,6 +179,12 @@ static int mthca_query_port(struct ib_device *ibdev,
return err; return err;
} }
static enum rdma_protocol_type
mthca_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IB;
}
static int mthca_modify_device(struct ib_device *ibdev, static int mthca_modify_device(struct ib_device *ibdev,
int mask, int mask,
struct ib_device_modify *props) 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.dma_device = &dev->pdev->dev;
dev->ib_dev.query_device = mthca_query_device; dev->ib_dev.query_device = mthca_query_device;
dev->ib_dev.query_port = mthca_query_port; dev->ib_dev.query_port = mthca_query_port;
dev->ib_dev.query_protocol = mthca_query_protocol;
dev->ib_dev.modify_device = mthca_modify_device; dev->ib_dev.modify_device = mthca_modify_device;
dev->ib_dev.modify_port = mthca_modify_port; dev->ib_dev.modify_port = mthca_modify_port;
dev->ib_dev.query_pkey = mthca_query_pkey; dev->ib_dev.query_pkey = mthca_query_pkey;

6
drivers/infiniband/hw/nes/nes_verbs.c
View file

@ -606,6 +606,11 @@ static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr
return 0; return 0;
} }
static enum rdma_protocol_type
nes_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IWARP;
}
/** /**
* nes_query_pkey * 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.dev.parent = &nesdev->pcidev->dev;
nesibdev->ibdev.query_device = nes_query_device; nesibdev->ibdev.query_device = nes_query_device;
nesibdev->ibdev.query_port = nes_query_port; nesibdev->ibdev.query_port = nes_query_port;
nesibdev->ibdev.query_protocol = nes_query_protocol;
nesibdev->ibdev.query_pkey = nes_query_pkey; nesibdev->ibdev.query_pkey = nes_query_pkey;
nesibdev->ibdev.query_gid = nes_query_gid; nesibdev->ibdev.query_gid = nes_query_gid;
nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext; nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext;

1
drivers/infiniband/hw/ocrdma/ocrdma_main.c
View file

@ -244,6 +244,7 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
/* mandatory verbs. */ /* mandatory verbs. */
dev->ibdev.query_device = ocrdma_query_device; dev->ibdev.query_device = ocrdma_query_device;
dev->ibdev.query_port = ocrdma_query_port; dev->ibdev.query_port = ocrdma_query_port;
dev->ibdev.query_protocol = ocrdma_query_protocol;
dev->ibdev.modify_port = ocrdma_modify_port; dev->ibdev.modify_port = ocrdma_modify_port;
dev->ibdev.query_gid = ocrdma_query_gid; dev->ibdev.query_gid = ocrdma_query_gid;
dev->ibdev.get_link_layer = ocrdma_link_layer; dev->ibdev.get_link_layer = ocrdma_link_layer;

6
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
View file

@ -187,6 +187,12 @@ int ocrdma_query_port(struct ib_device *ibdev,
return 0; return 0;
} }
enum rdma_protocol_type
ocrdma_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IBOE;
}
int ocrdma_modify_port(struct ib_device *ibdev, u8 port, int mask, int ocrdma_modify_port(struct ib_device *ibdev, u8 port, int mask,
struct ib_port_modify *props) struct ib_port_modify *props)
{ {

3
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
View file

@ -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, int ocrdma_modify_port(struct ib_device *, u8 port, int mask,
struct ib_port_modify *props); struct ib_port_modify *props);
enum rdma_protocol_type
ocrdma_query_protocol(struct ib_device *device, u8 port_num);
void ocrdma_get_guid(struct ocrdma_dev *, u8 *guid); void ocrdma_get_guid(struct ocrdma_dev *, u8 *guid);
int ocrdma_query_gid(struct ib_device *, u8 port, int ocrdma_query_gid(struct ib_device *, u8 port,
int index, union ib_gid *gid); int index, union ib_gid *gid);

7
drivers/infiniband/hw/qib/qib_verbs.c
View file

@ -1650,6 +1650,12 @@ static int qib_query_port(struct ib_device *ibdev, u8 port,
return 0; return 0;
} }
static enum rdma_protocol_type
qib_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_IB;
}
static int qib_modify_device(struct ib_device *device, static int qib_modify_device(struct ib_device *device,
int device_modify_mask, int device_modify_mask,
struct ib_device_modify *device_modify) 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->query_device = qib_query_device;
ibdev->modify_device = qib_modify_device; ibdev->modify_device = qib_modify_device;
ibdev->query_port = qib_query_port; ibdev->query_port = qib_query_port;
ibdev->query_protocol = qib_query_protocol;
ibdev->modify_port = qib_modify_port; ibdev->modify_port = qib_modify_port;
ibdev->query_pkey = qib_query_pkey; ibdev->query_pkey = qib_query_pkey;
ibdev->query_gid = qib_query_gid; ibdev->query_gid = qib_query_gid;

1
drivers/infiniband/hw/usnic/usnic_ib_main.c
View file

@ -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_device = usnic_ib_query_device;
us_ibdev->ib_dev.query_port = usnic_ib_query_port; us_ibdev->ib_dev.query_port = usnic_ib_query_port;
us_ibdev->ib_dev.query_protocol = usnic_ib_query_protocol;
us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey; us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
us_ibdev->ib_dev.query_gid = usnic_ib_query_gid; us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer; us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;

6
drivers/infiniband/hw/usnic/usnic_ib_verbs.c
View file

@ -348,6 +348,12 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
return 0; return 0;
} }
enum rdma_protocol_type
usnic_ib_query_protocol(struct ib_device *device, u8 port_num)
{
return RDMA_PROTOCOL_USNIC_UDP;
}
int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
int qp_attr_mask, int qp_attr_mask,
struct ib_qp_init_attr *qp_init_attr) struct ib_qp_init_attr *qp_init_attr)

2
drivers/infiniband/hw/usnic/usnic_ib_verbs.h
View file

@ -27,6 +27,8 @@ int usnic_ib_query_device(struct ib_device *ibdev,
struct ib_device_attr *props); struct ib_device_attr *props);
int usnic_ib_query_port(struct ib_device *ibdev, u8 port, int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props); struct ib_port_attr *props);
enum rdma_protocol_type
usnic_ib_query_protocol(struct ib_device *device, u8 port_num);
int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, int usnic_ib_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
int qp_attr_mask, int qp_attr_mask,
struct ib_qp_init_attr *qp_init_attr); struct ib_qp_init_attr *qp_init_attr);

9
include/rdma/ib_verbs.h
View file

@ -81,6 +81,13 @@ enum rdma_transport_type {
RDMA_TRANSPORT_USNIC_UDP RDMA_TRANSPORT_USNIC_UDP
}; };
enum rdma_protocol_type {
RDMA_PROTOCOL_IB,
RDMA_PROTOCOL_IBOE,
RDMA_PROTOCOL_IWARP,
RDMA_PROTOCOL_USNIC_UDP
};
__attribute_const__ enum rdma_transport_type __attribute_const__ enum rdma_transport_type
rdma_node_get_transport(enum rdma_node_type node_type); rdma_node_get_transport(enum rdma_node_type node_type);
@ -1501,6 +1508,8 @@ struct ib_device {
int (*query_port)(struct ib_device *device, int (*query_port)(struct ib_device *device,
u8 port_num, u8 port_num,
struct ib_port_attr *port_attr); struct ib_port_attr *port_attr);
enum rdma_protocol_type (*query_protocol)(struct ib_device *device,
u8 port_num);
enum rdma_link_layer (*get_link_layer)(struct ib_device *device, enum rdma_link_layer (*get_link_layer)(struct ib_device *device,
u8 port_num); u8 port_num);
int (*query_gid)(struct ib_device *device, int (*query_gid)(struct ib_device *device,