All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hiroshi Doyu <hdoyu@nvidia.com>
To: <m.szyprowski@samsung.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linaro-mm-sig@lists.linaro.org>, <linux-mm@kvack.org>,
	<linux-kernel@vger.kernel.org>, <kyungmin.park@samsung.com>,
	<arnd@arndb.de>, <linux@arm.linux.org.uk>,
	<chunsang.jeong@linaro.org>, <vdumpa@nvidia.com>,
	<konrad.wilk@oracle.com>, <subashrp@gmail.com>,
	<minchan@kernel.org>, <pullip.cho@samsung.com>
Subject: [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
Date: Fri, 24 Aug 2012 11:29:03 +0300	[thread overview]
Message-ID: <1345796945-21115-3-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1345796945-21115-1-git-send-email-hdoyu@nvidia.com>

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");
+		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


WARNING: multiple messages have this Message-ID (diff)
From: Hiroshi Doyu <hdoyu@nvidia.com>
To: m.szyprowski@samsung.com
Cc: Hiroshi Doyu <hdoyu@nvidia.com>,
	linux-arm-kernel@lists.infradead.org,
	linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org, kyungmin.park@samsung.com,
	arnd@arndb.de, linux@arm.linux.org.uk, chunsang.jeong@linaro.org,
	vdumpa@nvidia.com, konrad.wilk@oracle.com, subashrp@gmail.com,
	minchan@kernel.org, pullip.cho@samsung.com
Subject: [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
Date: Fri, 24 Aug 2012 11:29:03 +0300	[thread overview]
Message-ID: <1345796945-21115-3-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1345796945-21115-1-git-send-email-hdoyu@nvidia.com>

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");
+		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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

WARNING: multiple messages have this Message-ID (diff)
From: hdoyu@nvidia.com (Hiroshi Doyu)
To: linux-arm-kernel@lists.infradead.org
Subject: [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
Date: Fri, 24 Aug 2012 11:29:03 +0300	[thread overview]
Message-ID: <1345796945-21115-3-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1345796945-21115-1-git-send-email-hdoyu@nvidia.com>

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");
+		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

  parent reply	other threads:[~2012-08-24  8:30 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-24  8:29 [v3 0/4] ARM: dma-mapping: IOMMU atomic allocation Hiroshi Doyu
2012-08-24  8:29 ` Hiroshi Doyu
2012-08-24  8:29 ` Hiroshi Doyu
2012-08-24  8:29 ` [v3 1/4] ARM: dma-mapping: atomic_pool with struct page **pages Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24 11:13   ` Konrad Rzeszutek Wilk
2012-08-24 11:13     ` Konrad Rzeszutek Wilk
2012-08-24 11:13     ` Konrad Rzeszutek Wilk
2012-08-24 11:52     ` Hiroshi Doyu
2012-08-24 11:52       ` Hiroshi Doyu
2012-08-24 11:52       ` Hiroshi Doyu
2012-08-24 12:21       ` Marek Szyprowski
2012-08-24 12:21         ` Marek Szyprowski
2012-08-24 12:21         ` Marek Szyprowski
2012-08-24  8:29 ` Hiroshi Doyu [this message]
2012-08-24  8:29   ` [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24 11:14   ` Konrad Rzeszutek Wilk
2012-08-24 11:14     ` Konrad Rzeszutek Wilk
2012-08-24 11:14     ` Konrad Rzeszutek Wilk
2012-08-24 11:39     ` Hiroshi Doyu
2012-08-24 11:39       ` Hiroshi Doyu
2012-08-24 11:39       ` Hiroshi Doyu
2012-08-24  8:29 ` [v3 3/4] ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages() Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24  8:29 ` [v3 4/4] ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMIC Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu
2012-08-24  8:29   ` Hiroshi Doyu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345796945-21115-3-git-send-email-hdoyu@nvidia.com \
    --to=hdoyu@nvidia.com \
    --cc=arnd@arndb.de \
    --cc=chunsang.jeong@linaro.org \
    --cc=konrad.wilk@oracle.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linaro-mm-sig@lists.linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@arm.linux.org.uk \
    --cc=m.szyprowski@samsung.com \
    --cc=minchan@kernel.org \
    --cc=pullip.cho@samsung.com \
    --cc=subashrp@gmail.com \
    --cc=vdumpa@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.