Hi John, On Fri, 8 Jan 2021 at 01:56, John Stultz <[email protected]> wrote: > > Bing Song noticed the CMA heap was leaking memory due to a flub > I made in commit a5d2d29e24be ("dma-buf: heaps: Move heap-helper > logic into the cma_heap implementation"), and provided this fix > which ensures the pagelist is also freed on release. Thanks for your patch. > > Cc: Bing Song <[email protected]> > Cc: Sumit Semwal <[email protected]> > Cc: Liam Mark <[email protected]> > Cc: Laura Abbott <[email protected]> > Cc: Brian Starkey <[email protected]> > Cc: Hridya Valsaraju <[email protected]> > Cc: Suren Baghdasaryan <[email protected]> > Cc: Sandeep Patil <[email protected]> > Cc: Daniel Mentz <[email protected]> > Cc: Chris Goldsworthy <[email protected]> > Cc: Ørjan Eide <[email protected]> > Cc: Robin Murphy <[email protected]> > Cc: Ezequiel Garcia <[email protected]> > Cc: Simon Ser <[email protected]> > Cc: James Jones <[email protected]> > Cc: [email protected] > Cc: [email protected] > Reported-by: Bing Song <[email protected]> > Fixes: a5d2d29e24be ("dma-buf: heaps: Move heap-helper logic into the > cma_heap implementation") > Signed-off-by: John Stultz <[email protected]>
I will queue it up so it gets in the v5.11 cycle. > --- > drivers/dma-buf/heaps/cma_heap.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/dma-buf/heaps/cma_heap.c > b/drivers/dma-buf/heaps/cma_heap.c > index 3c4e34301172..364fc2f3e499 100644 > --- a/drivers/dma-buf/heaps/cma_heap.c > +++ b/drivers/dma-buf/heaps/cma_heap.c > @@ -251,6 +251,9 @@ static void cma_heap_dma_buf_release(struct dma_buf > *dmabuf) > buffer->vaddr = NULL; > } > > + /* free page list */ > + kfree(buffer->pages); > + /* release memory */ > cma_release(cma_heap->cma, buffer->cma_pages, buffer->pagecount); > kfree(buffer); > } > -- > 2.17.1 > Best, Sumit. _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
