github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mm: cma: kill cma_pages_valid()

Browse Source 
Kill cma_pages_valid() which only used in cma_release(), also cleanup code
duplication between cma pages valid checking and cma memrange finding.

Link: https://lkml.kernel.org/r/20260109093136.1491549-4-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Jane Chu <jane.chu@oracle.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kefeng Wang 2026-01-09 17:31:33 +08:00 committed by Andrew Morton
parent a9deb800b8
commit 6c08cc64d1
2 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/cma.h
View File

@ -49,7 +49,6 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
struct cma **res_cma);
extern struct page *cma_alloc(struct cma *cma, unsigned long count, unsigned int align,
bool no_warn);
extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned long count);
extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count);
extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data);

48
mm/cma.c
View File

@ -942,36 +942,6 @@ struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp)
return page ? page_folio(page) : NULL;
}
bool cma_pages_valid(struct cma *cma, const struct page *pages,
unsigned long count)
{
unsigned long pfn, end;
int r;
struct cma_memrange *cmr;
bool ret;
if (!cma || !pages || count > cma->count)
return false;
pfn = page_to_pfn(pages);
ret = false;
for (r = 0; r < cma->nranges; r++) {
cmr = &cma->ranges[r];
end = cmr->base_pfn + cmr->count;
if (pfn >= cmr->base_pfn && pfn < end) {
ret = pfn + count <= end;
break;
}
}
if (!ret)
pr_debug("%s(page %p, count %lu)\n",
__func__, (void *)pages, count);
return ret;
}
/**
* cma_release() - release allocated pages
* @cma: Contiguous memory region for which the allocation is performed.
@ -991,23 +961,27 @@ bool cma_release(struct cma *cma, const struct page *pages,
pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count);
if (!cma_pages_valid(cma, pages, count))
if (!cma || !pages || count > cma->count)
return false;
pfn = page_to_pfn(pages);
end_pfn = pfn + count;
for (r = 0; r < cma->nranges; r++) {
cmr = &cma->ranges[r];
if (pfn >= cmr->base_pfn &&
pfn < (cmr->base_pfn + cmr->count)) {
VM_BUG_ON(end_pfn > cmr->base_pfn + cmr->count);
break;
end_pfn = cmr->base_pfn + cmr->count;
if (pfn >= cmr->base_pfn && pfn < end_pfn) {
if (pfn + count <= end_pfn)
break;
VM_WARN_ON_ONCE(1);
}
}
if (r == cma->nranges)
if (r == cma->nranges) {
pr_debug("%s(page %p, count %lu, no cma range matches the page range)\n",
__func__, (void *)pages, count);
return false;
}
free_contig_range(pfn, count);
cma_clear_bitmap(cma, cmr, pfn, count);