| Message ID | 20210118234057.270930-1-zzyiwei@android.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/virtio: Track total GPU memory for virtio driver | expand |
On Mon, Jan 18, 2021 at 11:03 PM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Tue, Jan 19, 2021 at 12:41 AM Yiwei Zhang <zzyiwei@android.com> 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@android.com> > > 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. Many thanks! Yiwei
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@ffwll.ch> wrote: > > > > On Tue, Jan 19, 2021 at 12:41 AM Yiwei Zhang <zzyiwei@android.com> 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@android.com> > > > > 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
On Wed, Jan 20, 2021 at 1:11 AM Daniel Vetter <daniel@ffwll.ch> wrote: > > 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@ffwll.ch> wrote: > > > > > > On Tue, Jan 19, 2021 at 12:41 AM Yiwei Zhang <zzyiwei@android.com> 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@android.com> > > > > > > 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 The entire story is to better explain Android system memory usage. They fit together so that the dma-bufs overlap can be removed. Android GPU vendors have integrated this tracepoint to track gpu memory usage total(mapped into the gpu address space), which consists of below: (1) directly allocated via physical page allocator (2) imported external memory backed by dma-bufs (3) allocated exportable memory backed by dma-bufs Our Android kernel team is leading the other side of effort to help remove the dma-bufs overlap(those mapped into a gpu device) as a joint effort, so that we can accurately explain the memory usage of the entire Android system. For virtio-gpu, since that's used by our reference platform Cuttlefish(Cloud Android), we have to integrate the same tracepoint as well to enforce the use of this tracepoint and the eBPF stuff built on top to support runtime query of gpu memory on production devices. For virtio-gpu at this moment, we only want to track GEM allocations since PRIME import is currently not supported/used in Cuttlefish. That's all we are doing in this small patch. Best, Yiwei
On Wed, Jan 20, 2021 at 10:51 AM Yiwei Zhang <zzyiwei@android.com> wrote: > > On Wed, Jan 20, 2021 at 1:11 AM Daniel Vetter <daniel@ffwll.ch> wrote: > > > > 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@ffwll.ch> wrote: > > > > > > > > On Tue, Jan 19, 2021 at 12:41 AM Yiwei Zhang <zzyiwei@android.com> 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@android.com> > > > > > > > > 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 > > The entire story is to better explain Android system memory usage. > They fit together so that the dma-bufs overlap can be removed. > > Android GPU vendors have integrated this tracepoint to track gpu > memory usage total(mapped into the gpu address space), which consists > of below: > (1) directly allocated via physical page allocator > (2) imported external memory backed by dma-bufs > (3) allocated exportable memory backed by dma-bufs > > Our Android kernel team is leading the other side of effort to help > remove the dma-bufs overlap(those mapped into a gpu device) as a joint > effort, so that we can accurately explain the memory usage of the > entire Android system. > > For virtio-gpu, since that's used by our reference platform > Cuttlefish(Cloud Android), we have to integrate the same tracepoint as > well to enforce the use of this tracepoint and the eBPF stuff built on > top to support runtime query of gpu memory on production devices. For > virtio-gpu at this moment, we only want to track GEM allocations since > PRIME import is currently not supported/used in Cuttlefish. That's all > we are doing in this small patch. Ok if the plan is to have that as a hard requirement for android across all android uapi drivers, then - this needs to be done across all upstream drivers too (otherwise we don't have that uapi) - usual open source requirements for new uapi (but I don't think that should be a problem, these parts of android are all open I think) - figuring out the overlap with the dma-buf account, before we merge either Otherwise I don't see how this can work and be backed with upstreams "never break uapi" guarantee. -Daniel
Hi, > > > > > + select TRACE_GPU_MEM > > > > > +#ifdef CONFIG_TRACE_GPU_MEM That doesn't make sense btw. > > > > > +#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); Hmm, so no per process tracking (pid arg hard-coded to zero)? Any plans for that? The cgroups patches mentioned by Daniel should address that btw. The gpu_id is hardcoded to zero too. Shouldn't that be something like the minor number of the drm device? Or maybe something else in case you need drm and non-drm gpu devices work side-by-side? > > > 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 IIRC there have been discussions about a statfs, so you can export stats with a sane interface without also enabling all the power provided by debugfs, exactly because of the concerns to do that on production systems. Not sure what the state is, seems to not be upstream yet. That would be (beside cgroups) another thing to look at. > > > 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. Sounds like you define "gpu memory" as "system memory used to store gpu data". Is that correct? What about device memory? > > > 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. Well, it is basically the same for all drivers using the gem shmem helpers. So I see little reason why we should do that at virtio-gpu level. > Android GPU vendors have integrated this tracepoint to track gpu > memory usage total(mapped into the gpu address space), which consists > of below: > (1) directly allocated via physical page allocator > (2) imported external memory backed by dma-bufs > (3) allocated exportable memory backed by dma-bufs Hmm, the tracepoint doesn't track which of the three groups the memory belongs to. Which I think is important, specifically group (2) because that might already be accounted for by the exporting driver ... > Our Android kernel team is leading the other side of effort to help > remove the dma-bufs overlap(those mapped into a gpu device) as a joint > effort, so that we can accurately explain the memory usage of the > entire Android system. I suspect once you figured that you'll notice that this little hack is rather incomplete. > For virtio-gpu, since that's used by our reference platform > Cuttlefish(Cloud Android), we have to integrate the same tracepoint as > well to enforce the use of this tracepoint and the eBPF stuff built on > top to support runtime query of gpu memory on production devices. For > virtio-gpu at this moment, we only want to track GEM allocations since > PRIME import is currently not supported/used in Cuttlefish. That's all > we are doing in this small patch. take care, Gerd
On Wed, Jan 20, 2021 at 10:52:11AM -0800, Yiwei Zhang wrote: > On Wed, Jan 20, 2021 at 5:33 AM Gerd Hoffmann <kraxel@redhat.com> wrote: > > > > Hi, > > > > > > > > > + select TRACE_GPU_MEM > > > > > > > > > +#ifdef CONFIG_TRACE_GPU_MEM > > > > That doesn't make sense btw. > > Do you recommend we just select it or leave it an option? The patch selects it (which makes sense given the small size). The #ifdef is pointless then ... > > > > > > > +#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); > > > > Hmm, so no per process tracking (pid arg hard-coded to zero)? > > Any plans for that? > > The cgroups patches mentioned by Daniel should address that btw. > > Android GPU vendors do report the totals for each process as well. For > Cuttlefish virtual platform, we haven't yet required that, and want to > get the global total in place first. That means no plans yet? > > > > > 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. > > > > Sounds like you define "gpu memory" as "system memory used to store gpu > > data". Is that correct? What about device memory? > > The total definition does include all device memory being used as well > for numa devices.(If my understanding of your question is correct.) device memory == gpu-owned memory, typically exposed to as pci memory bar. qemu stdvga for example stores gem objects in device memory (unless it runs out of vram, then ttm allocates from / moves into main memory). > > > > > 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. > > > > Well, it is basically the same for all drivers using the gem shmem > > helpers. So I see little reason why we should do that at virtio-gpu > > level. > > This can be a starting point. Another reason would be I'm fearing that > this tracepoint approach might be more difficult to get upstreamed at > drm layer level, since later we may want to get to per-process total > tracking, which would be making more sense at device driver level. Tracking in __drm_gem_shmem_create + drm_gem_shmem_free_object should give you pretty much the same results, with the major difference being that it works for all shmem-based drivers. Of course just moving the trace points doesn't solve the other issues discussed. > > > Android GPU vendors have integrated this tracepoint to track gpu > > > memory usage total(mapped into the gpu address space), which consists > > > of below: > > > (1) directly allocated via physical page allocator > > > (2) imported external memory backed by dma-bufs > > > (3) allocated exportable memory backed by dma-bufs > > > > Hmm, the tracepoint doesn't track which of the three groups the memory > > belongs to. Which I think is important, specifically group (2) because > > that might already be accounted for by the exporting driver ... > > The tracepoint only cares about a total number, but I'm not against > the idea to extend the tracepoint with categorization. However, I > believe the dma-bufs core can track which dma-buf gets attached/mapped > to some devices. So that those overlap between dma-buf heaps and the > gpu memory total we are tracking here can be canceled out. Yep, maybe. Which is *exactly* why Daniel keeps asking for the big picture and how this integrates/interacts with the dma-buf accounting which seems to be in the works too. Note that dma-bufs are not only used for cross-device sharing. They are also used to pass handles from one application to another (application to wayland compositor or x server for example). Which doesn't matter much for the totals, but for per-process accounting you need a plan how to account these shared buffers. > > I suspect once you figured that you'll notice that this little hack is > > rather incomplete. > > Despite the dma-buf side effort, we still wish to have this tracepoint > integrated in virtio-gpu just for a global total at this moment. I don't feel like merging patches with obvious shortcomings which have a high chance to end up as technical dept. The question how this interacts with dma-buf accounting must be clarified. I'd also suggest to join forces with the cgroups people. The problem space has alot of overlap. Even if we end up with multiple ways to export the accounting data the spots you have to hook into to actually do the accounting should be largely identical. take care, Gerd
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;
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@android.com> --- 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(+)