On Tue, Jan 19, 2021 at 11:08:12AM -0800, Yiwei Zhang wrote:
> On Mon, Jan 18, 2021 at 11:03 PM Daniel Vetter <daniel@xxxxxxxx> wrote:
> >
> > On Tue, Jan 19, 2021 at 12:41 AM Yiwei Zhang <zzyiwei@xxxxxxxxxxx> wrote:
> > >
> > > On the success of virtio_gpu_object_create, add size of newly allocated
> > > bo to the tracled total_mem. In drm_gem_object_funcs.free, after the gem
> > > bo lost its last refcount, subtract the bo size from the tracked
> > > total_mem if the original underlying memory allocation is successful.
> > >
> > > Signed-off-by: Yiwei Zhang <zzyiwei@xxxxxxxxxxx>
> >
> > Isn't this something that ideally we'd for everyone? Also tracepoint
> > for showing the total feels like tracepoint abuse, usually we show
> > totals somewhere in debugfs or similar, and tracepoint just for what's
> > happening (i.e. which object got deleted/created).
> >
> > What is this for exactly?
> > -Daniel
> >
> > > ---
> > > drivers/gpu/drm/virtio/Kconfig | 1 +
> > > drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++++
> > > drivers/gpu/drm/virtio/virtgpu_object.c | 19 +++++++++++++++++++
> > > 3 files changed, 24 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/virtio/Kconfig b/drivers/gpu/drm/virtio/Kconfig
> > > index b925b8b1da16..e103b7e883b1 100644
> > > --- a/drivers/gpu/drm/virtio/Kconfig
> > > +++ b/drivers/gpu/drm/virtio/Kconfig
> > > @@ -5,6 +5,7 @@ config DRM_VIRTIO_GPU
> > > select DRM_KMS_HELPER
> > > select DRM_GEM_SHMEM_HELPER
> > > select VIRTIO_DMA_SHARED_BUFFER
> > > + select TRACE_GPU_MEM
> > > help
> > > This is the virtual GPU driver for virtio. It can be used with
> > > QEMU based VMMs (like KVM or Xen).
> > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
> > > index 6a232553c99b..7c60e7486bc4 100644
> > > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> > > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> > > @@ -249,6 +249,10 @@ struct virtio_gpu_device {
> > > spinlock_t resource_export_lock;
> > > /* protects map state and host_visible_mm */
> > > spinlock_t host_visible_lock;
> > > +
> > > +#ifdef CONFIG_TRACE_GPU_MEM
> > > + atomic64_t total_mem;
> > > +#endif
> > > };
> > >
> > > struct virtio_gpu_fpriv {
> > > diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> > > index d69a5b6da553..1e16226cebbe 100644
> > > --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> > > +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> > > @@ -25,12 +25,29 @@
> > >
> > > #include <linux/dma-mapping.h>
> > > #include <linux/moduleparam.h>
> > > +#ifdef CONFIG_TRACE_GPU_MEM
> > > +#include <trace/events/gpu_mem.h>
> > > +#endif
> > >
> > > #include "virtgpu_drv.h"
> > >
> > > static int virtio_gpu_virglrenderer_workaround = 1;
> > > module_param_named(virglhack, virtio_gpu_virglrenderer_workaround, int, 0400);
> > >
> > > +#ifdef CONFIG_TRACE_GPU_MEM
> > > +static inline void virtio_gpu_trace_total_mem(struct virtio_gpu_device *vgdev,
> > > + s64 delta)
> > > +{
> > > + u64 total_mem = atomic64_add_return(delta, &vgdev->total_mem);
> > > +
> > > + trace_gpu_mem_total(0, 0, total_mem);
> > > +}
> > > +#else
> > > +static inline void virtio_gpu_trace_total_mem(struct virtio_gpu_device *, s64)
> > > +{
> > > +}
> > > +#endif
> > > +
> > > int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev, uint32_t *resid)
> > > {
> > > if (virtio_gpu_virglrenderer_workaround) {
> > > @@ -104,6 +121,7 @@ static void virtio_gpu_free_object(struct drm_gem_object *obj)
> > > struct virtio_gpu_device *vgdev = bo->base.base.dev->dev_private;
> > >
> > > if (bo->created) {
> > > + virtio_gpu_trace_total_mem(vgdev, -(obj->size));
> > > virtio_gpu_cmd_unref_resource(vgdev, bo);
> > > virtio_gpu_notify(vgdev);
> > > /* completion handler calls virtio_gpu_cleanup_object() */
> > > @@ -265,6 +283,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
> > > virtio_gpu_object_attach(vgdev, bo, ents, nents);
> > > }
> > >
> > > + virtio_gpu_trace_total_mem(vgdev, shmem_obj->base.size);
> > > *bo_ptr = bo;
> > > return 0;
> > >
> > > --
> > > 2.30.0.284.gd98b1dd5eaa7-goog
> > >
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>
> Thanks for your reply! Android Cuttlefish virtual platform is using
> the virtio-gpu driver, and we currently are carrying this small patch
> at the downstream side. This is essential for us because:
> (1) Android has deprecated debugfs on production devices already
> (2) Android GPU drivers are not DRM based, and this won't change in a
> short term.
>
> Android relies on this tracepoint + eBPF to make the GPU memory totals
> available at runtime on production devices, which has been enforced
> already. Not only game developers can have a reliable kernel total GPU
> memory to look at, but also Android leverages this to take GPU memory
> usage out from the system lost ram.
>
> I'm not sure whether the other DRM drivers would like to integrate
> this tracepoint(maybe upstream drivers will move away from debugfs
> later as well?), but at least we hope virtio-gpu can take this.
There's already another proposal from Android people for tracking dma-buf
(in dma-buf heaps/ion) usage. I think we need something which is overall
integrated, otherwise we have a complete mess of partial solutions.
Also there's work going on to add cgroups support to gpu drivers (pushed
by amd and intel folks, latest rfc have been quite old), so that's another
proposal for gpu memory usage tracking.
Also for upstream we need something which works with upstream gpu drivers
(even if you don't end up using that in shipping products). So that's
another reason maybe why a quick hack in the virtio gpu driver isn't the
best approach here.
I guess a good approach would be if Android at least can get to something
unified (gpu driver, virtio-gpu, dma-buf heaps), and then we need to
figure out how to mesh that with the cgroups side somehow.
Also note that at least on dma-buf we already have some other debug
features (for android), so an overall "how does this all fit together"
would be good.
-Daniel
>
> Many thanks!
> Yiwei
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
