From: John Hubbard <jhubbard@nvidia.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
<john.hubbard@gmail.com>
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>,
"Jérôme Glisse" <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,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"David Airlie" <airlied@linux.ie>
Subject: Re: [PATCH 06/34] drm/i915: convert put_page() to put_user_page*()
Date: Fri, 2 Aug 2019 11:48:08 -0700 [thread overview]
Message-ID: <7d9a9c57-4322-270b-b636-7214019f87e9@nvidia.com> (raw)
In-Reply-To: <156473756254.19842.12384378926183716632@jlahtine-desk.ger.corp.intel.com>
On 8/2/19 2:19 AM, Joonas Lahtinen wrote:
> Quoting john.hubbard@gmail.com (2019-08-02 05:19:37)
>> 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
>> i915_gem_userptr_put_pages(): it now calls set_page_dirty_lock(),
>> instead of set_page_dirty(). This is probably more accurate.
>
> We've already fixed this in drm-tip where the current code uses
> set_page_dirty_lock().
>
> This would conflict with our tree. Rodrigo is handling
> drm-intel-next for 5.4, so you guys want to coordinate how
> to merge.
>
Hi Joonas, Rodrigo,
First of all, I apologize for the API breakage: put_user_pages_dirty_lock()
has an additional "dirty" parameter.
In order to deal with the merge problem, I'll drop this patch from my series,
and I'd recommend that the drm-intel-next take the following approach:
1) For now, s/put_page/put_user_page/ in i915_gem_userptr_put_pages(),
and fix up the set_page_dirty() --> set_page_dirty_lock() issue, like this
(based against linux.git):
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 528b61678334..94721cc0093b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -664,10 +664,10 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj,
for_each_sgt_page(page, sgt_iter, pages) {
if (obj->mm.dirty)
- set_page_dirty(page);
+ set_page_dirty_lock(page);
mark_page_accessed(page);
- put_page(page);
+ put_user_page(page);
}
obj->mm.dirty = false;
That will leave you with your original set_page_dirty_lock() calls
and everything works properly.
2) Next cycle, move to the new put_user_pages_dirty_lock().
thanks,
--
John Hubbard
NVIDIA
> Regards, Joonas
>
next prev parent reply other threads:[~2019-08-02 18:49 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 2:19 [PATCH 00/34] put_user_pages(): miscellaneous call sites john.hubbard
2019-08-02 2:19 ` [PATCH 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard
2019-08-02 2:19 ` [PATCH 02/34] net/rds: convert put_page() to put_user_page*() john.hubbard
2019-08-02 2:19 ` [PATCH 03/34] net/ceph: " john.hubbard
2019-08-02 22:32 ` Jeff Layton
2019-08-02 2:19 ` [PATCH 04/34] x86/kvm: " john.hubbard
2019-08-02 2:19 ` [PATCH 05/34] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard
2019-08-02 2:19 ` [PATCH 06/34] drm/i915: convert put_page() to put_user_page*() john.hubbard
2019-08-02 9:19 ` Joonas Lahtinen
2019-08-02 18:48 ` John Hubbard [this message]
2019-08-03 20:03 ` John Hubbard
2019-08-02 2:19 ` [PATCH 07/34] drm/radeon: " john.hubbard
2019-08-02 2:19 ` [PATCH 08/34] media/ivtv: " john.hubbard
2019-08-02 2:19 ` [PATCH 09/34] media/v4l2-core/mm: " john.hubbard
2019-08-02 2:19 ` [PATCH 10/34] genwqe: " john.hubbard
2019-08-03 7:06 ` Greg Kroah-Hartman
2019-08-02 2:19 ` [PATCH 11/34] scif: " john.hubbard
2019-08-02 2:19 ` [PATCH 12/34] vmci: " john.hubbard
2019-08-02 2:19 ` [PATCH 13/34] rapidio: " john.hubbard
2019-08-02 2:19 ` [PATCH 14/34] oradax: " john.hubbard
2019-08-02 2:19 ` [PATCH 15/34] staging/vc04_services: " john.hubbard
2019-08-03 7:06 ` Greg Kroah-Hartman
2019-08-02 2:19 ` [PATCH 16/34] drivers/tee: " john.hubbard
2019-08-02 6:29 ` Jens Wiklander
2019-08-02 18:51 ` John Hubbard
2019-08-02 2:19 ` [PATCH 17/34] vfio: " john.hubbard
2019-08-02 2:19 ` [PATCH 18/34] fbdev/pvr2fb: " john.hubbard
2019-08-02 2:19 ` [PATCH 19/34] fsl_hypervisor: " john.hubbard
2019-08-02 2:19 ` [PATCH 20/34] xen: " john.hubbard
2019-08-02 4:36 ` Juergen Gross
2019-08-02 5:48 ` John Hubbard
2019-08-02 6:10 ` Juergen Gross
2019-08-02 16:09 ` Weiny, Ira
2019-08-02 19:25 ` John Hubbard
2019-08-02 2:19 ` [PATCH 21/34] fs/exec.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 22/34] orangefs: " john.hubbard
2019-08-02 2:19 ` [PATCH 23/34] uprobes: " john.hubbard
2019-08-02 2:19 ` [PATCH 24/34] futex: " john.hubbard
2019-08-02 2:19 ` [PATCH 25/34] mm/frame_vector.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 26/34] mm/gup_benchmark.c: " john.hubbard
2019-08-02 14:19 ` Keith Busch
2019-08-02 2:19 ` [PATCH 27/34] mm/memory.c: " john.hubbard
2019-08-02 2:19 ` [PATCH 28/34] mm/madvise.c: " john.hubbard
2019-08-02 2:20 ` [PATCH 29/34] mm/process_vm_access.c: " john.hubbard
2019-08-02 2:20 ` [PATCH 30/34] crypt: " john.hubbard
2019-08-02 2:20 ` [PATCH 31/34] nfs: " john.hubbard
2019-08-03 1:27 ` Calum Mackay
2019-08-03 1:41 ` John Hubbard
2019-08-04 23:28 ` Calum Mackay
2019-08-02 2:20 ` [PATCH 32/34] goldfish_pipe: " john.hubbard
2019-08-02 2:20 ` [PATCH 33/34] kernel/events/core.c: " john.hubbard
2019-08-02 2:20 ` [PATCH 34/34] fs/binfmt_elf: " john.hubbard
2019-08-02 9:12 ` [PATCH 00/34] put_user_pages(): miscellaneous call sites Michal Hocko
2019-08-02 12:41 ` Jan Kara
2019-08-02 14:24 ` Matthew Wilcox
2019-08-02 14:52 ` Jan Kara
2019-08-02 19:14 ` John Hubbard
2019-08-07 8:37 ` Jan Kara
2019-08-07 8:46 ` Michal Hocko
2019-08-08 2:36 ` Ira Weiny
2019-08-08 3:46 ` John Hubbard
2019-08-08 16:25 ` Weiny, Ira
2019-08-08 18:18 ` John Hubbard
2019-08-09 8:34 ` Jan Kara
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=7d9a9c57-4322-270b-b636-7214019f87e9@nvidia.com \
--to=jhubbard@nvidia.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=jani.nikula@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=john.hubbard@gmail.com \
--cc=joonas.lahtinen@linux.intel.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=rodrigo.vivi@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).