On Thu, Oct 06, 2011 at 03:54:46PM +0200, Marek Szyprowski wrote:
+static unsigned long __init __cma_early_get_total_pages(void) +{
- struct memblock_region *reg;
- unsigned long total_pages = 0;
- /*
* We cannot use memblock_phys_mem_size() here, because* memblock_analyze() has not been called yet.*/- for_each_memblock(memory, reg)
total_pages += memblock_region_memory_end_pfn(reg) -memblock_region_memory_base_pfn(reg);- return total_pages;
+}
On Tue, 18 Oct 2011 06:43:21 -0700, Mel Gorman mel@csn.ul.ie wrote:
Is this being called too early yet? What prevents you seeing up the CMA regions after the page allocator is brought up for example? I understand that there is a need for the memory to be coherent so maybe that is the obstacle.
Another reason is that we want to be sure that we can get given range of pages. After page allocator is set-up, someone could allocate a non-movable page from the range that interests us and that wouldn't be nice for us.
+struct page *dma_alloc_from_contiguous(struct device *dev, int count,
unsigned int align)+{
- struct cma *cma = get_dev_cma_area(dev);
- unsigned long pfn, pageno;
- int ret;
- if (!cma)
return NULL;- if (align > CONFIG_CMA_ALIGNMENT)
align = CONFIG_CMA_ALIGNMENT;- pr_debug("%s(cma %p, count %d, align %d)\n", __func__, (void *)cma,
count, align);- if (!count)
return NULL;- mutex_lock(&cma_mutex);
- pageno = bitmap_find_next_zero_area(cma->bitmap, cma->count, 0, count,
(1 << align) - 1);- if (pageno >= cma->count) {
ret = -ENOMEM;goto error;- }
- bitmap_set(cma->bitmap, pageno, count);
- pfn = cma->base_pfn + pageno;
- ret = alloc_contig_range(pfn, pfn + count, 0, MIGRATE_CMA);
- if (ret)
goto free;
If alloc_contig_range returns failure, the bitmap is still set. It will never be freed so now the area cannot be used for CMA allocations any more.
bitmap is cleared at the “free:” label.
- mutex_unlock(&cma_mutex);
- pr_debug("%s(): returned %p\n", __func__, pfn_to_page(pfn));
- return pfn_to_page(pfn);
+free:
- bitmap_clear(cma->bitmap, pageno, count);
+error:
- mutex_unlock(&cma_mutex);
- return NULL;
+}
+int dma_release_from_contiguous(struct device *dev, struct page *pages,
int count)+{
- struct cma *cma = get_dev_cma_area(dev);
- unsigned long pfn;
- if (!cma || !pages)
return 0;- pr_debug("%s(page %p)\n", __func__, (void *)pages);
- pfn = page_to_pfn(pages);
- if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count)
return 0;- mutex_lock(&cma_mutex);
- bitmap_clear(cma->bitmap, pfn - cma->base_pfn, count);
- free_contig_pages(pfn, count);
- mutex_unlock(&cma_mutex);
It feels like the mutex could be a lot lighter here. If the bitmap is protected by a spinlock, it would only need to be held while the bitmap was being cleared. free the contig pages outside the spinlock and clear the bitmap afterwards.
It's not particularly important as the scalability of CMA is not something to be concerned with at this point.
Mutex is used also to protect the core operations, ie. isolating pages and such. This is because two CMA calls may want to work on the same pageblock and we have to prevent that from happening.
We could add the spinlock for protecting the bitmap but we will still need mutex for other uses.