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, 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 198B9C433DF for ; Wed, 13 May 2020 15:07:16 +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 121DA20659 for ; Wed, 13 May 2020 15:06:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 121DA20659 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 4BF586EA64; Wed, 13 May 2020 15:06:15 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C8476EA64 for ; Wed, 13 May 2020 15:06:14 +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 76A95ADF8; Wed, 13 May 2020 15:06:15 +0000 (UTC) Subject: Re: [PATCH 1/2] drm/shmem: Use cached mappings by default To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sean@poorly.run, kraxel@redhat.com, emil.l.velikov@gmail.com, sam@ravnborg.org References: <20200513150312.21421-1-tzimmermann@suse.de> <20200513150312.21421-2-tzimmermann@suse.de> 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: Date: Wed, 13 May 2020 17:06:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200513150312.21421-2-tzimmermann@suse.de> 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: dri-devel@lists.freedesktop.org Content-Type: multipart/mixed; boundary="===============0205337980==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0205337980== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8QWl4z6CKgC2Q8weV3qzBzYUwqM5qL2AT" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8QWl4z6CKgC2Q8weV3qzBzYUwqM5qL2AT Content-Type: multipart/mixed; boundary="XoXBje34fDhYM7OVgdjTZfp7gIAswpPeU"; protected-headers="v1" From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sean@poorly.run, kraxel@redhat.com, emil.l.velikov@gmail.com, sam@ravnborg.org Cc: dri-devel@lists.freedesktop.org Message-ID: Subject: Re: [PATCH 1/2] drm/shmem: Use cached mappings by default References: <20200513150312.21421-1-tzimmermann@suse.de> <20200513150312.21421-2-tzimmermann@suse.de> In-Reply-To: <20200513150312.21421-2-tzimmermann@suse.de> --XoXBje34fDhYM7OVgdjTZfp7gIAswpPeU Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 13.05.20 um 17:03 schrieb Thomas Zimmermann: > SHMEM-buffer backing storage is allocated from system memory; which is > typically cachable. Currently, only virtio uses cachable mappings; udl > uses its own vmap/mmap implementation for cachable mappings. Other > drivers default to writecombine mappings. >=20 > Use cached mappings by default. The exception is pages imported via > dma-buf. DMA memory is usually not cached. >=20 > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ++++-- > drivers/gpu/drm/virtio/virtgpu_object.c | 1 - > include/drm/drm_gem_shmem_helper.h | 4 ++-- > 3 files changed, 6 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/d= rm_gem_shmem_helper.c > index df31e5782eed1..1ce90325dfa31 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -259,7 +259,7 @@ static void *drm_gem_shmem_vmap_locked(struct drm_g= em_shmem_object *shmem) > } else { > pgprot_t prot =3D PAGE_KERNEL; > =20 > - if (!shmem->map_cached) > + if (shmem->map_wc) > prot =3D pgprot_writecombine(prot); > shmem->vaddr =3D vmap(shmem->pages, obj->size >> PAGE_SHIFT, > VM_MAP, prot); > @@ -546,7 +546,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, = struct vm_area_struct *vma) > =20 > vma->vm_flags |=3D VM_MIXEDMAP | VM_DONTEXPAND; > vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); > - if (!shmem->map_cached) > + if (shmem->map_wc) > vma->vm_page_prot =3D pgprot_writecombine(vma->vm_page_prot); > vma->vm_ops =3D &drm_gem_shmem_vm_ops; > =20 > @@ -664,6 +664,8 @@ drm_gem_shmem_prime_import_sg_table(struct drm_devi= ce *dev, > if (IS_ERR(shmem)) > return ERR_CAST(shmem); > =20 > + shmem->map_wc =3D false; /* dma-buf mappings use writecombine */ Just when I posted the patch, I saw this bug. map_wc should be set to true to enable writecombine mappings for dma-buf pages. Will be fixed in the next iteration. > + > shmem->pages =3D kvmalloc_array(npages, sizeof(struct page *), GFP_KE= RNEL); > if (!shmem->pages) { > ret =3D -ENOMEM; > diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/= virtio/virtgpu_object.c > index 6ccbd01cd888c..80ba6b2b61668 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_object.c > +++ b/drivers/gpu/drm/virtio/virtgpu_object.c > @@ -132,7 +132,6 @@ struct drm_gem_object *virtio_gpu_create_object(str= uct drm_device *dev, > =20 > dshmem =3D &shmem->base.base; > dshmem->base.funcs =3D &virtio_gpu_shmem_funcs; > - dshmem->map_cached =3D true; > return &dshmem->base; > } > =20 > diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_s= hmem_helper.h > index 294b2931c4cc0..a5bc082a77c48 100644 > --- a/include/drm/drm_gem_shmem_helper.h > +++ b/include/drm/drm_gem_shmem_helper.h > @@ -98,9 +98,9 @@ struct drm_gem_shmem_object { > unsigned int vmap_use_count; > =20 > /** > - * @map_cached: map object cached (instead of using writecombine). > + * @map_wc: map object using writecombine (instead of cached). > */ > - bool map_cached; > + bool map_wc; > }; > =20 > #define to_drm_gem_shmem_obj(obj) \ >=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 --XoXBje34fDhYM7OVgdjTZfp7gIAswpPeU-- --8QWl4z6CKgC2Q8weV3qzBzYUwqM5qL2AT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl68DOEACgkQaA3BHVML eiOdQwgAjcwBYiV4oYIqPs4Z2hElehn9BrqY/H1QDFR63Twwto5i+/b2AYwQmCnh ekV9QClWNwAeJbsKBAiTF1VfWFVsS0ZcbGb7HGfE1Ys0LurB6BJ20Nj78xs3Y+Gl JEkg3tY5VkF0VarT471eAENeKu9E+DMbFznV1bwO8zp1jALNbOeGTRxCYtUbzsGB LN62/UkCWRiB4ulwp06N9ixfkWvWdGWNzdb1cayaNLNMfZ9qCuAkK7TqAq6UwueA IBarcBDyAoJqWdaqNjQszCqX0oNSScfOf6YnmOIo6Q5guQ7NooxFKQu2YMkmJ4AB ITBiVoqRTq0Wl//ecH9o6CLXVeMOFQ== =m/jY -----END PGP SIGNATURE----- --8QWl4z6CKgC2Q8weV3qzBzYUwqM5qL2AT-- --===============0205337980== 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 --===============0205337980==--