| Message ID | 20200628111251.19108-2-song.bao.hua@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | make dma_alloc_coherent NUMA-aware by per-NUMA CMA | expand |
On Sun, Jun 28, 2020 at 11:12:50PM +1200, Barry Song wrote: > This is useful for at least two scenarios: > 1. ARM64 smmu will get memory from local numa node, it can save its > command queues and page tables locally. Tests show it can decrease > dma_unmap latency at lot. For example, without this patch, smmu on > node2 will get memory from node0 by calling dma_alloc_coherent(), > typically, it has to wait for more than 560ns for the completion of > CMD_SYNC in an empty command queue; with this patch, it needs 240ns > only. > 2. when we set iommu passthrough, drivers will get memory from CMA, > local memory means much less latency. I really don't like the config options. With the boot parameters you can always hardcode that in CONFIG_CMDLINE anyway.
On Sun, Jun 28, 2020 at 11:12:50PM +1200, Barry Song wrote: > struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) > { > size_t count = size >> PAGE_SHIFT; > struct page *page = NULL; > struct cma *cma = NULL; > + int nid = dev ? dev_to_node(dev) : NUMA_NO_NODE; > + bool alloc_from_pernuma = false; > + > + if ((count <= 1) && !(dev && dev->cma_area)) > + return NULL; > > if (dev && dev->cma_area) > cma = dev->cma_area; > - else if (count > 1) > + else if ((nid != NUMA_NO_NODE) && dma_contiguous_pernuma_area[nid] > + && !(gfp & (GFP_DMA | GFP_DMA32))) { > + cma = dma_contiguous_pernuma_area[nid]; > + alloc_from_pernuma = true; > + } else { > cma = dma_contiguous_default_area; > + } I find the function rather confusing now. What about something like (this relies on the fact that dev should never be NULL in the DMA API) struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) { size_t cma_align = min_t(size_t, get_order(size), CONFIG_CMA_ALIGNMENT); size_t count = size >> PAGE_SHIFT; if (gfpflags_allow_blocking(gfp)) return NULL; gfp &= __GFP_NOWARN; if (dev->cma_area) return cma_alloc(dev->cma_area, count, cma_align, gfp); if (count <= 1) return NULL; if (IS_ENABLED(CONFIG_PERNODE_CMA) && !(gfp & (GFP_DMA | GFP_DMA32)) { int nid = dev_to_node(dev); struct cma *cma = dma_contiguous_pernuma_area[nid]; struct page *page; if (cma) { page = cma_alloc(cma, count, cma_align, gfp); if (page) return page; } } return cma_alloc(dma_contiguous_default_area, count, cma_align, gfp); } > + /* > + * otherwise, page is from either per-numa cma or default cma > + */ > + int nid = page_to_nid(page); > + > + if (nid != NUMA_NO_NODE) { > + if (cma_release(dma_contiguous_pernuma_area[nid], page, > + PAGE_ALIGN(size) >> PAGE_SHIFT)) > + return; > + } > + > + if (cma_release(dma_contiguous_default_area, page, How can page_to_nid ever return NUMA_NO_NODE?
> -----Original Message----- > From: Christoph Hellwig [mailto:hch@lst.de] > Sent: Thursday, July 23, 2020 2:17 AM > To: Song Bao Hua (Barry Song) <song.bao.hua@hisilicon.com> > Cc: hch@lst.de; m.szyprowski@samsung.com; robin.murphy@arm.com; > will@kernel.org; ganapatrao.kulkarni@cavium.com; > catalin.marinas@arm.com; iommu@lists.linux-foundation.org; Linuxarm > <linuxarm@huawei.com>; linux-arm-kernel@lists.infradead.org; > linux-kernel@vger.kernel.org; Jonathan Cameron > <jonathan.cameron@huawei.com>; Nicolas Saenz Julienne > <nsaenzjulienne@suse.de>; Steve Capper <steve.capper@arm.com>; Andrew > Morton <akpm@linux-foundation.org>; Mike Rapoport <rppt@linux.ibm.com> > Subject: Re: [PATCH v3 1/2] dma-direct: provide the ability to reserve > per-numa CMA > +cc Prime and Daode who are interested in this patchset. > On Sun, Jun 28, 2020 at 11:12:50PM +1200, Barry Song wrote: > > This is useful for at least two scenarios: > > 1. ARM64 smmu will get memory from local numa node, it can save its > > command queues and page tables locally. Tests show it can decrease > > dma_unmap latency at lot. For example, without this patch, smmu on > > node2 will get memory from node0 by calling dma_alloc_coherent(), > > typically, it has to wait for more than 560ns for the completion of > > CMD_SYNC in an empty command queue; with this patch, it needs 240ns > > only. > > 2. when we set iommu passthrough, drivers will get memory from CMA, > > local memory means much less latency. > > I really don't like the config options. With the boot parameters > you can always hardcode that in CONFIG_CMDLINE anyway. I understand your concern. Anyway, The primary purpose of this patchset is providing a general way for users like IOMMU to get local coherent dma buffers to put their command queue and page tables in. The first user case is what really made me begin to prepare this patchset. For the second case, it is probably a positive side effect of this patchset for those users who have more concern on performance than dma security, then they maybe skip IOMMU by iommu.passthrough= [ARM64, X86] Configure DMA to bypass the IOMMU by default. Format: { "0" | "1" } 0 - Use IOMMU translation for DMA. 1 - Bypass the IOMMU for DMA. unset - Use value of CONFIG_IOMMU_DEFAULT_PASSTHROUGH. In this case, they can get local memory and get better performance. However, it is not the primary purpose of this patchset. Thanks Barry
> -----Original Message----- > From: Christoph Hellwig [mailto:hch@lst.de] > Sent: Thursday, July 23, 2020 2:30 AM > To: Song Bao Hua (Barry Song) <song.bao.hua@hisilicon.com> > Cc: hch@lst.de; m.szyprowski@samsung.com; robin.murphy@arm.com; > will@kernel.org; ganapatrao.kulkarni@cavium.com; > catalin.marinas@arm.com; iommu@lists.linux-foundation.org; Linuxarm > <linuxarm@huawei.com>; linux-arm-kernel@lists.infradead.org; > linux-kernel@vger.kernel.org; Jonathan Cameron > <jonathan.cameron@huawei.com>; Nicolas Saenz Julienne > <nsaenzjulienne@suse.de>; Steve Capper <steve.capper@arm.com>; Andrew > Morton <akpm@linux-foundation.org>; Mike Rapoport <rppt@linux.ibm.com> > Subject: Re: [PATCH v3 1/2] dma-direct: provide the ability to reserve > per-numa CMA > +cc Prime and Daode who are interested in this patchset. > On Sun, Jun 28, 2020 at 11:12:50PM +1200, Barry Song wrote: > > struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t > gfp) > > { > > size_t count = size >> PAGE_SHIFT; > > struct page *page = NULL; > > struct cma *cma = NULL; > > + int nid = dev ? dev_to_node(dev) : NUMA_NO_NODE; > > + bool alloc_from_pernuma = false; > > + > > + if ((count <= 1) && !(dev && dev->cma_area)) > > + return NULL; > > > > if (dev && dev->cma_area) > > cma = dev->cma_area; > > - else if (count > 1) > > + else if ((nid != NUMA_NO_NODE) && > dma_contiguous_pernuma_area[nid] > > + && !(gfp & (GFP_DMA | GFP_DMA32))) { > > + cma = dma_contiguous_pernuma_area[nid]; > > + alloc_from_pernuma = true; > > + } else { > > cma = dma_contiguous_default_area; > > + } > > I find the function rather confusing now. What about something > like (this relies on the fact that dev should never be NULL in the > DMA API) > > struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) > { > size_t cma_align = min_t(size_t, get_order(size), > CONFIG_CMA_ALIGNMENT); > size_t count = size >> PAGE_SHIFT; > > if (gfpflags_allow_blocking(gfp)) > return NULL; > gfp &= __GFP_NOWARN; > > if (dev->cma_area) I got a kernel robot warning which said dev should be checked before being accessed when I did a similar change in v1. Probably it was an invalid warning if dev should never be null. > return cma_alloc(dev->cma_area, count, cma_align, gfp); > if (count <= 1) > return NULL; > > if (IS_ENABLED(CONFIG_PERNODE_CMA) && !(gfp & (GFP_DMA | > GFP_DMA32)) { > int nid = dev_to_node(dev); > struct cma *cma = dma_contiguous_pernuma_area[nid]; > struct page *page; > > if (cma) { > page = cma_alloc(cma, count, cma_align, gfp); > if (page) > return page; > } > } > > return cma_alloc(dma_contiguous_default_area, count, cma_align, gfp); > } Yes, it looks much better. > > > + /* > > + * otherwise, page is from either per-numa cma or default cma > > + */ > > + int nid = page_to_nid(page); > > + > > + if (nid != NUMA_NO_NODE) { > > + if (cma_release(dma_contiguous_pernuma_area[nid], page, > > + PAGE_ALIGN(size) >> PAGE_SHIFT)) > > + return; > > + } > > + > > + if (cma_release(dma_contiguous_default_area, page, > > How can page_to_nid ever return NUMA_NO_NODE? I thought page_to_nid would return NUMA_NO_NODE if CONFIG_NUMA is not enabled. Probably I was wrong. Will get it fixed in v4. Thanks Barry
On Wed, Jul 22, 2020 at 09:26:03PM +0000, Song Bao Hua (Barry Song) wrote: > I understand your concern. Anyway, The primary purpose of this patchset is providing > a general way for users like IOMMU to get local coherent dma buffers to put their > command queue and page tables in. The first user case is what really made me > begin to prepare this patchset. > > For the second case, it is probably a positive side effect of this patchset for those users > who have more concern on performance than dma security, then they maybe skip > IOMMU by > iommu.passthrough= > [ARM64, X86] Configure DMA to bypass the IOMMU by default. > Format: { "0" | "1" } > 0 - Use IOMMU translation for DMA. > 1 - Bypass the IOMMU for DMA. > unset - Use value of CONFIG_IOMMU_DEFAULT_PASSTHROUGH. > In this case, they can get local memory and get better performance. > However, it is not the primary purpose of this patchset. That's not what I mean. Hardcoding the CMA regions in the kernel config is just a bad idea, and we should not add more hard coded values. You can always use CONFIG_CMDLINE to force a specific kernel command line including your options.
On Wed, Jul 22, 2020 at 09:41:50PM +0000, Song Bao Hua (Barry Song) wrote: > I got a kernel robot warning which said dev should be checked before being accessed > when I did a similar change in v1. Probably it was an invalid warning if dev should > never be null. That usually shows up if a function is inconsistent about sometimes checking it and sometimes now. > Yes, it looks much better. Below is a prep patch to rebase on top of: --- From b81a5e1da65fce9750f0a8b66dbb6f842cbfdd4d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Wed, 22 Jul 2020 16:33:43 +0200 Subject: dma-contiguous: cleanup dma_alloc_contiguous Split out a cma_alloc_aligned helper to deal with the "interesting" calling conventions for cma_alloc, which then allows to the main function to be written straight forward. This also takes advantage of the fact that NULL dev arguments have been gone from the DMA API for a while. Signed-off-by: Christoph Hellwig <hch@lst.de> --- kernel/dma/contiguous.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 15bc5026c485f2..cff7e60968b9e1 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -215,6 +215,13 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, return cma_release(dev_get_cma_area(dev), pages, count); } +static struct page *cma_alloc_aligned(struct cma *cma, size_t size, gfp_t gfp) +{ + unsigned int align = min(get_order(size), CONFIG_CMA_ALIGNMENT); + + return cma_alloc(cma, size >> PAGE_SHIFT, align, gfp & __GFP_NOWARN); +} + /** * dma_alloc_contiguous() - allocate contiguous pages * @dev: Pointer to device for which the allocation is performed. @@ -231,24 +238,14 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, */ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) { - size_t count = size >> PAGE_SHIFT; - struct page *page = NULL; - struct cma *cma = NULL; - - if (dev && dev->cma_area) - cma = dev->cma_area; - else if (count > 1) - cma = dma_contiguous_default_area; - /* CMA can be used only in the context which permits sleeping */ - if (cma && gfpflags_allow_blocking(gfp)) { - size_t align = get_order(size); - size_t cma_align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT); - - page = cma_alloc(cma, count, cma_align, gfp & __GFP_NOWARN); - } - - return page; + if (!gfpflags_allow_blocking(gfp)) + return NULL; + if (dev->cma_area) + return cma_alloc_aligned(dev->cma_area, size, gfp); + if (size <= PAGE_SIZE || !dma_contiguous_default_area) + return NULL; + return cma_alloc_aligned(dma_contiguous_default_area, size, gfp); } /**
> -----Original Message----- > From: Christoph Hellwig [mailto:hch@lst.de] > Sent: Friday, July 24, 2020 12:01 AM > To: Song Bao Hua (Barry Song) <song.bao.hua@hisilicon.com> > Cc: Christoph Hellwig <hch@lst.de>; m.szyprowski@samsung.com; > robin.murphy@arm.com; will@kernel.org; ganapatrao.kulkarni@cavium.com; > catalin.marinas@arm.com; iommu@lists.linux-foundation.org; Linuxarm > <linuxarm@huawei.com>; linux-arm-kernel@lists.infradead.org; > linux-kernel@vger.kernel.org; Jonathan Cameron > <jonathan.cameron@huawei.com>; Nicolas Saenz Julienne > <nsaenzjulienne@suse.de>; Steve Capper <steve.capper@arm.com>; Andrew > Morton <akpm@linux-foundation.org>; Mike Rapoport <rppt@linux.ibm.com>; > Zengtao (B) <prime.zeng@hisilicon.com>; huangdaode > <huangdaode@huawei.com> > Subject: Re: [PATCH v3 1/2] dma-direct: provide the ability to reserve > per-numa CMA > > On Wed, Jul 22, 2020 at 09:41:50PM +0000, Song Bao Hua (Barry Song) > wrote: > > I got a kernel robot warning which said dev should be checked before > > being accessed when I did a similar change in v1. Probably it was an > > invalid warning if dev should never be null. > > That usually shows up if a function is inconsistent about sometimes checking it > and sometimes now. > > > Yes, it looks much better. > > Below is a prep patch to rebase on top of: Thanks for letting me know. Will rebase on top of your patch. > > --- > From b81a5e1da65fce9750f0a8b66dbb6f842cbfdd4d Mon Sep 17 00:00:00 > 2001 > From: Christoph Hellwig <hch@lst.de> > Date: Wed, 22 Jul 2020 16:33:43 +0200 > Subject: dma-contiguous: cleanup dma_alloc_contiguous > > Split out a cma_alloc_aligned helper to deal with the "interesting" > calling conventions for cma_alloc, which then allows to the main function to > be written straight forward. This also takes advantage of the fact that NULL > dev arguments have been gone from the DMA API for a while. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > kernel/dma/contiguous.c | 31 ++++++++++++++----------------- > 1 file changed, 14 insertions(+), 17 deletions(-) > > diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index > 15bc5026c485f2..cff7e60968b9e1 100644 > --- a/kernel/dma/contiguous.c > +++ b/kernel/dma/contiguous.c > @@ -215,6 +215,13 @@ bool dma_release_from_contiguous(struct device > *dev, struct page *pages, > return cma_release(dev_get_cma_area(dev), pages, count); } > > +static struct page *cma_alloc_aligned(struct cma *cma, size_t size, > +gfp_t gfp) { > + unsigned int align = min(get_order(size), CONFIG_CMA_ALIGNMENT); > + > + return cma_alloc(cma, size >> PAGE_SHIFT, align, gfp & __GFP_NOWARN); > +} > + > /** > * dma_alloc_contiguous() - allocate contiguous pages > * @dev: Pointer to device for which the allocation is performed. > @@ -231,24 +238,14 @@ bool dma_release_from_contiguous(struct device > *dev, struct page *pages, > */ > struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) > { > - size_t count = size >> PAGE_SHIFT; > - struct page *page = NULL; > - struct cma *cma = NULL; > - > - if (dev && dev->cma_area) > - cma = dev->cma_area; > - else if (count > 1) > - cma = dma_contiguous_default_area; > - > /* CMA can be used only in the context which permits sleeping */ > - if (cma && gfpflags_allow_blocking(gfp)) { > - size_t align = get_order(size); > - size_t cma_align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT); > - > - page = cma_alloc(cma, count, cma_align, gfp & __GFP_NOWARN); > - } > - > - return page; > + if (!gfpflags_allow_blocking(gfp)) > + return NULL; > + if (dev->cma_area) > + return cma_alloc_aligned(dev->cma_area, size, gfp); > + if (size <= PAGE_SIZE || !dma_contiguous_default_area) > + return NULL; > + return cma_alloc_aligned(dma_contiguous_default_area, size, gfp); > } > > /** > -- > 2.27.0 Thanks Barry
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index fb95fad81c79..c52c22fa6de6 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -599,6 +599,15 @@ altogether. For more information, see include/linux/dma-contiguous.h + pernuma_cma=nn[MG]@[start[MG][-end[MG]]] + [ARM,X86,KNL] + Sets the size of kernel per-numa memory area for + contiguous memory allocations. A value of 0 disables + per-numa CMA altogether. DMA users on node nid will + first try to allocate buffer from the pernuma area + which is located in node nid, if the allocation fails, + they will fallback to the global default memory area. + cmo_free_hint= [PPC] Format: { yes | no } Specify whether pages are marked as being inactive when they are freed. This is used in CMO environments diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 03f8e98e3bcc..278a80a40456 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h @@ -79,6 +79,8 @@ static inline void dma_contiguous_set_default(struct cma *cma) void dma_contiguous_reserve(phys_addr_t addr_limit); +void dma_pernuma_cma_reserve(void); + int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, phys_addr_t limit, struct cma **res_cma, bool fixed); @@ -128,6 +130,8 @@ static inline void dma_contiguous_set_default(struct cma *cma) { } static inline void dma_contiguous_reserve(phys_addr_t limit) { } +static inline void dma_pernuma_cma_reserve(void) { } + static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, phys_addr_t limit, struct cma **res_cma, bool fixed) diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig index d006668c0027..aeb976b1d21c 100644 --- a/kernel/dma/Kconfig +++ b/kernel/dma/Kconfig @@ -104,6 +104,16 @@ config DMA_CMA if DMA_CMA comment "Default contiguous memory area size:" +config CMA_PERNUMA_SIZE_MBYTES + int "Size in Mega Bytes for per-numa CMA areas" + depends on NUMA + default 16 if ARM64 + default 0 + help + Defines the size (in MiB) of the per-numa memory area for Contiguous + Memory Allocator. Every numa node will get a separate CMA with this + size. If the size of 0 is selected, per-numa CMA is disabled. + config CMA_SIZE_MBYTES int "Size in Mega Bytes" depends on !CMA_SIZE_SEL_PERCENTAGE diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 15bc5026c485..d0bb694c2f4d 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -30,7 +30,14 @@ #define CMA_SIZE_MBYTES 0 #endif +#ifdef CONFIG_CMA_PERNUMA_SIZE_MBYTES +#define CMA_SIZE_PERNUMA_MBYTES CONFIG_CMA_PERNUMA_SIZE_MBYTES +#else +#define CMA_SIZE_PERNUMA_MBYTES 0 +#endif + struct cma *dma_contiguous_default_area; +static struct cma *dma_contiguous_pernuma_area[MAX_NUMNODES]; /* * Default global CMA area size can be defined in kernel's .config. @@ -44,6 +51,8 @@ struct cma *dma_contiguous_default_area; */ static const phys_addr_t size_bytes __initconst = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; +static phys_addr_t pernuma_size_bytes __initdata = + (phys_addr_t)CMA_SIZE_PERNUMA_MBYTES * SZ_1M; static phys_addr_t size_cmdline __initdata = -1; static phys_addr_t base_cmdline __initdata; static phys_addr_t limit_cmdline __initdata; @@ -69,6 +78,13 @@ static int __init early_cma(char *p) } early_param("cma", early_cma); +static int __init early_pernuma_cma(char *p) +{ + pernuma_size_bytes = memparse(p, &p); + return 0; +} +early_param("pernuma_cma", early_pernuma_cma); + #ifdef CONFIG_CMA_SIZE_PERCENTAGE static phys_addr_t __init __maybe_unused cma_early_percent_memory(void) @@ -96,6 +112,33 @@ static inline __maybe_unused phys_addr_t cma_early_percent_memory(void) #endif +void __init dma_pernuma_cma_reserve(void) +{ + int nid; + + if (!pernuma_size_bytes || nr_online_nodes <= 1) + return; + + for_each_node_state(nid, N_ONLINE) { + int ret; + char name[20]; + + snprintf(name, sizeof(name), "pernuma%d", nid); + ret = cma_declare_contiguous_nid(0, pernuma_size_bytes, 0, 0, + 0, false, name, + &dma_contiguous_pernuma_area[nid], + nid); + if (ret) { + pr_warn("%s: reservation failed: err %d, node %d", __func__, + ret, nid); + continue; + } + + pr_debug("%s: reserved %llu MiB on node %d\n", __func__, + (unsigned long long)pernuma_size_bytes / SZ_1M, nid); + } +} + /** * dma_contiguous_reserve() - reserve area(s) for contiguous memory handling * @limit: End address of the reserved memory (optional, 0 for any). @@ -222,23 +265,35 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, * @gfp: Allocation flags. * * This function allocates contiguous memory buffer for specified device. It - * tries to use device specific contiguous memory area if available, or the - * default global one. + * tries to use device specific contiguous memory area if available, or it + * tries to use per-numa cma, if the allocation fails, it will fallback to + * try default global one. * - * Note that it byapss one-page size of allocations from the global area as - * the addresses within one page are always contiguous, so there is no need - * to waste CMA pages for that kind; it also helps reduce fragmentations. + * Note that it bypass one-page size of allocations from the per-numa and + * global area as the addresses within one page are always contiguous, so + * there is no need to waste CMA pages for that kind; it also helps reduce + * fragmentations. */ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) { size_t count = size >> PAGE_SHIFT; struct page *page = NULL; struct cma *cma = NULL; + int nid = dev ? dev_to_node(dev) : NUMA_NO_NODE; + bool alloc_from_pernuma = false; + + if ((count <= 1) && !(dev && dev->cma_area)) + return NULL; if (dev && dev->cma_area) cma = dev->cma_area; - else if (count > 1) + else if ((nid != NUMA_NO_NODE) && dma_contiguous_pernuma_area[nid] + && !(gfp & (GFP_DMA | GFP_DMA32))) { + cma = dma_contiguous_pernuma_area[nid]; + alloc_from_pernuma = true; + } else { cma = dma_contiguous_default_area; + } /* CMA can be used only in the context which permits sleeping */ if (cma && gfpflags_allow_blocking(gfp)) { @@ -246,6 +301,11 @@ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) size_t cma_align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT); page = cma_alloc(cma, count, cma_align, gfp & __GFP_NOWARN); + + /* fall back to default cma if failed in per-numa cma */ + if (!page && alloc_from_pernuma) + page = cma_alloc(dma_contiguous_default_area, count, + cma_align, gfp & __GFP_NOWARN); } return page; @@ -264,9 +324,29 @@ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp) */ void dma_free_contiguous(struct device *dev, struct page *page, size_t size) { - if (!cma_release(dev_get_cma_area(dev), page, - PAGE_ALIGN(size) >> PAGE_SHIFT)) - __free_pages(page, get_order(size)); + /* if dev has its own cma, free page from there */ + if (dev && dev->cma_area) { + if (cma_release(dev->cma_area, page, PAGE_ALIGN(size) >> PAGE_SHIFT)) + return; + } else { + /* + * otherwise, page is from either per-numa cma or default cma + */ + int nid = page_to_nid(page); + + if (nid != NUMA_NO_NODE) { + if (cma_release(dma_contiguous_pernuma_area[nid], page, + PAGE_ALIGN(size) >> PAGE_SHIFT)) + return; + } + + if (cma_release(dma_contiguous_default_area, page, + PAGE_ALIGN(size) >> PAGE_SHIFT)) + return; + } + + /* not in any cma, free from buddy */ + __free_pages(page, get_order(size)); } /*
This is useful for at least two scenarios: 1. ARM64 smmu will get memory from local numa node, it can save its command queues and page tables locally. Tests show it can decrease dma_unmap latency at lot. For example, without this patch, smmu on node2 will get memory from node0 by calling dma_alloc_coherent(), typically, it has to wait for more than 560ns for the completion of CMD_SYNC in an empty command queue; with this patch, it needs 240ns only. 2. when we set iommu passthrough, drivers will get memory from CMA, local memory means much less latency. Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Will Deacon <will@kernel.org> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Cc: Steve Capper <steve.capper@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Barry Song <song.bao.hua@hisilicon.com> --- -v3: * move to use page_to_nid() while freeing cma with respect to Robin's comment, but this will only work after applying my below patch: "mm/cma.c: use exact_nid true to fix possible per-numa cma leak" https://marc.info/?l=linux-mm&m=159333034726647&w=2 * handle the case count <= 1 more properly according to Robin's comment; * add pernuma_cma parameter to support dynamic setting of per-numa cma size; ideally we can leverage the CMA_SIZE_MBYTES, CMA_SIZE_PERCENTAGE and "cma=" kernel parameter and avoid a new paramter separately for per- numa cma. Practically, it is really too complicated considering the below problems: (1) if we leverage the size of default numa for per-numa, we have to avoid creating two cma with same size in node0 since default cma is probably on node0. (2) default cma can consider the address limitation for old devices while per-numa cma doesn't support GFP_DMA and GFP_DMA32. all allocations with limitation flags will fallback to default one. (3) hard to apply CMA_SIZE_PERCENTAGE to per-numa. it is hard to decide if the percentage should apply to the whole memory size or only apply to the memory size of a specific numa node. (4) default cma size has CMA_SIZE_SEL_MIN and CMA_SIZE_SEL_MAX, it makes things even more complicated to per-numa cma. I haven't figured out a good way to leverage the size of default cma for per-numa cma. it seems a separate parameter for per-numa could make life easier. .../admin-guide/kernel-parameters.txt | 9 ++ include/linux/dma-contiguous.h | 4 + kernel/dma/Kconfig | 10 ++ kernel/dma/contiguous.c | 98 +++++++++++++++++-- 4 files changed, 112 insertions(+), 9 deletions(-)