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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A8DF6C43467 for ; Fri, 9 Oct 2020 16:24:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 253F622280 for ; Fri, 9 Oct 2020 16:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="I6Cumvnu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 253F622280 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9E53B94000A; Fri, 9 Oct 2020 12:24:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B8E46B0062; Fri, 9 Oct 2020 12:24:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8358394000A; Fri, 9 Oct 2020 12:24:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id 550736B005C for ; Fri, 9 Oct 2020 12:24:50 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id DBA208249980 for ; Fri, 9 Oct 2020 16:24:49 +0000 (UTC) X-FDA: 77352910698.09.dogs05_2e17737271e2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id C1AA4180AD807 for ; Fri, 9 Oct 2020 16:24:49 +0000 (UTC) X-HE-Tag: dogs05_2e17737271e2 X-Filterd-Recvd-Size: 15715 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Fri, 9 Oct 2020 16:24:48 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id e18so10902520wrw.9 for ; Fri, 09 Oct 2020 09:24:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=8A9JRNiHu6JNwMmochbxtTllf1xc/YR7bJPHBj6HZC4=; b=I6CumvnuIAkhA36z8zFnx630UJjLpBoLMT8plEkX9/qH7tSx/yqdeC5/tETeteyHzv LNaxb2Nwp7xj9hWALC7XpiM6HsSS4aHuOA8AY+E0/AIoKnjbCJ4MgFGItNN0yPA6D+1U 2GEHJy3T49qS37RelOiD/hpVfLV1msWKB+6ZQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=8A9JRNiHu6JNwMmochbxtTllf1xc/YR7bJPHBj6HZC4=; b=Uh68D+wG0tVebf0qWmD0zVeHGuX6u9/iOMAPELq+hBrAClJLnkcd0a0OuZqA5/MC+6 9zo/WKMMa8WQo7bFHoSl0yuzQAOU+lpL5QJKuiJlnmVE6W4ZBXPBQRSy9nFpcqVYEShL VbSmZREVZw8tb1xyxnZcF8/BnV1SSw8OEggZpTgLomjxGUj8bexXXhBKB3QKDmXP4oYy Zmz3AL0iWgtO9klGiXl6nvWDHOhviDhAljpErffcu169CfvXf7oIqKCXy5cVOQ9hLGaz dJ2Qo3DHtsWW/hl55I5rm+X/5fE18ketuCUeRRkSgOtmdkn40FJ7bRhpiFE+BiknIOom RL9w== X-Gm-Message-State: AOAM532sBVT9y/J+7vbG3wW5roHaJLsD3GgYhLtknNGUeuBlHNhzxtbn qmsod85AU0jAs0PRx8vHwzJVlQ== X-Google-Smtp-Source: ABdhPJzJ/E+dwPZ+qB2asDHJ4sUfbuVsUqXDSKeZekHXhRZqUh+hlziY6Yu/svpmF7pjjCgTY1Joww== X-Received: by 2002:a5d:6a0a:: with SMTP id m10mr7217354wru.189.1602260687177; Fri, 09 Oct 2020 09:24:47 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id g83sm12224145wmf.15.2020.10.09.09.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 09:24:46 -0700 (PDT) Date: Fri, 9 Oct 2020 18:24:44 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, chris@chris-wilson.co.uk, airlied@redhat.com, akpm@linux-foundation.org, daniel@ffwll.ch, sumit.semwal@linaro.org, willy@infradead.org, jhubbard@nvidia.com, jgg@ziepe.ca Subject: Re: [PATCH 6/6] drm/prime: document that use the page array is deprecated v2 Message-ID: <20201009162444.GO438822@phenom.ffwll.local> Mail-Followup-To: Christian =?iso-8859-1?Q?K=F6nig?= , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, chris@chris-wilson.co.uk, airlied@redhat.com, akpm@linux-foundation.org, sumit.semwal@linaro.org, willy@infradead.org, jhubbard@nvidia.com, jgg@ziepe.ca References: <20201009150342.1979-1-christian.koenig@amd.com> <20201009150342.1979-6-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20201009150342.1979-6-christian.koenig@amd.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Oct 09, 2020 at 05:03:42PM +0200, Christian K=F6nig wrote: > We have reoccurring requests on this so better document that > this approach doesn't work and dma_buf_mmap() needs to be used instead. >=20 > v2: split it into two functions >=20 > Signed-off-by: Christian K=F6nig Patches 3-5: Acked-by: Daniel Vetter This one looks good, but you have it on a strange baseline. This doesn't contain the sg walking fixes from Marek, so reintroduces the bugs. Probably need to request a backmerge chain, first of -rc8 into drm-next, and then that into drm-misc-next. Everything else in here lgtm. -Daniel > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 ++- > drivers/gpu/drm/drm_prime.c | 67 +++++++++++++++------ > drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- > drivers/gpu/drm/msm/msm_gem.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- > drivers/gpu/drm/radeon/radeon_ttm.c | 9 ++- > drivers/gpu/drm/vgem/vgem_drv.c | 3 +- > drivers/gpu/drm/vkms/vkms_gem.c | 2 +- > drivers/gpu/drm/xen/xen_drm_front_gem.c | 4 +- > include/drm/drm_prime.h | 7 ++- > 10 files changed, 69 insertions(+), 42 deletions(-) >=20 > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/= amd/amdgpu/amdgpu_ttm.c > index ac463e706b19..6a65490de391 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -1011,8 +1011,8 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_b= o_device *bdev, > goto release_sg; > =20 > /* convert SG to linear array of pages and dma addresses */ > - drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address, > - ttm->num_pages); > + drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address, > + ttm->num_pages); > =20 > return 0; > =20 > @@ -1345,9 +1345,8 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_d= evice *bdev, > ttm->sg =3D sgt; > } > =20 > - drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, > - gtt->ttm.dma_address, > - ttm->num_pages); > + drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address, > + ttm->num_pages); > ttm_tt_set_populated(ttm); > return 0; > } > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > index 4910c446db83..8b750c074494 100644 > --- a/drivers/gpu/drm/drm_prime.c > +++ b/drivers/gpu/drm/drm_prime.c > @@ -954,27 +954,25 @@ struct drm_gem_object *drm_gem_prime_import(struc= t drm_device *dev, > EXPORT_SYMBOL(drm_gem_prime_import); > =20 > /** > - * drm_prime_sg_to_page_addr_arrays - convert an sg table into a page = array > + * drm_prime_sg_to_page_array - convert an sg table into a page array > * @sgt: scatter-gather table to convert > - * @pages: optional array of page pointers to store the page array in > - * @addrs: optional array to store the dma bus address of each page > - * @max_entries: size of both the passed-in arrays > + * @pages: array of page pointers to store the pages in > + * @max_entries: size of the passed-in array > * > - * Exports an sg table into an array of pages and addresses. This is c= urrently > - * required by the TTM driver in order to do correct fault handling. > + * Exports an sg table into an array of pages. > * > - * Drivers can use this in their &drm_driver.gem_prime_import_sg_table > - * implementation. > + * This function is deprecated and strongly discouraged to be used. > + * The page array is only useful for page faults and those can corrupt= fields > + * in the struct page if they are not handled by the exporting driver. > */ > -int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page= **pages, > - dma_addr_t *addrs, int max_entries) > +int __deprecated drm_prime_sg_to_page_array(struct sg_table *sgt, > + struct page **pages, > + int max_entries) > { > unsigned count; > struct scatterlist *sg; > struct page *page; > u32 page_len, page_index; > - dma_addr_t addr; > - u32 dma_len, dma_index; > =20 > /* > * Scatterlist elements contains both pages and DMA addresses, but > @@ -984,14 +982,11 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_ta= ble *sgt, struct page **pages, > * described by the sg_dma_address(sg). > */ > page_index =3D 0; > - dma_index =3D 0; > for_each_sg(sgt->sgl, sg, sgt->nents, count) { > page_len =3D sg->length; > page =3D sg_page(sg); > - dma_len =3D sg_dma_len(sg); > - addr =3D sg_dma_address(sg); > =20 > - while (pages && page_len > 0) { > + while (page_len > 0) { > if (WARN_ON(page_index >=3D max_entries)) > return -1; > pages[page_index] =3D page; > @@ -999,7 +994,43 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_tab= le *sgt, struct page **pages, > page_len -=3D PAGE_SIZE; > page_index++; > } > - while (addrs && dma_len > 0) { > + } > + return 0; > +} > +EXPORT_SYMBOL(drm_prime_sg_to_page_array); > + > +/** > + * drm_prime_sg_to_dma_addr_array - convert an sg table into a dma add= r array > + * @sgt: scatter-gather table to convert > + * @addrs: array to store the dma bus address of each page > + * @max_entries: size of both the passed-in arrays > + * > + * Exports an sg table into an array of addresses. > + * > + * Drivers should use this in their &drm_driver.gem_prime_import_sg_ta= ble s/should/can/ There's no requirement, if your driver just handles everything as an sgt there's no conversion needed. > + * implementation. > + */ > +int drm_prime_sg_to_dma_addr_array(struct sg_table *sgt, dma_addr_t *a= ddrs, > + int max_entries) > +{ > + struct scatterlist *sg; > + u32 dma_len, dma_index; > + dma_addr_t addr; > + unsigned count; > + > + /* > + * Scatterlist elements contains both pages and DMA addresses, but > + * one shoud not assume 1:1 relation between them. The sg->length is > + * the size of the physical memory chunk described by the sg->page, > + * while sg_dma_len(sg) is the size of the DMA (IO virtual) chunk > + * described by the sg_dma_address(sg). > + */ > + dma_index =3D 0; > + for_each_sg(sgt->sgl, sg, sgt->nents, count) { > + dma_len =3D sg_dma_len(sg); > + addr =3D sg_dma_address(sg); > + > + while (dma_len > 0) { > if (WARN_ON(dma_index >=3D max_entries)) > return -1; > addrs[dma_index] =3D addr; > @@ -1010,7 +1041,7 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_ta= ble *sgt, struct page **pages, > } > return 0; > } > -EXPORT_SYMBOL(drm_prime_sg_to_page_addr_arrays); > +EXPORT_SYMBOL(drm_prime_sg_to_dma_addr_array); > =20 > /** > * drm_prime_gem_destroy - helper to clean up a PRIME-imported GEM obj= ect > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/= drm/etnaviv/etnaviv_gem_prime.c > index 135fbff6fecf..8c04b8e8054c 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c > @@ -133,8 +133,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_= table(struct drm_device *dev, > goto fail; > } > =20 > - ret =3D drm_prime_sg_to_page_addr_arrays(sgt, etnaviv_obj->pages, > - NULL, npages); > + ret =3D drm_prime_sg_to_page_array(sgt, etnaviv_obj->pages, npages); > if (ret) > goto fail; > =20 > diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_ge= m.c > index a71f42870d5e..616b87641740 100644 > --- a/drivers/gpu/drm/msm/msm_gem.c > +++ b/drivers/gpu/drm/msm/msm_gem.c > @@ -1174,7 +1174,7 @@ struct drm_gem_object *msm_gem_import(struct drm_= device *dev, > goto fail; > } > =20 > - ret =3D drm_prime_sg_to_page_addr_arrays(sgt, msm_obj->pages, NULL, n= pages); > + ret =3D drm_prime_sg_to_page_array(sgt, msm_obj->pages, npages); > if (ret) { > mutex_unlock(&msm_obj->lock); > goto fail; > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nou= veau/nouveau_bo.c > index e378bb491688..835edd74ef59 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -1299,9 +1299,8 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bde= v, > return 0; > =20 > if (slave && ttm->sg) { > - drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, > - ttm_dma->dma_address, > - ttm->num_pages); > + drm_prime_sg_to_dma_addr_array(ttm->sg, ttm_dma->dma_address, > + ttm->num_pages); > ttm_tt_set_populated(ttm); > return 0; > } > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/rade= on/radeon_ttm.c > index 4b92cdbcd29b..7997e4564576 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -474,8 +474,8 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_= device *bdev, struct ttm_tt * > if (r) > goto release_sg; > =20 > - drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address, > - ttm->num_pages); > + drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address, > + ttm->num_pages); > =20 > return 0; > =20 > @@ -642,9 +642,8 @@ static int radeon_ttm_tt_populate(struct ttm_bo_dev= ice *bdev, > } > =20 > if (slave && ttm->sg) { > - drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, > - gtt->ttm.dma_address, > - ttm->num_pages); > + drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address, > + ttm->num_pages); > ttm_tt_set_populated(ttm); > return 0; > } > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vge= m_drv.c > index ea0eecae5153..e505e5a291b3 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -356,8 +356,7 @@ static struct drm_gem_object *vgem_prime_import_sg_= table(struct drm_device *dev, > } > =20 > obj->pages_pin_count++; /* perma-pinned */ > - drm_prime_sg_to_page_addr_arrays(obj->table, obj->pages, NULL, > - npages); > + drm_prime_sg_to_page_array(obj->table, obj->pages, npages); > return &obj->base; > } > =20 > diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkm= s_gem.c > index 19a0e260a4df..a2ff21f47101 100644 > --- a/drivers/gpu/drm/vkms/vkms_gem.c > +++ b/drivers/gpu/drm/vkms/vkms_gem.c > @@ -256,6 +256,6 @@ vkms_prime_import_sg_table(struct drm_device *dev, > return ERR_PTR(-ENOMEM); > } > =20 > - drm_prime_sg_to_page_addr_arrays(sg, obj->pages, NULL, npages); > + drm_prime_sg_to_page_array(sg, obj->pages, npages); > return &obj->gem; > } > diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/= xen/xen_drm_front_gem.c > index f3830a0d1808..f4150ddfc5e2 100644 > --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c > +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c > @@ -220,8 +220,8 @@ xen_drm_front_gem_import_sg_table(struct drm_device= *dev, > =20 > xen_obj->sgt_imported =3D sgt; > =20 > - ret =3D drm_prime_sg_to_page_addr_arrays(sgt, xen_obj->pages, > - NULL, xen_obj->num_pages); > + ret =3D drm_prime_sg_to_page_array(sgt, xen_obj->pages, > + xen_obj->num_pages); > if (ret < 0) > return ERR_PTR(ret); > =20 > diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h > index 093f760cc131..4bda9ab3a3bb 100644 > --- a/include/drm/drm_prime.h > +++ b/include/drm/drm_prime.h > @@ -103,8 +103,9 @@ struct drm_gem_object *drm_gem_prime_import(struct = drm_device *dev, > =20 > void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table= *sg); > =20 > -int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page= **pages, > - dma_addr_t *addrs, int max_pages); > - > +int drm_prime_sg_to_page_array(struct sg_table *sgt, struct page **pag= es, > + int max_pages); > +int drm_prime_sg_to_dma_addr_array(struct sg_table *sgt, dma_addr_t *a= ddrs, > + int max_pages); > =20 > #endif /* __DRM_PRIME_H__ */ > --=20 > 2.17.1 >=20 --=20 Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch