IB/hfi1: Only set fd pointer when base context is completely initialized

The allocate_ctxt() function adds the context to the fd data structure.
Since the context is not completely initialized, this can cause confusion
as to whether the context is valid or not.

Move the fd reference from allocate_ctxt() to setup_base_ctxt().
Update the necessary functions to be aware of this move.

Reviewed-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index 650c1e578775ea608b4f98e407620ee589b6b00d..a0c13fa5babb8e392b18d0fdea9bffee566ffce7 100644 (file)
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -81,19 +81,22 @@ static u64 kvirt_to_phys(void *addr);
 static int assign_ctxt(struct hfi1_filedata *fd, struct hfi1_user_info *uinfo);
 static int init_subctxts(struct hfi1_ctxtdata *uctxt,
                         const struct hfi1_user_info *uinfo);
-static int init_user_ctxt(struct hfi1_filedata *fd);
+static int init_user_ctxt(struct hfi1_filedata *fd,
+                         struct hfi1_ctxtdata *uctxt);
 static void user_init(struct hfi1_ctxtdata *uctxt);
 static int get_ctxt_info(struct hfi1_filedata *fd, void __user *ubase,
                         __u32 len);
 static int get_base_info(struct hfi1_filedata *fd, void __user *ubase,
                         __u32 len);
-static int setup_base_ctxt(struct hfi1_filedata *fd);
+static int setup_base_ctxt(struct hfi1_filedata *fd,
+                          struct hfi1_ctxtdata *uctxt);
 static int setup_subctxt(struct hfi1_ctxtdata *uctxt);
 
 static int find_sub_ctxt(struct hfi1_filedata *fd,
                         const struct hfi1_user_info *uinfo);
 static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
-                        struct hfi1_user_info *uinfo);
+                        struct hfi1_user_info *uinfo,
+                        struct hfi1_ctxtdata **cd);
 static void deallocate_ctxt(struct hfi1_ctxtdata *uctxt);
 static unsigned int poll_urgent(struct file *fp, struct poll_table_struct *pt);
 static unsigned int poll_next(struct file *fp, struct poll_table_struct *pt);
@@ -759,7 +762,7 @@ static int hfi1_file_close(struct inode *inode, struct file *fp)
 
        flush_wc();
        /* drain user sdma queue */
-       hfi1_user_sdma_free_queues(fdata);
+       hfi1_user_sdma_free_queues(fdata, uctxt);
 
        /* release the cpu */
        hfi1_put_proc_affinity(fdata->rec_cpu_num);
@@ -845,6 +848,7 @@ static int assign_ctxt(struct hfi1_filedata *fd, struct hfi1_user_info *uinfo)
 {
        int ret;
        unsigned int swmajor, swminor;
+       struct hfi1_ctxtdata *uctxt = NULL;
 
        swmajor = uinfo->userversion >> 16;
        if (swmajor != HFI1_USER_SWMAJOR)
@@ -870,7 +874,7 @@ static int assign_ctxt(struct hfi1_filedata *fd, struct hfi1_user_info *uinfo)
         * couldn't find a sub context.
         */
        if (!ret)
-               ret = allocate_ctxt(fd, fd->dd, uinfo);
+               ret = allocate_ctxt(fd, fd->dd, uinfo, &uctxt);
 
        mutex_unlock(&hfi1_mutex);
 
@@ -888,28 +892,27 @@ static int assign_ctxt(struct hfi1_filedata *fd, struct hfi1_user_info *uinfo)
 
                /* The only thing a sub context needs is the user_xxx stuff */
                if (!ret)
-                       ret = init_user_ctxt(fd);
+                       ret = init_user_ctxt(fd, fd->uctxt);
 
                if (ret)
                        clear_bit(fd->subctxt, fd->uctxt->in_use_ctxts);
 
        } else if (!ret) {
-               ret = setup_base_ctxt(fd);
-               if (fd->uctxt->subctxt_cnt) {
+               ret = setup_base_ctxt(fd, uctxt);
+               if (uctxt->subctxt_cnt) {
                        /* If there is an error, set the failed bit. */
                        if (ret)
                                set_bit(HFI1_CTXT_BASE_FAILED,
-                                       &fd->uctxt->event_flags);
+                                       &uctxt->event_flags);
                        /*
                         * Base context is done, notify anybody using a
                         * sub-context that is waiting for this completion
                         */
-                       clear_bit(HFI1_CTXT_BASE_UNINIT,
-                                 &fd->uctxt->event_flags);
-                       wake_up(&fd->uctxt->wait);
+                       clear_bit(HFI1_CTXT_BASE_UNINIT, &uctxt->event_flags);
+                       wake_up(&uctxt->wait);
                }
                if (ret)
-                       deallocate_ctxt(fd->uctxt);
+                       deallocate_ctxt(uctxt);
        }
 
        /* If an error occurred, clear the reference */
@@ -976,7 +979,8 @@ static int find_sub_ctxt(struct hfi1_filedata *fd,
 }
 
 static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
