* [PATCH] net: ethernet: ti: cpdma: remove used_desc counter
@ 2016-08-04 15:20 Grygorii Strashko
2016-08-04 15:56 ` Ivan Khoronzhuk
2016-08-09 8:26 ` Mugunthan V N
0 siblings, 2 replies; 3+ messages in thread
From: Grygorii Strashko @ 2016-08-04 15:20 UTC (permalink / raw)
To: David S. Miller, netdev, Mugunthan V N
Cc: Sekhar Nori, linux-kernel, linux-omap, Grygorii Strashko
The struct cpdma_desc_pool->used_desc field can be safely removed from
CPDMA driver (and hot patch) because used_descs counter is used just
for pool consistency check at CPDMA deinitialization and now this
check can be re-implemnted using gen_pool_size(pool->gen_pool) !=
gen_pool_avail(pool->gen_pool).
More over, this will allow to get rid of warnings in
cpdma_desc_pool_destro()-> WARN_ON(pool->used_desc) which may happen
because the used_descs is used unprotected, since CPDMA has been
switched to use genalloc, and may get wrong values on SMP.
Hence, remove used_desc from struct cpdma_desc_pool.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/net/ethernet/ti/davinci_cpdma.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 19e5f32..cf72b33 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -86,7 +86,7 @@ struct cpdma_desc_pool {
void __iomem *iomap; /* ioremap map */
void *cpumap; /* dma_alloc map */
int desc_size, mem_size;
- int num_desc, used_desc;
+ int num_desc;
struct device *dev;
struct gen_pool *gen_pool;
};
@@ -148,7 +148,10 @@ static void cpdma_desc_pool_destroy(struct cpdma_desc_pool *pool)
if (!pool)
return;
- WARN_ON(pool->used_desc);
+ WARN(gen_pool_size(pool->gen_pool) != gen_pool_avail(pool->gen_pool),
+ "cpdma_desc_pool size %d != avail %d",
+ gen_pool_size(pool->gen_pool),
+ gen_pool_avail(pool->gen_pool));
if (pool->cpumap)
dma_free_coherent(pool->dev, pool->mem_size, pool->cpumap,
pool->phys);
@@ -232,21 +235,14 @@ desc_from_phys(struct cpdma_desc_pool *pool, dma_addr_t dma)
static struct cpdma_desc __iomem *
cpdma_desc_alloc(struct cpdma_desc_pool *pool)
{
- struct cpdma_desc __iomem *desc = NULL;
-
- desc = (struct cpdma_desc __iomem *)gen_pool_alloc(pool->gen_pool,
- pool->desc_size);
- if (desc)
- pool->used_desc++;
-
- return desc;
+ return (struct cpdma_desc __iomem *)
+ gen_pool_alloc(pool->gen_pool, pool->desc_size);
}
static void cpdma_desc_free(struct cpdma_desc_pool *pool,
struct cpdma_desc __iomem *desc, int num_desc)
{
gen_pool_free(pool->gen_pool, (unsigned long)desc, pool->desc_size);
- pool->used_desc--;
}
struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)
--
2.9.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: ethernet: ti: cpdma: remove used_desc counter
2016-08-04 15:20 [PATCH] net: ethernet: ti: cpdma: remove used_desc counter Grygorii Strashko
@ 2016-08-04 15:56 ` Ivan Khoronzhuk
2016-08-09 8:26 ` Mugunthan V N
1 sibling, 0 replies; 3+ messages in thread
From: Ivan Khoronzhuk @ 2016-08-04 15:56 UTC (permalink / raw)
To: Grygorii Strashko, David S. Miller, netdev, Mugunthan V N
Cc: Sekhar Nori, linux-kernel, linux-omap
On 04.08.16 18:20, Grygorii Strashko wrote:
> The struct cpdma_desc_pool->used_desc field can be safely removed from
> CPDMA driver (and hot patch) because used_descs counter is used just
> for pool consistency check at CPDMA deinitialization and now this
> check can be re-implemnted using gen_pool_size(pool->gen_pool) !=
> gen_pool_avail(pool->gen_pool).
> More over, this will allow to get rid of warnings in
> cpdma_desc_pool_destro()-> WARN_ON(pool->used_desc) which may happen
> because the used_descs is used unprotected, since CPDMA has been
> switched to use genalloc, and may get wrong values on SMP.
>
> Hence, remove used_desc from struct cpdma_desc_pool.
>
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com
Reviewed-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
> ---
> drivers/net/ethernet/ti/davinci_cpdma.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
> index 19e5f32..cf72b33 100644
> --- a/drivers/net/ethernet/ti/davinci_cpdma.c
> +++ b/drivers/net/ethernet/ti/davinci_cpdma.c
> @@ -86,7 +86,7 @@ struct cpdma_desc_pool {
> void __iomem *iomap; /* ioremap map */
> void *cpumap; /* dma_alloc map */
> int desc_size, mem_size;
> - int num_desc, used_desc;
> + int num_desc;
> struct device *dev;
> struct gen_pool *gen_pool;
> };
> @@ -148,7 +148,10 @@ static void cpdma_desc_pool_destroy(struct cpdma_desc_pool *pool)
> if (!pool)
> return;
>
> - WARN_ON(pool->used_desc);
> + WARN(gen_pool_size(pool->gen_pool) != gen_pool_avail(pool->gen_pool),
> + "cpdma_desc_pool size %d != avail %d",
> + gen_pool_size(pool->gen_pool),
> + gen_pool_avail(pool->gen_pool));
> if (pool->cpumap)
> dma_free_coherent(pool->dev, pool->mem_size, pool->cpumap,
> pool->phys);
> @@ -232,21 +235,14 @@ desc_from_phys(struct cpdma_desc_pool *pool, dma_addr_t dma)
> static struct cpdma_desc __iomem *
> cpdma_desc_alloc(struct cpdma_desc_pool *pool)
> {
> - struct cpdma_desc __iomem *desc = NULL;
> -
> - desc = (struct cpdma_desc __iomem *)gen_pool_alloc(pool->gen_pool,
> - pool->desc_size);
> - if (desc)
> - pool->used_desc++;
> -
> - return desc;
> + return (struct cpdma_desc __iomem *)
> + gen_pool_alloc(pool->gen_pool, pool->desc_size);
> }
>
> static void cpdma_desc_free(struct cpdma_desc_pool *pool,
> struct cpdma_desc __iomem *desc, int num_desc)
> {
> gen_pool_free(pool->gen_pool, (unsigned long)desc, pool->desc_size);
> - pool->used_desc--;
> }
>
> struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)
>
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: ethernet: ti: cpdma: remove used_desc counter
2016-08-04 15:20 [PATCH] net: ethernet: ti: cpdma: remove used_desc counter Grygorii Strashko
2016-08-04 15:56 ` Ivan Khoronzhuk
@ 2016-08-09 8:26 ` Mugunthan V N
1 sibling, 0 replies; 3+ messages in thread
From: Mugunthan V N @ 2016-08-09 8:26 UTC (permalink / raw)
To: Grygorii Strashko, David S. Miller, netdev
Cc: Sekhar Nori, linux-kernel, linux-omap
On Thursday 04 August 2016 08:50 PM, Grygorii Strashko wrote:
> The struct cpdma_desc_pool->used_desc field can be safely removed from
> CPDMA driver (and hot patch) because used_descs counter is used just
> for pool consistency check at CPDMA deinitialization and now this
> check can be re-implemnted using gen_pool_size(pool->gen_pool) !=
> gen_pool_avail(pool->gen_pool).
> More over, this will allow to get rid of warnings in
> cpdma_desc_pool_destro()-> WARN_ON(pool->used_desc) which may happen
> because the used_descs is used unprotected, since CPDMA has been
> switched to use genalloc, and may get wrong values on SMP.
>
> Hence, remove used_desc from struct cpdma_desc_pool.
>
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Regards
Mugunthan V N
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-09 8:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-04 15:20 [PATCH] net: ethernet: ti: cpdma: remove used_desc counter Grygorii Strashko
2016-08-04 15:56 ` Ivan Khoronzhuk
2016-08-09 8:26 ` Mugunthan V N
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).