[v6.6] udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap

Commit Message

Andrey Kalachev Dec. 4, 2024, 3:17 p.m. UTC

From: Vivek Kasireddy <[e-mail]>

[ Upstream commit 7d79cd784470395539bda91bf0b3505ff5b2ab6d ]

Add VM_PFNMAP to vm_flags in the mmap handler to ensure that the mappings
would be managed without using struct page.

And, in the vm_fault handler, use vmf_insert_pfn to share the page's pfn
to userspace instead of directly sharing the page (via struct page *).

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Vivek Kasireddy <[e-mail]>
Suggested-by: David Hildenbrand <[e-mail]>
Acked-by: David Hildenbrand <[e-mail]>
Acked-by: Dave Airlie <[e-mail]>
Acked-by: Gerd Hoffmann <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Dongwon Kim <[e-mail]>
Cc: Junxiao Chang <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Cc: Matthew Wilcox (Oracle) <[e-mail]>
Cc: Mike Kravetz <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Shuah Khan <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Reported-by: [e-mail]
---
 drivers/dma-buf/udmabuf.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
index c40645999648..820c993c8659 100644
--- a/drivers/dma-buf/udmabuf.c
+++ b/drivers/dma-buf/udmabuf.c
@@ -35,12 +35,13 @@  static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf)
 	struct vm_area_struct *vma = vmf->vma;
 	struct udmabuf *ubuf = vma->vm_private_data;
 	pgoff_t pgoff = vmf->pgoff;
+	unsigned long pfn;
 
 	if (pgoff >= ubuf->pagecount)
 		return VM_FAULT_SIGBUS;
-	vmf->page = ubuf->pages[pgoff];
-	get_page(vmf->page);
-	return 0;
+
+	pfn = page_to_pfn(ubuf->pages[pgoff]);
+	return vmf_insert_pfn(vma, vmf->address, pfn);
 }
 
 static const struct vm_operations_struct udmabuf_vm_ops = {
@@ -56,6 +57,7 @@  static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma)
 
 	vma->vm_ops = &udmabuf_vm_ops;
 	vma->vm_private_data = ubuf;
+	vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);
 	return 0;
 }