From: "Teres Alexis, Alan Previn" <alan.previn.teres.alexis@intel.com>
To: "Harrison, John C" <john.c.harrison@intel.com>,
"Intel-GFX@Lists.FreeDesktop.Org"
<Intel-GFX@Lists.FreeDesktop.Org>
Cc: "Wilson, Chris P" <chris.p.wilson@intel.com>,
"DRI-Devel@Lists.FreeDesktop.Org"
<DRI-Devel@Lists.FreeDesktop.Org>
Subject: Re: [Intel-gfx] [PATCH 5/7] drm/i915/guc: Use streaming loads to speed up dumping the guc log
Date: Tue, 2 Aug 2022 18:48:15 +0000 [thread overview]
Message-ID: <2c7675a1557691dd5546ef2bb36ad9190def37d3.camel@intel.com> (raw)
In-Reply-To: <20220728022028.2190627-6-John.C.Harrison@Intel.com>
One concern below. Else, nice, simple yet good optimization here. :)
In the interest of quicker progression, I will provide a conditional R-B if you can either fix the issue raised below on
the way in or provide a reason why that's not an issue:
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com>
On Wed, 2022-07-27 at 19:20 -0700, John.C.Harrison@Intel.com wrote:
> From: Chris Wilson <chris.p.wilson@intel.com>
>
> Use a temporary page and mempy_from_wc to reduce the time it takes to
> dump the guc log to debugfs.
>
> Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 24 ++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> index 07d31ae32f765..4722d4b18ed19 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> @@ -750,8 +750,9 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p,
> struct intel_guc *guc = log_to_guc(log);
> struct intel_uc *uc = container_of(guc, struct intel_uc, guc);
> struct drm_i915_gem_object *obj = NULL;
> - u32 *map;
> - int i = 0;
> + void *map;
> + u32 *page;
> + int i, j;
>
> if (!intel_guc_is_supported(guc))
> return -ENODEV;
> @@ -764,23 +765,34 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p,
> if (!obj)
> return 0;
>
> + page = (u32 *)__get_free_page(GFP_KERNEL);
> + if (!page)
> + return -ENOMEM;
Alan: although unlikely, its possible that user could trigger debugfs mid of a gt reset - not sure if we need to use the
"uc->reset_in_progress" before calling this allocation and return a different error in that case like EAGAIN or EBUSY or
ECONNRESET.
> +
> intel_guc_dump_time_info(guc, p);
>
> map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);
> if (IS_ERR(map)) {
> DRM_DEBUG("Failed to pin object\n");
> drm_puts(p, "(log data unaccessible)\n");
> + free_page((unsigned long)page);
> return PTR_ERR(map);
> }
>
> - for (i = 0; i < obj->base.size / sizeof(u32); i += 4)
> - drm_printf(p, "0x%08x 0x%08x 0x%08x 0x%08x\n",
> - *(map + i), *(map + i + 1),
> - *(map + i + 2), *(map + i + 3));
> + for (i = 0; i < obj->base.size; i += PAGE_SIZE) {
> + if (!i915_memcpy_from_wc(page, map + i, PAGE_SIZE))
> + memcpy(page, map + i, PAGE_SIZE);
> +
> + for (j = 0; j < PAGE_SIZE / sizeof(u32); j += 4)
> + drm_printf(p, "0x%08x 0x%08x 0x%08x 0x%08x\n",
> + *(page + j + 0), *(page + j + 1),
> + *(page + j + 2), *(page + j + 3));
> + }
>
> drm_puts(p, "\n");
>
> i915_gem_object_unpin_map(obj);
> + free_page((unsigned long)page);
>
> return 0;
> }
> --
> 2.37.1
>
next prev parent reply other threads:[~2022-08-02 18:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 2:20 [PATCH 0/7] Fixes and improvements to GuC logging and error capture John.C.Harrison
2022-07-28 2:20 ` [PATCH 1/7] drm/i915/guc: Add a helper for log buffer size John.C.Harrison
2022-08-02 17:37 ` Teres Alexis, Alan Previn
2022-08-03 0:29 ` John Harrison
2022-07-28 2:20 ` [PATCH 2/7] drm/i915/guc: Fix capture size warning and bump the size John.C.Harrison
2022-08-02 17:46 ` [Intel-gfx] " Teres Alexis, Alan Previn
2022-07-28 2:20 ` [PATCH 3/7] drm/i915/guc: Add GuC <-> kernel time stamp translation information John.C.Harrison
2022-08-05 0:40 ` [Intel-gfx] " Teres Alexis, Alan Previn
2022-08-08 18:43 ` John Harrison
2022-08-15 4:55 ` Teres Alexis, Alan Previn
2022-08-19 10:45 ` Jani Nikula
2022-08-19 21:02 ` John Harrison
2022-08-23 10:09 ` Jani Nikula
2022-07-28 2:20 ` [PATCH 4/7] drm/i915/guc: Record CTB info in error logs John.C.Harrison
2022-08-02 18:27 ` [Intel-gfx] " Teres Alexis, Alan Previn
2022-08-03 0:20 ` John Harrison
2022-07-28 2:20 ` [PATCH 5/7] drm/i915/guc: Use streaming loads to speed up dumping the guc log John.C.Harrison
2022-08-02 18:48 ` Teres Alexis, Alan Previn [this message]
2022-08-03 0:14 ` [Intel-gfx] " John Harrison
2022-07-28 2:20 ` [PATCH 6/7] drm/i915/guc: Make GuC log sizes runtime configurable John.C.Harrison
2022-08-15 5:43 ` [Intel-gfx] " Teres Alexis, Alan Previn
2022-08-24 9:01 ` Joonas Lahtinen
[not found] ` <4bd7b51a-caf0-d987-c7df-6cfb24f36597@intel.com>
2022-08-25 7:15 ` Joonas Lahtinen
2022-08-25 16:31 ` John Harrison
2022-08-26 6:23 ` Joonas Lahtinen
2022-09-12 7:12 ` Joonas Lahtinen
2022-09-12 23:46 ` John Harrison
2022-07-28 2:20 ` [PATCH 7/7] drm/i915/guc: Reduce spam from error capture John.C.Harrison
2022-08-02 18:54 ` [Intel-gfx] " Teres Alexis, Alan Previn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c7675a1557691dd5546ef2bb36ad9190def37d3.camel@intel.com \
--to=alan.previn.teres.alexis@intel.com \
--cc=DRI-Devel@Lists.FreeDesktop.Org \
--cc=Intel-GFX@Lists.FreeDesktop.Org \
--cc=chris.p.wilson@intel.com \
--cc=john.c.harrison@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).