With CONFIG_XENO_OPT_PRIVATE_HEAPSZ, user that request any heap size based on their needs. For some application needs, this can grow as large as 4MB that is, 2^10 order pages, which is unlikely to succeed with kzalloc. Even the default (256KB) may fail on highly fragmented system. Further without COMPACTION enabled, the situation can be worse.
Moreover, for this heap allocation, we don't need physical contiguous memory. Thus vmalloc may be sufficient here. But for performance benefit we may like to stick to kmalloc. Thus, it is better to replace kzalloc with kvzalloc which will first try to use kmalloc and if fails, fallback to vmalloc. Signed-off-by: Pintu Kumar <[email protected]> Signed-off-by: sunshilong <[email protected]> Tested-by: sunshilong <[email protected]> --- kernel/cobalt/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/cobalt/heap.c b/kernel/cobalt/heap.c index d01a2e0..312b41f 100644 --- a/kernel/cobalt/heap.c +++ b/kernel/cobalt/heap.c @@ -749,7 +749,7 @@ int xnheap_init(struct xnheap *heap, void *membase, size_t size) xnlock_init(&heap->lock); nrpages = size >> XNHEAP_PAGE_SHIFT; - heap->pagemap = kzalloc(sizeof(struct xnheap_pgentry) * nrpages, + heap->pagemap = kvzalloc(sizeof(struct xnheap_pgentry) * nrpages, GFP_KERNEL); if (heap->pagemap == NULL) return -ENOMEM; @@ -804,7 +804,7 @@ void xnheap_destroy(struct xnheap *heap) nrheaps--; xnvfile_touch_tag(&vfile_tag); xnlock_put_irqrestore(&nklock, s); - kfree(heap->pagemap); + kvfree(heap->pagemap); } EXPORT_SYMBOL_GPL(xnheap_destroy); -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