-                        struct hfi1_user_info *uinfo)
+                        struct hfi1_user_info *uinfo,
+                        struct hfi1_ctxtdata **cd)
 {
        struct hfi1_ctxtdata *uctxt;
        u16 ctxt;
@@ -1071,14 +1075,13 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
         */
        if (dd->freectxts-- == dd->num_user_contexts)
                aspm_disable_all(dd);
-       fd->uctxt = uctxt;
 
-       /* Count the reference for the fd */
-       hfi1_rcd_get(uctxt);
+       *cd = uctxt;
 
        return 0;
 
 ctxdata_free:
+       *cd = NULL;
        dd->rcd[ctxt] = NULL;
        hfi1_rcd_put(uctxt);
        return ret;
@@ -1243,23 +1246,25 @@ static int get_ctxt_info(struct hfi1_filedata *fd, void __user *ubase,
        return ret;
 }
 
-static int init_user_ctxt(struct hfi1_filedata *fd)
+static int init_user_ctxt(struct hfi1_filedata *fd,
+                         struct hfi1_ctxtdata *uctxt)
 {
-       struct hfi1_ctxtdata *uctxt = fd->uctxt;
        int ret;
 
        ret = hfi1_user_sdma_alloc_queues(uctxt, fd);
        if (ret)
                return ret;
 
-       ret = hfi1_user_exp_rcv_init(fd);
+       ret = hfi1_user_exp_rcv_init(fd, uctxt);
+       if (ret)
+               hfi1_user_sdma_free_queues(fd, uctxt);
 
        return ret;
 }
 
-static int setup_base_ctxt(struct hfi1_filedata *fd)
+static int setup_base_ctxt(struct hfi1_filedata *fd,
+                          struct hfi1_ctxtdata *uctxt)
 {
-       struct hfi1_ctxtdata *uctxt = fd->uctxt;
        struct hfi1_devdata *dd = uctxt->dd;
        int ret = 0;
 
@@ -1284,12 +1289,16 @@ static int setup_base_ctxt(struct hfi1_filedata *fd)
        if (ret)
                goto setup_failed;
 
-       ret = init_user_ctxt(fd);
+       ret = init_user_ctxt(fd, uctxt);
        if (ret)
                goto setup_failed;
 
        user_init(uctxt);
 
+       /* Now that the context is set up, the fd can get a reference. */
+       fd->uctxt = uctxt;
+       hfi1_rcd_get(uctxt);
+
        return 0;
 
 setup_failed:

diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.c b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
index 3baf71944471f5e1df29997e1851ce6c65c325ca..d9036ba3f4ebf5195c89fea1985155ba43de50ae 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_exp_rcv.c
+++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
@@ -104,9 +104,9 @@ static struct mmu_rb_ops tid_rb_ops = {
  * receive caching. This needs to be done after the context has
  * been configured with the eager/expected RcvEntry counts.
  */
-int hfi1_user_exp_rcv_init(struct hfi1_filedata *fd)
+int hfi1_user_exp_rcv_init(struct hfi1_filedata *fd,
+                          struct hfi1_ctxtdata *uctxt)
 {
-       struct hfi1_ctxtdata *uctxt = fd->uctxt;
        struct hfi1_devdata *dd = uctxt->dd;
        int ret = 0;
 

diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.h b/drivers/infiniband/hw/hfi1/user_exp_rcv.h
index 1bdc61be53cb751d2b2e5759911c9768c685cf58..6cbaa4cf4970a63c6cd9cca5ffb845359327c55d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_exp_rcv.h
+++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.h
@@ -51,7 +51,8 @@
 
 #include "exp_rcv.h"
 
-int hfi1_user_exp_rcv_init(struct hfi1_filedata *fd);
+int hfi1_user_exp_rcv_init(struct hfi1_filedata *fd,
+                          struct hfi1_ctxtdata *uctxt);
 void hfi1_user_exp_rcv_free(struct hfi1_filedata *fd);
 int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
                            struct hfi1_tid_info *tinfo);

diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index 64d31eb9bd824673e8c613efc127548c20e1fe5c..8f02707e9c951ff311b18eba1b3ffb45d8ecdff6 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -437,9 +437,9 @@ pq_reqs_nomem:
        return ret;
 }
 
-int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd)
+int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd,
+                              struct hfi1_ctxtdata *uctxt)
 {
-       struct hfi1_ctxtdata *uctxt = fd->uctxt;
        struct hfi1_user_sdma_pkt_q *pq;
 
        hfi1_cdbg(SDMA, "[%u:%u:%u] Freeing user SDMA queues", uctxt->dd->unit,

diff --git a/drivers/infiniband/hw/hfi1/user_sdma.h b/drivers/infiniband/hw/hfi1/user_sdma.h
index 73c2455189d3ce42ccc06868b1e4427fc4e13392..84c199d3e003ade2efd3a13563456102bd8f61b3 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_sdma.h
+++ b/drivers/infiniband/hw/hfi1/user_sdma.h
@@ -81,7 +81,8 @@ struct hfi1_user_sdma_comp_q {
 
 int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
                                struct hfi1_filedata *fd);
-int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd);
+int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd,
+                              struct hfi1_ctxtdata *uctxt);
 int hfi1_user_sdma_process_request(struct hfi1_filedata *fd,
                                   struct iovec *iovec, unsigned long dim,
                                   unsigned long *count);