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

Commit 513789ed authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Linus Torvalds
Browse files

[PATCH] IB: Add ib_create_ah_from_wc to IB verbs 



Added new call: ib_create_ah_from_wc.  Call will allocate an address handle
given work completion information, including any received GRH.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarHal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cabe3cbc

drivers/infiniband/core/verbs.c

+35 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/err.h>



#include <ib_verbs.h>

#include <ib_cache.h>



/* Protection domains */
@@ -88,6 +89,40 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) 
}

EXPORT_SYMBOL(ib_create_ah);



struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,

				   struct ib_grh *grh, u8 port_num)

{

	struct ib_ah_attr ah_attr;

	u32 flow_class;

	u16 gid_index;

	int ret;



	memset(&ah_attr, 0, sizeof ah_attr);

	ah_attr.dlid = wc->slid;

	ah_attr.sl = wc->sl;

	ah_attr.src_path_bits = wc->dlid_path_bits;

	ah_attr.port_num = port_num;



	if (wc->wc_flags & IB_WC_GRH) {

		ah_attr.ah_flags = IB_AH_GRH;

		ah_attr.grh.dgid = grh->dgid;



		ret = ib_find_cached_gid(pd->device, &grh->sgid, &port_num,

					 &gid_index);

		if (ret)

			return ERR_PTR(ret);



		ah_attr.grh.sgid_index = (u8) gid_index;

		flow_class = be32_to_cpu(&grh->version_tclass_flow);

		ah_attr.grh.flow_label = flow_class & 0xFFFFF;

		ah_attr.grh.traffic_class = (flow_class >> 20) & 0xFF;

		ah_attr.grh.hop_limit = grh->hop_limit;

	}



	return ib_create_ah(pd, &ah_attr);

}

EXPORT_SYMBOL(ib_create_ah_from_wc);



int ib_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr)

{

	return ah->device->modify_ah ?

drivers/infiniband/include/ib_mad.h

+0 −9
Original line number Diff line number Diff line
@@ -77,15 +77,6 @@ 
#define IB_QP1_QKEY	0x80010000

#define IB_QP_SET_QKEY	0x80000000



struct ib_grh {

	u32		version_tclass_flow;

	u16		paylen;

	u8		next_hdr;

	u8		hop_limit;

	union ib_gid	sgid;

	union ib_gid	dgid;

} __attribute__ ((packed));



struct ib_mad_hdr {

	u8	base_version;

	u8	mgmt_class;

drivers/infiniband/include/ib_verbs.h

+24 −0
Original line number Diff line number Diff line
@@ -289,6 +289,15 @@ struct ib_global_route { 
	u8		traffic_class;

};



struct ib_grh {

	u32		version_tclass_flow;

	u16		paylen;

	u8		next_hdr;

	u8		hop_limit;

	union ib_gid	sgid;

	union ib_gid	dgid;

};



enum {

	IB_MULTICAST_QPN = 0xffffff

};
@@ -990,6 +999,21 @@ int ib_dealloc_pd(struct ib_pd *pd); 
 */

struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);



/**

 * ib_create_ah_from_wc - Creates an address handle associated with the

 *   sender of the specified work completion.

 * @pd: The protection domain associated with the address handle.

 * @wc: Work completion information associated with a received message.

 * @grh: References the received global route header.  This parameter is

 *   ignored unless the work completion indicates that the GRH is valid.

 * @port_num: The outbound port number to associate with the address.

 *

 * The address handle is used to reference a local or global destination

 * in all UD QP post sends.

 */

struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,

				   struct ib_grh *grh, u8 port_num);



/**

 * ib_modify_ah - Modifies the address vector associated with an address

 *   handle.