Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932499Ab2HXIa0 (ORCPT ); Fri, 24 Aug 2012 04:30:26 -0400 Received: from hqemgate03.nvidia.com ([216.228.121.140]:4119 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932458Ab2HXIaU (ORCPT ); Fri, 24 Aug 2012 04:30:20 -0400 X-PGP-Universal: processed; by hqnvupgp05.nvidia.com on Fri, 24 Aug 2012 01:30:05 -0700 From: Hiroshi Doyu To: CC: Hiroshi Doyu , , , , , , , , , , , , , Subject: [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool Date: Fri, 24 Aug 2012 11:29:03 +0300 Message-ID: <1345796945-21115-3-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1345796945-21115-1-git-send-email-hdoyu@nvidia.com> References: <1345796945-21115-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1634 Lines: 58 Check the given range("start", "size") is included in "atomic_pool" or not. Signed-off-by: Hiroshi Doyu --- 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"); + 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 -- 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/