From 7dc34ccb987d428f2dee4c8291d92b7af85dcb42 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 26 Sep 2012 12:18:20 -0700 Subject: [PATCH] refresh --- meta | 7 ++-- patches/refresh-temp | 83 -------------------------------------------- patches/xrc_qp | 29 +++++++--------- 3 files changed, 15 insertions(+), 104 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 4b04de6..45f2dbd 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 87b08a31d4eaa5f41661fb02bb96f80115fb9117 -Head: 16c18070e595bc860cd73550b6261a7ba17d4670 +Previous: dbbe90a961757844fc58f7c22d60f6a15928693d +Head: f414dafee922a726e7f73f6bdca549ba4281bfed Applied: verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786 xrcd: 07cc711dd4091666de3c99545c64578ce6472da7 srq_ex: 9698473fabcdee089e866558fb1bfc9dbc867609 - xrc_qp: 609cbb29dc569cf106535379085e091408982ff2 - refresh-temp: 16c18070e595bc860cd73550b6261a7ba17d4670 + xrc_qp: f414dafee922a726e7f73f6bdca549ba4281bfed Unapplied: compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43 open_qp: dbfefad6a670045876a1bb21372f3d8535216dea diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index d6ac133..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,83 +0,0 @@ -Bottom: 3031200314ac92ae8dca630fbebad05131047596 -Top: 2974580c2cba361aa431ca4bf7b4b530a731d044 -Author: Sean Hefty -Date: 2012-09-26 12:18:20 -0700 - -Refresh of xrc_qp - ---- - -diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h -index f15457c..6afd93b 100644 ---- a/include/infiniband/driver.h -+++ b/include/infiniband/driver.h -@@ -160,7 +160,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, - struct ibv_qp *qp, struct ibv_qp_init_attr *attr, - struct ibv_create_qp *cmd, size_t cmd_size, - struct ibv_create_qp_resp *resp, size_t resp_size); --int ibv_cmd_create_qp_ex(struct ibv_context *context, -+int ibv_cmd_create_qp_ex(struct verbs_context *context, - struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex, - struct ibv_create_qp *cmd, size_t cmd_size, - struct ibv_create_qp_resp *resp, size_t resp_size); -diff --git a/src/cmd.c b/src/cmd.c -index 47426ab..70abfe8 100644 ---- a/src/cmd.c -+++ b/src/cmd.c -@@ -653,12 +653,11 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq) - return 0; - } - --int ibv_cmd_create_qp_ex(struct ibv_context *context, -+int ibv_cmd_create_qp_ex(struct verbs_context *context, - struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex, - struct ibv_create_qp *cmd, size_t cmd_size, - struct ibv_create_qp_resp *resp, size_t resp_size) - { -- struct ibv_context *context; - struct verbs_xrcd *vxrcd = NULL; - - IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size); -@@ -667,11 +666,9 @@ int ibv_cmd_create_qp_ex(struct ibv_context *context, - - if (attr_ex->comp_mask & IBV_QP_INIT_ATTR_XRCD) { - vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd); -- context = vxrcd->xrcd.context; - cmd->pd_handle = vxrcd->handle; - } else { -- context = pd->context; -- cmd->pd_handle = pd->handle; -+ cmd->pd_handle = attr_ex->pd->handle; - cmd->send_cq_handle = attr_ex->send_cq->handle; - - if (attr_ex->qp_type != IBV_QPT_XRC_SEND) { -@@ -690,7 +687,7 @@ int ibv_cmd_create_qp_ex(struct ibv_context *context, - cmd->is_srq = !!attr_ex->srq; - cmd->reserved = 0; - -- if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) -+ if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size) - return errno; - - (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); -@@ -721,9 +718,9 @@ int ibv_cmd_create_qp_ex(struct ibv_context *context, - - qp->qp.handle = resp->qp_handle; - qp->qp.qp_num = resp->qpn; -- qp->qp.context = context; -+ qp->qp.context = &context->context; - qp->qp.qp_context = qp_init_attr_ex->qp_context; -- qp->qp.pd = pd; -+ qp->qp.pd = attr_ex->pd; - qp->qp.send_cq = qp_init_attr_ex->send_cq; - qp->qp.recv_cq = qp_init_attr_ex->recv_cq; - qp->qp.srq = qp_init_attr_ex->srq; -@@ -752,8 +749,6 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, - IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size); - - cmd->user_handle = (uintptr_t) qp; -- -- context = pd->context; - cmd->pd_handle = pd->handle; - cmd->send_cq_handle = attr->send_cq->handle; - cmd->max_send_wr = attr->cap.max_send_wr; diff --git a/patches/xrc_qp b/patches/xrc_qp index 21cff45..aad1432 100644 --- a/patches/xrc_qp +++ b/patches/xrc_qp @@ -1,5 +1,5 @@ Bottom: 992bac9a3e4b537be435ba172596c0147b3170ef -Top: 3031200314ac92ae8dca630fbebad05131047596 +Top: 2974580c2cba361aa431ca4bf7b4b530a731d044 Author: Sean Hefty Date: 2012-09-17 16:00:12 -0700 @@ -32,7 +32,7 @@ Signed-off-by: Sean Hefty --- diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h -index dccfd1f..f15457c 100644 +index dccfd1f..6afd93b 100644 --- a/include/infiniband/driver.h +++ b/include/infiniband/driver.h @@ -81,6 +81,16 @@ struct verbs_srq { @@ -56,7 +56,7 @@ index dccfd1f..f15457c 100644 struct ibv_qp *qp, struct ibv_qp_init_attr *attr, struct ibv_create_qp *cmd, size_t cmd_size, struct ibv_create_qp_resp *resp, size_t resp_size); -+int ibv_cmd_create_qp_ex(struct ibv_context *context, ++int ibv_cmd_create_qp_ex(struct verbs_context *context, + struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex, + struct ibv_create_qp *cmd, size_t cmd_size, + struct ibv_create_qp_resp *resp, size_t resp_size); @@ -171,19 +171,18 @@ index e67bf21..799822d 100644 * ibv_modify_qp - Modify a queue pair. */ diff --git a/src/cmd.c b/src/cmd.c -index c3c6f53..47426ab 100644 +index c3c6f53..70abfe8 100644 --- a/src/cmd.c +++ b/src/cmd.c -@@ -653,18 +653,109 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq) +@@ -653,18 +653,104 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq) return 0; } -+int ibv_cmd_create_qp_ex(struct ibv_context *context, ++int ibv_cmd_create_qp_ex(struct verbs_context *context, + struct verbs_qp *qp, struct ibv_qp_init_attr_ex *attr_ex, + struct ibv_create_qp *cmd, size_t cmd_size, + struct ibv_create_qp_resp *resp, size_t resp_size) +{ -+ struct ibv_context *context; + struct verbs_xrcd *vxrcd = NULL; + + IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size); @@ -192,11 +191,9 @@ index c3c6f53..47426ab 100644 + + if (attr_ex->comp_mask & IBV_QP_INIT_ATTR_XRCD) { + vxrcd = container_of(attr_ex->xrcd, struct verbs_xrcd, xrcd); -+ context = vxrcd->xrcd.context; + cmd->pd_handle = vxrcd->handle; + } else { -+ context = pd->context; -+ cmd->pd_handle = pd->handle; ++ cmd->pd_handle = attr_ex->pd->handle; + cmd->send_cq_handle = attr_ex->send_cq->handle; + + if (attr_ex->qp_type != IBV_QPT_XRC_SEND) { @@ -215,7 +212,7 @@ index c3c6f53..47426ab 100644 + cmd->is_srq = !!attr_ex->srq; + cmd->reserved = 0; + -+ if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) ++ if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size) + return errno; + + (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); @@ -246,9 +243,9 @@ index c3c6f53..47426ab 100644 + + qp->qp.handle = resp->qp_handle; + qp->qp.qp_num = resp->qpn; -+ qp->qp.context = context; ++ qp->qp.context = &context->context; + qp->qp.qp_context = qp_init_attr_ex->qp_context; -+ qp->qp.pd = pd; ++ qp->qp.pd = attr_ex->pd; + qp->qp.send_cq = qp_init_attr_ex->send_cq; + qp->qp.recv_cq = qp_init_attr_ex->recv_cq; + qp->qp.srq = qp_init_attr_ex->srq; @@ -278,8 +275,6 @@ index c3c6f53..47426ab 100644 cmd->user_handle = (uintptr_t) qp; - cmd->pd_handle = pd->handle; -+ -+ context = pd->context; + cmd->pd_handle = pd->handle; cmd->send_cq_handle = attr->send_cq->handle; - cmd->recv_cq_handle = attr->recv_cq->handle; @@ -287,7 +282,7 @@ index c3c6f53..47426ab 100644 cmd->max_send_wr = attr->cap.max_send_wr; cmd->max_recv_wr = attr->cap.max_recv_wr; cmd->max_send_sge = attr->cap.max_send_sge; -@@ -675,21 +766,21 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, +@@ -675,21 +761,21 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, cmd->is_srq = !!attr->srq; cmd->reserved = 0; @@ -316,7 +311,7 @@ index c3c6f53..47426ab 100644 } if (abi_ver == 4) { -@@ -708,7 +799,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, +@@ -708,7 +794,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd, resp_size - sizeof *resp); } -- 2.46.0