evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IB/Verbs: Use management helper rdma_cap_eth_ah()

Browse source 
Introduce helper rdma_cap_eth_ah() to help us check if the port of an
IB device support Ethernet Address Handler.

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:40 +02:00 • committed by Doug Ledford
parent 30a74ef41d
commit 227128fc68
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/infiniband/core/cma.c
View file

@ -711,7 +711,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
int ret; int ret;
u16 pkey; u16 pkey;
if (rdma_protocol_iboe(id_priv->id.device, id_priv->id.port_num)) if (rdma_cap_eth_ah(id_priv->id.device, id_priv->id.port_num))
pkey = 0xffff; pkey = 0xffff;
else else
pkey = ib_addr_get_pkey(dev_addr); pkey = ib_addr_get_pkey(dev_addr);

2
drivers/infiniband/core/sa_query.c
View file

@ -540,7 +540,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
ah_attr->port_num = port_num; ah_attr->port_num = port_num;
ah_attr->static_rate = rec->rate; ah_attr->static_rate = rec->rate;
force_grh = rdma_protocol_iboe(device, port_num); force_grh = rdma_cap_eth_ah(device, port_num);
if (rec->hop_limit > 1 || force_grh) { if (rec->hop_limit > 1 || force_grh) {
ah_attr->ah_flags = IB_AH_GRH; ah_attr->ah_flags = IB_AH_GRH;

4
drivers/infiniband/core/verbs.c
View file

@ -200,7 +200,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,
int ret; int ret;
memset(ah_attr, 0, sizeof *ah_attr); memset(ah_attr, 0, sizeof *ah_attr);
if (rdma_protocol_iboe(device, port_num)) { if (rdma_cap_eth_ah(device, port_num)) {
if (!(wc->wc_flags & IB_WC_GRH)) if (!(wc->wc_flags & IB_WC_GRH))
return -EPROTOTYPE; return -EPROTOTYPE;
@ -869,7 +869,7 @@ int ib_resolve_eth_l2_attrs(struct ib_qp *qp,
union ib_gid sgid; union ib_gid sgid;
if ((*qp_attr_mask & IB_QP_AV) && if ((*qp_attr_mask & IB_QP_AV) &&
(rdma_protocol_iboe(qp->device, qp_attr->ah_attr.port_num))) { (rdma_cap_eth_ah(qp->device, qp_attr->ah_attr.port_num))) {
ret = ib_query_gid(qp->device, qp_attr->ah_attr.port_num, ret = ib_query_gid(qp->device, qp_attr->ah_attr.port_num,
qp_attr->ah_attr.grh.sgid_index, &sgid); qp_attr->ah_attr.grh.sgid_index, &sgid);
if (ret) if (ret)

15
include/rdma/ib_verbs.h
View file

@ -1879,6 +1879,21 @@ static inline bool rdma_cap_af_ib(struct ib_device *device, u8 port_num)
return rdma_ib_or_iboe(device, port_num); return rdma_ib_or_iboe(device, port_num);
} }
/**
* rdma_cap_eth_ah - Check if the port of device has the capability
* Ethernet Address Handler.
*
* @device: Device to be checked
* @port_num: Port number of the device
*
* Return false when port of the device don't support
* Ethernet Address Handler.
*/
static inline bool rdma_cap_eth_ah(struct ib_device *device, u8 port_num)
{
return rdma_protocol_iboe(device, port_num);
}
/** /**
* rdma_cap_read_multi_sge - Check if the port of device has the capability * rdma_cap_read_multi_sge - Check if the port of device has the capability
* RDMA Read Multiple Scatter-Gather Entries. * RDMA Read Multiple Scatter-Gather Entries.