From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A0053A7; Fri, 6 Dec 2024 15:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733498712; cv=none; b=Yh2bQSckwwem6hFd61yHGMdZm6WmhvQN2Vg3aPNXfqBq2v7g4m26x1qV/7P2LMFT/1mMunPsPg+8UHoV2MEz5Ol+cCnzXJ3WedizJDoRIIyHh8yPrCkR9nWN5ikDBKDVMmuIs8IP4n7qGVbxLmJMO8Yy6/3McPNM9+jnGu3Nk1Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733498712; c=relaxed/simple; bh=GY9kkZdyq1RET588CXM8+SuM2pXNDnisqRtg4d0UdJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GEpsEJPyV20g669uTK31bYDh8hocuzaz91czS6vATIxzP1qCKIQ5Utbqol1+ridnINeD207CjDSx6lyKiWSCcTnxXlyDBH2y45aQu34uTtWmnqoN5twQfm/N+9T6I9GE6ryQbz2rw8zx8o5WOq0RTJpTH7ZGp47SIkXCgtGHMHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hVkNC884; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hVkNC884" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6514C4CED1; Fri, 6 Dec 2024 15:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733498712; bh=GY9kkZdyq1RET588CXM8+SuM2pXNDnisqRtg4d0UdJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVkNC884xOV68oDyNWmTFR6dlt4o6z4AgoNfCbyDaCeuDSK1ulBujMLPBZob3PEme u/BNrfjNBLSPMvjXKigZ8Sb6Dbmfyz64PV3dkDnpT0qMKvBIHSczJuqQEsJh2834Hn g3seukAlmGltYS9OcuO+KlrUccWTnfucRovCzhFM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vivek Kasireddy , David Hildenbrand , Dave Airlie , Gerd Hoffmann , Daniel Vetter , Hugh Dickins , Peter Xu , Jason Gunthorpe , Dongwon Kim , Junxiao Chang , Arnd Bergmann , Christoph Hellwig , Christoph Hellwig , "Matthew Wilcox (Oracle)" , Mike Kravetz , Oscar Salvador , Shuah Khan , Andrew Morton Subject: [PATCH 6.6 666/676] udmabuf: use vmf_insert_pfn and VM_PFNMAP for handling mmap Date: Fri, 6 Dec 2024 15:38:05 +0100 Message-ID: <20241206143719.386529805@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vivek Kasireddy commit 7d79cd784470395539bda91bf0b3505ff5b2ab6d upstream. 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/20240624063952.1572359-6-vivek.kasireddy@intel.com Signed-off-by: Vivek Kasireddy Suggested-by: David Hildenbrand Acked-by: David Hildenbrand Acked-by: Dave Airlie Acked-by: Gerd Hoffmann Cc: Daniel Vetter Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Dongwon Kim Cc: Junxiao Chang Cc: Arnd Bergmann Cc: Christoph Hellwig Cc: Christoph Hellwig Cc: Matthew Wilcox (Oracle) Cc: Mike Kravetz Cc: Oscar Salvador Cc: Shuah Khan Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/dma-buf/udmabuf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -35,12 +35,13 @@ static vm_fault_t udmabuf_vm_fault(struc 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 * vma->vm_ops = &udmabuf_vm_ops; vma->vm_private_data = ubuf; + vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); return 0; }