With CONFIG_XENO_OPT_PRIVATE_HEAPSZ, user can 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.
Moreover, for this heap allocation, we don't need physical contiguous memory. Thus vmalloc/vzalloc may be sufficient here. Note, we may also use kvzalloc/kvmalloc, but unfortunately these are not available in all kernel versions. Thus for backward compatibility we stick to vmalloc at least till we support 4.x kernel. Signed-off-by: Pintu Kumar <[email protected]> Signed-off-by: sunshilong <[email protected]> Tested-by: sunshilong <[email protected]> --- kernel/cobalt/heap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/cobalt/heap.c b/kernel/cobalt/heap.c index d01a2e0..5d14a47 100644 --- a/kernel/cobalt/heap.c +++ b/kernel/cobalt/heap.c @@ -749,8 +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, - GFP_KERNEL); + heap->pagemap = vzalloc(sizeof(struct xnheap_pgentry) * nrpages); if (heap->pagemap == NULL) return -ENOMEM; @@ -804,7 +803,7 @@ void xnheap_destroy(struct xnheap *heap) nrheaps--; xnvfile_touch_tag(&vfile_tag); xnlock_put_irqrestore(&nklock, s); - kfree(heap->pagemap); + vfree(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.
