diff mbox series

[v3,08/41] drm/i915: convert put_page() to put_user_page*()

Message ID	20190807013340.9706-9-jhubbard@nvidia.com (mailing list archive)
State	Not Applicable, archived
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: john.hubbard@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: Christoph Hellwig <hch@infradead.org>, Dan Williams <dan.j.williams@intel.com>, Dave Chinner <david@fromorbit.com>, Dave Hansen <dave.hansen@linux.intel.com>, Ira Weiny <ira.weiny@intel.com>, Jan Kara <jack@suse.cz>, Jason Gunthorpe <jgg@ziepe.ca>, =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= <jglisse@redhat.com>, LKML <linux-kernel@vger.kernel.org>, amd-gfx@lists.freedesktop.org, ceph-devel@vger.kernel.org, devel@driverdev.osuosl.org, devel@lists.orangefs.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-media@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-xfs@vger.kernel.org, netdev@vger.kernel.org, rds-devel@oss.oracle.com, sparclinux@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, John Hubbard <jhubbard@nvidia.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, David Airlie <airlied@linux.ie> Subject: [PATCH v3 08/41] drm/i915: convert put_page() to put_user_page*() Date: Tue, 6 Aug 2019 18:33:07 -0700 Message-Id: <20190807013340.9706-9-jhubbard@nvidia.com> In-Reply-To: <20190807013340.9706-1-jhubbard@nvidia.com> References: <20190807013340.9706-1-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
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").

This is a merge-able version of the fix, because it restricts
itself to put_user_page() and put_user_pages(), both of which
have not changed their APIs. Later, i915_gem_userptr_put_pages()
can be simplified to use put_user_pages_dirty_lock().

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 2caa594322bc..76dda2923cf1 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -527,7 +527,7 @@  __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
 	}
 	mutex_unlock(&obj->mm.lock);
 
-	release_pages(pvec, pinned);
+	put_user_pages(pvec, pinned);
 	kvfree(pvec);
 
 	i915_gem_object_put(obj);
@@ -640,7 +640,7 @@  static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
 		__i915_gem_userptr_set_active(obj, true);
 
 	if (IS_ERR(pages))
-		release_pages(pvec, pinned);
+		put_user_pages(pvec, pinned);
 	kvfree(pvec);
 
 	return PTR_ERR_OR_ZERO(pages);
@@ -675,7 +675,7 @@  i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj,
 			set_page_dirty_lock(page);
 
 		mark_page_accessed(page);
-		put_page(page);
+		put_user_page(page);
 	}
 	obj->mm.dirty = false;