From patchwork Thu Aug 23 06:10:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 10894 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 DA2A423E00 for ; Thu, 23 Aug 2012 06:11:11 +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 CED0FA18F37 for ; Thu, 23 Aug 2012 06:10:57 +0000 (UTC) Received: by iadj38 with SMTP id j38so694163iad.11 for ; Wed, 22 Aug 2012 23:11:10 -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=KUdEf5StR4N08KTFgLrQRkHbdoXQRa8pKRkAbX7MSvo=; b=SLV8WNZCOXjl6TYO2DA/lXaYc8+blEZEINom/ij23kBx6BeYC0tupt1MBO5IGAYeG8 1mwytzZVvWePqCZ0b/pb+qpkQHExRi7+2ZMTHMTiXKSowUUpIIDKZz1edHtAGl5qrmJV 5cZWGI1ASGJXEuqKtdXCs5AUPFwiAiYg61Ldj0cp20HvNhK7gg3tSolfZPrj/DyIrMie kZgm0zZfqWvTjauTWJNuYplsPl1GHFO+nFD2M6RliaXLPIJxmeexJ0fsSI/VZue1frN/ qcrDhMhqgbtKWgXxqyHOcFPsBnQAJhWO0EOz5vgI6eVOrewpj9LTwWxWd7L+R4jxAqCl 6cVg== Received: by 10.50.45.162 with SMTP id o2mr423751igm.0.1345702270853; Wed, 22 Aug 2012 23:11:10 -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 ex8csp239283igc; Wed, 22 Aug 2012 23:11:10 -0700 (PDT) Received: by 10.216.241.202 with SMTP id g52mr204534wer.212.1345702269586; Wed, 22 Aug 2012 23:11:09 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id a19si8888549wec.95.2012.08.22.23.11.08; Wed, 22 Aug 2012 23:11:09 -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 1T4QdH-0004uI-FH; Thu, 23 Aug 2012 06:11:07 +0000 Received: from hqemgate03.nvidia.com ([216.228.121.140]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T4QdE-0004sz-RS for linaro-mm-sig@lists.linaro.org; Thu, 23 Aug 2012 06:11:05 +0000 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Wed, 22 Aug 2012 23:12:07 -0700 Received: from hqemhub02.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Wed, 22 Aug 2012 23:10:53 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 22 Aug 2012 23:10:53 -0700 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server id 8.3.264.0; Wed, 22 Aug 2012 23:10:53 -0700 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Wed, 22 Aug 2012 23:11:40 -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 q7N6AcIR004834; Wed, 22 Aug 2012 23:10:49 -0700 (PDT) From: Hiroshi Doyu To: Date: Thu, 23 Aug 2012 09:10:27 +0300 Message-ID: <1345702229-9539-3-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1345702229-9539-1-git-send-email-hdoyu@nvidia.com> References: <1345702229-9539-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] [v2 2/4] ARM: dma-mapping: Use kzalloc() with GFP_ATOMIC 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: ALoCoQmawJtqXRldG1FpVt/p36a2oNbNireJuRABRByRtedSh7a5KUv2AxKFsJRqoq3nykAaeF+0 Use kzalloc() with GFP_ATOMIC instead of vzalloc(). At freeing, __in_atomic_pool() checks if it comes from atomic_pool or not. Signed-off-by: Hiroshi Doyu --- arch/arm/mm/dma-mapping.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index aca2fd0..b64475a 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1029,7 +1029,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, gfp_t int array_size = count * sizeof(struct page *); int i = 0; - if (array_size <= PAGE_SIZE) + if ((array_size <= PAGE_SIZE) || (gfp & GFP_ATOMIC)) pages = kzalloc(array_size, gfp); else pages = vzalloc(array_size); @@ -1061,7 +1061,7 @@ error: while (i--) if (pages[i]) __free_pages(pages[i], 0); - if (array_size <= PAGE_SIZE) + if ((array_size <= PAGE_SIZE) || (gfp & GFP_ATOMIC)) kfree(pages); else vfree(pages); @@ -1076,7 +1076,8 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages, size_t s for (i = 0; i < count; i++) if (pages[i]) __free_pages(pages[i], 0); - if (array_size <= PAGE_SIZE) + if ((array_size <= PAGE_SIZE) || + __in_atomic_pool(page_address(pages[0]), size)) kfree(pages); else vfree(pages);