From patchwork Fri Aug 24 08:29:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 10915 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6B4D723E41 for ; Fri, 24 Aug 2012 08:30:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 30F2BA18861 for ; Fri, 24 Aug 2012 08:29:56 +0000 (UTC) Received: by iafj25 with SMTP id j25so671330iaf.11 for ; Fri, 24 Aug 2012 01:30:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :x-pgp-universal:from:to:date:message-id:x-mailer:in-reply-to :references:mime-version:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:content-type:content-transfer-encoding :sender:errors-to:x-gm-message-state; bh=qkLKV5KmgokDX4k9pcllF8DYHoPdI4KgnSTd1Y+uvRQ=; b=M9at2oXoaEwz7dY7/RffYq5+Z6LnMMqr+Fdo8WZaxZimQR9N4YZbs18h7NQm2NXkhe ZYbupT1JF5T6IFqNQB9yZcAUroUE5mQEkjewD1BR0bVD+Mhx8010dszlNYHXrgswpAv6 hgCeTkPlFBsOlPcfZe23OjkEY6aN2XMGtzcDo+3C8cBYTdvhri+ABXGQ2zczBC3rkKH3 /ONfazzwCrrM7HNsxDgMGSKZivoygq5F1qm1/b7ltMVDfPnRYxbiUamKybmN17IdksH3 t08jC91XL2su9iKDTD/FUiET2okuNuU/WP8IEvnzORMRJlx//UWy8ovN2JxVvi4e+rz+ ibow== Received: by 10.50.182.162 with SMTP id ef2mr1245648igc.43.1345797012341; Fri, 24 Aug 2012 01:30:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp307503igc; Fri, 24 Aug 2012 01:30:11 -0700 (PDT) Received: by 10.204.10.92 with SMTP id o28mr1595986bko.39.1345797010942; Fri, 24 Aug 2012 01:30:10 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fs16si6636332bkc.11.2012.08.24.01.30.09; Fri, 24 Aug 2012 01:30:10 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T4pHM-0003wb-Hg; Fri, 24 Aug 2012 08:30:08 +0000 Received: from hqemgate03.nvidia.com ([216.228.121.140]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T4pHK-0003ea-Dp for linaro-mm-sig@lists.linaro.org; Fri, 24 Aug 2012 08:30:06 +0000 Received: from hqnvupgp05.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Fri, 24 Aug 2012 01:31:20 -0700 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp05.nvidia.com (PGP Universal service); Fri, 24 Aug 2012 01:30:05 -0700 X-PGP-Universal: processed; by hqnvupgp05.nvidia.com on Fri, 24 Aug 2012 01:30:05 -0700 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.264.0; Fri, 24 Aug 2012 01:30:05 -0700 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Fri, 24 Aug 2012 01:30:56 -0700 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id q7O8TWAx024274; Fri, 24 Aug 2012 01:30:01 -0700 (PDT) From: Hiroshi Doyu To: 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 Cc: linux@arm.linux.org.uk, arnd@arndb.de, konrad.wilk@oracle.com, minchan@kernel.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, kyungmin.park@samsung.com, pullip.cho@samsung.com, linux-arm-kernel@lists.infradead.org Subject: [Linaro-mm-sig] [v3 2/4] ARM: dma-mapping: Refactor out to introduce __in_atomic_pool X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQlf/1awnOFmr2YZ+abqWACsJl/0bBdTjFekkeCEwhQvIx1z8FfGDaa2rmco64qRpqsOHyYF 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;