From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: john.hubbard@gmail.com
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"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,
"Jérôme Glisse" <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
Subject: Re: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 5 Aug 2019 09:53:46 -0700 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019 at 03:48:47PM -0700, john.hubbard@gmail.com wrote:
> 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@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 --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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: john.hubbard@gmail.com
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"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
Subject: Re: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 05 Aug 2019 16:53:46 +0000 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019 at 03:48:47PM -0700, john.hubbard@gmail.com wrote:
> 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@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 --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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: john.hubbard@gmail.com
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"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
Subject: Re: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 5 Aug 2019 09:53:46 -0700 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019 at 03:48:47PM -0700, john.hubbard@gmail.com wrote:
> 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@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 --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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: rodrigo.vivi@intel.com (Rodrigo Vivi)
Subject: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 5 Aug 2019 09:53:46 -0700 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019@03:48:47PM -0700, john.hubbard@gmail.com wrote:
> From: John Hubbard <jhubbard at 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: David Airlie <airlied at linux.ie>
> Cc: intel-gfx at lists.freedesktop.org
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: John Hubbard <jhubbard at nvidia.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> 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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: john.hubbard@gmail.com
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"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>,
"Dan Williams" <dan.j.williams@intel.com>,
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,
"Jérôme Glisse" <jglisse@redhat.com>,
linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org,
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,
"Andrew Morton" <akpm@linux-foundation.org>
Subject: Re: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 5 Aug 2019 09:53:46 -0700 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019 at 03:48:47PM -0700, john.hubbard@gmail.com wrote:
> 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@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 --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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: john.hubbard@gmail.com
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"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>,
"Dan Williams" <dan.j.williams@intel.com>,
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,
"Jérôme Glisse" <jglisse@redhat.com>,
linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org,
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,
"Andrew Morton" <akpm@linux-foundation.org>
Subject: Re: [Xen-devel] [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Mon, 5 Aug 2019 09:53:46 -0700 [thread overview]
Message-ID: <20190805165346.GB25953@intel.com> (raw)
In-Reply-To: <20190804224915.28669-7-jhubbard@nvidia.com>
On Sun, Aug 04, 2019 at 03:48:47PM -0700, john.hubbard@gmail.com wrote:
> 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().
Thanks for that.
with this version we won't have any conflict.
Ack for going through mm tree.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@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 --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;
>
> --
> 2.22.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-08-05 16:53 UTC|newest]
Thread overview: 250+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-04 22:48 [PATCH v2 00/34] put_user_pages(): miscellaneous call sites john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-06 17:39 ` Ira Weiny
2019-08-06 17:39 ` [Xen-devel] " Ira Weiny
2019-08-06 17:39 ` Ira Weiny
2019-08-06 17:39 ` Ira Weiny
2019-08-06 17:39 ` Ira Weiny
2019-08-06 17:39 ` Ira Weiny
2019-08-06 20:39 ` John Hubbard
2019-08-06 20:39 ` [Xen-devel] " John Hubbard
2019-08-06 20:39 ` John Hubbard
2019-08-06 20:39 ` John Hubbard
2019-08-06 20:39 ` John Hubbard
2019-08-06 20:39 ` John Hubbard
2019-08-06 20:39 ` John Hubbard
2019-08-04 22:48 ` [PATCH v2 02/34] net/rds: convert put_page() to put_user_page*() john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 03/34] net/ceph: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 04/34] x86/kvm: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 05/34] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*() john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-05 16:53 ` Rodrigo Vivi [this message]
2019-08-05 16:53 ` [Xen-devel] " Rodrigo Vivi
2019-08-05 16:53 ` Rodrigo Vivi
2019-08-05 16:53 ` Rodrigo Vivi
2019-08-05 16:53 ` Rodrigo Vivi
2019-08-05 16:53 ` Rodrigo Vivi
2019-08-04 22:48 ` [PATCH v2 07/34] drm/radeon: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 08/34] media/ivtv: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 09/34] media/v4l2-core/mm: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 10/34] genwqe: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 11/34] scif: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 12/34] vmci: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 13/34] rapidio: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 14/34] oradax: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 15/34] staging/vc04_services: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-13 5:23 ` Stefan Wahren
2019-08-13 5:23 ` [Xen-devel] " Stefan Wahren
2019-08-13 5:23 ` Stefan Wahren
2019-08-13 5:23 ` Stefan Wahren
2019-08-13 5:23 ` Stefan Wahren
2019-08-13 5:23 ` Stefan Wahren
2019-08-04 22:48 ` [PATCH v2 16/34] drivers/tee: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 17/34] vfio: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 18/34] fbdev/pvr2fb: " john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 19/34] fsl_hypervisor: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 20/34] xen: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-05 4:15 ` Juergen Gross
2019-08-05 4:15 ` [Xen-devel] " Juergen Gross
2019-08-05 4:15 ` Juergen Gross
2019-08-05 4:15 ` Juergen Gross
2019-08-05 4:15 ` Juergen Gross
2019-08-05 4:15 ` Juergen Gross
2019-08-04 22:49 ` [PATCH v2 21/34] fs/exec.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 22/34] orangefs: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 23/34] uprobes: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 24/34] futex: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 25/34] mm/frame_vector.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 26/34] mm/gup_benchmark.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 27/34] mm/memory.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 28/34] mm/madvise.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 29/34] mm/process_vm_access.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 30/34] crypt: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 31/34] fs/nfs: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-05 0:26 ` Calum Mackay
2019-08-05 0:26 ` [Xen-devel] " Calum Mackay
2019-08-05 0:26 ` Calum Mackay
2019-08-05 0:26 ` Calum Mackay
2019-08-05 0:26 ` Calum Mackay
2019-08-05 0:26 ` Calum Mackay
2019-08-04 22:49 ` [PATCH v2 32/34] goldfish_pipe: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 33/34] kernel/events/core.c: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 34/34] fs/binfmt_elf: " john.hubbard
2019-08-04 22:49 ` [Xen-devel] " john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-04 22:49 ` john.hubbard
2019-08-09 12:42 ` ✗ Fi.CI.CHECKPATCH: warning for put_user_pages(): miscellaneous call sites Patchwork
2019-08-09 13:14 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-10 5:41 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190805165346.GB25953@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=ceph-devel@vger.kernel.org \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@fromorbit.com \
--cc=devel@driverdev.osuosl.org \
--cc=devel@lists.orangefs.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@infradead.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ira.weiny@intel.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=john.hubbard@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-xfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rds-devel@oss.oracle.com \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.