From: Nicolin Chen <nicoleotsuka@gmail.com>
To: hch@lst.de, robin.murphy@arm.com
Cc: vdumpa@nvidia.com, linux@armlinux.org.uk,
catalin.marinas@arm.com, will.deacon@arm.com, joro@8bytes.org,
m.szyprowski@samsung.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
tony@atomide.com
Subject: [PATCH RFC/RFT 2/5] dma-remap: Run alloc_pages() on failure
Date: Tue, 26 Mar 2019 15:49:56 -0700 [thread overview]
Message-ID: <20190326224959.9656-3-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <20190326224959.9656-1-nicoleotsuka@gmail.com>
The CMA allocation will skip allocations of single pages to save CMA
resource. This requires its callers to rebound those page allocations
from normal area.
So this patch moves the alloc_pages() call to the fallback routines.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
kernel/dma/remap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c
index 2b750f13bc8f..daab2f3186a2 100644
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -116,7 +116,7 @@ int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot)
if (dev_get_cma_area(NULL))
page = dma_alloc_from_contiguous(NULL, nr_pages,
pool_size_order, false);
- else
+ if (!page)
page = alloc_pages(gfp, pool_size_order);
if (!page)
goto out;
--
2.17.1
next prev parent reply other threads:[~2019-03-26 22:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 22:49 [PATCH RFC/RFT 0/5] Save single pages from CMA area Nicolin Chen
2019-03-26 22:49 ` [PATCH RFC/RFT 1/5] ARM: dma-mapping: Add fallback normal page allocations Nicolin Chen
2019-03-26 22:49 ` Nicolin Chen [this message]
2019-03-26 22:53 ` [PATCH RFC/RFT 2/5] dma-remap: Run alloc_pages() on failure Nicolin Chen
2019-03-26 22:49 ` [PATCH RFC/RFT 3/5] iommu: amd_iommu: Add fallback normal page allocations Nicolin Chen
2019-03-26 22:49 ` [PATCH RFC/RFT 4/5] arm64: dma-mapping: " Nicolin Chen
2019-03-26 22:49 ` [PATCH RFC/RFT 5/5] dma-contiguous: Do not allocate a single page from CMA area Nicolin Chen
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=20190326224959.9656-3-nicoleotsuka@gmail.com \
--to=nicoleotsuka@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
--cc=tony@atomide.com \
--cc=vdumpa@nvidia.com \
--cc=will.deacon@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox