File libmlx4-Add-RoCE-IP-based-addressing-support-for-UD-QPs.patch of Package libmlx4-rdmav2
From 0a56fa02857bd2dcce32f8a107b7c397f9357545 Mon Sep 17 00:00:00 2001
From: Matan Barak <matanb@mellanox.com>
Date: Tue, 11 Feb 2014 14:31:14 +0200
Subject: [PATCH 1/3] Add RoCE IP based addressing support for UD QPs
In order to implement IP based addressing for UD QPs, we need a way to
resolve the addresses internally.
The L2 params are passed to the provider driver using an extension verbs
- drv_ibv_create_ah_ex.
libmlx4 gets the extra mac and vid params from libibverbs and sets
mlx4_ah relevant attributes.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
src/mlx4.c | 5 ++-
src/mlx4.h | 2 +
src/verbs.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 85 insertions(+), 12 deletions(-)
Index: libmlx4-1.0.5/src/mlx4.c
===================================================================
--- libmlx4-1.0.5.orig/src/mlx4.c 2014-03-31 18:15:17.755105851 +0200
+++ libmlx4-1.0.5/src/mlx4.c 2014-03-31 18:16:09.624909060 +0200
@@ -203,7 +203,8 @@ static int mlx4_init_context(struct verb
ibv_ctx->ops = mlx4_ctx_ops;
verbs_ctx->has_comp_mask = VERBS_CONTEXT_XRCD | VERBS_CONTEXT_SRQ |
- VERBS_CONTEXT_QP;
+ VERBS_CONTEXT_QP |
+ VERBS_CONTEXT_CREATE_AH;
verbs_set_ctx_op(verbs_ctx, close_xrcd, mlx4_close_xrcd);
verbs_set_ctx_op(verbs_ctx, open_xrcd, mlx4_open_xrcd);
verbs_set_ctx_op(verbs_ctx, create_srq_ex, mlx4_create_srq_ex);
@@ -211,6 +212,8 @@ static int mlx4_init_context(struct verb
verbs_set_ctx_op(verbs_ctx, create_qp_ex, mlx4_create_qp_ex);
verbs_set_ctx_op(verbs_ctx, open_qp, mlx4_open_qp);
+ verbs_set_ctx_op(verbs_ctx, drv_ibv_create_ah_ex, mlx4_create_ah_ex);
+
return 0;
}
Index: libmlx4-1.0.5/src/mlx4.h
===================================================================
--- libmlx4-1.0.5.orig/src/mlx4.h 2014-03-31 18:15:17.755105851 +0200
+++ libmlx4-1.0.5/src/mlx4.h 2014-03-31 18:15:17.769105528 +0200
@@ -437,6 +437,8 @@ struct mlx4_qp *mlx4_find_qp(struct mlx4
int mlx4_store_qp(struct mlx4_context *ctx, uint32_t qpn, struct mlx4_qp *qp);
void mlx4_clear_qp(struct mlx4_context *ctx, uint32_t qpn);
struct ibv_ah *mlx4_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr);
+struct ibv_ah *mlx4_create_ah_ex(struct ibv_pd *pd,
+ struct ibv_ah_attr_ex *attr_ex);
int mlx4_destroy_ah(struct ibv_ah *ah);
int mlx4_alloc_av(struct mlx4_pd *pd, struct ibv_ah_attr *attr,
struct mlx4_ah *ah);
Index: libmlx4-1.0.5/src/verbs.c
===================================================================
--- libmlx4-1.0.5.orig/src/verbs.c 2014-03-31 18:15:17.747106036 +0200
+++ libmlx4-1.0.5/src/verbs.c 2014-03-31 18:15:17.770105505 +0200
@@ -785,13 +785,11 @@ static int mlx4_resolve_grh_to_l2(struct
return 0;
}
-struct ibv_ah *mlx4_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
+static struct ibv_ah *mlx4_create_ah_common(struct ibv_pd *pd,
+ struct ibv_ah_attr *attr,
+ uint8_t link_layer)
{
struct mlx4_ah *ah;
- struct ibv_port_attr port_attr;
-
- if (ibv_query_port(pd->context, attr->port_num, &port_attr))
- return NULL;
ah = malloc(sizeof *ah);
if (!ah)
@@ -801,7 +799,7 @@ struct ibv_ah *mlx4_create_ah(struct ibv
ah->av.port_pd = htonl(to_mpd(pd)->pdn | (attr->port_num << 24));
- if (port_attr.link_layer != IBV_LINK_LAYER_ETHERNET) {
+ if (link_layer != IBV_LINK_LAYER_ETHERNET) {
ah->av.g_slid = attr->src_path_bits;
ah->av.dlid = htons(attr->dlid);
ah->av.sl_tclass_flowlabel = htonl(attr->sl << 28);
@@ -822,13 +820,83 @@ struct ibv_ah *mlx4_create_ah(struct ibv
memcpy(ah->av.dgid, attr->grh.dgid.raw, 16);
}
- if (port_attr.link_layer == IBV_LINK_LAYER_ETHERNET)
- if (mlx4_resolve_grh_to_l2(pd, ah, attr)) {
- free(ah);
- return NULL;
+ return &ah->ibv_ah;
+}
+
+struct ibv_ah *mlx4_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
+{
+ struct ibv_ah *ah;
+ struct ibv_port_attr port_attr;
+
+ if (ibv_query_port(pd->context, attr->port_num, &port_attr))
+ return NULL;
+
+ ah = mlx4_create_ah_common(pd, attr, port_attr.link_layer);
+ if (NULL != ah &&
+ (port_attr.link_layer != IBV_LINK_LAYER_ETHERNET ||
+ !mlx4_resolve_grh_to_l2(pd, to_mah(ah), attr)))
+ return ah;
+
+ if (ah)
+ free(ah);
+ return NULL;
+}
+
+struct ibv_ah *mlx4_create_ah_ex(struct ibv_pd *pd,
+ struct ibv_ah_attr_ex *attr_ex)
+{
+ struct ibv_port_attr port_attr;
+ struct ibv_ah *ah;
+ struct mlx4_ah *mah;
+
+ if (ibv_query_port(pd->context, attr_ex->port_num, &port_attr))
+ return NULL;
+
+ ah = mlx4_create_ah_common(pd, (struct ibv_ah_attr *)attr_ex,
+ port_attr.link_layer);
+
+ if (NULL == ah)
+ return NULL;
+
+ mah = to_mah(ah);
+
+ /* If vlan was given, check that we could use it */
+ if (attr_ex->comp_mask & IBV_AH_ATTR_EX_VID &&
+ attr_ex->vid <= 0xfff &&
+ (0 == attr_ex->ll_address.len ||
+ !(attr_ex->comp_mask & IBV_AH_ATTR_EX_LL)))
+ goto err;
+
+ /* ll_address.len == 0 means no ll address given */
+ if (attr_ex->comp_mask & IBV_AH_ATTR_EX_LL &&
+ 0 != attr_ex->ll_address.len) {
+ if (LL_ADDRESS_ETH != attr_ex->ll_address.type ||
+ port_attr.link_layer != IBV_LINK_LAYER_ETHERNET)
+ /* mlx4 provider currently only support ethernet
+ * extensions */
+ goto err;
+
+ /* link layer is ethernet */
+ if (6 != attr_ex->ll_address.len ||
+ NULL == attr_ex->ll_address.address)
+ goto err;
+
+ memcpy(mah->mac, attr_ex->ll_address.address,
+ attr_ex->ll_address.len);
+
+ if (attr_ex->comp_mask & IBV_AH_ATTR_EX_VID &&
+ attr_ex->vid <= 0xfff) {
+ mah->av.port_pd |= htonl(1 << 29);
+ mah->vlan = attr_ex->vid |
+ ((attr_ex->sl & 7) << 13);
}
+ }
- return &ah->ibv_ah;
+ return ah;
+
+err:
+ free(ah);
+ return NULL;
}
int mlx4_destroy_ah(struct ibv_ah *ah)
