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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 3B32EC433E0 for ; Mon, 8 Jun 2020 14:40:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1095020656 for ; Mon, 8 Jun 2020 14:40:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1095020656 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49B406E920; Mon, 8 Jun 2020 14:40:33 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C56789C08; Mon, 8 Jun 2020 14:40:31 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BEDD9AEEB; Mon, 8 Jun 2020 14:40:33 +0000 (UTC) Subject: Re: [PATCH 8/9] drm/shmem-helpers: Ensure get_pages is not called on imported dma-buf To: Daniel Vetter References: <20200511093554.211493-1-daniel.vetter@ffwll.ch> <20200511093554.211493-9-daniel.vetter@ffwll.ch> <41b3f24c-de0c-9390-6b8c-e71ceadb6d07@suse.de> <20200603131209.GN20149@phenom.ffwll.local> From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= mQENBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAG0J1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPokBVAQTAQgAPhYh BHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMB Ah4BAheAAAoJEGgNwR1TC3ojR80H/jH+vYavwQ+TvO8ksXL9JQWc3IFSiGpuSVXLCdg62AmR irxW+qCwNncNQyb9rd30gzdectSkPWL3KSqEResBe24IbA5/jSkPweJasgXtfhuyoeCJ6PXo clQQGKIoFIAEv1s8l0ggPZswvCinegl1diyJXUXmdEJRTWYAtxn/atut1o6Giv6D2qmYbXN7 mneMC5MzlLaJKUtoH7U/IjVw1sx2qtxAZGKVm4RZxPnMCp9E1MAr5t4dP5gJCIiqsdrVqI6i KupZstMxstPU//azmz7ZWWxT0JzgJqZSvPYx/SATeexTYBP47YFyri4jnsty2ErS91E6H8os Bv6pnSn7eAq5AQ0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRH UE9eosYbT6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgT RjP+qbU63Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+R dhgATnWWGKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zb ehDda8lvhFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r 12+lqdsAEQEAAYkBPAQYAQgAJhYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsMBQkD wmcAAAoJEGgNwR1TC3ojpfcIAInwP5OlcEKokTnHCiDTz4Ony4GnHRP2fXATQZCKxmu4AJY2 h9ifw9Nf2TjCZ6AMvC3thAN0rFDj55N9l4s1CpaDo4J+0fkrHuyNacnT206CeJV1E7NYntxU n+LSiRrOdywn6erjxRi9EYTVLCHcDhBEjKmFZfg4AM4GZMWX1lg0+eHbd5oL1as28WvvI/uI aMyV8RbyXot1r/8QLlWldU3NrTF5p7TMU2y3ZH2mf5suSKHAMtbE4jKJ8ZHFOo3GhLgjVrBW HE9JXO08xKkgD+w6v83+nomsEuf6C6LYrqY/tsZvyEX6zN8CtirPdPWu/VXNRYAl/lat7lSI 3H26qrE= Message-ID: <37f561a1-c0fc-57c9-4759-9fca5ae46a4d@suse.de> Date: Mon, 8 Jun 2020 16:40:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <20200603131209.GN20149@phenom.ffwll.local> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Gerd Hoffmann , DRI Development , Daniel Vetter Content-Type: multipart/mixed; boundary="===============0551878869==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0551878869== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="UqJsoOJbrz0Z20L4x6ISyIeT9FtY5cRLo" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --UqJsoOJbrz0Z20L4x6ISyIeT9FtY5cRLo Content-Type: multipart/mixed; boundary="UYOevlM6aUwiZVhvcaKkKGtAXSzBSSNy8"; protected-headers="v1" From: Thomas Zimmermann To: Daniel Vetter Cc: Daniel Vetter , DRI Development , Intel Graphics Development , Gerd Hoffmann , Daniel Vetter Message-ID: <37f561a1-c0fc-57c9-4759-9fca5ae46a4d@suse.de> Subject: Re: [PATCH 8/9] drm/shmem-helpers: Ensure get_pages is not called on imported dma-buf References: <20200511093554.211493-1-daniel.vetter@ffwll.ch> <20200511093554.211493-9-daniel.vetter@ffwll.ch> <41b3f24c-de0c-9390-6b8c-e71ceadb6d07@suse.de> <20200603131209.GN20149@phenom.ffwll.local> In-Reply-To: <20200603131209.GN20149@phenom.ffwll.local> --UYOevlM6aUwiZVhvcaKkKGtAXSzBSSNy8 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Am 03.06.20 um 15:12 schrieb Daniel Vetter: > On Thu, May 14, 2020 at 09:30:04AM +0200, Thomas Zimmermann wrote: >> Hi >> >> Am 11.05.20 um 11:35 schrieb Daniel Vetter: >>> Just a bit of light paranoia. Also sprinkle this check over >>> drm_gem_shmem_get_sg_table, which should only be called when >>> exporting, same for the pin/unpin functions, on which it relies to >>> work correctly. >>> >>> Cc: Gerd Hoffmann >>> Cc: Rob Herring >>> Cc: Noralf Tr=C3=B8nnes >>> Signed-off-by: Daniel Vetter >>> --- >>> drivers/gpu/drm/drm_gem_shmem_helper.c | 10 ++++++++++ >>> 1 file changed, 10 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm= /drm_gem_shmem_helper.c >>> index 117a7841e284..f7011338813e 100644 >>> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c >>> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c >>> @@ -170,6 +170,8 @@ int drm_gem_shmem_get_pages(struct drm_gem_shmem_= object *shmem) >>> { >>> int ret; >>> =20 >>> + WARN_ON(shmem->base.import_attach); >>> + >>> ret =3D mutex_lock_interruptible(&shmem->pages_lock); >>> if (ret) >>> return ret; >>> @@ -225,6 +227,8 @@ int drm_gem_shmem_pin(struct drm_gem_object *obj)= >>> { >>> struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); >>> =20 >>> + WARN_ON(shmem->base.import_attach); >>> + >> >> I don't understand this change. If a driver pins pages it now has to >> check that the pages are not imported? >=20 > Nope. There's two classes of functions in the helpers, and I'm trying t= o > unconfuse them: >=20 > - stuff used to implement gem_funcs. These are obviously only ever used= on > native objects, never on imported ones (on imported ones we try to > forward through the dma-buf layer to the exporter). drm_gem_shmem_pin= is > only used in that role to implement gem_funcs->pin. Calling it on an > imported buffer is indeed a bug. >=20 > - the other set of functions are for drivers to do their stuff. The > interface which (implicitly) pins stuff into places is various set of= > get_pages, which do have different paths for native and imported > objects. Thanks for explaining. Patch is Acked-by: Thomas Zimmermann >=20 > Apologies that I missed your question here, I merged all the patches > leading up to this one for now. >=20 > Thanks, Daniel >=20 >> >> >>> return drm_gem_shmem_get_pages(shmem); >>> } >>> EXPORT_SYMBOL(drm_gem_shmem_pin); >>> @@ -240,6 +244,8 @@ void drm_gem_shmem_unpin(struct drm_gem_object *o= bj) >>> { >>> struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); >>> =20 >>> + WARN_ON(shmem->base.import_attach); >>> + >>> drm_gem_shmem_put_pages(shmem); >>> } >>> EXPORT_SYMBOL(drm_gem_shmem_unpin); >>> @@ -510,6 +516,8 @@ static void drm_gem_shmem_vm_open(struct vm_area_= struct *vma) >>> struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); >>> int ret; >>> =20 >>> + WARN_ON(shmem->base.import_attach); >>> + >>> ret =3D drm_gem_shmem_get_pages(shmem); >>> WARN_ON_ONCE(ret !=3D 0); >>> =20 >>> @@ -611,6 +619,8 @@ struct sg_table *drm_gem_shmem_get_sg_table(struc= t drm_gem_object *obj) >>> { >>> struct drm_gem_shmem_object *shmem =3D to_drm_gem_shmem_obj(obj); >>> =20 >>> + WARN_ON(shmem->base.import_attach); >>> + >>> return drm_prime_pages_to_sg(shmem->pages, obj->size >> PAGE_SHIFT)= ; >>> } >>> EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table); >>> >> >> --=20 >> Thomas Zimmermann >> Graphics Driver Developer >> SUSE Software Solutions Germany GmbH >> Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany >> (HRB 36809, AG N=C3=BCrnberg) >> Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer >> >=20 >=20 >=20 >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany (HRB 36809, AG N=C3=BCrnberg) Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer --UYOevlM6aUwiZVhvcaKkKGtAXSzBSSNy8-- --UqJsoOJbrz0Z20L4x6ISyIeT9FtY5cRLo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl7eTdoACgkQaA3BHVML eiPWDAf/fAzBNnGa25EkTKGj+C4NUuFgBqKC4GG8iwB7Dnq7aklucc11BQPQ6w/L 3s82/dDhG1eCPMZfR/HfRV8Z5tQnol+S4Y7Lyc7Lc0PbtwHxGmX0Lp7LdKX3U97P FBW9Wa7Ro5ucJnQAp8UgtiQ2MGNqMgz3nWuskIfHoXBTx7sSX0y6z05CpuLhlEmx Pq4QqVdS93KqFhUG9Iu84dWSYTgvHANwP6FtGnBPzC4znua7ICn27IxfQpPIZHIC GUUEc+o3Wa6oPweY9Lqli85KYY78Mk+eyda5ovhpfAmYobzAgdEqJvW8f21pobJZ /6CAwGKnG0Kn8kZhwjZ6Ratl6PPK6Q== =5Va1 -----END PGP SIGNATURE----- --UqJsoOJbrz0Z20L4x6ISyIeT9FtY5cRLo-- --===============0551878869== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============0551878869==--