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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8DCC0C7EE24 for ; Tue, 6 Jun 2023 09:47:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0606110E242; Tue, 6 Jun 2023 09:47:21 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id C386210E242; Tue, 6 Jun 2023 09:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686044839; x=1717580839; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=BCjE8AtzZ1FYRpEfzNypsKXSAZs1GAtnDKARpjkWZ/k=; b=WoFgiIvwsvGdNAyc9Cf1FDxL+UtyrL4mEAFq1C6jqk15uQMTfWMxW/NO Ps9oi+j9BhBWttbf01onINrpV6spqDuEadbJ+Ur1MkROExr1nUHrilm9c LUlSgbc/uD+n3GkkgtSFnPH1kqfMFvb20uOrzkiGkwNNHlQdGwNWu5XuC Ctbq6neE31aF7s1DQOP1GpBHpSkN2/80oUTArq2OAoOJRdJixmD5Xd4gu tZFkgNDkdx3MCksV1kDhbtsJhcS32ONeKLxfgVZGiXVnI+/IA3s+YB0qX /GIKVd93daUCRtgrDvT4zHa6WhYo7DxmHBwO4xOQRhbse2Q/yr70F9/qj g==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="336976307" X-IronPort-AV: E=Sophos;i="6.00,219,1681196400"; d="scan'208";a="336976307" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2023 02:47:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="821565861" X-IronPort-AV: E=Sophos;i="6.00,219,1681196400"; d="scan'208";a="821565861" Received: from wacarey-mobl1.ger.corp.intel.com (HELO [10.213.192.12]) ([10.213.192.12]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2023 02:47:18 -0700 Message-ID: Date: Tue, 6 Jun 2023 10:47:16 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US To: Andi Shyti References: <20230605143720.435046-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH] drm/i915: Implement fdinfo memory stats printing X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 05/06/2023 23:22, Andi Shyti wrote: > Hi Tvrtko, > > On Mon, Jun 05, 2023 at 03:37:20PM +0100, Tvrtko Ursulin wrote: >> From: Tvrtko Ursulin >> >> Use the newly added drm_print_memory_stats helper to show memory >> utilisation of our objects in drm/driver specific fdinfo output. >> >> To collect the stats we walk the per memory regions object lists >> and accumulate object size into the respective drm_memory_stats >> categories. >> >> Objects with multiple possible placements are reported in multiple >> regions for total and shared sizes, while other categories are >> counted only for the currently active region. >> >> Signed-off-by: Tvrtko Ursulin >> Cc: Rob Clark >> --- >> drivers/gpu/drm/i915/i915_drm_client.c | 66 ++++++++++++++++++++++++++ >> 1 file changed, 66 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c >> index 2a44b3876cb5..2a40f763f8f6 100644 >> --- a/drivers/gpu/drm/i915/i915_drm_client.c >> +++ b/drivers/gpu/drm/i915/i915_drm_client.c >> @@ -41,6 +41,70 @@ void __i915_drm_client_free(struct kref *kref) >> } >> >> #ifdef CONFIG_PROC_FS >> +static void >> +add_obj_meminfo(struct drm_i915_gem_object *obj, >> + struct intel_memory_region *mr, >> + struct drm_memory_stats stats[INTEL_REGION_UNKNOWN]) >> +{ >> + u64 sz = obj->base.size; >> + enum intel_region_id id; >> + unsigned int i; >> + >> + id = mr->id; >> + if (obj->base.handle_count > 1) >> + stats[id].shared += sz; >> + else >> + stats[id].private += sz; >> + >> + if (i915_gem_object_has_pages(obj)) { >> + stats[id].resident += sz; >> + >> + if (!dma_resv_test_signaled(obj->base.resv, >> + dma_resv_usage_rw(true))) >> + stats[id].active += sz; >> + else if (i915_gem_object_is_shrinkable(obj) && >> + obj->mm.madv == I915_MADV_DONTNEED) >> + stats[id].purgeable += sz; > > this is a bit off... otherwise: > > Reviewed-by: Andi Shyti Thanks! I will sit on this until I can find time to add some tests to drm_fdinfo.c. Regards, Tvrtko > > Andi > >> + } >> + >> + /* Attribute size and shared to all possible object memory regions. */ >> + for (i = 0; i < obj->mm.n_placements; i++) { >> + if (obj->mm.placements[i] == mr) >> + continue; >> + >> + id = obj->mm.placements[i]->id; >> + if (obj->base.handle_count > 1) >> + stats[id].shared += sz; >> + else >> + stats[id].private += sz; >> + } >> +} >> + >> +static void show_meminfo(struct drm_printer *p, struct drm_file *file) >> +{ >> + struct drm_i915_file_private *file_priv = file->driver_priv; >> + struct drm_memory_stats stats[INTEL_REGION_UNKNOWN] = {}; >> + struct drm_i915_private *i915 = file_priv->i915; >> + struct intel_memory_region *mr; >> + unsigned int id; >> + >> + for_each_memory_region(mr, i915, id) { >> + struct drm_i915_gem_object *obj; >> + >> + mutex_lock(&mr->objects.lock); >> + list_for_each_entry(obj, &mr->objects.list, mm.region_link) >> + add_obj_meminfo(obj, mr, stats); >> + mutex_unlock(&mr->objects.lock); >> + } >> + >> + for_each_memory_region(mr, i915, id) >> + drm_print_memory_stats(p, >> + &stats[id], >> + DRM_GEM_OBJECT_RESIDENT | >> + DRM_GEM_OBJECT_PURGEABLE, >> + mr->name); >> +} >> + >> static const char * const uabi_class_names[] = { >> [I915_ENGINE_CLASS_RENDER] = "render", >> [I915_ENGINE_CLASS_COPY] = "copy", >> @@ -102,6 +166,8 @@ void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file) >> * ****************************************************************** >> */ >> >> + show_meminfo(p, file); >> + >> if (GRAPHICS_VER(i915) < 8) >> return; >> >> -- >> 2.39.2