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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 C7AE9C433DB for ; Tue, 19 Jan 2021 08:37:28 +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 8EC0522241 for ; Tue, 19 Jan 2021 08:37:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EC0522241 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=android.com 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 837E26E071; Tue, 19 Jan 2021 08:37:26 +0000 (UTC) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by gabe.freedesktop.org (Postfix) with ESMTPS id 908EF6E5BB for ; Mon, 18 Jan 2021 23:23:18 +0000 (UTC) Received: by mail-qk1-x729.google.com with SMTP id w79so20276488qkb.5 for ; Mon, 18 Jan 2021 15:23:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DBvkANnsASxNzW1l4kG04pLbjkG68+3VpEAecnZNaSA=; b=XDm097mldCjKNGSrByLQ0T7F7N9MUkOW49lOtt+kzwDNZ2vn4ZgGt98sJsHoiJ3PpD 2CXsO7iCz4GOUKGp9omKhzptoX41tdKD6/5rs2JGStmHiEToMK7YhljMwGSseW/5AE90 XstktZpNsBNFrtASn1vL3HMq0VTMQuDCvjA+XdLcoFpGFFxQzwng/2E6vWxw6e9RBR8G zClNzhSTKcv1ZfWBnxNK+4jZZpVfVlw35nDG5JWBKP0t1DwKyitaS2E+w0Ax/k0aKbMp Jm8ZsVWhgvy89C3mx6/elomre4rUs6JhYdw6+ANB0C6h/HJ35BGQ6XZ+vamtnavlOSt2 fUNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DBvkANnsASxNzW1l4kG04pLbjkG68+3VpEAecnZNaSA=; b=L8QzExKVKBjkOb4yjD4pW2mRLd4VyMfnDh0Lovy/6C7CujPgqeEE8ya/CMihnfioo9 4RQHJKVcUDW9MF34ZT5ykhY6+T9s2OK/PvgvIaVDZJ2CzkDNmxD+5sfxK14CEKOVWJjg BFsafrgTva+eAp4lM/GAzTorhdxvtmosv1LiFW2B4jXwTT1a+IZ6Dw9bycCAG05iwZ5E M9QbJzytErv58F57vRdI032zcG8IgcvnKSSSKVY0cS1QPjw7++HZJqp+AwDrrIC04LWa V6MceiKx6PJhxIn8sPfhc9orLb6VIA+a1x+rcB39VPo5OpfZTrRMIFM+gfV0VTCcstV/ U6mg== X-Gm-Message-State: AOAM533KOABmD/sp7a38JPElemMoyBZIC0mNFhZZy8in9TuoIDKgf14m tt9pW0Ag8wNlXw5A5d/gN6/rUYHJ1PyNwJAwN7hL5Q== X-Google-Smtp-Source: ABdhPJxUVtLZ5wlXdNBM3SyiUYqA8bQPWf2PF9ARLTVL4xSRF3Uvs7Olys7HhET4W8YekMTWVyI4yCY7mD9ViPLhu0A= X-Received: by 2002:a37:68e:: with SMTP id 136mr1897310qkg.121.1611012197723; Mon, 18 Jan 2021 15:23:17 -0800 (PST) MIME-Version: 1.0 References: <20210118224659.263928-1-zzyiwei@android.com> In-Reply-To: <20210118224659.263928-1-zzyiwei@android.com> From: =?UTF-8?B?WWl3ZWkgWmhhbmfigI4=?= Date: Mon, 18 Jan 2021 15:23:07 -0800 Message-ID: Subject: Re: [PATCH] Track total GPU memory for virtio driver To: David Airlie , Gerd Hoffmann , Daniel Vetter X-Mailman-Approved-At: Tue, 19 Jan 2021 08:37:25 +0000 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: kernel-team , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Jan 18, 2021 at 2:47 PM Yiwei Zhang 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 > --- > 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 > #include > +#ifdef CONFIG_TRACE_GPU_MEM > +#include > +#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 > -CC android-kernel-team@google.com +CC kernel-team@android.com _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel