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

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

IB/Verbs: Use management helper rdma_cap_eth_ah() 



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

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 30a74ef4

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, 
	int ret;

	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;

	else

		pkey = ib_addr_get_pkey(dev_addr);

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -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->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) {

		ah_attr->ah_flags = IB_AH_GRH;

drivers/infiniband/core/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc, 
	int ret;



	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))

			return -EPROTOTYPE;
@@ -869,7 +869,7 @@ int ib_resolve_eth_l2_attrs(struct ib_qp *qp, 
	union ib_gid  sgid;



	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,

				   qp_attr->ah_attr.grh.sgid_index, &sgid);

		if (ret)

include/rdma/ib_verbs.h

+15 −0
Original line number Diff line number Diff line
@@ -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);

}



/**

 * 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 Read Multiple Scatter-Gather Entries.