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=-15.6 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 9952AC433DB for ; Fri, 26 Feb 2021 09:19:17 +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 30A5B64F31 for ; Fri, 26 Feb 2021 09:19:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30A5B64F31 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 31BC76E8FE; Fri, 26 Feb 2021 09:19:16 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E9376E8FE; Fri, 26 Feb 2021 09:19:14 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 06E5CAAAE; Fri, 26 Feb 2021 09:19:13 +0000 (UTC) Subject: Re: [PATCH] drm/vgem: use shmem helpers To: Daniel Vetter , DRI Development References: <20210223105951.912577-2-daniel.vetter@ffwll.ch> <20210225102306.1173073-1-daniel.vetter@ffwll.ch> From: Thomas Zimmermann Message-ID: <373f003f-1e7b-78ee-6de7-2982372f48b9@suse.de> Date: Fri, 26 Feb 2021 10:19:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210225102306.1173073-1-daniel.vetter@ffwll.ch> 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: Intel Graphics Development , =?UTF-8?Q?Christian_K=c3=b6nig?= , Melissa Wen , Daniel Vetter , Chris Wilson Content-Type: multipart/mixed; boundary="===============0342966587==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0342966587== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0jf8Vk0eqlezQi7cfyGU7xCdhC6iXofH2" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0jf8Vk0eqlezQi7cfyGU7xCdhC6iXofH2 Content-Type: multipart/mixed; boundary="QcuBX9FGW3w3M2dzllYiueD1X5yC4m1w2"; protected-headers="v1" From: Thomas Zimmermann To: Daniel Vetter , DRI Development Cc: Intel Graphics Development , John Stultz , Sumit Semwal , =?UTF-8?Q?Christian_K=c3=b6nig?= , Daniel Vetter , Melissa Wen , Chris Wilson Message-ID: <373f003f-1e7b-78ee-6de7-2982372f48b9@suse.de> Subject: Re: [PATCH] drm/vgem: use shmem helpers References: <20210223105951.912577-2-daniel.vetter@ffwll.ch> <20210225102306.1173073-1-daniel.vetter@ffwll.ch> In-Reply-To: <20210225102306.1173073-1-daniel.vetter@ffwll.ch> --QcuBX9FGW3w3M2dzllYiueD1X5yC4m1w2 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Am 25.02.21 um 11:23 schrieb Daniel Vetter: > Aside from deleting lots of code the real motivation here is to switch > the mmap over to VM_PFNMAP, to be more consistent with what real gpu > drivers do. They're all VM_PFNMP, which means get_user_pages doesn't > work, and even if you try and there's a struct page behind that, > touching it and mucking around with its refcount can upset drivers > real bad. >=20 > v2: Review from Thomas: > - sort #include > - drop more dead code that I didn't spot somehow >=20 > v3: select DRM_GEM_SHMEM_HELPER to make it build (intel-gfx-ci) Since you're working on it, could you move the config item into a=20 Kconfig file under vgem? Best regards Thomas >=20 > Cc: Thomas Zimmermann > Acked-by: Thomas Zimmermann > Cc: John Stultz > Cc: Sumit Semwal > Cc: "Christian K=C3=B6nig" > Signed-off-by: Daniel Vetter > Cc: Melissa Wen > Cc: Chris Wilson > --- > drivers/gpu/drm/Kconfig | 1 + > drivers/gpu/drm/vgem/vgem_drv.c | 340 +------------------------------= - > 2 files changed, 4 insertions(+), 337 deletions(-) >=20 > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 8e73311de583..94e4ac830283 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -274,6 +274,7 @@ source "drivers/gpu/drm/kmb/Kconfig" > config DRM_VGEM > tristate "Virtual GEM provider" > depends on DRM > + select DRM_GEM_SHMEM_HELPER > help > Choose this option to get a virtual graphics memory manager, > as used by Mesa's software renderer for enhanced performance. > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vge= m_drv.c > index a0e75f1d5d01..b1b3a5ffc542 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -38,6 +38,7 @@ > =20 > #include > #include > +#include > #include > #include > #include > @@ -50,87 +51,11 @@ > #define DRIVER_MAJOR 1 > #define DRIVER_MINOR 0 > =20 > -static const struct drm_gem_object_funcs vgem_gem_object_funcs; > - > static struct vgem_device { > struct drm_device drm; > struct platform_device *platform; > } *vgem_device; > =20 > -static void vgem_gem_free_object(struct drm_gem_object *obj) > -{ > - struct drm_vgem_gem_object *vgem_obj =3D to_vgem_bo(obj); > - > - kvfree(vgem_obj->pages); > - mutex_destroy(&vgem_obj->pages_lock); > - > - if (obj->import_attach) > - drm_prime_gem_destroy(obj, vgem_obj->table); > - > - drm_gem_object_release(obj); > - kfree(vgem_obj); > -} > - > -static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) > -{ > - struct vm_area_struct *vma =3D vmf->vma; > - struct drm_vgem_gem_object *obj =3D vma->vm_private_data; > - /* We don't use vmf->pgoff since that has the fake offset */ > - unsigned long vaddr =3D vmf->address; > - vm_fault_t ret =3D VM_FAULT_SIGBUS; > - loff_t num_pages; > - pgoff_t page_offset; > - page_offset =3D (vaddr - vma->vm_start) >> PAGE_SHIFT; > - > - num_pages =3D DIV_ROUND_UP(obj->base.size, PAGE_SIZE); > - > - if (page_offset >=3D num_pages) > - return VM_FAULT_SIGBUS; > - > - mutex_lock(&obj->pages_lock); > - if (obj->pages) { > - get_page(obj->pages[page_offset]); > - vmf->page =3D obj->pages[page_offset]; > - ret =3D 0; > - } > - mutex_unlock(&obj->pages_lock); > - if (ret) { > - struct page *page; > - > - page =3D shmem_read_mapping_page( > - file_inode(obj->base.filp)->i_mapping, > - page_offset); > - if (!IS_ERR(page)) { > - vmf->page =3D page; > - ret =3D 0; > - } else switch (PTR_ERR(page)) { > - case -ENOSPC: > - case -ENOMEM: > - ret =3D VM_FAULT_OOM; > - break; > - case -EBUSY: > - ret =3D VM_FAULT_RETRY; > - break; > - case -EFAULT: > - case -EINVAL: > - ret =3D VM_FAULT_SIGBUS; > - break; > - default: > - WARN_ON(PTR_ERR(page)); > - ret =3D VM_FAULT_SIGBUS; > - break; > - } > - > - } > - return ret; > -} > - > -static const struct vm_operations_struct vgem_gem_vm_ops =3D { > - .fault =3D vgem_gem_fault, > - .open =3D drm_gem_vm_open, > - .close =3D drm_gem_vm_close, > -}; > - > static int vgem_open(struct drm_device *dev, struct drm_file *file) > { > struct vgem_file *vfile; > @@ -159,265 +84,12 @@ static void vgem_postclose(struct drm_device *dev= , struct drm_file *file) > kfree(vfile); > } > =20 > -static struct drm_vgem_gem_object *__vgem_gem_create(struct drm_device= *dev, > - unsigned long size) > -{ > - struct drm_vgem_gem_object *obj; > - int ret; > - > - obj =3D kzalloc(sizeof(*obj), GFP_KERNEL); > - if (!obj) > - return ERR_PTR(-ENOMEM); > - > - obj->base.funcs =3D &vgem_gem_object_funcs; > - > - ret =3D drm_gem_object_init(dev, &obj->base, roundup(size, PAGE_SIZE)= ); > - if (ret) { > - kfree(obj); > - return ERR_PTR(ret); > - } > - > - mutex_init(&obj->pages_lock); > - > - return obj; > -} > - > -static void __vgem_gem_destroy(struct drm_vgem_gem_object *obj) > -{ > - drm_gem_object_release(&obj->base); > - kfree(obj); > -} > - > -static struct drm_gem_object *vgem_gem_create(struct drm_device *dev, > - struct drm_file *file, > - unsigned int *handle, > - unsigned long size) > -{ > - struct drm_vgem_gem_object *obj; > - int ret; > - > - obj =3D __vgem_gem_create(dev, size); > - if (IS_ERR(obj)) > - return ERR_CAST(obj); > - > - ret =3D drm_gem_handle_create(file, &obj->base, handle); > - if (ret) { > - drm_gem_object_put(&obj->base); > - return ERR_PTR(ret); > - } > - > - return &obj->base; > -} > - > -static int vgem_gem_dumb_create(struct drm_file *file, struct drm_devi= ce *dev, > - struct drm_mode_create_dumb *args) > -{ > - struct drm_gem_object *gem_object; > - u64 pitch, size; > - > - pitch =3D args->width * DIV_ROUND_UP(args->bpp, 8); > - size =3D args->height * pitch; > - if (size =3D=3D 0) > - return -EINVAL; > - > - gem_object =3D vgem_gem_create(dev, file, &args->handle, size); > - if (IS_ERR(gem_object)) > - return PTR_ERR(gem_object); > - > - args->size =3D gem_object->size; > - args->pitch =3D pitch; > - > - drm_gem_object_put(gem_object); > - > - DRM_DEBUG("Created object of size %llu\n", args->size); > - > - return 0; > -} > - > static struct drm_ioctl_desc vgem_ioctls[] =3D { > DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_RE= NDER_ALLOW), > DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_RE= NDER_ALLOW), > }; > =20 > -static int vgem_mmap(struct file *filp, struct vm_area_struct *vma) > -{ > - unsigned long flags =3D vma->vm_flags; > - int ret; > - > - ret =3D drm_gem_mmap(filp, vma); > - if (ret) > - return ret; > - > - /* Keep the WC mmaping set by drm_gem_mmap() but our pages > - * are ordinary and not special. > - */ > - vma->vm_flags =3D flags | VM_DONTEXPAND | VM_DONTDUMP; > - return 0; > -} > - > -static const struct file_operations vgem_driver_fops =3D { > - .owner =3D THIS_MODULE, > - .open =3D drm_open, > - .mmap =3D vgem_mmap, > - .poll =3D drm_poll, > - .read =3D drm_read, > - .unlocked_ioctl =3D drm_ioctl, > - .compat_ioctl =3D drm_compat_ioctl, > - .release =3D drm_release, > -}; > - > -static struct page **vgem_pin_pages(struct drm_vgem_gem_object *bo) > -{ > - mutex_lock(&bo->pages_lock); > - if (bo->pages_pin_count++ =3D=3D 0) { > - struct page **pages; > - > - pages =3D drm_gem_get_pages(&bo->base); > - if (IS_ERR(pages)) { > - bo->pages_pin_count--; > - mutex_unlock(&bo->pages_lock); > - return pages; > - } > - > - bo->pages =3D pages; > - } > - mutex_unlock(&bo->pages_lock); > - > - return bo->pages; > -} > - > -static void vgem_unpin_pages(struct drm_vgem_gem_object *bo) > -{ > - mutex_lock(&bo->pages_lock); > - if (--bo->pages_pin_count =3D=3D 0) { > - drm_gem_put_pages(&bo->base, bo->pages, true, true); > - bo->pages =3D NULL; > - } > - mutex_unlock(&bo->pages_lock); > -} > - > -static int vgem_prime_pin(struct drm_gem_object *obj) > -{ > - struct drm_vgem_gem_object *bo =3D to_vgem_bo(obj); > - long n_pages =3D obj->size >> PAGE_SHIFT; > - struct page **pages; > - > - pages =3D vgem_pin_pages(bo); > - if (IS_ERR(pages)) > - return PTR_ERR(pages); > - > - /* Flush the object from the CPU cache so that importers can rely > - * on coherent indirect access via the exported dma-address. > - */ > - drm_clflush_pages(pages, n_pages); > - > - return 0; > -} > - > -static void vgem_prime_unpin(struct drm_gem_object *obj) > -{ > - struct drm_vgem_gem_object *bo =3D to_vgem_bo(obj); > - > - vgem_unpin_pages(bo); > -} > - > -static struct sg_table *vgem_prime_get_sg_table(struct drm_gem_object = *obj) > -{ > - struct drm_vgem_gem_object *bo =3D to_vgem_bo(obj); > - > - return drm_prime_pages_to_sg(obj->dev, bo->pages, bo->base.size >> PA= GE_SHIFT); > -} > - > -static struct drm_gem_object* vgem_prime_import(struct drm_device *dev= , > - struct dma_buf *dma_buf) > -{ > - struct vgem_device *vgem =3D container_of(dev, typeof(*vgem), drm); > - > - return drm_gem_prime_import_dev(dev, dma_buf, &vgem->platform->dev); > -} > - > -static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_de= vice *dev, > - struct dma_buf_attachment *attach, struct sg_table *sg) > -{ > - struct drm_vgem_gem_object *obj; > - int npages; > - > - obj =3D __vgem_gem_create(dev, attach->dmabuf->size); > - if (IS_ERR(obj)) > - return ERR_CAST(obj); > - > - npages =3D PAGE_ALIGN(attach->dmabuf->size) / PAGE_SIZE; > - > - obj->table =3D sg; > - obj->pages =3D kvmalloc_array(npages, sizeof(struct page *), GFP_KERN= EL); > - if (!obj->pages) { > - __vgem_gem_destroy(obj); > - return ERR_PTR(-ENOMEM); > - } > - > - obj->pages_pin_count++; /* perma-pinned */ > - drm_prime_sg_to_page_array(obj->table, obj->pages, npages); > - return &obj->base; > -} > - > -static int vgem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_= map *map) > -{ > - struct drm_vgem_gem_object *bo =3D to_vgem_bo(obj); > - long n_pages =3D obj->size >> PAGE_SHIFT; > - struct page **pages; > - void *vaddr; > - > - pages =3D vgem_pin_pages(bo); > - if (IS_ERR(pages)) > - return PTR_ERR(pages); > - > - vaddr =3D vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL)); > - if (!vaddr) > - return -ENOMEM; > - dma_buf_map_set_vaddr(map, vaddr); > - > - return 0; > -} > - > -static void vgem_prime_vunmap(struct drm_gem_object *obj, struct dma_b= uf_map *map) > -{ > - struct drm_vgem_gem_object *bo =3D to_vgem_bo(obj); > - > - vunmap(map->vaddr); > - vgem_unpin_pages(bo); > -} > - > -static int vgem_prime_mmap(struct drm_gem_object *obj, > - struct vm_area_struct *vma) > -{ > - int ret; > - > - if (obj->size < vma->vm_end - vma->vm_start) > - return -EINVAL; > - > - if (!obj->filp) > - return -ENODEV; > - > - ret =3D call_mmap(obj->filp, vma); > - if (ret) > - return ret; > - > - vma_set_file(vma, obj->filp); > - vma->vm_flags |=3D VM_DONTEXPAND | VM_DONTDUMP; > - vma->vm_page_prot =3D pgprot_writecombine(vm_get_page_prot(vma->vm_fl= ags)); > - > - return 0; > -} > - > -static const struct drm_gem_object_funcs vgem_gem_object_funcs =3D { > - .free =3D vgem_gem_free_object, > - .pin =3D vgem_prime_pin, > - .unpin =3D vgem_prime_unpin, > - .get_sg_table =3D vgem_prime_get_sg_table, > - .vmap =3D vgem_prime_vmap, > - .vunmap =3D vgem_prime_vunmap, > - .vm_ops =3D &vgem_gem_vm_ops, > -}; > +DEFINE_DRM_GEM_FOPS(vgem_driver_fops); > =20 > static const struct drm_driver vgem_driver =3D { > .driver_features =3D DRIVER_GEM | DRIVER_RENDER, > @@ -427,13 +99,7 @@ static const struct drm_driver vgem_driver =3D { > .num_ioctls =3D ARRAY_SIZE(vgem_ioctls), > .fops =3D &vgem_driver_fops, > =20 > - .dumb_create =3D vgem_gem_dumb_create, > - > - .prime_handle_to_fd =3D drm_gem_prime_handle_to_fd, > - .prime_fd_to_handle =3D drm_gem_prime_fd_to_handle, > - .gem_prime_import =3D vgem_prime_import, > - .gem_prime_import_sg_table =3D vgem_prime_import_sg_table, > - .gem_prime_mmap =3D vgem_prime_mmap, > + DRM_GEM_SHMEM_DRIVER_OPS, > =20 > .name =3D DRIVER_NAME, > .desc =3D DRIVER_DESC, >=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 --QcuBX9FGW3w3M2dzllYiueD1X5yC4m1w2-- --0jf8Vk0eqlezQi7cfyGU7xCdhC6iXofH2 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEExndm/fpuMUdwYFFolh/E3EQov+AFAmA4vQ8FAwAAAAAACgkQlh/E3EQov+Db fBAAsVQTLw4TIhHQWwdRZ4e72XDYHDUoalbQDE+frURx6+wynKq15ru3vr1wnqBdkDl7QVr0Rg2q CMmxOGw5kzvgAwl5cm8xP93XsaxQPIf2qANqBLdezGwSYL/YBlEupIErqH8kjAnBMnXRU0rYaKQ4 HgZNKrAS9bbIuYuFRidGhBAr7+NfV9w2qZAkaYgEqcJtCjUUJ5PcYnVpXUYuRNU654LpzflycHBW ZnBlsX47Xja6QSjkZdBC8qOfwGu8NYFvXoTosnGLHXl3aE3AiwmBoN/dQP3k0ZgOtCb/uQMSN7iH CQexdjiOSyEkylim1oj4+0+uwieNAtwuN7IiCPZ0OaY1sqHRlzEpwbl8+CCjeN+PWHGOrjHIiDLz mkNfO9jWr10oDh3ZF99YOXZK03xnZOrrIJP8v8IRG+Q+KUPMc+O84MN3nDJvgfywvJM6JD9nxDtv TxzVPSnMddbYvavb3opr0jA3jRuXTSirc442ksuaqyiWyWb+rp4bV+5CIB6zuchRNPGXh0qRjety n3GkXClTkn5SY+NpmDcWVSdqN1vg7C9rx8R8piaU+mulEBFj/w3uR8SbgpWpFziT8ZqJoMFaKpnd baBxYifNb1D0lo3bMtSi/k7BqnCLfoHkwFr/E/G0JFSZ36twdolpP7QRvb8Sj/naw8QBlOXo/ocY Kb0= =+t8g -----END PGP SIGNATURE----- --0jf8Vk0eqlezQi7cfyGU7xCdhC6iXofH2-- --===============0342966587== 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 --===============0342966587==--