diff mbox series

[v3,19/41] vfio: convert put_page() to put_user_page*()

Message ID	20190807013340.9706-20-jhubbard@nvidia.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: john.hubbard@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Date: Tue, 6 Aug 2019 18:33:18 -0700 Message-Id: <20190807013340.9706-20-jhubbard@nvidia.com> In-Reply-To: <20190807013340.9706-1-jhubbard@nvidia.com> References: <20190807013340.9706-1-jhubbard@nvidia.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 19/41] vfio: convert put_page() to put_user_page*() Precedence: list Cc: linux-fbdev@vger.kernel.org, Jan Kara <jack@suse.cz>, kvm@vger.kernel.org, Dave Hansen <dave.hansen@linux.intel.com>, Dave Chinner <david@fromorbit.com>, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, sparclinux@vger.kernel.org, Ira Weiny <ira.weiny@intel.com>, ceph-devel@vger.kernel.org, devel@driverdev.osuosl.org, rds-devel@oss.oracle.com, linux-rdma@vger.kernel.org, x86@kernel.org, amd-gfx@lists.freedesktop.org, Christoph Hellwig <hch@infradead.org>, Jason Gunthorpe <jgg@ziepe.ca>, xen-devel@lists.xenproject.org, devel@lists.orangefs.org, linux-media@vger.kernel.org, John Hubbard <jhubbard@nvidia.com>, intel-gfx@lists.freedesktop.org, linux-block@vger.kernel.org, =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= <jglisse@redhat.com>, linux-rpi-kernel@lists.infradead.org, Dan Williams <dan.j.williams@intel.com>, linux-arm-kernel@lists.infradead.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, linux-xfs@vger.kernel.org, linux-crypto@vger.kernel.org, linux-fsdevel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	put_user_pages(): miscellaneous call sites \| expand [v3,00/39] put_user_pages(): miscellaneous call sites [v3,01/41] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() [v3,02/41] drivers/gpu/drm/via: convert put_page() to put_user_page() [v3,03/41] net/xdp: convert put_page() to put_user_page() [v3,04/41] net/rds: convert put_page() to put_user_page() [v3,05/41] net/ceph: convert put_page() to put_user_page() [v3,06/41] x86/kvm: convert put_page() to put_user_page() [v3,07/41] drm/etnaviv: convert release_pages() to put_user_pages() [v3,08/41] drm/i915: convert put_page() to put_user_page() [v3,09/41] drm/radeon: convert put_page() to put_user_page() [v3,10/41] media/ivtv: convert put_page() to put_user_page() [v3,11/41] media/v4l2-core/mm: convert put_page() to put_user_page() [v3,12/41] genwqe: convert put_page() to put_user_page() [v3,13/41] scif: convert put_page() to put_user_page() [v3,14/41] vmci: convert put_page() to put_user_page() [v3,15/41] rapidio: convert put_page() to put_user_page() [v3,16/41] oradax: convert put_page() to put_user_page() [v3,17/41] staging/vc04_services: convert put_page() to put_user_page() [v3,18/41] drivers/tee: convert put_page() to put_user_page() [v3,19/41] vfio: convert put_page() to put_user_page() [v3,20/41] fbdev/pvr2fb: convert put_page() to put_user_page() [v3,21/41] fsl_hypervisor: convert put_page() to put_user_page() [v3,22/41] xen: convert put_page() to put_user_page() [v3,23/41] fs/exec.c: convert put_page() to put_user_page() [v3,24/41] orangefs: convert put_page() to put_user_page() [v3,25/41] uprobes: convert put_page() to put_user_page() [v3,26/41] futex: convert put_page() to put_user_page() [v3,27/41] mm/frame_vector.c: convert put_page() to put_user_page() [v3,28/41] mm/gup_benchmark.c: convert put_page() to put_user_page() [v3,29/41] mm/memory.c: convert put_page() to put_user_page() [v3,30/41] mm/madvise.c: convert put_page() to put_user_page() [v3,31/41] mm/process_vm_access.c: convert put_page() to put_user_page() [v3,32/41] crypt: convert put_page() to put_user_page() [v3,33/41] fs/nfs: convert put_page() to put_user_page() [v3,34/41] goldfish_pipe: convert put_page() to put_user_page() [v3,35/41] kernel/events/core.c: convert put_page() to put_user_page() [v3,36/41] fs/binfmt_elf: convert put_page() to put_user_page() [v3,37/41] security/tomoyo: convert put_page() to put_user_page() [v3,38/41] powerpc: convert put_page() to put_user_page() [v3,39/41] mm/mlock.c: convert put_page() to put_user_page() [v3,40/41] mm/mempolicy.c: convert put_page() to put_user_page() [v3,41/41] mm/ksm: convert put_page() to put_user_page*()

Commit Message

john.hubbard@gmail.com Aug. 7, 2019, 1:33 a.m. UTC

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Note that this effectively changes the code's behavior in
qp_release_pages(): it now ultimately calls set_page_dirty_lock(),
instead of set_page_dirty(). This is probably more accurate.

As Christoph Hellwig put it, "set_page_dirty() is only safe if we are
dealing with a file backed page where we have reference on the inode it
hangs off." [1]

[1] https://lore.kernel.org/r/20190723153640.GB720@lst.de

Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/vfio/vfio_iommu_type1.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 054391f30fa8..5a5461a14299 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -320,9 +320,9 @@  static int put_pfn(unsigned long pfn, int prot)
 {
 	if (!is_invalid_reserved_pfn(pfn)) {
 		struct page *page = pfn_to_page(pfn);
-		if (prot & IOMMU_WRITE)
-			SetPageDirty(page);
-		put_page(page);
+		bool dirty = prot & IOMMU_WRITE;
+
+		put_user_pages_dirty_lock(&page, 1, dirty);
 		return 1;
 	}
 	return 0;
@@ -356,7 +356,7 @@  static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
 		 */
 		if (ret > 0 && vma_is_fsdax(vmas[0])) {
 			ret = -EOPNOTSUPP;
-			put_page(page[0]);
+			put_user_page(page[0]);
 		}
 	}
 	up_read(&mm->mmap_sem);