From: Dmitry Osipenko <dmitry.osipenko@collabora.com> To: "David Airlie" <airlied@gmail.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Gurchetan Singh" <gurchetansingh@chromium.org>, "Chia-I Wu" <olvaffe@gmail.com>, "Daniel Vetter" <daniel@ffwll.ch>, "Daniel Almeida" <daniel.almeida@collabora.com>, "Gustavo Padovan" <gustavo.padovan@collabora.com>, "Daniel Stone" <daniel@fooishbar.org>, "Tomeu Vizoso" <tomeu.vizoso@collabora.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Maxime Ripard" <mripard@kernel.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Rob Clark" <robdclark@gmail.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com>, "Qiang Yu" <yuq825@gmail.com>, "Steven Price" <steven.price@arm.com>, "Alyssa Rosenzweig" <alyssa.rosenzweig@collabora.com>, "Rob Herring" <robh@kernel.org>, "Sean Paul" <sean@poorly.run>, "Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>, "Abhinav Kumar" <quic_abhinavk@quicinc.com> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: [PATCH v9 06/11] drm/shmem-helper: Don't use vmap_use_count for dma-bufs Date: Wed, 23 Nov 2022 05:57:18 +0300 [thread overview] Message-ID: <20221123025723.695075-7-dmitry.osipenko@collabora.com> (raw) In-Reply-To: <20221123025723.695075-1-dmitry.osipenko@collabora.com> DMA-buf core has its own refcounting of vmaps, use it instead of drm-shmem counting. This change prepares drm-shmem for addition of memory shrinker support where drm-shmem will use a single dma-buf reservation lock for all operations performed over dma-bufs. Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 35 +++++++++++++++----------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 5504eeb61099..ba9d9c5f1064 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -299,24 +299,22 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, struct drm_gem_object *obj = &shmem->base; int ret = 0; - if (shmem->vmap_use_count++ > 0) { - iosys_map_set_vaddr(map, shmem->vaddr); - return 0; - } - if (obj->import_attach) { ret = dma_buf_vmap(obj->import_attach->dmabuf, map); if (!ret) { if (drm_WARN_ON(obj->dev, map->is_iomem)) { dma_buf_vunmap(obj->import_attach->dmabuf, map); - ret = -EIO; - goto err_put_pages; + return -EIO; } - shmem->vaddr = map->vaddr; } } else { pgprot_t prot = PAGE_KERNEL; + if (shmem->vmap_use_count++ > 0) { + iosys_map_set_vaddr(map, shmem->vaddr); + return 0; + } + ret = drm_gem_shmem_get_pages(shmem); if (ret) goto err_zero_use; @@ -382,15 +380,15 @@ static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, { struct drm_gem_object *obj = &shmem->base; - if (drm_WARN_ON_ONCE(obj->dev, !shmem->vmap_use_count)) - return; - - if (--shmem->vmap_use_count > 0) - return; - if (obj->import_attach) { dma_buf_vunmap(obj->import_attach->dmabuf, map); } else { + if (drm_WARN_ON_ONCE(obj->dev, !shmem->vmap_use_count)) + return; + + if (--shmem->vmap_use_count > 0) + return; + vunmap(shmem->vaddr); drm_gem_shmem_put_pages(shmem); } @@ -652,7 +650,14 @@ void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem, struct drm_printer *p, unsigned int indent) { drm_printf_indent(p, indent, "pages_use_count=%u\n", shmem->pages_use_count); - drm_printf_indent(p, indent, "vmap_use_count=%u\n", shmem->vmap_use_count); + + if (shmem->base.import_attach) + drm_printf_indent(p, indent, "vmap_use_count=%u\n", + shmem->base.dma_buf->vmapping_counter); + else + drm_printf_indent(p, indent, "vmap_use_count=%u\n", + shmem->vmap_use_count); + drm_printf_indent(p, indent, "vaddr=%p\n", shmem->vaddr); } EXPORT_SYMBOL(drm_gem_shmem_print_info); -- 2.38.1
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <dmitry.osipenko@collabora.com> To: "David Airlie" <airlied@gmail.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Gurchetan Singh" <gurchetansingh@chromium.org>, "Chia-I Wu" <olvaffe@gmail.com>, "Daniel Vetter" <daniel@ffwll.ch>, "Daniel Almeida" <daniel.almeida@collabora.com>, "Gustavo Padovan" <gustavo.padovan@collabora.com>, "Daniel Stone" <daniel@fooishbar.org>, "Tomeu Vizoso" <tomeu.vizoso@collabora.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Maxime Ripard" <mripard@kernel.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Rob Clark" <robdclark@gmail.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com>, "Qiang Yu" <yuq825@gmail.com>, "Steven Price" <steven.price@arm.com>, "Alyssa Rosenzweig" <alyssa.rosenzweig@collabora.com>, "Rob Herring" <robh@kernel.org>, "Sean Paul" <sean@poorly.run>, "Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>, "Abhinav Kumar" <quic_abhinavk@quicinc.com> Cc: kernel@collabora.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Subject: [PATCH v9 06/11] drm/shmem-helper: Don't use vmap_use_count for dma-bufs Date: Wed, 23 Nov 2022 05:57:18 +0300 [thread overview] Message-ID: <20221123025723.695075-7-dmitry.osipenko@collabora.com> (raw) In-Reply-To: <20221123025723.695075-1-dmitry.osipenko@collabora.com> DMA-buf core has its own refcounting of vmaps, use it instead of drm-shmem counting. This change prepares drm-shmem for addition of memory shrinker support where drm-shmem will use a single dma-buf reservation lock for all operations performed over dma-bufs. Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 35 +++++++++++++++----------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 5504eeb61099..ba9d9c5f1064 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -299,24 +299,22 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, struct drm_gem_object *obj = &shmem->base; int ret = 0; - if (shmem->vmap_use_count++ > 0) { - iosys_map_set_vaddr(map, shmem->vaddr); - return 0; - } - if (obj->import_attach) { ret = dma_buf_vmap(obj->import_attach->dmabuf, map); if (!ret) { if (drm_WARN_ON(obj->dev, map->is_iomem)) { dma_buf_vunmap(obj->import_attach->dmabuf, map); - ret = -EIO; - goto err_put_pages; + return -EIO; } - shmem->vaddr = map->vaddr; } } else { pgprot_t prot = PAGE_KERNEL; + if (shmem->vmap_use_count++ > 0) { + iosys_map_set_vaddr(map, shmem->vaddr); + return 0; + } + ret = drm_gem_shmem_get_pages(shmem); if (ret) goto err_zero_use; @@ -382,15 +380,15 @@ static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, { struct drm_gem_object *obj = &shmem->base; - if (drm_WARN_ON_ONCE(obj->dev, !shmem->vmap_use_count)) - return; - - if (--shmem->vmap_use_count > 0) - return; - if (obj->import_attach) { dma_buf_vunmap(obj->import_attach->dmabuf, map); } else { + if (drm_WARN_ON_ONCE(obj->dev, !shmem->vmap_use_count)) + return; + + if (--shmem->vmap_use_count > 0) + return; + vunmap(shmem->vaddr); drm_gem_shmem_put_pages(shmem); } @@ -652,7 +650,14 @@ void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem, struct drm_printer *p, unsigned int indent) { drm_printf_indent(p, indent, "pages_use_count=%u\n", shmem->pages_use_count); - drm_printf_indent(p, indent, "vmap_use_count=%u\n", shmem->vmap_use_count); + + if (shmem->base.import_attach) + drm_printf_indent(p, indent, "vmap_use_count=%u\n", + shmem->base.dma_buf->vmapping_counter); + else + drm_printf_indent(p, indent, "vmap_use_count=%u\n", + shmem->vmap_use_count); + drm_printf_indent(p, indent, "vaddr=%p\n", shmem->vaddr); } EXPORT_SYMBOL(drm_gem_shmem_print_info); -- 2.38.1
next prev parent reply other threads:[~2022-11-23 3:00 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-23 2:57 [PATCH v9 00/11] Add generic memory shrinker to VirtIO-GPU and Panfrost DRM drivers Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 01/11] drm/msm/gem: Prevent blocking within shrinker loop Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-29 16:40 ` Rob Clark 2022-11-29 16:40 ` Rob Clark 2022-11-29 16:40 ` Rob Clark 2022-11-23 2:57 ` [PATCH v9 02/11] drm/panfrost: Don't sync rpm suspension after mmu flushing Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 15:59 ` Steven Price 2022-11-23 2:57 ` [PATCH v9 03/11] drm/gem: Add evict() callback to drm_gem_object_funcs Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 15:58 ` Steven Price 2022-11-23 16:40 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 04/11] drm/shmem: Put booleans in the end of struct drm_gem_shmem_object Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 05/11] drm/shmem: Switch to use drm_* debug helpers Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko [this message] 2022-11-23 2:57 ` [PATCH v9 06/11] drm/shmem-helper: Don't use vmap_use_count for dma-bufs Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 07/11] drm/shmem-helper: Switch to reservation lock Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 08/11] drm/shmem-helper: Add memory shrinker Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 15:56 ` kernel test robot 2022-11-23 15:56 ` kernel test robot 2022-11-23 15:56 ` kernel test robot 2022-11-23 18:08 ` kernel test robot 2022-11-23 18:08 ` kernel test robot 2022-11-23 18:08 ` kernel test robot 2022-11-23 2:57 ` [PATCH v9 09/11] drm/gem: Add drm_gem_pin_unlocked() Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 10/11] drm/virtio: Support memory shrinking Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 2:57 ` [PATCH v9 11/11] drm/panfrost: Switch to generic memory shrinker Dmitry Osipenko 2022-11-23 2:57 ` Dmitry Osipenko 2022-11-23 17:03 ` Steven Price
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221123025723.695075-7-dmitry.osipenko@collabora.com \ --to=dmitry.osipenko@collabora.com \ --cc=airlied@gmail.com \ --cc=alyssa.rosenzweig@collabora.com \ --cc=christian.koenig@amd.com \ --cc=daniel.almeida@collabora.com \ --cc=daniel@ffwll.ch \ --cc=daniel@fooishbar.org \ --cc=dmitry.baryshkov@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=gurchetansingh@chromium.org \ --cc=gustavo.padovan@collabora.com \ --cc=kernel@collabora.com \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mripard@kernel.org \ --cc=olvaffe@gmail.com \ --cc=quic_abhinavk@quicinc.com \ --cc=robdclark@gmail.com \ --cc=robh@kernel.org \ --cc=sean@poorly.run \ --cc=steven.price@arm.com \ --cc=sumit.semwal@linaro.org \ --cc=tomeu.vizoso@collabora.com \ --cc=tzimmermann@suse.de \ --cc=virtualization@lists.linux-foundation.org \ --cc=yuq825@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.