linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: Konrad Rzeszutek Wilk <konrad@darnok.org>,
	linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com,
	linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
	linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org,
	Michal Simek <monstr@monstr.eu>,
	linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org,
	linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
	sparclinux@vger.kernel.org, Guan Xuetao <gxt@mprc.pku.edu.cn>,
	x86@kernel.org, linux-arch@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 28/33] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32
Date: Wed, 10 Jan 2018 08:00:22 +0000	[thread overview]
Message-ID: <20180110080027.13879-29-hch@lst.de> (raw)
In-Reply-To: <20180110080027.13879-1-hch@lst.de>

This allows to dip into zones for lower memory if they are available.
If one of the zones is not available the corresponding GFP_* flag
will evaluate to 0 so they won't change anything.  We provide an
arch tunable for those architectures that do not use GFP_DMA for
the lowest 24-bits, given that there are a few.

Roughly based on the x86 code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/dma-direct.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/dma-direct.c b/lib/dma-direct.c
index f04a424f91fa..8f76032ebc3c 100644
--- a/lib/dma-direct.c
+++ b/lib/dma-direct.c
@@ -12,6 +12,14 @@
 
 #define DIRECT_MAPPING_ERROR		0
 
+/*
+ * Most architectures use ZONE_DMA for the first 16 Megabytes, but
+ * some use it for entirely different regions:
+ */
+#ifndef ARCH_ZONE_DMA_BITS
+#define ARCH_ZONE_DMA_BITS 24
+#endif
+
 static bool
 check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,
 		const char *caller)
@@ -34,6 +42,12 @@ static void *dma_direct_alloc(struct device *dev, size_t size,
 	int page_order = get_order(size);
 	struct page *page = NULL;
 
+	/* GFP_DMA32 and GFP_DMA are no ops without the corresponding zones: */
+	if (dev->coherent_dma_mask <= DMA_BIT_MASK(ARCH_ZONE_DMA_BITS))
+		gfp |= GFP_DMA;
+	if (dev->coherent_dma_mask <= DMA_BIT_MASK(32) && !(gfp & GFP_DMA))
+		gfp |= GFP_DMA32;
+
 	/* CMA can be used only in the context which permits sleeping */
 	if (gfpflags_allow_blocking(gfp))
 		page = dma_alloc_from_contiguous(dev, count, page_order, gfp);
-- 
2.14.2


  parent reply	other threads:[~2018-01-10  8:00 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-10  7:59 consolidate direct dma mapping V3 Christoph Hellwig
2018-01-10  7:59 ` [PATCH 02/33] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-10  7:59 ` [PATCH 05/33] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-10  8:00 ` [PATCH 06/33] m32r: remove the unused dma_capable helper Christoph Hellwig
     [not found] ` <20180110080027.13879-1-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10  7:59   ` [PATCH 01/33] alpha: mark jensen as broken Christoph Hellwig
2018-01-10  7:59   ` [PATCH 03/33] m32r: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-10  7:59   ` [PATCH 04/33] powerpc: " Christoph Hellwig
2018-01-10  8:00   ` [PATCH 07/33] riscv: remove the unused dma_capable helper Christoph Hellwig
2018-01-10  8:00   ` [PATCH 08/33] s390: " Christoph Hellwig
2018-01-10  8:00   ` [PATCH 10/33] arm64: don't override dma_max_pfn Christoph Hellwig
2018-01-10 11:08     ` Robin Murphy
2018-01-10  8:00   ` [PATCH 11/33] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2018-01-10  9:31     ` Vladimir Murzin
2018-01-10 15:22       ` Christoph Hellwig
     [not found]     ` <20180110080027.13879-12-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10 14:56       ` Robin Murphy
2018-01-10 15:26         ` Christoph Hellwig
2018-01-10 15:31           ` Robin Murphy
2018-01-10 15:40             ` Christoph Hellwig
2018-01-10  8:00   ` [PATCH 14/33] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-10  8:00   ` [PATCH 15/33] microblaze: rename dma_direct to dma_nommu Christoph Hellwig
2018-01-10  8:00   ` [PATCH 16/33] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2018-01-10  8:00   ` [PATCH 18/33] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2018-01-10  8:00   ` [PATCH 19/33] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
     [not found]     ` <20180110080027.13879-20-hch-jcswGhMUV9g@public.gmane.org>
2018-01-12 13:16       ` Konrad Rzeszutek Wilk
2018-01-10  8:00   ` [PATCH 20/33] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
     [not found]     ` <20180110080027.13879-21-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10 11:59       ` Robin Murphy
2018-01-10 15:29         ` Christoph Hellwig
2018-01-10  8:00   ` [PATCH 27/33] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-10 12:06     ` Robin Murphy
     [not found]       ` <3672aa56-b85c-5d2c-0c0e-709031b0c0a0-5wv7dgnIgG8@public.gmane.org>
2018-01-10 15:30         ` Christoph Hellwig
2018-01-10 16:49           ` Robin Murphy
2018-01-10  8:00 ` [PATCH 09/33] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2018-01-10 11:07   ` Robin Murphy
2018-01-10  8:00 ` [PATCH 12/33] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2018-01-10  8:00 ` [PATCH 13/33] hexagon: use the generic dma_capable helper Christoph Hellwig
2018-01-10  8:00 ` [PATCH 17/33] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2018-01-10  8:00 ` [PATCH 21/33] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2018-01-12 13:17   ` Konrad Rzeszutek Wilk
2018-01-10  8:00 ` [PATCH 22/33] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2018-01-10  8:00 ` [PATCH 23/33] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-10  8:00 ` [PATCH 24/33] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-10  8:00 ` [PATCH 25/33] dma-direct: add dma address sanity checks Christoph Hellwig
2018-01-10  8:00 ` [PATCH 26/33] dma-direct: add support for CMA allocation Christoph Hellwig
2018-01-10  8:00 ` Christoph Hellwig [this message]
2018-01-10  8:00 ` [PATCH 29/33] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-10  9:32   ` Vladimir Murzin
2018-01-10  8:00 ` [PATCH 30/33] dma-direct: make dma_direct_{alloc,free} available to other implementations Christoph Hellwig
2018-01-10  8:00 ` [PATCH 31/33] dma-direct: reject too small dma masks Christoph Hellwig
2018-01-10 11:49   ` Robin Murphy
2018-01-10 15:32     ` Christoph Hellwig
2018-01-10 17:00       ` Robin Murphy
2018-01-10  8:00 ` [PATCH 32/33] cris: use dma-direct Christoph Hellwig
2018-01-10  8:00 ` [PATCH 33/33] h8300: " Christoph Hellwig

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=20180110080027.13879-29-hch@lst.de \
    --to=hch@lst.de \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=iommu@lists.linux-foundation.org \
    --cc=konrad@darnok.org \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-c6x-dev@linux-c6x.org \
    --cc=linux-cris-kernel@axis.com \
    --cc=linux-hexagon@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-metag@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linux-snps-arc@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=monstr@monstr.eu \
    --cc=patches@groups.riscv.org \
    --cc=sparclinux@vger.kernel.org \
    --cc=x86@kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).