* [PATCH 02/14] atm/nicstar: don't use idr_remove_all() [not found] <1359163872-1949-1-git-send-email-tj@kernel.org> @ 2013-01-26 1:31 ` Tejun Heo 2013-01-27 6:43 ` David Miller 2013-02-04 17:52 ` [PATCH v2 " Tejun Heo 0 siblings, 2 replies; 5+ messages in thread From: Tejun Heo @ 2013-01-26 1:31 UTC (permalink / raw) To: akpm; +Cc: rusty, linux-kernel, Tejun Heo, Chas Williams, netdev idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop its usage. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Chas Williams <chas@cmf.nrl.navy.mil> Cc: netdev@vger.kernel.org --- This patch depends on an earlier idr patch and given the trivial nature of the patch, I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. drivers/atm/nicstar.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index ed1d2b7..628787e 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -251,7 +251,6 @@ static void nicstar_remove_one(struct pci_dev *pcidev) if (card->scd2vc[j] != NULL) free_scq(card, card->scd2vc[j]->scq, card->scd2vc[j]->tx_vcc); } - idr_remove_all(&card->idr); idr_destroy(&card->idr); pci_free_consistent(card->pcidev, NS_RSQSIZE + NS_RSQ_ALIGNMENT, card->rsq.org, card->rsq.dma); -- 1.8.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 02/14] atm/nicstar: don't use idr_remove_all() 2013-01-26 1:31 ` [PATCH 02/14] atm/nicstar: don't use idr_remove_all() Tejun Heo @ 2013-01-27 6:43 ` David Miller 2013-02-04 17:52 ` [PATCH v2 " Tejun Heo 1 sibling, 0 replies; 5+ messages in thread From: David Miller @ 2013-01-27 6:43 UTC (permalink / raw) To: tj; +Cc: akpm, rusty, linux-kernel, chas, netdev From: Tejun Heo <tj@kernel.org> Date: Fri, 25 Jan 2013 17:31:00 -0800 > idr_destroy() can destroy idr by itself and idr_remove_all() is being > deprecated. Drop its usage. > > Signed-off-by: Tejun Heo <tj@kernel.org> > Cc: Chas Williams <chas@cmf.nrl.navy.mil> > Cc: netdev@vger.kernel.org > --- > This patch depends on an earlier idr patch and given the trivial > nature of the patch, I think it would be best to route these together > through -mm. Please holler if there's any objection. Please do: Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 02/14] atm/nicstar: don't use idr_remove_all() 2013-01-26 1:31 ` [PATCH 02/14] atm/nicstar: don't use idr_remove_all() Tejun Heo 2013-01-27 6:43 ` David Miller @ 2013-02-04 17:52 ` Tejun Heo 2013-02-04 18:10 ` chas williams - CONTRACTOR 1 sibling, 1 reply; 5+ messages in thread From: Tejun Heo @ 2013-02-04 17:52 UTC (permalink / raw) To: akpm; +Cc: rusty, linux-kernel, Chas Williams, netdev Subject: atm/nicstar: convert to idr_alloc() Convert to the much saner new idr interface. The existing code looks buggy to me - ID 0 is treated as no-ID but allocation specifies 0 as lower limit and there's no error handling after partial success. This conversion keeps the bugs unchanged. Only compile tested. v2: id1 and id2 are now directly used for -errno return and thus should be signed. Make them int instead of u32. This was spotted by kbuild test robot. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Chas Williams <chas@cmf.nrl.navy.mil> Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: netdev@vger.kernel.org --- drivers/atm/nicstar.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -949,7 +949,7 @@ static void free_scq(ns_dev *card, scq_i static void push_rxbufs(ns_dev * card, struct sk_buff *skb) { struct sk_buff *handle1, *handle2; - u32 id1 = 0, id2 = 0; + int id1 = 0, id2 = 0; u32 addr1, addr2; u32 stat; unsigned long flags; @@ -1026,24 +1026,21 @@ static void push_rxbufs(ns_dev * card, s card->lbfqc += 2; } - do { - if (!idr_pre_get(&card->idr, GFP_ATOMIC)) { - printk(KERN_ERR - "nicstar%d: no free memory for idr\n", - card->index); + if (id1 < 0) { + id1 = idr_alloc(&card->idr, handle1, 0, 0, GFP_ATOMIC); + if (id1 < 0) { + err = id1; goto out; } + } - if (!id1) - err = idr_get_new_above(&card->idr, handle1, 0, &id1); - - if (!id2 && err == 0) - err = idr_get_new_above(&card->idr, handle2, 0, &id2); - - } while (err == -EAGAIN); - - if (err) - goto out; + if (id2 < 0) { + id2 = idr_alloc(&card->idr, handle2, 0, 0, GFP_ATOMIC); + if (id2 < 0) { + err = id2; + goto out; + } + } spin_lock_irqsave(&card->res_lock, flags); while (CMD_BUSY(card)) ; ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 02/14] atm/nicstar: don't use idr_remove_all() 2013-02-04 17:52 ` [PATCH v2 " Tejun Heo @ 2013-02-04 18:10 ` chas williams - CONTRACTOR 2013-02-04 18:35 ` Tejun Heo 0 siblings, 1 reply; 5+ messages in thread From: chas williams - CONTRACTOR @ 2013-02-04 18:10 UTC (permalink / raw) To: Tejun Heo; +Cc: akpm, rusty, linux-kernel, netdev On Mon, 4 Feb 2013 09:52:10 -0800 Tejun Heo <tj@kernel.org> wrote: > Subject: atm/nicstar: convert to idr_alloc() > > Convert to the much saner new idr interface. The existing code looks > buggy to me - ID 0 is treated as no-ID but allocation specifies 0 as > lower limit and there's no error handling after partial success. This > conversion keeps the bugs unchanged. > > Only compile tested. > > v2: id1 and id2 are now directly used for -errno return and thus > should be signed. Make them int instead of u32. This was spotted > by kbuild test robot. > > Signed-off-by: Tejun Heo <tj@kernel.org> > Acked-by: Chas Williams <chas@cmf.nrl.navy.mil> > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Cc: netdev@vger.kernel.org > --- > drivers/atm/nicstar.c | 29 +++++++++++++---------------- > 1 file changed, 13 insertions(+), 16 deletions(-) > > --- a/drivers/atm/nicstar.c > +++ b/drivers/atm/nicstar.c > @@ -949,7 +949,7 @@ static void free_scq(ns_dev *card, scq_i > static void push_rxbufs(ns_dev * card, struct sk_buff *skb) > { > struct sk_buff *handle1, *handle2; > - u32 id1 = 0, id2 = 0; > + int id1 = 0, id2 = 0; > u32 addr1, addr2; > u32 stat; > unsigned long flags; > @@ -1026,24 +1026,21 @@ static void push_rxbufs(ns_dev * card, s > card->lbfqc += 2; > } > > - do { > - if (!idr_pre_get(&card->idr, GFP_ATOMIC)) { > - printk(KERN_ERR > - "nicstar%d: no free memory for idr\n", > - card->index); > + if (id1 < 0) { you assign id1 to 0, so this never happens i think. i don't think the reason to preassign id1/id2 exists anymore once the do loop is removed. > + id1 = idr_alloc(&card->idr, handle1, 0, 0, GFP_ATOMIC); > + if (id1 < 0) { > + err = id1; you dont need to assign err since it isn't returned. > goto out; > } > + } > > - if (!id1) > - err = idr_get_new_above(&card->idr, handle1, 0, &id1); > - > - if (!id2 && err == 0) > - err = idr_get_new_above(&card->idr, handle2, 0, &id2); > - > - } while (err == -EAGAIN); > - > - if (err) > - goto out; > + if (id2 < 0) { same as above. > + id2 = idr_alloc(&card->idr, handle2, 0, 0, GFP_ATOMIC); > + if (id2 < 0) { > + err = id2; > + goto out; > + } > + } > > spin_lock_irqsave(&card->res_lock, flags); > while (CMD_BUSY(card)) ; ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 02/14] atm/nicstar: don't use idr_remove_all() 2013-02-04 18:10 ` chas williams - CONTRACTOR @ 2013-02-04 18:35 ` Tejun Heo 0 siblings, 0 replies; 5+ messages in thread From: Tejun Heo @ 2013-02-04 18:35 UTC (permalink / raw) To: chas williams - CONTRACTOR; +Cc: akpm, rusty, linux-kernel, netdev Hey, On Mon, Feb 04, 2013 at 01:10:34PM -0500, chas williams - CONTRACTOR wrote: > you assign id1 to 0, so this never happens i think. i don't think the > reason to preassign id1/id2 exists anymore once the do loop is removed. > > > + id1 = idr_alloc(&card->idr, handle1, 0, 0, GFP_ATOMIC); > > + if (id1 < 0) { > > + err = id1; > > you dont need to assign err since it isn't returned. Heh, I put v2 under the wrong thread. I'll do v3 and post it under v1. Thanks. -- tejun ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-04 18:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1359163872-1949-1-git-send-email-tj@kernel.org>
2013-01-26 1:31 ` [PATCH 02/14] atm/nicstar: don't use idr_remove_all() Tejun Heo
2013-01-27 6:43 ` David Miller
2013-02-04 17:52 ` [PATCH v2 " Tejun Heo
2013-02-04 18:10 ` chas williams - CONTRACTOR
2013-02-04 18:35 ` Tejun Heo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).