lkml.org 
[lkml]   [2006]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 8 of 28] IB/ipath - count SRQs properly
    Date
    From
    Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>

    diff -r fcd3e3bc98d8 -r cc3350eeb557 drivers/infiniband/hw/ipath/ipath_srq.c
    --- a/drivers/infiniband/hw/ipath/ipath_srq.c Thu Sep 28 08:57:12 2006 -0700
    +++ b/drivers/infiniband/hw/ipath/ipath_srq.c Thu Sep 28 08:57:12 2006 -0700
    @@ -103,11 +103,6 @@ struct ib_srq *ipath_create_srq(struct i
    struct ipath_srq *srq;
    u32 sz;
    struct ib_srq *ret;
    -
    - if (dev->n_srqs_allocated == ib_ipath_max_srqs) {
    - ret = ERR_PTR(-ENOMEM);
    - goto done;
    - }

    if (srq_init_attr->attr.max_wr == 0) {
    ret = ERR_PTR(-EINVAL);
    @@ -180,10 +175,17 @@ struct ib_srq *ipath_create_srq(struct i
    spin_lock_init(&srq->rq.lock);
    srq->rq.wq->head = 0;
    srq->rq.wq->tail = 0;
    - srq->rq.max_sge = srq_init_attr->attr.max_sge;
    srq->limit = srq_init_attr->attr.srq_limit;

    - dev->n_srqs_allocated++;
    + spin_lock(&dev->n_srqs_lock);
    + if (dev->n_srqs_allocated == ib_ipath_max_srqs) {
    + spin_unlock(&dev->n_srqs_lock);
    + ret = ERR_PTR(-ENOMEM);
    + goto bail_wq;
    + }
    +
    + dev->n_srqs_allocated++;
    + spin_unlock(&dev->n_srqs_lock);

    ret = &srq->ibsrq;
    goto done;
    @@ -351,8 +353,13 @@ int ipath_destroy_srq(struct ib_srq *ibs
    struct ipath_srq *srq = to_isrq(ibsrq);
    struct ipath_ibdev *dev = to_idev(ibsrq->device);

    + spin_lock(&dev->n_srqs_lock);
    dev->n_srqs_allocated--;
    - vfree(srq->rq.wq);
    + spin_unlock(&dev->n_srqs_lock);
    + if (srq->ip)
    + kref_put(&srq->ip->ref, ipath_release_mmap_info);
    + else
    + vfree(srq->rq.wq);
    kfree(srq);

    return 0;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-09-28 18:13    [W:0.021 / U:63.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site