| Message ID | 1359854463-2538-26-git-send-email-tj@kernel.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 2/2/2013 7:20 PM, Tejun Heo wrote: > Convert to the much saner new idr interface. > > Only compile tested. > > Signed-off-by: Tejun Heo <tj@kernel.org> > Cc: Steve Wise <swise@chelsio.com> > Cc: linux-rdma@vger.kernel.org > --- > This patch depends on an earlier idr changes and I think it would be > best to route these together through -mm. Please holler if there's > any objection. Thanks. Is there a git tree somewhere that I can use to test these patches out? > drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > > diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h > index 9c1644f..7f862da 100644 > --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h > +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h > @@ -260,20 +260,21 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr, > void *handle, u32 id, int lock) > { > int ret; > - int newid; > > - do { > - if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC)) > - return -ENOMEM; > - if (lock) > - spin_lock_irq(&rhp->lock); > - ret = idr_get_new_above(idr, handle, id, &newid); > - BUG_ON(!ret && newid != id); > - if (lock) > - spin_unlock_irq(&rhp->lock); > - } while (ret == -EAGAIN); > - > - return ret; > + if (lock) { > + idr_preload(GFP_KERNEL); > + spin_lock_irq(&rhp->lock); > + } The idr_preload() needs to be above the 'if (lock)', no? > + > + ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC); > + > + if (lock) { > + spin_unlock_irq(&rhp->lock); > + idr_preload_end(); > + } And idr_preload_end() should be after the 'if (lock)' block methinks... > + > + BUG_ON(ret == -ENOSPC); > + return ret < 0 ? ret : 0; What would cause ret > 0? > } > > static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr, -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, On Sun, Feb 3, 2013 at 6:18 AM, Steve Wise <swise@opengridcomputing.com> wrote: > Is there a git tree somewhere that I can use to test these patches out? git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git convert-to-idr_alloc >> - return ret; >> + if (lock) { >> + idr_preload(GFP_KERNEL); >> + spin_lock_irq(&rhp->lock); >> + } > > The idr_preload() needs to be above the 'if (lock)', no? No reason to preload for ATOMIC allocation. idr_alloc() can be called by itself. >> + >> + ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC); >> + >> + if (lock) { >> + spin_unlock_irq(&rhp->lock); >> + idr_preload_end(); >> + } > > And idr_preload_end() should be after the 'if (lock)' block methinks... Ditto. >> + >> + BUG_ON(ret == -ENOSPC); >> + return ret < 0 ? ret : 0; > > What would cause ret > 0? It's the allocated id. In this case, ret would either be @id or -errno. Thanks.
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 9c1644f..7f862da 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -260,20 +260,21 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr, void *handle, u32 id, int lock) { int ret; - int newid; - do { - if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC)) - return -ENOMEM; - if (lock) - spin_lock_irq(&rhp->lock); - ret = idr_get_new_above(idr, handle, id, &newid); - BUG_ON(!ret && newid != id); - if (lock) - spin_unlock_irq(&rhp->lock); - } while (ret == -EAGAIN); - - return ret; + if (lock) { + idr_preload(GFP_KERNEL); + spin_lock_irq(&rhp->lock); + } + + ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC); + + if (lock) { + spin_unlock_irq(&rhp->lock); + idr_preload_end(); + } + + BUG_ON(ret == -ENOSPC); + return ret < 0 ? ret : 0; } static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,
Convert to the much saner new idr interface. Only compile tested. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Steve Wise <swise@chelsio.com> Cc: linux-rdma@vger.kernel.org --- This patch depends on an earlier idr changes and I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)