[HW] fixed a bug in context values handling in new event notification mechanism ...

git-svn-id: svn://openib.tc.cornell.edu/gen1@1457 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
index 1c6e8327b3359e5e428a65a1c1b5356eacdf7148..7e40518fee0193d6ac978c93750b33aa5c6944d2 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
+++ b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
@@ -742,7 +742,6 @@ struct ib_cq {
        void *                  cq_context;\r
        int                     cqe;\r
        atomic_t                usecnt; /* count number of work queues */\r
-       struct ib_cq_ex         x;\r
 };\r
 \r
 struct ib_srq {\r
@@ -752,7 +751,6 @@ struct ib_srq {
        void                  (*event_handler)(ib_event_rec_t *);\r
        void                   *srq_context;\r
        atomic_t                usecnt;\r
-       struct ib_srq_ex        x;\r
 };\r
 \r
 struct ib_qp {\r
@@ -766,7 +764,6 @@ struct ib_qp {
        void                   *qp_context;\r
        u32                     qp_num;\r
        enum ib_qp_type         qp_type;\r
-       struct ib_qp_ex         x;\r
 };\r
 \r
 struct ib_mr {\r

diff --git a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs_ex.h b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs_ex.h
index 4184d7f139fcbc3a456487121f88a66af784acbe..49692cc402e795a724a3b85d0f664abe1baf58c5 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs_ex.h
+++ b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs_ex.h
@@ -73,24 +73,6 @@ struct ib_ucontext_ex
        int                             fw_if_open;
 };
 
-/* extension for ib_cq */
-struct ib_cq_ex 
-{
-       void *                          ctx;            /* IBAL CQ context */
-};
-
-/* extension for ib_qp */
-struct ib_qp_ex 
-{
-       void *                          ctx;            /* IBAL QP context */
-};
-
-/* extension for ib_srq */
-struct ib_srq_ex 
-{
-       void *                          ctx;            /* IBAL SRQ context */
-};
-
 /* extension for ib_event */
 struct ib_event_ex 
 {

diff --git a/trunk/hw/mlx4/kernel/hca/cq.c b/trunk/hw/mlx4/kernel/hca/cq.c
index 452a62f32a5b7975767f43c1a312affba08943c7..dbd8cfa45b48fc9ace5b6ecece016069b8c7c69e 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/cq.c
+++ b/trunk/hw/mlx4/kernel/hca/cq.c
@@ -89,7 +89,7 @@ mlnx_create_cq (
        // allocate cq  \r
        p_ib_cq = ibv_create_cq(p_ibdev, \r
                cq_comp_handler, event_handler,\r
-               p_hca, *p_size, p_uctx, p_umv_buf );\r
+               (void*)cq_context, *p_size, p_uctx, p_umv_buf );\r
        if (IS_ERR(p_ib_cq)) {\r
                err = PTR_ERR(p_ib_cq);\r
                HCA_PRINT (TRACE_LEVEL_ERROR ,HCA_DBG_CQ, ("ibv_create_cq failed (%d)\n", err));\r
@@ -97,9 +97,6 @@ mlnx_create_cq (
                goto err_create_cq;\r
        }\r
 \r
-       // fill the object\r
-       p_ib_cq->x.ctx = (void*)cq_context;\r
-       \r
        // return the result\r
        *p_size = p_ib_cq->cqe;\r
 \r

diff --git a/trunk/hw/mlx4/kernel/hca/qp.c b/trunk/hw/mlx4/kernel/hca/qp.c
index 7fe73dc1445b257952480f56e2c9feb7aef460ad..1a91125ea78cf58ac02e7958ed63d8ec434d896b 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/qp.c
+++ b/trunk/hw/mlx4/kernel/hca/qp.c
@@ -100,8 +100,6 @@ __create_qp (
        struct ib_qp_init_attr qp_init_attr;\r
        struct ib_ucontext *p_uctx = NULL;\r
        struct ib_pd *p_ib_pd = (struct ib_pd *)h_pd;\r
-       struct ib_device *p_ib_dev = p_ib_pd->device;\r
-       mlnx_hca_t *p_hca = ibdev2hca(p_ib_dev);\r
        struct ibv_create_qp *p_req = NULL;\r
        \r
        HCA_ENTER(HCA_DBG_QP);\r
@@ -121,7 +119,7 @@ __create_qp (
        // prepare the parameters\r
        RtlZeroMemory(&qp_init_attr, sizeof(qp_init_attr));\r
        qp_init_attr.event_handler = event_handler;\r
-       qp_init_attr.qp_context = p_hca;\r
+       qp_init_attr.qp_context = (void*)qp_uctx;\r
        qp_init_attr.send_cq = (struct ib_cq *)p_create_attr->h_sq_cq;\r
        qp_init_attr.recv_cq = (struct ib_cq *)p_create_attr->h_rq_cq;\r
        qp_init_attr.srq = (struct ib_srq *)p_create_attr->h_srq;\r
@@ -153,9 +151,6 @@ __create_qp (
                goto err_create_qp;\r
        }\r
 \r
-       // fill the object\r
-       p_ib_qp->x.ctx = (void*)qp_uctx;\r
-\r
        // Query QP to obtain requested attributes\r
        if (p_qp_attr) {\r
                status = mlnx_query_qp((ib_qp_handle_t)p_ib_qp, p_qp_attr, p_umv_buf);\r

diff --git a/trunk/hw/mlx4/kernel/hca/srq.c b/trunk/hw/mlx4/kernel/hca/srq.c
index a78caaeb5b5575dbbbe91a543ce4a00234eaaa1e..971b8358822346e274a5badd8fca868994abff70 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/srq.c
+++ b/trunk/hw/mlx4/kernel/hca/srq.c
@@ -55,8 +55,6 @@ mlnx_create_srq (
        struct ib_srq_init_attr srq_init_attr;\r
        struct ib_ucontext *p_uctx = NULL;\r
        struct ib_pd *p_ib_pd = (struct ib_pd *)h_pd;\r
-       struct ib_device *p_ib_dev = p_ib_pd->device;\r
-       mlnx_hca_t *p_hca = ibdev2hca(p_ib_dev);\r
 \r
        HCA_ENTER(HCA_DBG_SRQ);\r
 \r
@@ -75,7 +73,7 @@ mlnx_create_srq (
        // prepare the parameters\r
        RtlZeroMemory(&srq_init_attr, sizeof(srq_init_attr));\r
        srq_init_attr.event_handler = event_handler;\r
-       srq_init_attr.srq_context = p_hca;\r
+       srq_init_attr.srq_context = (void*)srq_context;\r
        srq_init_attr.attr.max_wr = p_srq_attr->max_wr;\r
        srq_init_attr.attr.max_sge = p_srq_attr->max_sge;\r
        srq_init_attr.attr.srq_limit = p_srq_attr->srq_limit;\r
@@ -88,7 +86,6 @@ mlnx_create_srq (
                status = errno_to_iberr(err);\r
                goto err_create_srq;\r
        }\r
-       p_ib_srq->x.ctx = (void*)srq_context;\r
 \r
        // return the result\r
        if (ph_srq) *ph_srq = (ib_srq_handle_t)p_ib_srq;\r

diff --git a/trunk/hw/mthca/kernel/hca_verbs.c b/trunk/hw/mthca/kernel/hca_verbs.c
index 38c7ff2bee94c6c8ff93730b8f32e382a399e050..87c5586e0e625afb8f24540bd14056686e1994ef 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_verbs.c
+++ b/trunk/hw/mthca/kernel/hca_verbs.c
@@ -870,12 +870,10 @@ mlnx_create_srq (
        int err;\r
        ib_api_status_t         status;\r
        struct ib_srq *ib_srq_p;\r
-       struct mthca_srq *srq_p;\r
        struct ib_srq_init_attr srq_init_attr;\r
        struct ib_ucontext *p_context = NULL;\r
        struct ib_pd *ib_pd_p = (struct ib_pd *)h_pd;\r
        struct ib_device *ib_dev = ib_pd_p->device;\r
-       mlnx_hob_t       *hob_p = HOB_FROM_IBDEV(ib_dev);\r
 \r
        HCA_ENTER(HCA_DBG_SRQ);\r
 \r
@@ -894,7 +892,7 @@ mlnx_create_srq (
        // prepare the parameters\r
        RtlZeroMemory(&srq_init_attr, sizeof(srq_init_attr));\r
        srq_init_attr.event_handler = event_handler;\r
-       srq_init_attr.srq_context = hob_p;\r
+       srq_init_attr.srq_context = (void*)srq_context;\r
        srq_init_attr.attr = *p_srq_attr;\r
 \r
        // allocate srq \r
@@ -906,12 +904,8 @@ mlnx_create_srq (
                goto err_create_srq;\r
        }\r
 \r
-       // fill the object\r
-       srq_p = (struct mthca_srq *)ib_srq_p;\r
-       srq_p->srq_context = (void*)srq_context;\r
-       \r
        // return the result\r
-       if (ph_srq) *ph_srq = (ib_srq_handle_t)srq_p;\r
+       if (ph_srq) *ph_srq = (ib_srq_handle_t)ib_srq_p;\r
 \r
        status = IB_SUCCESS;\r
        \r
@@ -1044,7 +1038,6 @@ _create_qp (
        struct ib_ucontext *p_context = NULL;\r
        struct ib_pd *ib_pd_p = (struct ib_pd *)h_pd;\r
        struct ib_device *ib_dev = ib_pd_p->device;\r
-       mlnx_hob_t       *hob_p = HOB_FROM_IBDEV(ib_dev);\r
        \r
        HCA_ENTER(HCA_DBG_QP);\r
 \r
@@ -1063,7 +1056,7 @@ _create_qp (
        RtlZeroMemory(&qp_init_attr, sizeof(qp_init_attr));\r
        qp_init_attr.qp_type = p_create_attr->qp_type;\r
        qp_init_attr.event_handler = event_handler;\r
-       qp_init_attr.qp_context = hob_p;\r
+       qp_init_attr.qp_context = (void*)qp_context;\r
        qp_init_attr.recv_cq = (struct ib_cq *)p_create_attr->h_rq_cq;\r
        qp_init_attr.send_cq = (struct ib_cq *)p_create_attr->h_sq_cq;\r
        qp_init_attr.srq = (struct ib_srq *)p_create_attr->h_srq;\r
@@ -1087,7 +1080,6 @@ _create_qp (
 \r
        // fill the object\r
        qp_p = (struct mthca_qp *)ib_qp_p;\r
-       qp_p->qp_context = (void*)qp_context;\r
        qp_p->qp_init_attr = qp_init_attr;\r
 \r
        // Query QP to obtain requested attributes\r
@@ -1401,7 +1393,6 @@ mlnx_create_cq (
        int err;\r
        ib_api_status_t         status;\r
        struct ib_cq *ib_cq_p;\r
-       struct mthca_cq *cq_p;\r
        mlnx_hob_t                      *hob_p;\r
        struct ib_device *ib_dev;\r
        struct ib_ucontext *p_context;\r
@@ -1437,7 +1428,7 @@ mlnx_create_cq (
        // allocate cq  \r
        ib_cq_p = ibv_create_cq(ib_dev, \r
                cq_comp_handler, event_handler,\r
-               hob_p, *p_size, p_context, p_umv_buf );\r
+               (void*)cq_context, *p_size, p_context, p_umv_buf );\r
        if (IS_ERR(ib_cq_p)) {\r
                err = PTR_ERR(ib_cq_p);\r
                HCA_PRINT (TRACE_LEVEL_ERROR ,HCA_DBG_CQ, ("ibv_create_cq failed (%d)\n", err));\r
@@ -1445,15 +1436,11 @@ mlnx_create_cq (
                goto err_create_cq;\r
        }\r
 \r
-       // fill the object\r
-       cq_p = (struct mthca_cq *)ib_cq_p;\r
-       cq_p->cq_context = (void*)cq_context;\r
-       \r
        // return the result\r
 //     *p_size = *p_size;      // return the same value\r
        *p_size = ib_cq_p->cqe;\r
 \r
-       if (ph_cq) *ph_cq = (ib_cq_handle_t)cq_p;\r
+       if (ph_cq) *ph_cq = (ib_cq_handle_t)ib_cq_p;\r
 \r
        status = IB_SUCCESS;\r
        \r

diff --git a/trunk/hw/mthca/kernel/mthca_cq.c b/trunk/hw/mthca/kernel/mthca_cq.c
index a89768834acaed1430bfb74f0605f67af2287863..d937695ce1a378283802dcf438d6e55f56d2a7d6 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_cq.c
+++ b/trunk/hw/mthca/kernel/mthca_cq.c
@@ -237,7 +237,7 @@ void mthca_cq_completion(struct mthca_dev *dev, u32 cqn)
                        ++cq->arm_sn;\r
        }\r
 \r
-       cq->ibcq.comp_handler(cq->cq_context);\r
+       cq->ibcq.comp_handler(cq->ibcq.cq_context);\r
 }\r
 \r
 void mthca_cq_event(struct mthca_dev *dev, u32 cqn,\r

diff --git a/trunk/hw/mthca/kernel/mthca_provider.h b/trunk/hw/mthca/kernel/mthca_provider.h
index 0917bbbc534525aa14da08775f8d8824e7dabd14..ca5db21ff00fc399f8b6d715b2489daa17f86969 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_provider.h
+++ b/trunk/hw/mthca/kernel/mthca_provider.h
@@ -189,7 +189,6 @@ struct mthca_ah {
 \r
 struct mthca_cq {\r
        struct ib_cq           ibcq;\r
-       void                                            *cq_context;    // leo: for IBAL shim\r
        spinlock_t             lock;\r
        atomic_t               refcount;\r
        int                    cqn;\r
@@ -234,7 +233,6 @@ struct mthca_srq {
 \r
        wait_queue_head_t       wait;\r
        KMUTEX                  mutex;\r
-       void                            *srq_context;   \r
 };\r
 \r
 struct mthca_wq {\r
@@ -254,7 +252,6 @@ struct mthca_wq {
 \r
 struct mthca_qp {\r
        struct ib_qp           ibqp;\r
-       void                                            *qp_context;    // leo: for IBAL shim\r
        //TODO: added just because absense of ibv_query_qp\r
        // thereafter it may be worth to be replaced by struct ib_qp_attr qp_attr;\r
        struct ib_qp_init_attr qp_init_attr;    // leo: for query_qp\r