From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Subject: [PATCH 11/11] drm/i915/gem: Honour O_NONBLOCK before throttling execbuf submissions Date: Thu, 24 Oct 2019 12:40:28 +0100 [thread overview] Message-ID: <20191024114028.6170-12-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20191024114028.6170-1-chris@chris-wilson.co.uk> Check the user's flags on the struct file before deciding whether or not to stall before submitting a request. This allows us to reasonably cheaply honour O_NONBLOCK without checking at more critical phases during request submission. Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e4f5c269150a..c88948e4094b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2193,15 +2193,22 @@ static int __eb_pin_engine(struct i915_execbuffer *eb, struct intel_context *ce) intel_context_timeline_unlock(tl); if (rq) { - if (i915_request_wait(rq, - I915_WAIT_INTERRUPTIBLE, - MAX_SCHEDULE_TIMEOUT) < 0) { - i915_request_put(rq); - err = -EINTR; - goto err_exit; - } + bool nonblock = eb->file->filp->f_flags & O_NONBLOCK; + long timeout; + + timeout = MAX_SCHEDULE_TIMEOUT; + if (nonblock) + timeout = 0; + timeout = i915_request_wait(rq, + I915_WAIT_INTERRUPTIBLE, + timeout); i915_request_put(rq); + + if (timeout < 0) { + err = nonblock ? -EWOULDBLOCK : timeout; + goto err_exit; + } } eb->engine = ce->engine; -- 2.24.0.rc0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 11/11] drm/i915/gem: Honour O_NONBLOCK before throttling execbuf submissions Date: Thu, 24 Oct 2019 12:40:28 +0100 [thread overview] Message-ID: <20191024114028.6170-12-chris@chris-wilson.co.uk> (raw) Message-ID: <20191024114028.8euTaM-rcgOLb4ZKjShuDAsTtd3t0mhTt31vpS5JZ9w@z> (raw) In-Reply-To: <20191024114028.6170-1-chris@chris-wilson.co.uk> Check the user's flags on the struct file before deciding whether or not to stall before submitting a request. This allows us to reasonably cheaply honour O_NONBLOCK without checking at more critical phases during request submission. Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e4f5c269150a..c88948e4094b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2193,15 +2193,22 @@ static int __eb_pin_engine(struct i915_execbuffer *eb, struct intel_context *ce) intel_context_timeline_unlock(tl); if (rq) { - if (i915_request_wait(rq, - I915_WAIT_INTERRUPTIBLE, - MAX_SCHEDULE_TIMEOUT) < 0) { - i915_request_put(rq); - err = -EINTR; - goto err_exit; - } + bool nonblock = eb->file->filp->f_flags & O_NONBLOCK; + long timeout; + + timeout = MAX_SCHEDULE_TIMEOUT; + if (nonblock) + timeout = 0; + timeout = i915_request_wait(rq, + I915_WAIT_INTERRUPTIBLE, + timeout); i915_request_put(rq); + + if (timeout < 0) { + err = nonblock ? -EWOULDBLOCK : timeout; + goto err_exit; + } } eb->engine = ce->engine; -- 2.24.0.rc0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-10-24 11:40 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-24 11:40 CI testing of persistence and sysfs Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 01/11] drm/i915/gem: Make context persistence optional Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-25 9:10 ` Joonas Lahtinen 2019-10-25 9:10 ` [Intel-gfx] " Joonas Lahtinen 2019-10-25 18:22 ` Jason Ekstrand 2019-10-25 18:22 ` [Intel-gfx] " Jason Ekstrand 2019-10-25 21:29 ` Chris Wilson 2019-10-25 21:29 ` [Intel-gfx] " Chris Wilson 2019-10-29 16:19 ` Jason Ekstrand 2019-10-29 16:19 ` [Intel-gfx] " Jason Ekstrand 2019-10-29 18:02 ` Chris Wilson 2019-10-29 18:02 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 02/11] drm/i915: Put future HW and their uAPIs under STAGING & BROKEN Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 23:25 ` David Airlie 2019-10-24 23:25 ` [Intel-gfx] " David Airlie 2019-10-24 23:35 ` Rodrigo Vivi 2019-10-24 23:35 ` [Intel-gfx] " Rodrigo Vivi 2019-10-25 7:09 ` Jani Nikula 2019-10-25 7:09 ` [Intel-gfx] " Jani Nikula 2019-10-24 11:40 ` [PATCH 03/11] drm/i915/gt: Expose engine properties via sysfs Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 04/11] drm/i915/gt: Expose engine->mmio_base " Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 05/11] drm/i915/gt: Expose timeslice duration to sysfs Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 06/11] drm/i915/gt: Expose reset stop timeout via sysfs Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 07/11] drm/i915/gt: Expose preempt reset " Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 08/11] drm/i915/gt: Expose heartbeat interval " Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 09/11] drm/i915: Flush idle barriers when waiting Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` [PATCH 10/11] drm/i915: Allow userspace to specify ringsize on construction Chris Wilson 2019-10-24 11:40 ` [Intel-gfx] " Chris Wilson 2019-10-24 11:40 ` Chris Wilson [this message] 2019-10-24 11:40 ` [Intel-gfx] [PATCH 11/11] drm/i915/gem: Honour O_NONBLOCK before throttling execbuf submissions Chris Wilson
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=20191024114028.6170-12-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --cc=intel-gfx@lists.freedesktop.org \ /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.