From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel-gfx@lists.freedesktop.org,
Matthew Auld <matthew.auld@intel.com>,
dri-devel@lists.freedesktop.org,
Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: Re: [PATCH 5/7] drm/i915: Request watchdog infrastructure
Date: Fri, 26 Mar 2021 10:32:06 +0000 [thread overview]
Message-ID: <b5c1b7d8-af8b-a219-8faa-da1c69275800@linux.intel.com> (raw)
In-Reply-To: <YF0kCsX0INuCSBat@phenom.ffwll.local>
On 26/03/2021 00:00, Daniel Vetter wrote:
> On Wed, Mar 24, 2021 at 12:13:33PM +0000, Tvrtko Ursulin wrote:
[snip]
>> +static enum hrtimer_restart __rq_watchdog_expired(struct hrtimer *hrtimer)
>> +{
>> + struct i915_request *rq =
>> + container_of(hrtimer, struct i915_request, watchdog.timer);
>> + struct intel_gt *gt = rq->engine->gt;
>> +
>> + if (!i915_request_completed(rq)) {
>> + if (llist_add(&rq->watchdog.link, >->watchdog.list))
>> + schedule_work(>->watchdog.work);
>> + } else {
>> + i915_request_put(rq);
>> + }
>> +
>> + return HRTIMER_NORESTART;
>> +}
>> +
>> +static void __rq_arm_watchdog(struct i915_request *rq)
>> +{
>> + struct i915_request_watchdog *wdg = &rq->watchdog;
>> + struct intel_context *ce = rq->context;
>> +
>> + if (!ce->watchdog.timeout_us)
>> + return;
>> +
>> + hrtimer_init(&wdg->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
>> + wdg->timer.function = __rq_watchdog_expired;
>> + hrtimer_start_range_ns(&wdg->timer,
>> + ns_to_ktime(ce->watchdog.timeout_us *
>> + NSEC_PER_USEC),
>> + NSEC_PER_MSEC,
>> + HRTIMER_MODE_REL);
>> + i915_request_get(rq);
>
> Shouldn't we grab the new reference before we arm the timer? Either way
> since fairly academic I went ahead and applied, but if you agree pls do a
> follow up patch.
Absolutely true.. my bad.
Regards,
Tvrtko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel-gfx@lists.freedesktop.org,
Matthew Auld <matthew.auld@intel.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 5/7] drm/i915: Request watchdog infrastructure
Date: Fri, 26 Mar 2021 10:32:06 +0000 [thread overview]
Message-ID: <b5c1b7d8-af8b-a219-8faa-da1c69275800@linux.intel.com> (raw)
In-Reply-To: <YF0kCsX0INuCSBat@phenom.ffwll.local>
On 26/03/2021 00:00, Daniel Vetter wrote:
> On Wed, Mar 24, 2021 at 12:13:33PM +0000, Tvrtko Ursulin wrote:
[snip]
>> +static enum hrtimer_restart __rq_watchdog_expired(struct hrtimer *hrtimer)
>> +{
>> + struct i915_request *rq =
>> + container_of(hrtimer, struct i915_request, watchdog.timer);
>> + struct intel_gt *gt = rq->engine->gt;
>> +
>> + if (!i915_request_completed(rq)) {
>> + if (llist_add(&rq->watchdog.link, >->watchdog.list))
>> + schedule_work(>->watchdog.work);
>> + } else {
>> + i915_request_put(rq);
>> + }
>> +
>> + return HRTIMER_NORESTART;
>> +}
>> +
>> +static void __rq_arm_watchdog(struct i915_request *rq)
>> +{
>> + struct i915_request_watchdog *wdg = &rq->watchdog;
>> + struct intel_context *ce = rq->context;
>> +
>> + if (!ce->watchdog.timeout_us)
>> + return;
>> +
>> + hrtimer_init(&wdg->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
>> + wdg->timer.function = __rq_watchdog_expired;
>> + hrtimer_start_range_ns(&wdg->timer,
>> + ns_to_ktime(ce->watchdog.timeout_us *
>> + NSEC_PER_USEC),
>> + NSEC_PER_MSEC,
>> + HRTIMER_MODE_REL);
>> + i915_request_get(rq);
>
> Shouldn't we grab the new reference before we arm the timer? Either way
> since fairly academic I went ahead and applied, but if you agree pls do a
> follow up patch.
Absolutely true.. my bad.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-03-26 10:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 12:13 [PATCH v4 0/7] Default request/fence expiry + watchdog Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 12:13 ` [PATCH 1/7] drm/i915: Extract active lookup engine to a helper Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 12:21 ` Matthew Auld
2021-03-24 12:21 ` Matthew Auld
2021-03-24 12:13 ` [PATCH 2/7] drm/i915: Individual request cancellation Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 15:24 ` Matthew Auld
2021-03-24 15:24 ` Matthew Auld
2021-03-24 12:13 ` [PATCH 3/7] drm/i915: Restrict sentinel requests further Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 15:25 ` Matthew Auld
2021-03-24 15:25 ` [Intel-gfx] " Matthew Auld
2021-03-26 0:01 ` Daniel Vetter
2021-03-26 0:01 ` Daniel Vetter
2021-03-24 12:13 ` [PATCH 4/7] drm/i915: Handle async cancellation in sentinel assert Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 17:22 ` Matthew Auld
2021-03-24 17:22 ` Matthew Auld
2021-03-24 12:13 ` [PATCH 5/7] drm/i915: Request watchdog infrastructure Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-26 0:00 ` Daniel Vetter
2021-03-26 0:00 ` [Intel-gfx] " Daniel Vetter
2021-03-26 10:32 ` Tvrtko Ursulin [this message]
2021-03-26 10:32 ` Tvrtko Ursulin
2021-03-24 12:13 ` [PATCH 6/7] drm/i915: Fail too long user submissions by default Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-24 12:13 ` [PATCH 7/7] drm/i915: Allow configuring default request expiry via modparam Tvrtko Ursulin
2021-03-24 12:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-03-26 0:25 ` Daniel Vetter
2021-03-26 0:25 ` [Intel-gfx] " Daniel Vetter
2021-03-24 13:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Default request/fence expiry + watchdog (rev5) Patchwork
2021-03-24 13:21 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-03-24 13:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-24 23:29 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-03-26 9:10 ` [Intel-gfx] [PATCH v4 0/7] Default request/fence expiry + watchdog Daniel Vetter
2021-03-26 9:10 ` Daniel Vetter
2021-03-26 10:31 ` Tvrtko Ursulin
2021-03-26 10:31 ` Tvrtko Ursulin
2021-04-08 10:18 ` Daniel Vetter
2021-04-08 10:18 ` Daniel Vetter
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=b5c1b7d8-af8b-a219-8faa-da1c69275800@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
--cc=tvrtko.ursulin@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 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.