From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Cc: Chris Wilson <chris.p.wilson@intel.com>, DRI-Devel@Lists.FreeDesktop.Org Subject: [PATCH 06/12] drm/i915/guc: Use streaming loads to speed up dumping the guc log Date: Tue, 12 Jul 2022 16:31:30 -0700 [thread overview] Message-ID: <20220712233136.1044951-7-John.C.Harrison@Intel.com> (raw) In-Reply-To: <20220712233136.1044951-1-John.C.Harrison@Intel.com> 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> --- 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 45f62cdabe356..ff091adb56096 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -749,8 +749,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; @@ -763,23 +764,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; + 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.36.0
WARNING: multiple messages have this Message-ID (diff)
From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Cc: Chris Wilson <chris.p.wilson@intel.com>, DRI-Devel@Lists.FreeDesktop.Org Subject: [Intel-gfx] [PATCH 06/12] drm/i915/guc: Use streaming loads to speed up dumping the guc log Date: Tue, 12 Jul 2022 16:31:30 -0700 [thread overview] Message-ID: <20220712233136.1044951-7-John.C.Harrison@Intel.com> (raw) In-Reply-To: <20220712233136.1044951-1-John.C.Harrison@Intel.com> 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> --- 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 45f62cdabe356..ff091adb56096 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -749,8 +749,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; @@ -763,23 +764,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; + 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.36.0
next prev parent reply other threads:[~2022-07-12 23:32 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-12 23:31 [PATCH 00/12] Random assortment of (mostly) GuC related patches John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-12 23:31 ` [PATCH 01/12] drm/i915: Remove bogus GEM_BUG_ON in unpark John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-18 12:15 ` Tvrtko Ursulin 2022-07-19 0:05 ` John Harrison 2022-07-19 9:42 ` Tvrtko Ursulin 2022-07-21 0:54 ` John Harrison 2022-07-21 9:24 ` Tvrtko Ursulin 2022-07-22 19:09 ` John Harrison 2022-07-12 23:31 ` [PATCH 02/12] drm/i915/guc: Don't call ring_is_idle in GuC submission John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-18 12:26 ` Tvrtko Ursulin 2022-07-19 0:09 ` John Harrison 2022-07-19 9:49 ` Tvrtko Ursulin 2022-07-19 10:14 ` Tvrtko Ursulin 2022-07-12 23:31 ` [PATCH 03/12] drm/i915/guc: Fix issues with live_preempt_cancel John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-12 23:31 ` [PATCH 04/12] drm/i915/guc: Add GuC <-> kernel time stamp translation information John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-12 23:31 ` [PATCH 05/12] drm/i915/guc: Record CTB info in error logs John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-12 23:31 ` John.C.Harrison [this message] 2022-07-12 23:31 ` [Intel-gfx] [PATCH 06/12] drm/i915/guc: Use streaming loads to speed up dumping the guc log John.C.Harrison 2022-07-22 20:05 ` John Harrison 2022-07-12 23:31 ` [PATCH 07/12] drm/i915/guc: Route semaphores to GuC for Gen12+ John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-13 0:51 ` Matthew Brost 2022-07-13 0:51 ` [Intel-gfx] " Matthew Brost 2022-07-15 17:21 ` Ceraolo Spurio, Daniele 2022-07-15 17:21 ` [Intel-gfx] " Ceraolo Spurio, Daniele 2022-07-12 23:31 ` [PATCH 08/12] drm/i915/guc: Add selftest for a hung GuC John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-12 23:31 ` [PATCH 09/12] drm/i915/selftest: Cope with not having an RCS engine John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-13 0:48 ` Matthew Brost 2022-07-13 0:48 ` [Intel-gfx] " Matthew Brost 2022-07-12 23:31 ` [PATCH 10/12] drm/i915/guc: Support larger contexts on newer hardware John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-18 12:35 ` Tvrtko Ursulin 2022-07-19 0:13 ` John Harrison 2022-07-19 9:56 ` Tvrtko Ursulin 2022-07-22 19:32 ` John Harrison 2022-07-25 11:24 ` Tvrtko Ursulin 2022-07-12 23:31 ` [PATCH 11/12] drm/i915/guc: Don't abort on CTB_UNUSED status John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-18 12:36 ` Tvrtko Ursulin 2022-07-19 0:16 ` John Harrison 2022-07-12 23:31 ` [PATCH 12/12] drm/i915/guc: Add a helper for log buffer size John.C.Harrison 2022-07-12 23:31 ` [Intel-gfx] " John.C.Harrison 2022-07-13 0:46 ` Matthew Brost 2022-07-13 0:46 ` [Intel-gfx] " Matthew Brost 2022-07-13 0:31 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning for Random assortment of (mostly) GuC related patches Patchwork 2022-07-13 20:09 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Random assortment of (mostly) GuC related patches (rev2) Patchwork 2022-07-13 20:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-07-14 1:41 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=20220712233136.1044951-7-John.C.Harrison@Intel.com \ --to=john.c.harrison@intel.com \ --cc=DRI-Devel@Lists.FreeDesktop.Org \ --cc=Intel-GFX@Lists.FreeDesktop.Org \ --cc=chris.p.wilson@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.