From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A9AEC4363C for ; Wed, 7 Oct 2020 20:33:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 022FE20760 for ; Wed, 7 Oct 2020 20:33:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="bGis6r8C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728124AbgJGUdI (ORCPT ); Wed, 7 Oct 2020 16:33:08 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:3133 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726105AbgJGUdH (ORCPT ); Wed, 7 Oct 2020 16:33:07 -0400 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 07 Oct 2020 13:32:10 -0700 Received: from [10.2.85.86] (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 7 Oct 2020 20:32:56 +0000 Subject: Re: [PATCH 01/13] drm/exynos: Stop using frame_vector helpers To: Daniel Vetter , DRI Development , LKML CC: , , , , , , Daniel Vetter , Jason Gunthorpe , Inki Dae , Joonyoung Shim , "Seung-Woo Kim" , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , "Andrew Morton" , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Jan Kara , Dan Williams References: <20201007164426.1812530-1-daniel.vetter@ffwll.ch> <20201007164426.1812530-2-daniel.vetter@ffwll.ch> From: John Hubbard Message-ID: <80718789-b3de-c30a-03c5-7c8cbf41f7d9@nvidia.com> Date: Wed, 7 Oct 2020 13:32:55 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201007164426.1812530-2-daniel.vetter@ffwll.ch> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1602102730; bh=l9BqHF8KWQmaN4RXmMMQ0YcJNLZG1Nf+tEGI/Rd7B58=; h=Subject:To:CC:References:From:Message-ID:Date:User-Agent: MIME-Version:In-Reply-To:Content-Type:Content-Language: Content-Transfer-Encoding:X-Originating-IP:X-ClientProxiedBy; b=bGis6r8CEYmrZyavIIA1+AVI5ZOhpqwwr99ccXacmU9iQ3VFTDuM97FlAOqT78Igm rCn6vdto1m5+BSCNb/A8nxrfefBagyIX9EjaXmATUsXTn9akCKaOpm6guzuSkTwIzf IpnyPYT00yPR0jTRCgi6gumSrIvalRt72z/Kx816tUwt9BZjxVThNnp6kaGyo0nU3j 3PUi0rvlZKXu+7CrW0/PBtJDkTJjVt3tkFU+HWV1HnGZfccwM07dwDqshD0XGAGCor R7Fs108WnSzw2GTZDHNFHdIx8S9N3rVALIhly96SHgPVr7dfKcd4j8QZRD4wOkO8oz RPfm1ouAMFSew== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. >=20 > Signed-off-by: Daniel Vetter > Cc: Jason Gunthorpe > Cc: Inki Dae > Cc: Joonyoung Shim > Cc: Seung-Woo Kim > Cc: Kyungmin Park > Cc: Kukjin Kim > Cc: Krzysztof Kozlowski > Cc: Andrew Morton > Cc: John Hubbard > Cc: J=C3=A9r=C3=B4me Glisse > Cc: Jan Kara > Cc: Dan Williams > 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(-) >=20 > diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kcon= fig > 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=3Dn || COMPILE_TEST > - select FRAME_VECTOR > help > Choose this option if you want to use Exynos G2D for DRM. > =20 > diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/ex= ynos/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 =3D obj; > - struct page **pages; > + int i; The above line can also be deleted, see below. > =20 > if (!obj) > return; > @@ -398,15 +399,11 @@ static void g2d_userptr_put_dma_addr(struct g2d_dat= a *g2d, > dma_unmap_sgtable(to_dma_dev(g2d->drm_dev), g2d_userptr->sgt, > DMA_BIDIRECTIONAL, 0); > =20 > - pages =3D frame_vector_pages(g2d_userptr->vec); > - if (!IS_ERR(pages)) { > - int i; > + for (i =3D 0; i < g2d_userptr->npages; i++) > + set_page_dirty_lock(g2d_userptr->pages[i]); > =20 > - for (i =3D 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); > =20 > 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 =3D userptr & ~PAGE_MASK; > end =3D PAGE_ALIGN(userptr + size); > npages =3D (end - start) >> PAGE_SHIFT; > - g2d_userptr->vec =3D frame_vector_create(npages); > - if (!g2d_userptr->vec) { > + g2d_userptr->pages =3D kvmalloc_array(npages, sizeof(*g2d_userptr->page= s), > + GFP_KERNEL); > + if (!g2d_userptr->pages) { > ret =3D -ENOMEM; > goto err_free; > } > =20 > - ret =3D get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, > - g2d_userptr->vec); > + ret =3D pin_user_pages_fast(start, npages, FOLL_FORCE | FOLL_WRITE, > + g2d_userptr->pages); > if (ret !=3D npages) { > DRM_DEV_ERROR(g2d->dev, > "failed to get user pages from userptr.\n"); > if (ret < 0) > - goto err_destroy_framevec; > - ret =3D -EFAULT; > - goto err_put_framevec; > - } > - if (frame_vector_to_pages(g2d_userptr->vec) < 0) { > + goto err_destroy_pages; > + npages =3D ret; > ret =3D -EFAULT; > - goto err_put_framevec; > + goto err_unpin_pages; > } > + g2d_userptr->npages =3D npages; > =20 > sgt =3D kzalloc(sizeof(*sgt), GFP_KERNEL); > if (!sgt) { > ret =3D -ENOMEM; > - goto err_put_framevec; > + goto err_unpin_pages; > } > =20 > ret =3D 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); > =20 > -err_put_framevec: > - put_vaddr_frames(g2d_userptr->vec); > +err_unpin_pages: > + unpin_user_pages(g2d_userptr->pages, npages); > =20 > -err_destroy_framevec: > - frame_vector_destroy(g2d_userptr->vec); > +err_destroy_pages: > + kvfree(g2d_userptr->pages); > =20 > err_free: > kfree(g2d_userptr); >=20 The rest all looks good, you've avoided the usual API pitfalls. :) thanks, --=20 John Hubbard NVIDIA