| Message ID | 1345796945-21115-3-git-send-email-hdoyu@nvidia.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Aug 24, 2012 at 11:29:03AM +0300, Hiroshi Doyu wrote: > Check the given range("start", "size") is included in "atomic_pool" or not. > > Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> > --- > arch/arm/mm/dma-mapping.c | 25 +++++++++++++++++++------ > 1 files changed, 19 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c > index b14ee64..508fde1 100644 > --- a/arch/arm/mm/dma-mapping.c > +++ b/arch/arm/mm/dma-mapping.c > @@ -501,19 +501,32 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) > return ptr; > } > > +static bool __in_atomic_pool(void *start, size_t size) > +{ > + struct dma_pool *pool = &atomic_pool; > + void *end = start + size; > + void *pool_start = pool->vaddr; > + void *pool_end = pool->vaddr + pool->size; > + > + if (start < pool_start || start > pool_end) > + return false; > + > + if (end > pool_end) { > + WARN(1, "freeing wrong coherent size from pool\n"); That does not tell what size or from what pool. Perhaps you should include some details, such as the 'size' value, the pool used, the range of the pool, etc. Something that will help _you_in the field be able to narrow down what might be wrong. > + return false; > + } > + > + return true; > +} > + > static int __free_from_pool(void *start, size_t size) > { > struct dma_pool *pool = &atomic_pool; > unsigned long pageno, count; > unsigned long flags; > > - if (start < pool->vaddr || start > pool->vaddr + pool->size) > - return 0; > - > - if (start + size > pool->vaddr + pool->size) { > - WARN(1, "freeing wrong coherent size from pool\n"); > + if (!__in_atomic_pool(start, size)) > return 0; > - } > > pageno = (start - pool->vaddr) >> PAGE_SHIFT; > count = size >> PAGE_SHIFT; > -- > 1.7.5.4 >
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote @ Fri, 24 Aug 2012 13:14:55 +0200: > On Fri, Aug 24, 2012 at 11:29:03AM +0300, Hiroshi Doyu wrote: > > Check the given range("start", "size") is included in "atomic_pool" or not. > > > > Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> > > --- > > arch/arm/mm/dma-mapping.c | 25 +++++++++++++++++++------ > > 1 files changed, 19 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c > > index b14ee64..508fde1 100644 > > --- a/arch/arm/mm/dma-mapping.c > > +++ b/arch/arm/mm/dma-mapping.c > > @@ -501,19 +501,32 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) > > return ptr; > > } > > > > +static bool __in_atomic_pool(void *start, size_t size) > > +{ > > + struct dma_pool *pool = &atomic_pool; > > + void *end = start + size; > > + void *pool_start = pool->vaddr; > > + void *pool_end = pool->vaddr + pool->size; > > + > > + if (start < pool_start || start > pool_end) > > + return false; > > + > > + if (end > pool_end) { > > + WARN(1, "freeing wrong coherent size from pool\n"); > > That does not tell what size or from what pool. Perhaps you should > include some details, such as the 'size' value, the pool used, the > range of the pool, etc. Something that will help _you_in the field > be able to narrow down what might be wrong. True. I'll.
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index b14ee64..508fde1 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -501,19 +501,32 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) return ptr; } +static bool __in_atomic_pool(void *start, size_t size) +{ + struct dma_pool *pool = &atomic_pool; + void *end = start + size; + void *pool_start = pool->vaddr; + void *pool_end = pool->vaddr + pool->size; + + if (start < pool_start || start > pool_end) + return false; + + if (end > pool_end) { + WARN(1, "freeing wrong coherent size from pool\n"); + return false; + } + + return true; +} + static int __free_from_pool(void *start, size_t size) { struct dma_pool *pool = &atomic_pool; unsigned long pageno, count; unsigned long flags; - if (start < pool->vaddr || start > pool->vaddr + pool->size) - return 0; - - if (start + size > pool->vaddr + pool->size) { - WARN(1, "freeing wrong coherent size from pool\n"); + if (!__in_atomic_pool(start, size)) return 0; - } pageno = (start - pool->vaddr) >> PAGE_SHIFT; count = size >> PAGE_SHIFT;
Check the given range("start", "size") is included in "atomic_pool" or not. Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> --- arch/arm/mm/dma-mapping.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-)