IB/rdmavt: Use correct numa node for SRQ allocation

Normal receive queue allocation ensures that kernel receive queues
are allocated on the local numa node. Shared receive queues
do not behave the same way.

Ensure that kernel shared receive queues are allocated on the device
local node.

Reviewed-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/srq.c b/drivers/infiniband/sw/rdmavt/srq.c
index f7c48e9023de954339a43af53251ed23d6016d32..3707952b4364120329b375cd6d5e03ad1eec6fc7 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/srq.c
+++ b/drivers/infiniband/sw/rdmavt/srq.c
@@ -90,7 +90,7 @@ struct ib_srq *rvt_create_srq(struct ib_pd *ibpd,
            srq_init_attr->attr.max_wr > dev->dparms.props.max_srq_wr)
                return ERR_PTR(-EINVAL);
 
-       srq = kmalloc(sizeof(*srq), GFP_KERNEL);
+       srq = kzalloc_node(sizeof(*srq), GFP_KERNEL, dev->dparms.node);
        if (!srq)
                return ERR_PTR(-ENOMEM);
 
@@ -101,7 +101,10 @@ struct ib_srq *rvt_create_srq(struct ib_pd *ibpd,
        srq->rq.max_sge = srq_init_attr->attr.max_sge;
        sz = sizeof(struct ib_sge) * srq->rq.max_sge +
                sizeof(struct rvt_rwqe);
-       srq->rq.wq = vmalloc_user(sizeof(struct rvt_rwq) + srq->rq.size * sz);
+       srq->rq.wq = udata ?
+               vmalloc_user(sizeof(struct rvt_rwq) + srq->rq.size * sz) :
+               vzalloc_node(sizeof(struct rvt_rwq) + srq->rq.size * sz,
+                            dev->dparms.node);
        if (!srq->rq.wq) {
                ret = ERR_PTR(-ENOMEM);
                goto bail_srq;
@@ -129,16 +132,12 @@ struct ib_srq *rvt_create_srq(struct ib_pd *ibpd,
                        ret = ERR_PTR(err);
                        goto bail_ip;
                }
-       } else {
-               srq->ip = NULL;
        }
 
        /*
         * ib_create_srq() will initialize srq->ibsrq.
         */
        spin_lock_init(&srq->rq.lock);
-       srq->rq.wq->head = 0;
-       srq->rq.wq->tail = 0;
        srq->limit = srq_init_attr->attr.srq_limit;
 
        spin_lock(&dev->n_srqs_lock);
@@ -200,7 +199,10 @@ int rvt_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                sz = sizeof(struct rvt_rwqe) +
                        srq->rq.max_sge * sizeof(struct ib_sge);
                size = attr->max_wr + 1;
-               wq = vmalloc_user(sizeof(struct rvt_rwq) + size * sz);
+               wq = udata ?
+                       vmalloc_user(sizeof(struct rvt_rwq) + size * sz) :
+                       vzalloc_node(sizeof(struct rvt_rwq) + size * sz,
+                                    dev->dparms.node);
                if (!wq)
                        return -ENOMEM;