From: Matthew Brost <matthew.brost@intel.com> To: John.C.Harrison@Intel.com Cc: IGT-Dev@Lists.FreeDesktop.Org, Intel-GFX@Lists.FreeDesktop.Org Subject: Re: [Intel-gfx] [igt-dev] [PATCH v3 i-g-t 13/15] lib/i915: Add helper for non-destructive engine property updates Date: Thu, 13 Jan 2022 14:33:49 -0800 [thread overview] Message-ID: <20220113223349.GA17845@jons-linux-dev-box> (raw) In-Reply-To: <20220113195947.1536897-14-John.C.Harrison@Intel.com> On Thu, Jan 13, 2022 at 11:59:45AM -0800, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Various tests want to configure engine properties such as pre-emption > timeout and heartbeat interval. Some don't bother to restore the > original values again afterwards. So, add a helper to make it easier > to do this. > > v2: Fix for platforms with no pre-emption capability. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> > --- > lib/i915/gem_engine_topology.c | 46 ++++++++++++++++++++++++++++++++++ > lib/i915/gem_engine_topology.h | 9 +++++++ > 2 files changed, 55 insertions(+) > > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c > index 729f42b0a..bd12d0bc9 100644 > --- a/lib/i915/gem_engine_topology.c > +++ b/lib/i915/gem_engine_topology.c > @@ -488,6 +488,52 @@ int gem_engine_property_printf(int i915, const char *engine, const char *attr, > return ret; > } > > +/* Ensure fast hang detection */ > +void gem_engine_properties_configure(int fd, struct gem_engine_properties *params) > +{ > + int ret; > + struct gem_engine_properties write = *params; > + > + ret = gem_engine_property_scanf(fd, write.engine->name, > + "heartbeat_interval_ms", > + "%d", ¶ms->heartbeat_interval); > + igt_assert_eq(ret, 1); > + > + ret = gem_engine_property_printf(fd, write.engine->name, > + "heartbeat_interval_ms", "%d", > + write.heartbeat_interval); > + igt_assert_lt(0, ret); > + > + if (gem_scheduler_has_preemption(fd)) { > + ret = gem_engine_property_scanf(fd, write.engine->name, > + "preempt_timeout_ms", > + "%d", ¶ms->preempt_timeout); > + igt_assert_eq(ret, 1); > + > + ret = gem_engine_property_printf(fd, write.engine->name, > + "preempt_timeout_ms", "%d", > + write.preempt_timeout); > + igt_assert_lt(0, ret); > + } > +} > + > +void gem_engine_properties_restore(int fd, const struct gem_engine_properties *saved) > +{ > + int ret; > + > + ret = gem_engine_property_printf(fd, saved->engine->name, > + "heartbeat_interval_ms", "%d", > + saved->heartbeat_interval); > + igt_assert_lt(0, ret); > + > + if (gem_scheduler_has_preemption(fd)) { > + ret = gem_engine_property_printf(fd, saved->engine->name, > + "preempt_timeout_ms", "%d", > + saved->preempt_timeout); > + igt_assert_lt(0, ret); > + } > +} > + > uint32_t gem_engine_mmio_base(int i915, const char *engine) > { > unsigned int mmio = 0; > diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h > index 4cfab560b..b413aa8ab 100644 > --- a/lib/i915/gem_engine_topology.h > +++ b/lib/i915/gem_engine_topology.h > @@ -115,6 +115,15 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags); > ((e__) = intel_get_current_physical_engine(&i__##e__)); \ > intel_next_engine(&i__##e__)) > > +struct gem_engine_properties { > + const struct intel_execution_engine2 *engine; > + int preempt_timeout; > + int heartbeat_interval; > +}; > + > +void gem_engine_properties_configure(int fd, struct gem_engine_properties *params); > +void gem_engine_properties_restore(int fd, const struct gem_engine_properties *saved); > + > __attribute__((format(scanf, 4, 5))) > int gem_engine_property_scanf(int i915, const char *engine, const char *attr, > const char *fmt, ...); > -- > 2.25.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com> To: John.C.Harrison@Intel.com Cc: IGT-Dev@Lists.FreeDesktop.Org, Intel-GFX@Lists.FreeDesktop.Org Subject: Re: [igt-dev] [PATCH v3 i-g-t 13/15] lib/i915: Add helper for non-destructive engine property updates Date: Thu, 13 Jan 2022 14:33:49 -0800 [thread overview] Message-ID: <20220113223349.GA17845@jons-linux-dev-box> (raw) In-Reply-To: <20220113195947.1536897-14-John.C.Harrison@Intel.com> On Thu, Jan 13, 2022 at 11:59:45AM -0800, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Various tests want to configure engine properties such as pre-emption > timeout and heartbeat interval. Some don't bother to restore the > original values again afterwards. So, add a helper to make it easier > to do this. > > v2: Fix for platforms with no pre-emption capability. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> > --- > lib/i915/gem_engine_topology.c | 46 ++++++++++++++++++++++++++++++++++ > lib/i915/gem_engine_topology.h | 9 +++++++ > 2 files changed, 55 insertions(+) > > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c > index 729f42b0a..bd12d0bc9 100644 > --- a/lib/i915/gem_engine_topology.c > +++ b/lib/i915/gem_engine_topology.c > @@ -488,6 +488,52 @@ int gem_engine_property_printf(int i915, const char *engine, const char *attr, > return ret; > } > > +/* Ensure fast hang detection */ > +void gem_engine_properties_configure(int fd, struct gem_engine_properties *params) > +{ > + int ret; > + struct gem_engine_properties write = *params; > + > + ret = gem_engine_property_scanf(fd, write.engine->name, > + "heartbeat_interval_ms", > + "%d", ¶ms->heartbeat_interval); > + igt_assert_eq(ret, 1); > + > + ret = gem_engine_property_printf(fd, write.engine->name, > + "heartbeat_interval_ms", "%d", > + write.heartbeat_interval); > + igt_assert_lt(0, ret); > + > + if (gem_scheduler_has_preemption(fd)) { > + ret = gem_engine_property_scanf(fd, write.engine->name, > + "preempt_timeout_ms", > + "%d", ¶ms->preempt_timeout); > + igt_assert_eq(ret, 1); > + > + ret = gem_engine_property_printf(fd, write.engine->name, > + "preempt_timeout_ms", "%d", > + write.preempt_timeout); > + igt_assert_lt(0, ret); > + } > +} > + > +void gem_engine_properties_restore(int fd, const struct gem_engine_properties *saved) > +{ > + int ret; > + > + ret = gem_engine_property_printf(fd, saved->engine->name, > + "heartbeat_interval_ms", "%d", > + saved->heartbeat_interval); > + igt_assert_lt(0, ret); > + > + if (gem_scheduler_has_preemption(fd)) { > + ret = gem_engine_property_printf(fd, saved->engine->name, > + "preempt_timeout_ms", "%d", > + saved->preempt_timeout); > + igt_assert_lt(0, ret); > + } > +} > + > uint32_t gem_engine_mmio_base(int i915, const char *engine) > { > unsigned int mmio = 0; > diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h > index 4cfab560b..b413aa8ab 100644 > --- a/lib/i915/gem_engine_topology.h > +++ b/lib/i915/gem_engine_topology.h > @@ -115,6 +115,15 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags); > ((e__) = intel_get_current_physical_engine(&i__##e__)); \ > intel_next_engine(&i__##e__)) > > +struct gem_engine_properties { > + const struct intel_execution_engine2 *engine; > + int preempt_timeout; > + int heartbeat_interval; > +}; > + > +void gem_engine_properties_configure(int fd, struct gem_engine_properties *params); > +void gem_engine_properties_restore(int fd, const struct gem_engine_properties *saved); > + > __attribute__((format(scanf, 4, 5))) > int gem_engine_property_scanf(int i915, const char *engine, const char *attr, > const char *fmt, ...); > -- > 2.25.1 >
next prev parent reply other threads:[~2022-01-13 22:39 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-13 19:59 [Intel-gfx] [PATCH v3 i-g-t 00/15] Fixes for i915_hangman and gem_exec_capture John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 01/15] tests/i915/i915_hangman: Add descriptions John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 02/15] lib/hang: Fix igt_require_hang_ring to work with all engines John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 03/15] tests/i915/i915_hangman: Update capture test to use engine structure John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 19:58 ` [Intel-gfx] " Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 04/15] tests/i915/i915_hangman: Explicitly test per engine reset vs full GPU reset John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 05/15] tests/i915/i915_hangman: Add uevent test & fix detector John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 06/15] tests/i915/i915_hangman: Use the correct context in hangcheck_unterminated John.C.Harrison 2022-01-13 20:00 ` Matthew Brost 2022-01-13 20:00 ` [igt-dev] " Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 07/15] lib/store: Refactor common store code into helper function John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 20:10 ` [Intel-gfx] " Matthew Brost 2022-01-13 20:27 ` John Harrison 2022-01-13 20:27 ` John Harrison 2022-01-13 20:23 ` [Intel-gfx] " Matthew Brost 2022-01-13 20:23 ` Matthew Brost 2022-01-13 20:40 ` [Intel-gfx] " John Harrison 2022-01-13 20:40 ` John Harrison 2022-01-13 20:50 ` [Intel-gfx] [PATCH i-g-t] " John.C.Harrison 2022-01-13 20:50 ` [igt-dev] " John.C.Harrison 2022-01-13 20:53 ` [Intel-gfx] " Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 08/15] tests/i915/i915_hangman: Add alive-ness test after error capture John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 20:18 ` [Intel-gfx] " Matthew Brost 2022-01-13 20:18 ` [igt-dev] " Matthew Brost 2022-01-13 23:24 ` [Intel-gfx] [PATCH i-g-t] " John.C.Harrison 2022-01-13 23:24 ` [igt-dev] " John.C.Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 09/15] tests/i915/i915_hangman: Remove reliance on context persistance John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 20:30 ` [Intel-gfx] " Matthew Brost 2022-01-13 20:30 ` Matthew Brost 2022-01-13 20:42 ` [Intel-gfx] " John Harrison 2022-01-13 20:38 ` Matthew Brost 2022-01-13 20:38 ` Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 10/15] tests/i915/i915_hangman: Run background task on all engines John.C.Harrison 2022-01-13 20:48 ` Matthew Brost 2022-01-13 20:48 ` [igt-dev] " Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 11/15] tests/i915/i915_hangman: Don't let background contexts cause a ban John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 21:01 ` [Intel-gfx] " Matthew Brost 2022-01-13 21:01 ` Matthew Brost 2022-01-13 21:19 ` [Intel-gfx] " John Harrison 2022-01-13 21:19 ` John Harrison 2022-01-13 21:26 ` [Intel-gfx] [PATCH i-g-t] " John.C.Harrison 2022-01-13 22:30 ` Matthew Brost 2022-01-13 22:30 ` [igt-dev] " Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 12/15] tests/i915/gem_exec_fence: Configure correct context John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 21:06 ` [Intel-gfx] " Matthew Brost 2022-01-13 21:23 ` John Harrison 2022-01-13 21:23 ` John Harrison 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 13/15] lib/i915: Add helper for non-destructive engine property updates John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 22:33 ` Matthew Brost [this message] 2022-01-13 22:33 ` Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 14/15] tests/i915/i915_hangman: Configure engine properties for quicker hangs John.C.Harrison 2022-01-13 22:38 ` Matthew Brost 2022-01-13 19:59 ` [Intel-gfx] [PATCH v3 i-g-t 15/15] tests/i915/gem_exec_capture: Restore engines John.C.Harrison 2022-01-13 19:59 ` [igt-dev] " John.C.Harrison 2022-01-13 23:04 ` [Intel-gfx] " Matthew Brost 2022-01-13 23:04 ` Matthew Brost 2022-01-13 22:23 ` [igt-dev] ✗ Fi.CI.BAT: failure for Fixes for i915_hangman and gem_exec_capture (rev6) Patchwork 2022-01-13 22:53 ` Matthew Brost 2022-01-13 23:15 ` John Harrison 2022-01-13 23:25 ` [igt-dev] ✗ Fi.CI.BUILD: failure for Fixes for i915_hangman and gem_exec_capture (rev7) 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=20220113223349.GA17845@jons-linux-dev-box \ --to=matthew.brost@intel.com \ --cc=IGT-Dev@Lists.FreeDesktop.Org \ --cc=Intel-GFX@Lists.FreeDesktop.Org \ --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: 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.