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 41ED6C433EF for ; Tue, 5 Apr 2022 08:09:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6ED1610F048; Tue, 5 Apr 2022 08:09:07 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33C6610F048; Tue, 5 Apr 2022 08:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649146146; x=1680682146; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=S6iRPRF2ZC7Klpn70Lbv5AMePvin0QkZXNw7cGoV190=; b=largmXXaJANyRQKTasT3Osg44Z2L5oVtk7ux2+pTYtnomq2Xa5eTGrCX u4IAj424sKV4sfHuLnndA9nCO1QP0vqTIZTTsDOk0APF8EKY6DnrLAQKA cqZPrK8Mdnc/LDs8Q9QmMNMe10oM69XPuFvm+4ksntk7o9TfqwqIzuLRH MIefzRRb1u8p0YqlHYAzMNtQSlveWYu5fIfFo7Bvva1Lj8LnYJ1x6653o 8B/VpOnqFRk7aqhz1CR82I0wVMRfQKlR4yP19kVWJwygRSLF4tRvpK9xz wGGM5lxDqHEv6eMidqJ9hLTS+B4iJoHCKZjtzIJ8TMAf/Vzzm8PBRMnqZ A==; X-IronPort-AV: E=McAfee;i="6200,9189,10307"; a="248207767" X-IronPort-AV: E=Sophos;i="5.90,236,1643702400"; d="scan'208";a="248207767" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2022 01:09:02 -0700 X-IronPort-AV: E=Sophos;i="5.90,236,1643702400"; d="scan'208";a="657843861" Received: from pmulcahy-mobl.ger.corp.intel.com (HELO [10.213.235.32]) ([10.213.235.32]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2022 01:09:00 -0700 Message-ID: <70c2b24a-60b6-6222-ff73-d33abf073e4b@linux.intel.com> Date: Tue, 5 Apr 2022 09:08:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo Content-Language: en-US To: Daniel Vetter References: <20220401142205.3123159-1-tvrtko.ursulin@linux.intel.com> <20220401142205.3123159-9-tvrtko.ursulin@linux.intel.com> <5a6d725f-02a3-bbdf-4585-5e0b491f2721@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: 8bit 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: Intel-gfx@lists.freedesktop.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 04/04/2022 16:36, Daniel Vetter wrote: > On Mon, Apr 04, 2022 at 10:23:53AM +0100, Tvrtko Ursulin wrote: >> >> + Dave and Daniel >> >> Guys, are you okay with merging this via drm-intel-gt-next? It is one new >> file at Documentation/gpu/drm-usage-stats.rst only which is outside i915. It >> has acks from Christian and Rob. > > Acked-by: Daniel Vetter Thanks, pushed now. Rob - you can proceed with your driver at your leisure. I will re-send the rebased gputop to igt-dev shortly and copy you. Regards, Tvrtko >> >> Daniel, series is also fully reviewed and IGT reviewed and ready. Rob also >> demonstrated the approach works for msm when using the vendor agnosstic >> gputop tool I sketched out (see >> 20220225202614.225197-3-robdclark@gmail.com). >> >> My plan is to merge the i915 support with the common spec and intel_gpu_top >> on the IGT side. Then follow-up with vendor agnostic gputop and later yet >> potentially re-visit the AMD side by re-sending the patch which tweaks the >> fdinfo format there and adds support for relative engine utilisation as >> provided by amdgpu. >> >> Regards, >> >> Tvrtko >> >> On 04/04/2022 10:12, Tvrtko Ursulin wrote: >>> >>> On 01/04/2022 15:22, Tvrtko Ursulin wrote: >>>> From: Tvrtko Ursulin >>>> >>>> Similar to AMD commit >>>> 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the >>>> infrastructure added in previous patches, we add basic client info >>>> and GPU engine utilisation for i915. >>>> >>>> Example of the output: >>>> >>>>    pos:    0 >>>>    flags:  0100002 >>>>    mnt_id: 21 >>>>    drm-driver: i915 >>>>    drm-pdev:   0000:00:02.0 >>>>    drm-client-id:      7 >>>>    drm-engine-render:  9288864723 ns >>>>    drm-engine-copy:    2035071108 ns >>>>    drm-engine-video:   0 ns >>>>    drm-engine-video-enhance:   0 ns >>>> >>>> v2: >>>>   * Update for removal of name and pid. >>>> >>>> v3: >>>>   * Use drm_driver.name. >>>> >>>> v4: >>>>   * Added drm-engine-capacity- tag. >>>>   * Fix typo. (Umesh) >>>> >>>> v5: >>>>   * Don't output engine data before Gen8. >>>> >>>> Signed-off-by: Tvrtko Ursulin >>>> Cc: David M Nieto >>>> Cc: Christian König >>>> Cc: Daniel Vetter >>>> Cc: Chris Healy >>>> Acked-by: Christian König >>>> Reviewed-by: Umesh Nerlige Ramappa >>> >>> Forgot to apply an earlier: >>> >>> Acked-by: Rob Clark >>> >>> Regards, >>> >>> Tvrtko >>> >>>> --- >>>>   Documentation/gpu/drm-usage-stats.rst  |  6 ++ >>>>   Documentation/gpu/i915.rst             | 28 +++++++++ >>>>   drivers/gpu/drm/i915/i915_driver.c     |  3 + >>>>   drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++ >>>>   drivers/gpu/drm/i915/i915_drm_client.h |  4 ++ >>>>   5 files changed, 125 insertions(+) >>>> >>>> diff --git a/Documentation/gpu/drm-usage-stats.rst >>>> b/Documentation/gpu/drm-usage-stats.rst >>>> index b8cc28f4da6f..6c9f166a8d6f 100644 >>>> --- a/Documentation/gpu/drm-usage-stats.rst >>>> +++ b/Documentation/gpu/drm-usage-stats.rst >>>> @@ -104,3 +104,9 @@ object belong to this client, in the respective >>>> memory region. >>>>   Default unit shall be bytes with optional unit specifiers of 'KiB' >>>> or 'MiB' >>>>   indicating kibi- or mebi-bytes. >>>> + >>>> +=============================== >>>> +Driver specific implementations >>>> +=============================== >>>> + >>>> +:ref:`i915-usage-stats` >>>> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst >>>> index 0f08693d05cd..54060cd6c419 100644 >>>> --- a/Documentation/gpu/i915.rst >>>> +++ b/Documentation/gpu/i915.rst >>>> @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``. >>>>   .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h >>>>      :doc: The i915 register macro definition style guide >>>> + >>>> +.. _i915-usage-stats: >>>> + >>>> +i915 DRM client usage stats implementation >>>> +========================================== >>>> + >>>> +The drm/i915 driver implements the DRM client usage stats >>>> specification as >>>> +documented in :ref:`drm-client-usage-stats`. >>>> + >>>> +Example of the output showing the implemented key value pairs and >>>> entirety of >>>> +the currently possible format options: >>>> + >>>> +:: >>>> + >>>> +      pos:    0 >>>> +      flags:  0100002 >>>> +      mnt_id: 21 >>>> +      drm-driver: i915 >>>> +      drm-pdev:   0000:00:02.0 >>>> +      drm-client-id:      7 >>>> +      drm-engine-render:  9288864723 ns >>>> +      drm-engine-copy:    2035071108 ns >>>> +      drm-engine-video:   0 ns >>>> +      drm-engine-capacity-video:   2 >>>> +      drm-engine-video-enhance:   0 ns >>>> + >>>> +Possible `drm-engine-` key names are: `render`, `copy`, `video` and >>>> +`video-enhance`. >>>> diff --git a/drivers/gpu/drm/i915/i915_driver.c >>>> b/drivers/gpu/drm/i915/i915_driver.c >>>> index b2df273e6d7b..3ffb617d75c9 100644 >>>> --- a/drivers/gpu/drm/i915/i915_driver.c >>>> +++ b/drivers/gpu/drm/i915/i915_driver.c >>>> @@ -1745,6 +1745,9 @@ static const struct file_operations >>>> i915_driver_fops = { >>>>       .read = drm_read, >>>>       .compat_ioctl = i915_ioc32_compat_ioctl, >>>>       .llseek = noop_llseek, >>>> +#ifdef CONFIG_PROC_FS >>>> +    .show_fdinfo = i915_drm_client_fdinfo, >>>> +#endif >>>>   }; >>>>   static int >>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c >>>> b/drivers/gpu/drm/i915/i915_drm_client.c >>>> index 91a8559bebf7..e539f6b23060 100644 >>>> --- a/drivers/gpu/drm/i915/i915_drm_client.c >>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.c >>>> @@ -7,7 +7,13 @@ >>>>   #include >>>>   #include >>>> +#include >>>> + >>>> +#include >>>> + >>>> +#include "gem/i915_gem_context.h" >>>>   #include "i915_drm_client.h" >>>> +#include "i915_file_private.h" >>>>   #include "i915_gem.h" >>>>   #include "i915_utils.h" >>>> @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct >>>> i915_drm_clients *clients) >>>>       GEM_BUG_ON(!xa_empty(&clients->xarray)); >>>>       xa_destroy(&clients->xarray); >>>>   } >>>> + >>>> +#ifdef CONFIG_PROC_FS >>>> +static const char * const uabi_class_names[] = { >>>> +    [I915_ENGINE_CLASS_RENDER] = "render", >>>> +    [I915_ENGINE_CLASS_COPY] = "copy", >>>> +    [I915_ENGINE_CLASS_VIDEO] = "video", >>>> +    [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance", >>>> +}; >>>> + >>>> +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class) >>>> +{ >>>> +    struct i915_gem_engines_iter it; >>>> +    struct intel_context *ce; >>>> +    u64 total = 0; >>>> + >>>> +    for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) { >>>> +        if (ce->engine->uabi_class != class) >>>> +            continue; >>>> + >>>> +        total += intel_context_get_total_runtime_ns(ce); >>>> +    } >>>> + >>>> +    return total; >>>> +} >>>> + >>>> +static void >>>> +show_client_class(struct seq_file *m, >>>> +          struct i915_drm_client *client, >>>> +          unsigned int class) >>>> +{ >>>> +    const struct list_head *list = &client->ctx_list; >>>> +    u64 total = atomic64_read(&client->past_runtime[class]); >>>> +    const unsigned int capacity = >>>> +        client->clients->i915->engine_uabi_class_count[class]; >>>> +    struct i915_gem_context *ctx; >>>> + >>>> +    rcu_read_lock(); >>>> +    list_for_each_entry_rcu(ctx, list, client_link) >>>> +        total += busy_add(ctx, class); >>>> +    rcu_read_unlock(); >>>> + >>>> +    seq_printf(m, "drm-engine-%s:\t%llu ns\n", >>>> +           uabi_class_names[class], total); >>>> + >>>> +    if (capacity > 1) >>>> +        seq_printf(m, "drm-engine-capacity-%s:\t%u\n", >>>> +               uabi_class_names[class], >>>> +               capacity); >>>> +} >>>> + >>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f) >>>> +{ >>>> +    struct drm_file *file = f->private_data; >>>> +    struct drm_i915_file_private *file_priv = file->driver_priv; >>>> +    struct drm_i915_private *i915 = file_priv->dev_priv; >>>> +    struct i915_drm_client *client = file_priv->client; >>>> +    struct pci_dev *pdev = to_pci_dev(i915->drm.dev); >>>> +    unsigned int i; >>>> + >>>> +    /* >>>> +     * >>>> ****************************************************************** >>>> +     * For text output format description please see >>>> drm-usage-stats.rst! >>>> +     * >>>> ****************************************************************** >>>> +     */ >>>> + >>>> +    seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name); >>>> +    seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n", >>>> +           pci_domain_nr(pdev->bus), pdev->bus->number, >>>> +           PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); >>>> +    seq_printf(m, "drm-client-id:\t%u\n", client->id); >>>> + >>>> +    if (GRAPHICS_VER(i915) < 8) >>>> +        return; >>>> + >>>> +    for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++) >>>> +        show_client_class(m, client, i); >>>> +} >>>> +#endif >>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h >>>> b/drivers/gpu/drm/i915/i915_drm_client.h >>>> index 191368386ace..5f5b02b01ba0 100644 >>>> --- a/drivers/gpu/drm/i915/i915_drm_client.h >>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h >>>> @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct >>>> i915_drm_client *client) >>>>   struct i915_drm_client *i915_drm_client_add(struct >>>> i915_drm_clients *clients); >>>> +#ifdef CONFIG_PROC_FS >>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f); >>>> +#endif >>>> + >>>>   void i915_drm_clients_fini(struct i915_drm_clients *clients); >>>>   #endif /* !__I915_DRM_CLIENT_H__ */ >