Re: [PATCH] CMA: generalize CMA reserved area management functionality (fixup)
On Thu, 17 Jul 2014 11:36:07 +0200 Marek Szyprowski wrote: > MAX_CMA_AREAS is used by other subsystems (i.e. arch/arm/mm/dma-mapping.c), > so we need to provide correct definition even if CMA is disabled. > This patch fixes this issue. > > Reported-by: Sylwester Nawrocki > Signed-off-by: Marek Szyprowski > --- > include/linux/cma.h | 4 > 1 file changed, 4 insertions(+) > > diff --git a/include/linux/cma.h b/include/linux/cma.h > index 9a18a2b1934c..c077635cad76 100644 > --- a/include/linux/cma.h > +++ b/include/linux/cma.h > @@ -5,7 +5,11 @@ > * There is always at least global CMA area and a few optional > * areas configured in kernel .config. > */ > +#ifdef CONFIG_CMA > #define MAX_CMA_AREAS(1 + CONFIG_CMA_AREAS) > +#else > +#define MAX_CMA_AREAS(0) > +#endif > > struct cma; Joonsoo already fixed this up, a bit differently: http://ozlabs.org/~akpm/mmots/broken-out/cma-generalize-cma-reserved-area-management-functionality-fix.patch Which approach makes more sense? From: Joonsoo Kim Subject: CMA: fix ARM build failure related to MAX_CMA_AREAS definition If CMA is disabled, CONFIG_CMA_AREAS isn't defined so compile error happens. To fix it, define MAX_CMA_AREAS if CONFIG_CMA_AREAS isn't defined. Signed-off-by: Joonsoo Kim Reported-by: Stephen Rothwell Signed-off-by: Andrew Morton --- include/linux/cma.h |6 ++ 1 file changed, 6 insertions(+) diff -puN include/linux/cma.h~cma-generalize-cma-reserved-area-management-functionality-fix include/linux/cma.h --- a/include/linux/cma.h~cma-generalize-cma-reserved-area-management-functionality-fix +++ a/include/linux/cma.h @@ -5,8 +5,14 @@ * There is always at least global CMA area and a few optional * areas configured in kernel .config. */ +#ifdef CONFIG_CMA_AREAS #define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS) +#else +#define MAX_CMA_AREAS (0) + +#endif + struct cma; extern phys_addr_t cma_get_base(struct cma *cma); _ -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 -next 0/9] CMA: generalize CMA reserved area management code
On Wed, 25 Jun 2014 14:33:56 +0200 Marek Szyprowski wrote: > > That's probably easier. Marek, I'll merge these into -mm (and hence > > -next and git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git) > > and shall hold them pending you review/ack/test/etc, OK? > > Ok. I've tested them and they work fine. I'm sorry that you had to wait for > me for a few days. You can now add: > > Acked-and-tested-by: Marek Szyprowski Thanks. > I've also rebased my pending patches onto this set (I will send them soon). > > The question is now if you want to keep the discussed patches in your > -mm tree, > or should I take them to my -next branch. If you like to keep them, I assume > you will also take the patches which depends on the discussed changes. Yup, that works. -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 -next 0/9] CMA: generalize CMA reserved area management code
On Tue, 17 Jun 2014 10:25:07 +0900 Joonsoo Kim wrote: > > >v2: > > > - Although this patchset looks very different with v1, the end result, > > > that is, mm/cma.c is same with v1's one. So I carry Ack to patch 6-7. > > > > > >This patchset is based on linux-next 20140610. > > > > Thanks for taking care of this. I will test it with my setup and if > > everything goes well, I will take it to my -next tree. If any branch > > is required for anyone to continue his works on top of those patches, > > let me know, I will also prepare it. > > Hello, > > I'm glad to hear that. :) > But, there is one concern. As you already know, I am preparing further > patches (Aggressively allocate the pages on CMA reserved memory). It > may be highly related to MM branch and also slightly depends on this CMA > changes. In this case, what is the best strategy to merge this > patchset? IMHO, Anrew's tree is more appropriate branch. If there is > no issue in this case, I am willing to develope further patches based > on your tree. That's probably easier. Marek, I'll merge these into -mm (and hence -next and git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git) and shall hold them pending you review/ack/test/etc, OK? -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 -next 4/9] DMA, CMA: support arbitrary bitmap granularity
On Mon, 16 Jun 2014 14:40:46 +0900 Joonsoo Kim wrote:
> PPC KVM's CMA area management requires arbitrary bitmap granularity,
> since they want to reserve very large memory and manage this region
> with bitmap that one bit for several pages to reduce management overheads.
> So support arbitrary bitmap granularity for following generalization.
>
> ...
>
> --- a/drivers/base/dma-contiguous.c
> +++ b/drivers/base/dma-contiguous.c
> @@ -38,6 +38,7 @@ struct cma {
> unsigned long base_pfn;
> unsigned long count;
> unsigned long *bitmap;
> + unsigned int order_per_bit; /* Order of pages represented by one bit */
> struct mutexlock;
> };
>
> @@ -157,9 +158,37 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
>
> static DEFINE_MUTEX(cma_mutex);
>
> +static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int
> align_order)
> +{
> + return (1 << (align_order >> cma->order_per_bit)) - 1;
> +}
Might want a "1UL << ..." here.
> +static unsigned long cma_bitmap_maxno(struct cma *cma)
> +{
> + return cma->count >> cma->order_per_bit;
> +}
> +
> +static unsigned long cma_bitmap_pages_to_bits(struct cma *cma,
> + unsigned long pages)
> +{
> + return ALIGN(pages, 1 << cma->order_per_bit) >> cma->order_per_bit;
> +}
Ditto. I'm not really sure what the compiler will do in these cases,
but would prefer not to rely on it anyway!
---
a/drivers/base/dma-contiguous.c~dma-cma-support-arbitrary-bitmap-granularity-fix
+++ a/drivers/base/dma-contiguous.c
@@ -160,7 +160,7 @@ static DEFINE_MUTEX(cma_mutex);
static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int align_order)
{
- return (1 << (align_order >> cma->order_per_bit)) - 1;
+ return (1UL << (align_order >> cma->order_per_bit)) - 1;
}
static unsigned long cma_bitmap_maxno(struct cma *cma)
@@ -171,7 +171,7 @@ static unsigned long cma_bitmap_maxno(st
static unsigned long cma_bitmap_pages_to_bits(struct cma *cma,
unsigned long pages)
{
- return ALIGN(pages, 1 << cma->order_per_bit) >> cma->order_per_bit;
+ return ALIGN(pages, 1UL << cma->order_per_bit) >> cma->order_per_bit;
}
static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, int count)
_
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 04/10] powerpc: Prepare to support kernel handling of IOMMU map/unmap
On Tue, 23 Jul 2013 12:22:59 +1000 Alexey Kardashevskiy wrote: > Ping, anyone, please? ew, you top-posted. > Ben needs ack from any of MM people before proceeding with this patch. Thanks! For what? The three lines of comment in page-flags.h? ack :) Manipulating page->_count directly is considered poor form. Don't blame us if we break your code ;) Actually, the manipulation in realmode_get_page() duplicates the existing get_page_unless_zero() and the one in realmode_put_page() could perhaps be placed in mm.h with a suitable name and some documentation. That would improve your form and might protect the code from getting broken later on. -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
