From: John Hubbard <jhubbard@nvidia.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Cc: kvm@vger.kernel.org, linux-mm@kvack.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org,
linux-s390@vger.kernel.org,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Inki Dae" <inki.dae@samsung.com>,
"Joonyoung Shim" <jy0922.shim@samsung.com>,
"Seung-Woo Kim" <sw0312.kim@samsung.com>,
"Kyungmin Park" <kyungmin.park@samsung.com>,
"Kukjin Kim" <kgene@kernel.org>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Jérôme Glisse" <jglisse@redhat.com>, "Jan Kara" <jack@suse.cz>,
"Dan Williams" <dan.j.williams@intel.com>
Subject: Re: [PATCH 01/13] drm/exynos: Stop using frame_vector helpers
Date: Wed, 7 Oct 2020 13:32:55 -0700 [thread overview]
Message-ID: <80718789-b3de-c30a-03c5-7c8cbf41f7d9@nvidia.com> (raw)
In-Reply-To: <20201007164426.1812530-2-daniel.vetter@ffwll.ch>
On 10/7/20 9:44 AM, Daniel Vetter wrote:
> All we need are a pages array, pin_user_pages_fast can give us that
> directly. Plus this avoids the entire raw pfn side of get_vaddr_frames.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jason Gunthorpe <jgg@ziepe.ca>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: John Hubbard <jhubbard@nvidia.com>
> Cc: Jérôme Glisse <jglisse@redhat.com>
> Cc: Jan Kara <jack@suse.cz>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: linux-mm@kvack.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: linux-media@vger.kernel.org
> ---
> drivers/gpu/drm/exynos/Kconfig | 1 -
> drivers/gpu/drm/exynos/exynos_drm_g2d.c | 48 ++++++++++++-------------
> 2 files changed, 22 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
> index 6417f374b923..43257ef3c09d 100644
> --- a/drivers/gpu/drm/exynos/Kconfig
> +++ b/drivers/gpu/drm/exynos/Kconfig
> @@ -88,7 +88,6 @@ comment "Sub-drivers"
> config DRM_EXYNOS_G2D
> bool "G2D"
> depends on VIDEO_SAMSUNG_S5P_G2D=n || COMPILE_TEST
> - select FRAME_VECTOR
> help
> Choose this option if you want to use Exynos G2D for DRM.
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> index 967a5cdc120e..c83f6faac9de 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> @@ -205,7 +205,8 @@ struct g2d_cmdlist_userptr {
> dma_addr_t dma_addr;
> unsigned long userptr;
> unsigned long size;
> - struct frame_vector *vec;
> + struct page **pages;
> + unsigned int npages;
> struct sg_table *sgt;
> atomic_t refcount;
> bool in_pool;
> @@ -378,7 +379,7 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d,
> bool force)
> {
> struct g2d_cmdlist_userptr *g2d_userptr = obj;
> - struct page **pages;
> + int i;
The above line can also be deleted, see below.
>
> if (!obj)
> return;
> @@ -398,15 +399,11 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d,
> dma_unmap_sgtable(to_dma_dev(g2d->drm_dev), g2d_userptr->sgt,
> DMA_BIDIRECTIONAL, 0);
>
> - pages = frame_vector_pages(g2d_userptr->vec);
> - if (!IS_ERR(pages)) {
> - int i;
> + for (i = 0; i < g2d_userptr->npages; i++)
> + set_page_dirty_lock(g2d_userptr->pages[i]);
>
> - for (i = 0; i < frame_vector_count(g2d_userptr->vec); i++)
> - set_page_dirty_lock(pages[i]);
> - }
> - put_vaddr_frames(g2d_userptr->vec);
> - frame_vector_destroy(g2d_userptr->vec);
> + unpin_user_pages(g2d_userptr->pages, g2d_userptr->npages);
> + kvfree(g2d_userptr->pages);
You can avoid writing your own loop, and just simplify the whole thing down to
two lines:
unpin_user_pages_dirty_lock(g2d_userptr->pages, g2d_userptr->npages,
true);
kvfree(g2d_userptr->pages);
>
> if (!g2d_userptr->out_of_list)
> list_del_init(&g2d_userptr->list);
> @@ -474,35 +471,34 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
> offset = userptr & ~PAGE_MASK;
> end = PAGE_ALIGN(userptr + size);
> npages = (end - start) >> PAGE_SHIFT;
> - g2d_userptr->vec = frame_vector_create(npages);
> - if (!g2d_userptr->vec) {
> + g2d_userptr->pages = kvmalloc_array(npages, sizeof(*g2d_userptr->pages),
> + GFP_KERNEL);
> + if (!g2d_userptr->pages) {
> ret = -ENOMEM;
> goto err_free;
> }
>
> - ret = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE,
> - g2d_userptr->vec);
> + ret = pin_user_pages_fast(start, npages, FOLL_FORCE | FOLL_WRITE,
> + g2d_userptr->pages);
> if (ret != npages) {
> DRM_DEV_ERROR(g2d->dev,
> "failed to get user pages from userptr.\n");
> if (ret < 0)
> - goto err_destroy_framevec;
> - ret = -EFAULT;
> - goto err_put_framevec;
> - }
> - if (frame_vector_to_pages(g2d_userptr->vec) < 0) {
> + goto err_destroy_pages;
> + npages = ret;
> ret = -EFAULT;
> - goto err_put_framevec;
> + goto err_unpin_pages;
> }
> + g2d_userptr->npages = npages;
>
> sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
> if (!sgt) {
> ret = -ENOMEM;
> - goto err_put_framevec;
> + goto err_unpin_pages;
> }
>
> ret = sg_alloc_table_from_pages(sgt,
> - frame_vector_pages(g2d_userptr->vec),
> + g2d_userptr->pages,
> npages, offset, size, GFP_KERNEL);
> if (ret < 0) {
> DRM_DEV_ERROR(g2d->dev, "failed to get sgt from pages.\n");
> @@ -538,11 +534,11 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
> err_free_sgt:
> kfree(sgt);
>
> -err_put_framevec:
> - put_vaddr_frames(g2d_userptr->vec);
> +err_unpin_pages:
> + unpin_user_pages(g2d_userptr->pages, npages);
>
> -err_destroy_framevec:
> - frame_vector_destroy(g2d_userptr->vec);
> +err_destroy_pages:
> + kvfree(g2d_userptr->pages);
>
> err_free:
> kfree(g2d_userptr);
>
The rest all looks good, you've avoided the usual API pitfalls. :)
thanks,
--
John Hubbard
NVIDIA
next prev parent reply other threads:[~2020-10-07 20:33 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 16:44 [PATCH 00/13] follow_pfn and other iomap races Daniel Vetter
2020-10-07 16:44 ` [PATCH 01/13] drm/exynos: Stop using frame_vector helpers Daniel Vetter
2020-10-07 20:32 ` John Hubbard [this message]
2020-10-07 21:32 ` Daniel Vetter
2020-10-07 21:36 ` John Hubbard
2020-10-07 21:50 ` Daniel Vetter
2020-10-07 16:44 ` [PATCH 02/13] drm/exynos: Use FOLL_LONGTERM for g2d cmdlists Daniel Vetter
2020-10-07 20:43 ` John Hubbard
2020-10-07 16:44 ` [PATCH 03/13] misc/habana: Stop using frame_vector helpers Daniel Vetter
2020-10-07 20:38 ` John Hubbard
2020-10-07 16:44 ` [PATCH 04/13] misc/habana: Use FOLL_LONGTERM for userptr Daniel Vetter
2020-10-07 20:46 ` John Hubbard
2020-10-07 16:44 ` [PATCH 05/13] mm/frame-vector: Use FOLL_LONGTERM Daniel Vetter
2020-10-07 16:53 ` Jason Gunthorpe
2020-10-07 17:12 ` Daniel Vetter
2020-10-07 17:33 ` Jason Gunthorpe
2020-10-07 21:13 ` John Hubbard
2020-10-07 21:30 ` Daniel Vetter
2020-10-07 16:44 ` [PATCH 06/13] media: videobuf2: Move frame_vector into media subsystem Daniel Vetter
2020-10-07 22:18 ` John Hubbard
2020-10-07 16:44 ` [PATCH 07/13] mm: close race in generic_access_phys Daniel Vetter
2020-10-07 17:27 ` Jason Gunthorpe
2020-10-07 18:01 ` Daniel Vetter
2020-10-07 23:21 ` Jason Gunthorpe
2020-10-08 0:44 ` John Hubbard
2020-10-08 7:23 ` Daniel Vetter
2020-10-07 16:44 ` [PATCH 08/13] s390/pci: Remove races against pte updates Daniel Vetter
2020-10-08 16:44 ` Gerald Schaefer
2020-10-08 17:16 ` Daniel Vetter
2020-10-07 16:44 ` [PATCH 09/13] PCI: obey iomem restrictions for procfs mmap Daniel Vetter
2020-10-07 18:46 ` Bjorn Helgaas
2020-10-07 16:44 ` [PATCH 10/13] PCI: revoke mappings like devmem Daniel Vetter
2020-10-07 18:41 ` Bjorn Helgaas
2020-10-07 19:24 ` Daniel Vetter
2020-10-07 19:33 ` Dan Williams
2020-10-07 19:47 ` Daniel Vetter
2020-10-07 22:23 ` Dan Williams
2020-10-07 22:29 ` Dan Williams
2020-10-08 8:09 ` Daniel Vetter
2020-10-07 23:24 ` Jason Gunthorpe
2020-10-08 7:31 ` Daniel Vetter
2020-10-08 7:49 ` Dan Williams
2020-10-08 8:13 ` Daniel Vetter
2020-10-08 8:35 ` Dan Williams
2020-10-08 12:41 ` Jason Gunthorpe
2020-10-07 16:44 ` [PATCH 11/13] mm: add unsafe_follow_pfn Daniel Vetter
2020-10-07 17:36 ` Jason Gunthorpe
2020-10-07 18:10 ` Daniel Vetter
2020-10-07 19:00 ` Jason Gunthorpe
2020-10-07 19:38 ` Daniel Vetter
2020-10-07 16:44 ` [PATCH 12/13] media/videbuf1|2: Mark follow_pfn usage as unsafe Daniel Vetter
2020-10-07 16:44 ` [PATCH 13/13] vfio/type1: Mark follow_pfn " Daniel Vetter
2020-10-07 17:39 ` Jason Gunthorpe
2020-10-07 18:14 ` Daniel Vetter
2020-10-07 18:47 ` Jason Gunthorpe
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=80718789-b3de-c30a-03c5-7c8cbf41f7d9@nvidia.com \
--to=jhubbard@nvidia.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jy0922.shim@samsung.com \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=sw0312.kim@samsung.com \
/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).