Clean up GuC CI failures, simplify locking, and kernel DOC
Subsystems (2)
cover Clean up GuC CI failures, simplify locking, and kernel DOC
Daniel Vetter pointed out that locking in the GuC submission code was overly complicated, let's clean this up a bit before introducing more features in the GuC submission backend.
Also fix some CI failures, port fixes from our internal tree, and add a few more selftests for coverage.
Lastly, add some kernel DOC explaining how the GuC submission backend works.
Matthew Brost (21):
drm/i915/guc: Fix blocked context accounting
drm/i915/guc: outstanding G2H accounting
drm/i915/guc: Unwind context requests in reverse order drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context drm/i915/guc: Workaround reset G2H is received after schedule done G2H drm/i915/selftests: Add a cancel request selftest that triggers a
reset
drm/i915/guc: Don't enable scheduling on a banned context, guc_id
invalid, not registered
drm/i915/selftests: Fix memory corruption in live_lrc_isolation drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H drm/i915/guc: Take context ref when cancelling request drm/i915/guc: Don't touch guc_state.sched_state without a lock drm/i915/guc: Reset LRC descriptor if register returns -ENODEV drm/i915: Allocate error capture in atomic context drm/i915/guc: Flush G2H work queue during reset drm/i915/guc: Release submit fence from an IRQ drm/i915/guc: Move guc_blocked fence to struct guc_state drm/i915/guc: Rework and simplify locking
drm/i915/guc: Proper xarray usage for contexts_lookup drm/i915/guc: Drop pin count check trick between sched_disable and
re-pin
drm/i915/guc: Move GuC priority fields in context under guc_active drm/i915/guc: Add GuC kernel doc
drivers/gpu/drm/i915/gt/intel_context.c | 5 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 68 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 29 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 19 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 688 +++++++++++------- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 126 ++++ drivers/gpu/drm/i915/i915_gpu_error.c | 37 +- drivers/gpu/drm/i915/i915_request.h | 23 +- drivers/gpu/drm/i915/i915_trace.h | 8 +- .../drm/i915/selftests/i915_live_selftests.h | 1 + drivers/gpu/drm/i915/selftests/i915_request.c | 94 +++ .../i915/selftests/intel_scheduler_helpers.c | 12 + .../i915/selftests/intel_scheduler_helpers.h | 2 + 13 files changed, 805 insertions(+), 307 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c
Signature · 1 line
2.32.0
PATCH 1/21 drm/i915/guc: Fix blocked context accounting
Prior to this patch the blocked context counter was cleared on init_sched_state (used during registering a context & resets) which is incorrect. This state needs to be persistent or the counter can read the incorrect value resulting in scheduling never getting enabled again.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -152,7 +152,7 @@ static inline void init_sched_state(struct intel_context *ce) {/* Only should be called from guc_lrc_desc_pin() */ atomic_set (&ce->guc_sched_state_no_lock,0 ); - ce->guc_state.sched_state =0 ; + ce->guc_state.sched_state &=SCHED_STATE_BLOCKED_MASK ; } static inline bool
Signature · 1 line
2.32.0
PATCH 2/21 drm/i915/guc: outstanding G2H accounting
In reply to Matthew BrostA small race that could result in incorrect accounting of the number of outstanding G2H. Basically prior to this patch we did not increment the number of outstanding G2H if we encoutered a GT reset while sending a H2G. This was incorrect as the context state had already been updated to anticipate a G2H response thus the counter should be incremented.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +5 -3
@@ -360,11 +360,13 @@ static int guc_submission_send_busy_loop(struct intel_guc *guc, {int err; - err =intel_guc_send_busy_loop (guc, action, len, g2h_len_dw, loop); - -if (!err && g2h_len_dw) +if (g2h_len_dw)atomic_inc (&guc->outstanding_submission_g2h); + err =intel_guc_send_busy_loop (guc, action, len, g2h_len_dw, loop); +if (err == -EBUSY && g2h_len_dw) +atomic_dec (&guc->outstanding_submission_g2h); +return err; }
Signature · 1 line
2.32.0
PATCH 3/21 drm/i915/guc: Unwind context requests in reverse order
In reply to Matthew BrostWhen unwinding requests on a reset context, if other requests in the context are in the priority list the requests could be resubmitted out of seqno order. Traverse the list of active requests in reverse and append to the head of the priority list to fix this.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4 -4
@@ -799,9 +799,9 @@ __unwind_incomplete_requests(struct intel_context *ce)spin_lock_irqsave (&sched_engine->lock, flags);spin_lock (&ce->guc_active.lock); -list_for_each_entry_safe (rq, rn, - &ce->guc_active.requests, - sched.link) { +list_for_each_entry_safe_reverse (rq, rn, + &ce->guc_active.requests, + sched.link) {if (i915_request_completed (rq))continue ;
@@ -818,7 +818,7 @@ __unwind_incomplete_requests(struct intel_context *ce) }GEM_BUG_ON (i915_sched_engine_is_empty (sched_engine)); -list_add_tail (&rq->sched.link, pl); +list_add (&rq->sched.link, pl);set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags);spin_lock (&ce->guc_active.lock);
Signature · 1 line
2.32.0
PATCH 4/21 drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context
In reply to Matthew BrostDon't drop ce->guc_active.lock when unwinding a context after reset. At one point we had to drop this because of a lock inversion but that is no longer the case. It is much safer to hold the lock so let's do that.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +0 -4
@@ -806,8 +806,6 @@ __unwind_incomplete_requests(struct intel_context *ce)continue ;list_del_init (&rq->sched.link); -spin_unlock (&ce->guc_active.lock); -__i915_request_unsubmit (rq);/* Push the request back into the queue for later resubmission. */
@@ -820,8 +818,6 @@ __unwind_incomplete_requests(struct intel_context *ce)list_add (&rq->sched.link, pl);set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags); - -spin_lock (&ce->guc_active.lock); }spin_unlock (&ce->guc_active.lock);spin_unlock_irqrestore (&sched_engine->lock, flags);
Signature · 1 line
2.32.0
PATCH 5/21 drm/i915/guc: Workaround reset G2H is received after schedule done G2H
In reply to Matthew BrostIf the context is reset as a result of the request cancelation the context reset G2H is received after schedule disable done G2H which is likely the wrong order. The schedule disable done G2H release the waiting request cancelation code which resubmits the context. This races with the context reset G2H which also wants to resubmit the context but in this case it really should be a NOP as request cancelation code owns the resubmit. Use some clever tricks of checking the context state to seal this race until if / when the GuC firmware is fixed.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +36 -6
@@ -826,17 +826,34 @@ __unwind_incomplete_requests(struct intel_context *ce)static void __guc_reset_context (struct intel_context *ce,bool stalled) {struct i915_request *rq; +unsigned long flags;u32 head; +bool skip = false;intel_context_get (ce);/* -* GuC will implicitly mark the context as non-schedulable -* when it sends the reset notification. Make sure our state -* reflects this change. The context will be marked enabled -* on resubmission. +* GuC will implicitly mark the context as non-schedulable when it sends +* the reset notification. Make sure our state reflects this change. The +* context will be marked enabled on resubmission. +* +* XXX: If the context is reset as a result of the request cancelation +* this G2H is received after the schedule disable complete G2H which is +* likely wrong as this creates a race between the request cancelation +* code re-submitting the context and this G2H handler. This likely +* should be fixed in the GuC but until if / when that gets fixed we +* need to workaround this. Convert this function to a NOP if a pending +* enable is in flight as this indicates that a request cancelation has +* occured. */ -clr_context_enabled (ce); +spin_lock_irqsave (&ce->guc_state.lock, flags); +if (unlikely (!context_pending_enable (ce))) { +clr_context_enabled (ce); + skip = true; + } +spin_unlock_irqrestore (&ce->guc_state.lock, flags); +if (unlikely (skip)) + goto out_put; rq =intel_context_find_active_request (ce);if (!rq) {
@@ -855,6 +872,7 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled) out_replay:guc_reset_state (ce, head, stalled);__unwind_incomplete_requests (ce); +out_put:intel_context_put (ce); }
@@ -1599,6 +1617,13 @@ static void guc_context_cancel_request(struct intel_context *ce,guc_reset_state (ce,intel_ring_wrap (ce->ring, rq->head), true); } + +/* +* XXX: Racey if context is reset, see comment in +* __guc_reset_context(). +*/ +flush_work (&ce_to_guc (ce)->ct.requests.worker); +guc_context_unblock (ce); } }
@@ -2719,7 +2744,12 @@ static void guc_handle_context_reset(struct intel_guc *guc, {trace_intel_context_reset (ce); -if (likely (!intel_context_is_banned (ce))) { +/* +* XXX: Racey if request cancelation has occurred, see comment in +* __guc_reset_context(). +*/ +if (likely (!intel_context_is_banned (ce) && + !context_blocked (ce))) {capture_error_state (guc, ce);guc_context_replay (ce); }
Signature · 1 line
2.32.0
PATCH 6/21 drm/i915/selftests: Add a cancel request selftest that triggers a reset
In reply to Matthew BrostAdd a cancel request selftest that results in an engine reset to cancel the request as it is non-preemptable. Also insert a NOP request after the cancelled request and confirm that it completely successfully.
--- drivers/gpu/drm/i915/selftests/i915_request.c | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+)
drivers/gpu/drm/i915/selftests/i915_request.c +94 -0
@@ -772,6 +772,98 @@ static int __cancel_completed(struct intel_engine_cs *engine)return err; } +static int __cancel_reset (struct intel_engine_cs *engine) +{ +struct intel_context *ce; +struct igt_spinner spin; +struct i915_request *rq, *nop; +unsigned long preempt_timeout_ms; +int err =0 ; + + preempt_timeout_ms = engine->props.preempt_timeout_ms; + engine->props.preempt_timeout_ms =100 ; + +if (igt_spinner_init (&spin, engine->gt)) + goto out_restore; + + ce =intel_context_create (engine); +if (IS_ERR (ce)) { + err =PTR_ERR (ce); + goto out_spin; + } + + rq =igt_spinner_create_request (&spin, ce,MI_NOOP ); +if (IS_ERR (rq)) { + err =PTR_ERR (rq); + goto out_ce; + } + +pr_debug ("%s: Cancelling active request\n" , engine->name); +i915_request_get (rq); +i915_request_add (rq); +if (!igt_wait_for_spinner (&spin, rq)) { +struct drm_printer p =drm_info_printer (engine->i915->drm.dev); + +pr_err ("Failed to start spinner on %s\n" , engine->name); +intel_engine_dump (engine, &p,"%s\n" , engine->name); + err = -ETIME ; + goto out_rq; + } + + nop =intel_context_create_request (ce); +if (IS_ERR (nop)) + goto out_nop; +i915_request_get (nop); +i915_request_add (nop); + +i915_request_cancel (rq, -EINTR ); + +if (i915_request_wait (rq,0 ,HZ ) <0 ) { +struct drm_printer p =drm_info_printer (engine->i915->drm.dev); + +pr_err ("%s: Failed to cancel hung request\n" , engine->name); +intel_engine_dump (engine, &p,"%s\n" , engine->name); + err = -ETIME ; + goto out_nop; + } + +if (rq->fence.error != -EINTR ) { +pr_err ("%s: fence not cancelled (%u)\n" , + engine->name, rq->fence.error); + err = -EINVAL ; + goto out_nop; + } + +if (i915_request_wait (nop,0 ,HZ ) <0 ) { +struct drm_printer p =drm_info_printer (engine->i915->drm.dev); + +pr_err ("%s: Failed to complete nop request\n" , engine->name); +intel_engine_dump (engine, &p,"%s\n" , engine->name); + err = -ETIME ; + goto out_nop; + } + +if (nop->fence.error !=0 ) { +pr_err ("%s: Nop request errored (%u)\n" , + engine->name, nop->fence.error); + err = -EINVAL ; + } + +out_nop: +i915_request_put (nop); +out_rq: +i915_request_put (rq); +out_ce: +intel_context_put (ce); +out_spin: +igt_spinner_fini (&spin); +out_restore: + engine->props.preempt_timeout_ms = preempt_timeout_ms; +if (err) +pr_err ("%s: %s error %d\n" , __func__, engine->name, err); +return err; +} +static int live_cancel_request (void *arg) {struct drm_i915_private *i915 = arg;
@@ -798,6 +890,8 @@ static int live_cancel_request(void *arg) err =__cancel_active (engine);if (err ==0 ) err =__cancel_completed (engine); +if (err ==0 ) + err =__cancel_reset (engine); err2 =igt_live_test_end (&t);if (err)
Signature · 1 line
2.32.0
PATCH 7/21 drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered
In reply to Matthew BrostWhen unblocking a context, do not enable scheduling if the context is banned, guc_id invalid, or not registered.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3 -0
@@ -1578,6 +1578,9 @@ static void guc_context_unblock(struct intel_context *ce)spin_lock_irqsave (&ce->guc_state.lock, flags);if (unlikely (submission_disabled (guc) || +intel_context_is_banned (ce) || +context_guc_id_invalid (ce) || + !lrc_desc_registered (guc, ce->guc_id) || !intel_context_is_pinned (ce) ||context_pending_disable (ce) ||context_blocked (ce) >1 )) {
Signature · 1 line
2.32.0
PATCH 8/21 drm/i915/selftests: Fix memory corruption in live_lrc_isolation
In reply to Matthew BrostGuC submission has exposed an existing memory corruption in live_lrc_isolation. We believe that some writes to the watchdog offsets in the LRC (0x178 & 0x17c) can result in trashing of portions of the address space. With GuC submission there are additional objects which can move the context redzone into the space that is trashed. To workaround this avoid poisoning the watchdog.
v2:
(Daniel Vetter)
- Add VLK ref in code to workaround
--- drivers/gpu/drm/i915/gt/selftest_lrc.c | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/selftest_lrc.c +28 -1
@@ -1074,6 +1074,32 @@ record_registers(struct intel_context *ce, goto err_after; } +static u32 safe_offset (u32 offset,u32 reg) +{ +/* XXX skip testing of watchdog - VLK-22772 */ +if (offset ==0x178 || offset ==0x17c ) + reg =0 ; + +return reg; +} + +static int get_offset_mask (struct intel_engine_cs *engine) +{ +if (GRAPHICS_VER (engine->i915) <12 ) +return 0xfff ; + +switch (engine->class) { +default : +case RENDER_CLASS : +return 0x07ff ; +case COPY_ENGINE_CLASS : +return 0x0fff ; +case VIDEO_DECODE_CLASS : +case VIDEO_ENHANCEMENT_CLASS : +return 0x3fff ; + } +} +static struct i915_vma *load_context (struct intel_context *ce,u32 poison) {struct i915_vma *batch;
@@ -1117,7 +1143,8 @@ static struct i915_vma *load_context(struct intel_context *ce, u32 poison) len = (len +1 ) /2 ; *cs++ =MI_LOAD_REGISTER_IMM (len);while (len--) { - *cs++ = hw[dw]; + *cs++ =safe_offset (hw[dw] &get_offset_mask (ce->engine), + hw[dw]); *cs++ = poison; dw +=2 ; }
Signature · 1 line
2.32.0
PATCH 9/21 drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H
In reply to Matthew BrostWhile debugging an issue with full GT resets I went down a rabbit hole thinking the scrubbing of lost G2H wasn't working correctly. This proved to be incorrect as this was working just fine but this chase inspired me to write a selftest to prove that this works. This simple selftest injects errors dropping various G2H and then issues a full GT reset proving that the scrubbing of these G2H doesn't blow up.
v2:
(Daniel Vetter)
- Use ifdef instead of macros for selftests
--- drivers/gpu/drm/i915/gt/intel_context_types.h | 18 +++ .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 25 ++++ drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 126 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + .../i915/selftests/intel_scheduler_helpers.c | 12 ++ .../i915/selftests/intel_scheduler_helpers.h | 2 + 6 files changed, 184 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c
drivers/gpu/drm/i915/gt/intel_context_types.h +18 -0
@@ -198,6 +198,24 @@ struct intel_context {*/ u8 guc_prio;u32 guc_prio_count[GUC_CLIENT_PRIORITY_NUM ]; + +#ifdef CONFIG_DRM_I915_SELFTEST +/** +* @drop_schedule_enable: Force drop of schedule enable G2H for selftest +*/ +bool drop_schedule_enable; + +/** +* @drop_schedule_disable: Force drop of schedule disable G2H for +* selftest +*/ +bool drop_schedule_disable; + +/** +* @drop_deregister: Force drop of deregister G2H for selftest +*/ +bool drop_deregister; +#endif };#endif /* __INTEL_CONTEXT_TYPES__ */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +25 -0
@@ -2633,6 +2633,13 @@ int intel_guc_deregister_done_process_msg(struct intel_guc *guc,trace_intel_context_deregister_done (ce); +#ifdef CONFIG_DRM_I915_SELFTEST +if (unlikely (ce->drop_deregister)) { + ce->drop_deregister = false; +return 0 ; + } +#endif +if (context_wait_for_deregister_to_register (ce)) {struct intel_runtime_pm *runtime_pm = &ce->engine->gt->i915->runtime_pm;
@@ -2687,10 +2694,24 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc,trace_intel_context_sched_done (ce);if (context_pending_enable (ce)) { +#ifdef CONFIG_DRM_I915_SELFTEST +if (unlikely (ce->drop_schedule_enable)) { + ce->drop_schedule_enable = false; +return 0 ; + } +#endif +clr_context_pending_enable (ce); }else if (context_pending_disable (ce)) {bool banned; +#ifdef CONFIG_DRM_I915_SELFTEST +if (unlikely (ce->drop_schedule_disable)) { + ce->drop_schedule_disable = false; +return 0 ; + } +#endif +/* * Unpin must be done before __guc_signal_context_fence, * otherwise a race exists between the requests getting
@@ -3067,3 +3088,7 @@ bool intel_guc_virtual_engine_has_heartbeat(const struct intel_engine_cs *ve)return false; } + +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST ) +#include "selftest_guc.c" +#endif
drivers/gpu/drm/i915/gt/uc/selftest_guc.c new file +126 -0
126 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
@@ -47,5 +47,6 @@ selftest(execlists, intel_execlists_live_selftests) selftest(ring_submission, intel_ring_submission_live_selftests) selftest(perf, i915_perf_live_selftests) selftest(slpc, intel_slpc_live_selftests) +selftest (guc, intel_guc_live_selftests) /* Here be dragons: keep last to run last! */selftest (late_gt_pm, intel_gt_pm_late_selftests)
drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c +12 -0
@@ -14,6 +14,18 @@#define REDUCED_PREEMPT 10#define WAIT_FOR_RESET_TIME 10000 +struct intel_engine_cs *intel_selftest_find_any_engine (struct intel_gt *gt) +{ +struct intel_engine_cs *engine; +enum intel_engine_id id; + +for_each_engine (engine, gt, id) +return engine; + +pr_err ("No valid engine found!\n" ); +return NULL ; +} +int intel_selftest_modify_policy (struct intel_engine_cs *engine,struct intel_selftest_saved_policy *saved,u32 modify_type)
drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.h +2 -0
@@ -10,6 +10,7 @@struct i915_request ;struct intel_engine_cs ; +struct intel_gt ;struct intel_selftest_saved_policy {u32 flags;
@@ -23,6 +24,7 @@ enum selftest_scheduler_modify { SELFTEST_SCHEDULER_MODIFY_FAST_RESET, }; +struct intel_engine_cs *intel_selftest_find_any_engine (struct intel_gt *gt);int intel_selftest_modify_policy (struct intel_engine_cs *engine,struct intel_selftest_saved_policy *saved,enum selftest_scheduler_modify modify_type);
Signature · 1 line
2.32.0
PATCH 10/21 drm/i915/guc: Take context ref when cancelling request
In reply to Matthew BrostA context can get destroyed after cancelling a request so take a reference to context when cancelling a request.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4 -1
@@ -1612,8 +1612,10 @@ static void guc_context_cancel_request(struct intel_context *ce, struct i915_request *rq) {if (i915_sw_fence_signaled (&rq->submit)) { -struct i915_sw_fence *fence =guc_context_block (ce); +struct i915_sw_fence *fence; +intel_context_get (ce); + fence =guc_context_block (ce);i915_sw_fence_wait (fence);if (!i915_request_completed (rq)) {__i915_request_skip (rq);
@@ -1628,6 +1630,7 @@ static void guc_context_cancel_request(struct intel_context *ce,flush_work (&ce_to_guc (ce)->ct.requests.worker);guc_context_unblock (ce); +intel_context_put (ce); } }
Signature · 1 line
2.32.0
PATCH 11/21 drm/i915/guc: Don't touch guc_state.sched_state without a lock
In reply to Matthew BrostBefore we did some clever tricks to not use the a lock when touching guc_state.sched_state in certain cases. Don't do that, enforce the use of the lock.
Part of this is removing a dead code path from guc_lrc_desc_pin where a context could be deregistered when the aforementioned function was called from the submission path. Remove this dead code and add a GEM_BUG_ON if this path is ever attempted to be used.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +31 -26
@@ -150,11 +150,22 @@ static inline void clr_context_registered(struct intel_context *ce)#define SCHED_STATE_BLOCKED_MASK (0xfff << SCHED_STATE_BLOCKED_SHIFT)static inline void init_sched_state (struct intel_context *ce) { -/* Only should be called from guc_lrc_desc_pin() */ +lockdep_assert_held (&ce->guc_state.lock);atomic_set (&ce->guc_sched_state_no_lock,0 ); ce->guc_state.sched_state &=SCHED_STATE_BLOCKED_MASK ; } +static inline bool sched_state_is_init (struct intel_context *ce) +{ +/* +* XXX: Kernel contexts can have SCHED_STATE_NO_LOCK_REGISTERED after +* suspend. +*/ +return !(atomic_read (&ce->guc_sched_state_no_lock) & + ~SCHED_STATE_NO_LOCK_REGISTERED ) && + !(ce->guc_state.sched_state &= ~SCHED_STATE_BLOCKED_MASK ); +} +static inline bool context_wait_for_deregister_to_register (struct intel_context *ce) {
@@ -165,7 +176,7 @@ context_wait_for_deregister_to_register(struct intel_context *ce)static inline void set_context_wait_for_deregister_to_register (struct intel_context *ce) { -/* Only should be called from guc_lrc_desc_pin() without lock */ +lockdep_assert_held (&ce->guc_state.lock); ce->guc_state.sched_state |=SCHED_STATE_WAIT_FOR_DEREGISTER_TO_REGISTER ; }
@@ -599,9 +610,7 @@ static void scrub_guc_desc_for_outstanding_g2h(struct intel_guc *guc)bool pending_disable, pending_enable, deregister, destroyed, banned;xa_for_each (&guc->context_lookup, index, ce) { -/* Flush context */ spin_lock_irqsave (&ce->guc_state.lock, flags); -spin_unlock_irqrestore (&ce->guc_state.lock, flags);/* * Once we are at this point submission_disabled() is guaranteed
@@ -617,6 +626,8 @@ static void scrub_guc_desc_for_outstanding_g2h(struct intel_guc *guc) banned =context_banned (ce);init_sched_state (ce); +spin_unlock_irqrestore (&ce->guc_state.lock, flags); +if (pending_enable || destroyed || deregister) {atomic_dec (&guc->outstanding_submission_g2h);if (deregister)
@@ -1317,6 +1328,7 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop)int ret =0 ;GEM_BUG_ON (!engine->mask); +GEM_BUG_ON (!sched_state_is_init (ce));/* * Ensure LRC + CT vmas are is same region as write barrier is done
@@ -1345,7 +1357,6 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->priority = ce->guc_prio; desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); -init_sched_state (ce);/* * The context_lookup xarray is used to determine if the hardware
@@ -1356,26 +1367,23 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop)* registering this context. */ if (context_registered) { +bool disabled; +unsigned long flags; +trace_intel_context_steal_guc_id (ce); -if (!loop) { +GEM_BUG_ON (!loop); + +/* Seal race with Reset */ +spin_lock_irqsave (&ce->guc_state.lock, flags); + disabled =submission_disabled (guc); +if (likely (!disabled)) {set_context_wait_for_deregister_to_register (ce);intel_context_get (ce); - }else { -bool disabled; -unsigned long flags; - -/* Seal race with Reset */ -spin_lock_irqsave (&ce->guc_state.lock, flags); - disabled =submission_disabled (guc); -if (likely (!disabled)) { -set_context_wait_for_deregister_to_register (ce); -intel_context_get (ce); - } -spin_unlock_irqrestore (&ce->guc_state.lock, flags); -if (unlikely (disabled)) { -reset_lrc_desc (guc, desc_idx); -return 0 ;/* Will get registered later */ - } + } +spin_unlock_irqrestore (&ce->guc_state.lock, flags); +if (unlikely (disabled)) { +reset_lrc_desc (guc, desc_idx); +return 0 ;/* Will get registered later */ }/*
@@ -1384,10 +1392,7 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop)*/ with_intel_runtime_pm (runtime_pm, wakeref) ret = deregister_context(ce, ce->guc_id, loop); -if (unlikely (ret == -EBUSY )) { -clr_context_wait_for_deregister_to_register (ce); -intel_context_put (ce); - }else if (unlikely (ret == -ENODEV )) { +if (unlikely (ret == -ENODEV )) { ret =0 ;/* Will get registered later */ } }else {
Signature · 1 line
2.32.0
PATCH 12/21 drm/i915/guc: Reset LRC descriptor if register returns -ENODEV
In reply to Matthew BrostReset LRC descriptor if a context register returns -ENODEV as this means we are mid-reset.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4 -2
@@ -1398,10 +1398,12 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) }else {with_intel_runtime_pm (runtime_pm, wakeref) ret = register_context(ce, loop); -if (unlikely (ret == -EBUSY )) +if (unlikely (ret == -EBUSY )) { +reset_lrc_desc (guc, desc_idx); + }else if (unlikely (ret == -ENODEV )) {reset_lrc_desc (guc, desc_idx); -else if (unlikely (ret == -ENODEV )) ret =0 ;/* Will get registered later */ + } }return ret;
Signature · 1 line
2.32.0
PATCH 13/21 drm/i915: Allocate error capture in atomic context
In reply to Matthew BrostError captures can now be done in a work queue processing G2H messages. These messages need to be completely done being processed in the reset path, to avoid races in the missing G2H cleanup, which create a dependency on memory allocations and dma fences (i915_requests). Requests depend on resets, thus now we have a circular dependency. To work around this, allocate the error capture in an atomic context.
--- drivers/gpu/drm/i915/i915_gpu_error.c | 37 +++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +18 -19
@@ -49,7 +49,6 @@#include "i915_memcpy.h" #include "i915_scatterlist.h" -#define ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)#define ATOMIC_MAYFAIL (GFP_ATOMIC | __GFP_NOWARN) static void __sg_set_buf(struct scatterlist *sg,
@@ -79,7 +78,7 @@ static bool __i915_error_grow(struct drm_i915_error_state_buf *e, size_t len)if (e->cur == e->end) {struct scatterlist *sgl; - sgl = (typeof (sgl ))__get_free_page (ALLOW_FAIL ); + sgl = (typeof (sgl ))__get_free_page (ATOMIC_MAYFAIL );if (!sgl) { e->err = -ENOMEM ;return false;
@@ -99,10 +98,10 @@ static bool __i915_error_grow(struct drm_i915_error_state_buf *e, size_t len) } e->size =ALIGN (len +1 ,SZ_64K ); - e->buf =kmalloc (e->size,ALLOW_FAIL ); + e->buf =kmalloc (e->size,ATOMIC_MAYFAIL );if (!e->buf) { e->size =PAGE_ALIGN (len +1 ); - e->buf =kmalloc (e->size,GFP_KERNEL ); + e->buf =kmalloc (e->size,ATOMIC_MAYFAIL ); }if (!e->buf) { e->err = -ENOMEM ;
@@ -243,12 +242,12 @@ static bool compress_init(struct i915_vma_compress *c) {struct z_stream_s *zstream = &c->zstream; -if (pool_init (&c->pool,ALLOW_FAIL )) +if (pool_init (&c->pool,ATOMIC_MAYFAIL ))return false; zstream->workspace =kmalloc (zlib_deflate_workspacesize (MAX_WBITS ,MAX_MEM_LEVEL ), -ALLOW_FAIL ); +ATOMIC_MAYFAIL );if (!zstream->workspace) {pool_fini (&c->pool);return false;
@@ -256,7 +255,7 @@ static bool compress_init(struct i915_vma_compress *c) c->tmp =NULL ;if (i915_has_memcpy_from_wc ()) - c->tmp =pool_alloc (&c->pool,ALLOW_FAIL ); + c->tmp =pool_alloc (&c->pool,ATOMIC_MAYFAIL );return true; }
@@ -280,7 +279,7 @@ static void *compress_next_page(struct i915_vma_compress *c,if (dst->page_count >= dst->num_pages)return ERR_PTR (-ENOSPC ); - page =pool_alloc (&c->pool,ALLOW_FAIL ); + page =pool_alloc (&c->pool,ATOMIC_MAYFAIL );if (!page)return ERR_PTR (-ENOMEM );
@@ -376,7 +375,7 @@ struct i915_vma_compress {static bool compress_init (struct i915_vma_compress *c) { -return pool_init (&c->pool,ALLOW_FAIL ) ==0 ; +return pool_init (&c->pool,ATOMIC_MAYFAIL ) ==0 ; }static bool compress_start (struct i915_vma_compress *c)
@@ -391,7 +390,7 @@ static int compress_page(struct i915_vma_compress *c, {void *ptr; - ptr =pool_alloc (&c->pool,ALLOW_FAIL ); + ptr =pool_alloc (&c->pool,ATOMIC_MAYFAIL );if (!ptr)return -ENOMEM ;
@@ -997,7 +996,7 @@ i915_vma_coredump_create(const struct intel_gt *gt, num_pages =min_t (u64, vma->size, vma->obj->base.size) >>PAGE_SHIFT ; num_pages =DIV_ROUND_UP (10 * num_pages,8 );/* worstcase zlib growth */ - dst =kmalloc (sizeof (*dst) + num_pages *sizeof (u32 *),ALLOW_FAIL ); + dst =kmalloc (sizeof (*dst) + num_pages *sizeof (u32 *),ATOMIC_MAYFAIL );if (!dst)return NULL ;
@@ -1433,7 +1432,7 @@ capture_engine(struct intel_engine_cs *engine,struct i915_request *rq =NULL ;unsigned long flags; - ee =intel_engine_coredump_alloc (engine,GFP_KERNEL ); + ee =intel_engine_coredump_alloc (engine,ATOMIC_MAYFAIL );if (!ee)return NULL ;
@@ -1481,7 +1480,7 @@ gt_record_engines(struct intel_gt_coredump *gt,struct intel_engine_coredump *ee;/* Refill our page pool before entering atomic section */ -pool_refill (&compress->pool,ALLOW_FAIL ); +pool_refill (&compress->pool,ATOMIC_MAYFAIL ); ee =capture_engine (engine, compress);if (!ee)
@@ -1507,7 +1506,7 @@ gt_record_uc(struct intel_gt_coredump *gt,const struct intel_uc *uc = >->_gt->uc;struct intel_uc_coredump *error_uc; - error_uc =kzalloc (sizeof (*error_uc),ALLOW_FAIL ); + error_uc =kzalloc (sizeof (*error_uc),ATOMIC_MAYFAIL );if (!error_uc)return NULL ;
@@ -1518,8 +1517,8 @@ gt_record_uc(struct intel_gt_coredump *gt,* As modparams are generally accesible from the userspace make * explicit copies of the firmware paths. */ - error_uc->guc_fw.path =kstrdup (uc->guc.fw.path,ALLOW_FAIL ); - error_uc->huc_fw.path =kstrdup (uc->huc.fw.path,ALLOW_FAIL ); + error_uc->guc_fw.path =kstrdup (uc->guc.fw.path,ATOMIC_MAYFAIL ); + error_uc->huc_fw.path =kstrdup (uc->huc.fw.path,ATOMIC_MAYFAIL ); error_uc->guc_log = i915_vma_coredump_create(gt->_gt, uc->guc.log.vma, "GuC log buffer",
@@ -1778,7 +1777,7 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt) {struct i915_vma_compress *compress; - compress =kmalloc (sizeof (*compress),ALLOW_FAIL ); + compress =kmalloc (sizeof (*compress),ATOMIC_MAYFAIL );if (!compress)return NULL ;
@@ -1811,11 +1810,11 @@ i915_gpu_coredump(struct intel_gt *gt, intel_engine_mask_t engine_mask)if (IS_ERR (error))return error; - error =i915_gpu_coredump_alloc (i915,ALLOW_FAIL ); + error =i915_gpu_coredump_alloc (i915,ATOMIC_MAYFAIL );if (!error)return ERR_PTR (-ENOMEM ); - error->gt =intel_gt_coredump_alloc (gt,ALLOW_FAIL ); + error->gt =intel_gt_coredump_alloc (gt,ATOMIC_MAYFAIL );if (error->gt) {struct i915_vma_compress *compress;
Signature · 1 line
2.32.0
PATCH 14/21 drm/i915/guc: Flush G2H work queue during reset
In reply to Matthew BrostIt isn't safe to scrub for missing G2H or continue with the reset until all G2H processing is complete. Flush the G2H work queue during reset to ensure it is done running.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2 -16
@@ -707,8 +707,6 @@ static void guc_flush_submissions(struct intel_guc *guc)void intel_guc_submission_reset_prepare (struct intel_guc *guc) { -int i; -if (unlikely (!guc_submission_initialized (guc))) {/* Reset called during driver load? GuC not yet initialised! */ return ;
@@ -724,20 +722,8 @@ void intel_guc_submission_reset_prepare(struct intel_guc *guc)guc_flush_submissions (guc); -/* -* Handle any outstanding G2Hs before reset. Call IRQ handler directly -* each pass as interrupt have been disabled. We always scrub for -* outstanding G2H as it is possible for outstanding_submission_g2h to -* be incremented after the context state update. -*/ -for (i =0 ; i <4 &&atomic_read (&guc->outstanding_submission_g2h); ++i) { -intel_guc_to_host_event_handler (guc); -#define wait_for_reset (guc, wait_var) \ - intel_guc_wait_for_pending_msg(guc, wait_var, false, (HZ / 20)) -do { -wait_for_reset (guc, &guc->outstanding_submission_g2h); - }while (!list_empty (&guc->ct.requests.incoming)); - } +flush_work (&guc->ct.requests.worker); +scrub_guc_desc_for_outstanding_g2h (guc); }
Signature · 1 line
2.32.0
PATCH 15/21 drm/i915/guc: Release submit fence from an IRQ
In reply to Matthew BrostA subsequent patch will flip the locking hierarchy from ce->guc_state.lock -> sched_engine->lock to sched_engine->lock -> ce->guc_state.lock. As such we need to release the submit fence for a request from an IRQ to break a lock inversion - i.e. the fence must be release went holding ce->guc_state.lock and the releasing of the can acquire sched_engine->lock.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 15 ++++++++++++++- drivers/gpu/drm/i915/i915_request.h | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +14 -1
@@ -2016,6 +2016,14 @@ static const struct intel_context_ops guc_context_ops = { .create_virtual = guc_create_virtual, }; +static void submit_work_cb (struct irq_work *wrk) +{ +struct i915_request *rq =container_of (wrk,typeof (*rq), submit_work); + +might_lock (&rq->engine->sched_engine->lock); +i915_sw_fence_complete (&rq->submit); +} +static void __guc_signal_context_fence (struct intel_context *ce) {struct i915_request *rq;
@@ -2025,8 +2033,12 @@ static void __guc_signal_context_fence(struct intel_context *ce)if (!list_empty (&ce->guc_state.fences))trace_intel_context_fence_release (ce); +/* +* Use an IRQ to ensure locking order of sched_engine->lock -> +* ce->guc_state.lock is preserved. +*/ list_for_each_entry (rq, &ce->guc_state.fences, guc_fence_link) -i915_sw_fence_complete (&rq->submit); +irq_work_queue (&rq->submit_work);INIT_LIST_HEAD (&ce->guc_state.fences); }
@@ -2136,6 +2148,7 @@ static int guc_request_alloc(struct i915_request *rq)spin_lock_irqsave (&ce->guc_state.lock, flags);if (context_wait_for_deregister_to_register (ce) ||context_pending_disable (ce)) { +init_irq_work (&rq->submit_work, submit_work_cb);i915_sw_fence_await (&rq->submit);list_add_tail (&rq->guc_fence_link, &ce->guc_state.fences);
drivers/gpu/drm/i915/i915_request.h +5 -0
@@ -218,6 +218,11 @@ struct i915_request { };struct llist_head execute_cb;struct i915_sw_fence semaphore; +/** +* @submit_work: complete submit fence from an IRQ if needed for +* locking hierarchy reasons. +*/ +struct irq_work submit_work;/* * A list of everyone we wait upon, and everyone who waits upon us.
Signature · 1 line
2.32.0
PATCH 16/21 drm/i915/guc: Move guc_blocked fence to struct guc_state
In reply to Matthew BrostMove guc_blocked fence to struct guc_state as the lock which protects the fence lives there.
s/ce->guc_blocked/ce->guc_state.blocked_fence/g
--- drivers/gpu/drm/i915/gt/intel_context.c | 5 +++-- drivers/gpu/drm/i915/gt/intel_context_types.h | 5 ++--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.c +3 -2
@@ -405,8 +405,9 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine)* Initialize fence to be complete as this is expected to be complete * unless there is a pending schedule disable outstanding. */ -i915_sw_fence_init (&ce->guc_blocked, sw_fence_dummy_notify); -i915_sw_fence_commit (&ce->guc_blocked); +i915_sw_fence_init (&ce->guc_state.blocked_fence, + sw_fence_dummy_notify); +i915_sw_fence_commit (&ce->guc_state.blocked_fence);i915_active_init (&ce->active, __intel_context_active, __intel_context_retire,0 );
drivers/gpu/drm/i915/gt/intel_context_types.h +2 -3
@@ -167,6 +167,8 @@ struct intel_context {* fence related to GuC submission */ struct list_head fences; +/* GuC context blocked fence */ +struct i915_sw_fence blocked_fence; } guc_state;struct {
@@ -190,9 +192,6 @@ struct intel_context {*/ struct list_head guc_id_link; -/* GuC context blocked fence */ -struct i915_sw_fence guc_blocked; -/* * GuC priority management */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +9 -9
@@ -1481,24 +1481,24 @@ static void guc_blocked_fence_complete(struct intel_context *ce) {lockdep_assert_held (&ce->guc_state.lock); -if (!i915_sw_fence_done (&ce->guc_blocked)) -i915_sw_fence_complete (&ce->guc_blocked); +if (!i915_sw_fence_done (&ce->guc_state.blocked_fence)) +i915_sw_fence_complete (&ce->guc_state.blocked_fence); }static void guc_blocked_fence_reinit (struct intel_context *ce) {lockdep_assert_held (&ce->guc_state.lock); -GEM_BUG_ON (!i915_sw_fence_done (&ce->guc_blocked)); +GEM_BUG_ON (!i915_sw_fence_done (&ce->guc_state.blocked_fence));/* * This fence is always complete unless a pending schedule disable is * outstanding. We arm the fence here and complete it when we receive * the pending schedule disable complete message. */ -i915_sw_fence_fini (&ce->guc_blocked); -i915_sw_fence_reinit (&ce->guc_blocked); -i915_sw_fence_await (&ce->guc_blocked); -i915_sw_fence_commit (&ce->guc_blocked); +i915_sw_fence_fini (&ce->guc_state.blocked_fence); +i915_sw_fence_reinit (&ce->guc_state.blocked_fence); +i915_sw_fence_await (&ce->guc_state.blocked_fence); +i915_sw_fence_commit (&ce->guc_state.blocked_fence); }static u16 prep_context_pending_disable (struct intel_context *ce)
@@ -1538,7 +1538,7 @@ static struct i915_sw_fence *guc_context_block(struct intel_context *ce)if (enabled)clr_context_enabled (ce);spin_unlock_irqrestore (&ce->guc_state.lock, flags); -return &ce->guc_blocked; +return &ce->guc_state.blocked_fence; }/*
@@ -1554,7 +1554,7 @@ static struct i915_sw_fence *guc_context_block(struct intel_context *ce) with_intel_runtime_pm(runtime_pm, wakeref)__guc_context_sched_disable (guc, ce, guc_id); -return &ce->guc_blocked; +return &ce->guc_state.blocked_fence; }static void guc_context_unblock (struct intel_context *ce)
Signature · 1 line
2.32.0
PATCH 17/21 drm/i915/guc: Rework and simplify locking
In reply to Matthew BrostRework and simplify the locking with GuC subission. Drop sched_state_no_lock and move all fields under the guc_state.sched_state and protect all these fields with guc_state.lock . This requires changing the locking hierarchy from guc_state.lock -> sched_engine.lock to sched_engine.lock -> guc_state.lock.
--- drivers/gpu/drm/i915/gt/intel_context_types.h | 5 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 186 ++++++++---------- drivers/gpu/drm/i915/i915_trace.h | 6 +- 3 files changed, 89 insertions(+), 108 deletions(-)
drivers/gpu/drm/i915/gt/intel_context_types.h +1 -4
@@ -161,7 +161,7 @@ struct intel_context {* sched_state: scheduling state of this context using GuC * submission */ -u16 sched_state; +u32 sched_state;/* * fences: maintains of list of requests that have a submit * fence related to GuC submission
@@ -178,9 +178,6 @@ struct intel_context {struct list_head requests; } guc_active; -/* GuC scheduling state flags that do not require a lock. */ -atomic_t guc_sched_state_no_lock; -/* GuC LRC descriptor ID */ u16 guc_id;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +87 -99
345 lines not on this page · raw message
drivers/gpu/drm/i915/i915_trace.h +1 -5
@@ -903,7 +903,6 @@ DECLARE_EVENT_CLASS(intel_context, __field(u32, guc_id) __field(int, pin_count) __field(u32, sched_state) - __field(u32, guc_sched_state_no_lock)__field (u8, guc_prio) ),
@@ -911,15 +910,12 @@ DECLARE_EVENT_CLASS(intel_context, __entry->guc_id = ce->guc_id; __entry->pin_count =atomic_read (&ce->pin_count); __entry->sched_state = ce->guc_state.sched_state; - __entry->guc_sched_state_no_lock = -atomic_read (&ce->guc_sched_state_no_lock); __entry->guc_prio = ce->guc_prio; ), -TP_printk ("guc_id=%d, pin_count=%d sched_state=0x%x,0x%x, guc_prio=%u" , +TP_printk ("guc_id=%d, pin_count=%d sched_state=0x%x, guc_prio=%u" , __entry->guc_id, __entry->pin_count, __entry->sched_state, - __entry->guc_sched_state_no_lock, __entry->guc_prio) );
Signature · 1 line
2.32.0
PATCH 18/21 drm/i915/guc: Proper xarray usage for contexts_lookup
In reply to Matthew BrostLock the xarray and take ref to the context if needed.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 83 ++++++++++++++++--- 1 file changed, 72 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +72 -11
@@ -599,8 +599,17 @@ static void scrub_guc_desc_for_outstanding_g2h(struct intel_guc *guc)unsigned long index, flags;bool pending_disable, pending_enable, deregister, destroyed, banned; +xa_lock_irqsave (&guc->context_lookup, flags);xa_for_each (&guc->context_lookup, index, ce) { -spin_lock_irqsave (&ce->guc_state.lock, flags); +/* +* Corner case where the ref count on the object is zero but and +* deregister G2H was lost. In this case we don't touch the ref +* count and finish the destroy of the context. +*/ +bool do_put =kref_get_unless_zero (&ce->ref); +xa_unlock (&guc->context_lookup); + +spin_lock (&ce->guc_state.lock);/* * Once we are at this point submission_disabled() is guaranteed
@@ -616,7 +625,9 @@ static void scrub_guc_desc_for_outstanding_g2h(struct intel_guc *guc) banned =context_banned (ce);init_sched_state (ce); -spin_unlock_irqrestore (&ce->guc_state.lock, flags); +spin_unlock (&ce->guc_state.lock); + +GEM_BUG_ON (!do_put && !destroyed);if (pending_enable || destroyed || deregister) {atomic_dec (&guc->outstanding_submission_g2h);
@@ -645,7 +656,12 @@ static void scrub_guc_desc_for_outstanding_g2h(struct intel_guc *guc)intel_context_put (ce); } + +if (do_put) +intel_context_put (ce); +xa_lock (&guc->context_lookup); } +xa_unlock_irqrestore (&guc->context_lookup, flags); } static inline bool
@@ -865,16 +881,26 @@ void intel_guc_submission_reset(struct intel_guc *guc, bool stalled) {struct intel_context *ce;unsigned long index; +unsigned long flags;if (unlikely (!guc_submission_initialized (guc))) {/* Reset called during driver load? GuC not yet initialised! */ return ; } -xa_for_each (&guc->context_lookup, index, ce) +xa_lock_irqsave (&guc->context_lookup, flags); +xa_for_each (&guc->context_lookup, index, ce) { +intel_context_get (ce); +xa_unlock (&guc->context_lookup); +if (intel_context_is_pinned (ce))__guc_reset_context (ce, stalled); +intel_context_put (ce); +xa_lock (&guc->context_lookup); + } +xa_unlock_irqrestore (&guc->context_lookup, flags); +/* GuC is blown away, drop all references to contexts */ xa_destroy (&guc->context_lookup); }
@@ -949,11 +975,21 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc) {struct intel_context *ce;unsigned long index; +unsigned long flags; + +xa_lock_irqsave (&guc->context_lookup, flags); +xa_for_each (&guc->context_lookup, index, ce) { +intel_context_get (ce); +xa_unlock (&guc->context_lookup); -xa_for_each (&guc->context_lookup, index, ce)if (intel_context_is_pinned (ce))guc_cancel_context_requests (ce); +intel_context_put (ce); +xa_lock (&guc->context_lookup); + } +xa_unlock_irqrestore (&guc->context_lookup, flags); +guc_cancel_sched_engine_requests (guc->sched_engine);/* GuC is blown away, drop all references to contexts */
@@ -2847,21 +2883,26 @@ void intel_guc_find_hung_context(struct intel_engine_cs *engine)struct intel_context *ce;struct i915_request *rq;unsigned long index; +unsigned long flags;/* Reset called during driver load? GuC not yet initialised! */ if (unlikely (!guc_submission_initialized (guc)))return ; +xa_lock_irqsave (&guc->context_lookup, flags);xa_for_each (&guc->context_lookup, index, ce) { +intel_context_get (ce); +xa_unlock (&guc->context_lookup); +if (!intel_context_is_pinned (ce)) -continue ; + goto next;if (intel_engine_is_virtual (ce->engine)) {if (!(ce->engine->mask & engine->mask)) -continue ; + goto next; }else {if (ce->engine != engine) -continue ; + goto next; }list_for_each_entry (rq, &ce->guc_active.requests, sched.link) {
@@ -2871,9 +2912,17 @@ void intel_guc_find_hung_context(struct intel_engine_cs *engine)intel_engine_set_hung_context (engine, ce);/* Can only cope with one hang at a time... */ -return ; +intel_context_put (ce); +xa_lock (&guc->context_lookup); + goto done; } +next: +intel_context_put (ce); +xa_lock (&guc->context_lookup); + } +done: +xa_unlock_irqrestore (&guc->context_lookup, flags); } void intel_guc_dump_active_requests(struct intel_engine_cs *engine,
@@ -2889,23 +2938,32 @@ void intel_guc_dump_active_requests(struct intel_engine_cs *engine,if (unlikely (!guc_submission_initialized (guc)))return ; +xa_lock_irqsave (&guc->context_lookup, flags);xa_for_each (&guc->context_lookup, index, ce) { +intel_context_get (ce); +xa_unlock (&guc->context_lookup); +if (!intel_context_is_pinned (ce)) -continue ; + goto next;if (intel_engine_is_virtual (ce->engine)) {if (!(ce->engine->mask & engine->mask)) -continue ; + goto next; }else {if (ce->engine != engine) -continue ; + goto next; }spin_lock_irqsave (&ce->guc_active.lock, flags);intel_engine_dump_active_requests (&ce->guc_active.requests, hung_rq, m);spin_unlock_irqrestore (&ce->guc_active.lock, flags); + +next: +intel_context_put (ce); +xa_lock (&guc->context_lookup); } +xa_unlock_irqrestore (&guc->context_lookup, flags); } void intel_guc_submission_print_info(struct intel_guc *guc,
@@ -2959,7 +3017,9 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc, {struct intel_context *ce;unsigned long index; +unsigned long flags; +xa_lock_irqsave (&guc->context_lookup, flags);xa_for_each (&guc->context_lookup, index, ce) {drm_printf (p,"GuC lrc descriptor %u:\n" , ce->guc_id);drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca);
@@ -2978,6 +3038,7 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,guc_log_context_priority (p, ce); } +xa_unlock_irqrestore (&guc->context_lookup, flags); } static struct intel_context *
Signature · 1 line
2.32.0
PATCH 19/21 drm/i915/guc: Drop pin count check trick between sched_disable and re-pin
In reply to Matthew BrostDrop pin count check trick between a sched_disable and re-pin, now rely on the lock and counter of the number of committed requests to determine if scheduling should be disabled on the context.
--- drivers/gpu/drm/i915/gt/intel_context_types.h | 2 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 49 ++++++++++++------- 2 files changed, 34 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/intel_context_types.h +2 -0
@@ -169,6 +169,8 @@ struct intel_context {struct list_head fences;/* GuC context blocked fence */ struct i915_sw_fence blocked_fence; +/* GuC committed requests */ +int number_committed_requests; } guc_state;struct {
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +32 -17
92 lines not on this page · raw message
Signature · 1 line
2.32.0
PATCH 20/21 drm/i915/guc: Move GuC priority fields in context under guc_active
In reply to Matthew BrostMove GuC management fields in context under guc_active struct as this is where the lock that protects theses fields lives. Also only set guc_prio field once during context init.
--- drivers/gpu/drm/i915/gt/intel_context_types.h | 12 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 68 +++++++++++-------- drivers/gpu/drm/i915/i915_trace.h | 2 +- 3 files changed, 45 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/gt/intel_context_types.h +6 -6
@@ -112,6 +112,7 @@ struct intel_context {#define CONTEXT_FORCE_SINGLE_SUBMISSION 7#define CONTEXT_NOPREEMPT 8#define CONTEXT_LRCA_DIRTY 9 +#define CONTEXT_GUC_INIT 10struct {u64 timeout_us;
@@ -178,6 +179,11 @@ struct intel_context {spinlock_t lock;/** requests: active requests on this context */ struct list_head requests; +/* +* GuC priority management +*/ +u8 guc_prio; +u32 guc_prio_count[GUC_CLIENT_PRIORITY_NUM ]; } guc_active;/* GuC LRC descriptor ID */
@@ -191,12 +197,6 @@ struct intel_context {*/ struct list_head guc_id_link; -/* -* GuC priority management -*/ -u8 guc_prio; -u32 guc_prio_count[GUC_CLIENT_PRIORITY_NUM ]; -#ifdef CONFIG_DRM_I915_SELFTEST /** * @drop_schedule_enable: Force drop of schedule enable G2H for selftest
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +38 -30
155 lines not on this page · raw message
drivers/gpu/drm/i915/i915_trace.h +1 -1
@@ -910,7 +910,7 @@ DECLARE_EVENT_CLASS(intel_context, __entry->guc_id = ce->guc_id; __entry->pin_count =atomic_read (&ce->pin_count); __entry->sched_state = ce->guc_state.sched_state; - __entry->guc_prio = ce->guc_prio; + __entry->guc_prio = ce->guc_active.guc_prio; ), TP_printk("guc_id=%d, pin_count=%d sched_state=0x%x, guc_prio=%u",
Signature · 1 line
2.32.0
PATCH 21/21 drm/i915/guc: Add GuC kernel doc
In reply to Matthew BrostAdd GuC kernel doc for all structures added thus far for GuC submission and update the main GuC submission section with the new interface details.
--- drivers/gpu/drm/i915/gt/intel_context_types.h | 42 +++++--- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 19 +++- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 101 ++++++++++++++---- drivers/gpu/drm/i915/i915_request.h | 18 ++-- 4 files changed, 131 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/gt/intel_context_types.h +27 -15
@@ -156,44 +156,56 @@ struct intel_context {u8 wa_bb_page;/* if set, page num reserved for context workarounds */ struct { -/** lock: protects everything in guc_state */ +/** @lock: protects everything in guc_state */ spinlock_t lock;/** -* sched_state: scheduling state of this context using GuC +* @sched_state: scheduling state of this context using GuC * submission */ u32 sched_state;/* -* fences: maintains of list of requests that have a submit -* fence related to GuC submission +* @fences: maintains a list of requests are currently being +* fenced until a GuC operation completes */ struct list_head fences; -/* GuC context blocked fence */ +/** +* @blocked_fence: fence used to signal when the blocking of a +* contexts submissions is complete. +*/ struct i915_sw_fence blocked_fence; -/* GuC committed requests */ +/** @number_committed_requests: number of committed requests */ int number_committed_requests; } guc_state;struct { -/** lock: protects everything in guc_active */ +/** @lock: protects everything in guc_active */ spinlock_t lock; -/** requests: active requests on this context */ +/** @requests: list of active requests on this context */ struct list_head requests; -/* -* GuC priority management -*/ +/** @guc_prio: the contexts current guc priority */ u8 guc_prio; +/** +* @guc_prio_count: a counter of the number requests inflight in +* each priority bucket +*/ u32 guc_prio_count[GUC_CLIENT_PRIORITY_NUM ]; } guc_active; -/* GuC LRC descriptor ID */ +/** +* @guc_id: unique handle which is used to communicate information with +* the GuC about this context, protected by guc->contexts_lock +*/ u16 guc_id; -/* GuC LRC descriptor reference count */ +/** +* @guc_id_ref: the number of references to the guc_id, when +* transitioning in and out of zero protected by guc->contexts_lock +*/ atomic_t guc_id_ref; -/* -* GuC ID link - in list when unpinned but guc_id still valid in GuC +/** +* @guc_id_link: in guc->guc_id_list when the guc_id has no refs but is +* still valid, protected by guc->contexts_lock */ struct list_head guc_id_link;
drivers/gpu/drm/i915/gt/uc/intel_guc.h +15 -4
@@ -41,6 +41,10 @@ struct intel_guc {spinlock_t irq_lock;unsigned int msg_enabled_mask; +/** +* @outstanding_submission_g2h: number of outstanding G2H related to GuC +* submission, used to determine if the GT is idle +*/ atomic_t outstanding_submission_g2h;struct {
@@ -49,12 +53,16 @@ struct intel_guc {void (*disable)(struct intel_guc *guc); } interrupts; -/* -* contexts_lock protects the pool of free guc ids and a linked list of -* guc ids available to be stolen +/** +* @contexts_lock: protects guc_ids, guc_id_list, ce->guc_id, and +* ce->guc_id_ref when transitioning in and out of zero */ spinlock_t contexts_lock; +/** @guc_ids: used to allocate new guc_ids */ struct ida guc_ids; +/** +* @guc_id_list: list of intel_context with valid guc_ids but no refs +*/ struct list_head guc_id_list;bool submission_supported;
@@ -70,7 +78,10 @@ struct intel_guc {struct i915_vma *lrc_desc_pool;void *lrc_desc_pool_vaddr; -/* guc_id to intel_context lookup */ +/** +* @context_lookup: used to intel_context from guc_id, if a context is +* present in this structure it is registered with the GuC +*/ struct xarray context_lookup;/* Control params for fw initialization */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +79 -22
114 lines not on this page · raw message
drivers/gpu/drm/i915/i915_request.h +10 -8
@@ -290,18 +290,20 @@ struct i915_request {struct hrtimer timer; } watchdog; -/* -* Requests may need to be stalled when using GuC submission waiting for -* certain GuC operations to complete. If that is the case, stalled -* requests are added to a per context list of stalled requests. The -* below list_head is the link in that list. +/** +* @guc_fence_link: Requests may need to be stalled when using GuC +* submission waiting for certain GuC operations to complete. If that is +* the case, stalled requests are added to a per context list of stalled +* requests. The below list_head is the link in that list. Protected by +* ce->guc_state.lock. */ struct list_head guc_fence_link;/** -* Priority level while the request is inflight. Differs from i915 -* scheduler priority. See comment above -* I915_SCHEDULER_CAP_STATIC_PRIORITY_MAP for details. +* @guc_prio: Priority level while the request is inflight. Differs from +* i915 scheduler priority. See comment above +* I915_SCHEDULER_CAP_STATIC_PRIORITY_MAP for details. Protected by +* ce->guc_active.lock. */ #define GUC_PRIO_INIT 0xff#define GUC_PRIO_FINI 0xfe
Signature · 1 line
2.32.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Clean up GuC CI failures, simplify locking, and kernel DOC
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Clean up GuC CI failures, simplify locking, and kernel DOC
URL : https://patchwork.freedesktop.org/series/93704/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c9f3859e5dce drm/i915/guc: Fix blocked context accounting
7fe738f56abc drm/i915/guc: outstanding G2H accounting
1d414637d838 drm/i915/guc: Unwind context requests in reverse order
2739b8f8966f drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context
8ec967ce47da drm/i915/guc: Workaround reset G2H is received after schedule done G2H
-:7: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'?
#7:
If the context is reset as a result of the request cancelation the
^^^^^^^^^^^-:10: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #10:
waiting request cancelation code which resubmits the context. This races
^^^^^^^^^^^
-:12: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #12:
in this case it really should be a NOP as request cancelation code owns
^^^^^^^^^^^
-:43: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #43: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:840:
+ * XXX: If the context is reset as a result of the request cancelation
^^^^^^^^^^^
-:45: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #45: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:842:
+ * likely wrong as this creates a race between the request cancelation
^^^^^^^^^^^
-:49: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #49: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:846:
+ * enable is in flight as this indicates that a request cancelation has
^^^^^^^^^^^
-:50: WARNING:TYPO_SPELLING: 'occured' may be misspelled - perhaps 'occurred'? #50: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:847:
+ * occured.
^^^^^^^
-:92: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'? #92: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:2748:
+ * XXX: Racey if request cancelation has occurred, see comment in
^^^^^^^^^^^
total: 0 errors, 8 warnings, 0 checks, 72 lines checked0c0928ba1ba8 drm/i915/selftests: Add a cancel request selftest that triggers a reset c18da32e671c drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered cddf94c9bda0 drm/i915/selftests: Fix memory corruption in live_lrc_isolation b5e8c08dff35 drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H -:101: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #101:
new file mode 100644
-:161: ERROR:SPACING: space required before the open parenthesis '(' #161: FILE: drivers/gpu/drm/i915/gt/uc/selftest_guc.c:56:
+ switch(i) {
total: 1 errors, 1 warnings, 0 checks, 232 lines checked b929abcf3b59 drm/i915/guc: Take context ref when cancelling request 025e88fa74d3 drm/i915/guc: Don't touch guc_state.sched_state without a lock 6c1c488a3654 drm/i915/guc: Reset LRC descriptor if register returns -ENODEV c0ad63d810e6 drm/i915: Allocate error capture in atomic context 14dc302536e1 drm/i915/guc: Flush G2H work queue during reset 1c2b4c0ac62a drm/i915/guc: Release submit fence from an IRQ 4c980575f7af drm/i915/guc: Move guc_blocked fence to struct guc_state d97ab34c8bac drm/i915/guc: Rework and simplify locking 7057a0daff8c drm/i915/guc: Proper xarray usage for contexts_lookup -:27: WARNING:LINE_SPACING: Missing a blank line after declarations #27: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:610:
+ bool do_put = kref_get_unless_zero(&ce->ref);
+ xa_unlock(&guc->context_lookup);
total: 0 errors, 1 warnings, 0 checks, 187 lines checkedeb8a352e7c1f drm/i915/guc: Drop pin count check trick between sched_disable and re-pin af14e3698d19 drm/i915/guc: Move GuC priority fields in context under guc_active f7ff315bfe3a drm/i915/guc: Add GuC kernel doc
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Clean up GuC CI failures, simplify locking, and kernel DOC
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Clean up GuC CI failures, simplify locking, and kernel DOC
URL : https://patchwork.freedesktop.org/series/93704/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. +drivers/gpu/drm/i915/selftests/i915_syncmap.c:80:54: warning: dubious: x | !y
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Clean up GuC CI failures, simplify locking, and kernel DOC
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Clean up GuC CI failures, simplify locking, and kernel DOC
URL : https://patchwork.freedesktop.org/series/93704/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10484 -> Patchwork_20826
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20826 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20826, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20826:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@requests:
- fi-cfl-guc: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-cfl-guc/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-cfl-guc/igt@i915_selftest@[email protected]
- fi-kbl-soraka: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-soraka/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-soraka/igt@i915_selftest@[email protected]
- fi-bxt-dsi: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-bxt-dsi/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-bxt-dsi/igt@i915_selftest@[email protected]
- fi-tgl-1115g4: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-tgl-1115g4/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-tgl-1115g4/igt@i915_selftest@[email protected]
- fi-cml-u2: [PASS][9] -> [DMESG-FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-cml-u2/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-cml-u2/igt@i915_selftest@[email protected]
- fi-kbl-8809g: [PASS][11] -> [DMESG-FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-8809g/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-8809g/igt@i915_selftest@[email protected]
- fi-cfl-8700k: [PASS][13] -> [DMESG-FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-cfl-8700k/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-cfl-8700k/igt@i915_selftest@[email protected]
- fi-cfl-8109u: [PASS][15] -> [DMESG-FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-cfl-8109u/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-cfl-8109u/igt@i915_selftest@[email protected]
- fi-icl-u2: [PASS][17] -> [DMESG-FAIL][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-icl-u2/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-icl-u2/igt@i915_selftest@[email protected]
- fi-kbl-7500u: [PASS][19] -> [DMESG-FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-7500u/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-7500u/igt@i915_selftest@[email protected]
- fi-bsw-nick: [PASS][21] -> [DMESG-FAIL][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-bsw-nick/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-bsw-nick/igt@i915_selftest@[email protected]
- fi-icl-y: [PASS][23] -> [DMESG-FAIL][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-icl-y/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-icl-y/igt@i915_selftest@[email protected]
- fi-kbl-guc: [PASS][25] -> [DMESG-FAIL][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-guc/igt@i915_selftest@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-guc/igt@i915_selftest@[email protected]
- fi-kbl-7567u: [PASS][27] -> [DMESG-FAIL][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-7567u/igt@i915_selftest@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-7567u/igt@i915_selftest@[email protected]
- fi-skl-guc: [PASS][29] -> [DMESG-FAIL][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-skl-guc/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-skl-guc/igt@i915_selftest@[email protected]
- fi-bdw-5557u: [PASS][31] -> [DMESG-FAIL][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-bdw-5557u/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-bdw-5557u/igt@i915_selftest@[email protected]
- fi-glk-dsi: [PASS][33] -> [DMESG-FAIL][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-glk-dsi/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-glk-dsi/igt@i915_selftest@[email protected]
- fi-bsw-kefka: [PASS][35] -> [DMESG-FAIL][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-bsw-kefka/igt@i915_selftest@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-bsw-kefka/igt@i915_selftest@[email protected]
- fi-skl-6700k2: [PASS][37] -> [DMESG-FAIL][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-skl-6700k2/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-skl-6700k2/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@workarounds:
- fi-rkl-guc: [DMESG-FAIL][39] ([i915#3928]) -> [INCOMPLETE][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-rkl-guc/igt@i915_selftest@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-rkl-guc/igt@i915_selftest@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@requests:
- {fi-tgl-dsi}: [PASS][41] -> [DMESG-FAIL][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-tgl-dsi/igt@i915_selftest@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-tgl-dsi/igt@i915_selftest@[email protected]
- {fi-jsl-1}: [PASS][43] -> [DMESG-FAIL][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-jsl-1/igt@i915_selftest@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-jsl-1/igt@i915_selftest@[email protected]
- {fi-ehl-2}: [PASS][45] -> [DMESG-FAIL][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-ehl-2/igt@i915_selftest@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-ehl-2/igt@i915_selftest@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_10484 and Patchwork_20826:
### New IGT tests (1) ###
* igt@i915_selftest@live@guc:
- Statuses : 30 pass(s)
- Exec time: [0.42, 5.06] s
Known issues
------------
Here are the changes found in Patchwork_20826 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-kbl-soraka: [PASS][47] -> [DMESG-WARN][48] ([i915#1982])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-kbl-soraka/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-y: [PASS][49] -> [DMESG-FAIL][50] ([i915#1993])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-icl-y/igt@i915_selftest@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-icl-y/igt@i915_selftest@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload:
- {fi-tgl-dsi}: [DMESG-WARN][51] ([i915#1982] / [k.org#205379]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10484/fi-tgl-dsi/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/fi-tgl-dsi/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#1993]: https://gitlab.freedesktop.org/drm/intel/issues/1993
[i915#3928]: https://gitlab.freedesktop.org/drm/intel/issues/3928
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (37 -> 34)
------------------------------
Missing (3): fi-bdw-samus fi-bsw-cyan bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10484 -> Patchwork_20826
CI-20190529: 20190529
CI_DRM_10484: 7de02d5cb1f35bd3f068237444063844dea47ddc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6175: c91f99c74b966f635d7e2eb898bf0f78383d281b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20826: f7ff315bfe3a76713c1f0a16cd92b0908d28e4c6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f7ff315bfe3a drm/i915/guc: Add GuC kernel docaf14e3698d19 drm/i915/guc: Move GuC priority fields in context under guc_active eb8a352e7c1f drm/i915/guc: Drop pin count check trick between sched_disable and re-pin 7057a0daff8c drm/i915/guc: Proper xarray usage for contexts_lookupd97ab34c8bac drm/i915/guc: Rework and simplify locking4c980575f7af drm/i915/guc: Move guc_blocked fence to struct guc_state1c2b4c0ac62a drm/i915/guc: Release submit fence from an IRQ14dc302536e1 drm/i915/guc: Flush G2H work queue during resetc0ad63d810e6 drm/i915: Allocate error capture in atomic context6c1c488a3654 drm/i915/guc: Reset LRC descriptor if register returns -ENODEV 025e88fa74d3 drm/i915/guc: Don't touch guc_state.sched_state without a lock b929abcf3b59 drm/i915/guc: Take context ref when cancelling requestb5e8c08dff35 drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H cddf94c9bda0 drm/i915/selftests: Fix memory corruption in live_lrc_isolation c18da32e671c drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered 0c0928ba1ba8 drm/i915/selftests: Add a cancel request selftest that triggers a reset 8ec967ce47da drm/i915/guc: Workaround reset G2H is received after schedule done G2H 2739b8f8966f drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context 1d414637d838 drm/i915/guc: Unwind context requests in reverse order7fe738f56abc drm/i915/guc: outstanding G2H accountingc9f3859e5dce drm/i915/guc: Fix blocked context accounting
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/index.html
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for Clean up GuC CI failures, simplify locking, and kernel DOC
Quoted 27 lines · Patchwork
Patch Details
Series: Clean up GuC CI failures, simplify locking, and kernel DOC URL: https://patchwork.freedesktop.org/series/93704/ State: failure Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/index.htmlCI Bug Log - changes from
CI_DRM_10484->Patchwork_20826Summary
FAILURE
Serious unknown changes coming with
Patchwork_20826absolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_20826, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20826/
index.htmlPossible new issues
Here are the unknown changes that may have been introduced in
Patchwork_20826:
Quoted 8 lines
IGT changes
Possible regressions
• igt@i915_selftest@live@requests:
□ fi-cfl-guc: PASS -> DMESG-FAIL
New selftext, __cancel_reset, is exposing a bug (or at minimum different behavior) in the execlists implementation for canceling requests. Will fix in new rev.
Matt
Quoted 134 lines
□ fi-kbl-soraka: PASS -> DMESG-FAIL □ fi-bxt-dsi: PASS -> DMESG-FAIL □ fi-tgl-1115g4: PASS -> DMESG-FAIL □ fi-cml-u2: PASS -> DMESG-FAIL □ fi-kbl-8809g: PASS -> DMESG-FAIL □ fi-cfl-8700k: PASS -> DMESG-FAIL □ fi-cfl-8109u: PASS -> DMESG-FAIL □ fi-icl-u2: PASS -> DMESG-FAIL □ fi-kbl-7500u: PASS -> DMESG-FAIL □ fi-bsw-nick: PASS -> DMESG-FAIL □ fi-icl-y: PASS -> DMESG-FAIL □ fi-kbl-guc: PASS -> DMESG-FAIL □ fi-kbl-7567u: PASS -> DMESG-FAIL □ fi-skl-guc: PASS -> DMESG-FAIL □ fi-bdw-5557u: PASS -> DMESG-FAIL □ fi-glk-dsi: PASS -> DMESG-FAIL □ fi-bsw-kefka: PASS -> DMESG-FAIL □ fi-skl-6700k2: PASS -> DMESG-FAILWarnings
• igt@i915_selftest@live@workarounds:
□ fi-rkl-guc: DMESG-FAIL (i915#3928) -> INCOMPLETESuppressed
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
• igt@i915_selftest@live@requests:
□ {fi-tgl-dsi}: PASS -> DMESG-FAIL □ {fi-jsl-1}: PASS -> DMESG-FAIL □ {fi-ehl-2}: PASS -> DMESG-FAILNew tests
New tests have been introduced between
CI_DRM_10484andPatchwork_20826:New IGT tests (1)
• igt@i915_selftest@live@guc:
□ Statuses : 30 pass(s)
□ Exec time: [0.42, 5.06] sKnown issues
Here are the changes found in
Patchwork_20826that come from known issues:IGT changes
Issues hit
• igt@i915_module_load@reload:
□ fi-kbl-soraka: PASS -> DMESG-WARN (i915#1982)• igt@i915_selftest@live@execlists:
□ fi-icl-y: PASS -> DMESG-FAIL (i915#1993)Possible fixes
• igt@i915_module_load@reload:
□ {fi-tgl-dsi}: DMESG-WARN (i915#1982 / k.org#205379) -> PASS{name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE).
Participating hosts (37 -> 34)
Missing (3): fi-bdw-samus fi-bsw-cyan bat-jsl-1
Build changes
• Linux:
CI_DRM_10484->Patchwork_20826CI-20190529: 20190529
CI_DRM_10484:7de02d5cb1f35bd3f068237444063844dea47ddc@git://
anongit.freedesktop.org/gfx-ci/linuxIGT_6175:c91f99c74b966f635d7e2eb898bf0f78383d281b@ https://
gitlab.freedesktop.org/drm/igt-gpu-tools.gitPatchwork_20826:f7ff315bfe3a76713c1f0a16cd92b0908d28e4c6@git://
anongit.freedesktop.org/gfx-ci/linux== Linux commits ==
f7ff315bfe3adrm/i915/guc: Add GuC kernel docaf14e3698d19drm/i915/guc: Move GuC priority fields in context underguc_activeeb8a352e7c1fdrm/i915/guc: Drop pin count check trick betweensched_disableand re-pin7057a0daff8cdrm/i915/guc: Proper xarray usage forcontexts_lookupd97ab34c8bacdrm/i915/guc: Rework and simplify locking4c980575f7afdrm/i915/guc: Moveguc_blockedfence to structguc_state1c2b4c0ac62adrm/i915/guc: Release submit fence from an IRQ14dc302536e1drm/i915/guc: Flush G2H work queue during resetc0ad63d810e6drm/i915: Allocate error capture in atomic context6c1c488a3654drm/i915/guc: Reset LRC descriptor if register returns-ENODEV025e88fa74d3drm/i915/guc: Don't touch guc_state.sched_state without a lockb929abcf3b59drm/i915/guc: Take context ref when cancelling requestb5e8c08dff35drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2Hcddf94c9bda0drm/i915/selftests: Fix memory corruption inlive_lrc_isolationc18da32e671cdrm/i915/guc: Don't enable scheduling on a banned context,guc_idinvalid, not registered0c0928ba1ba8drm/i915/selftests: Add a cancel request selftest that triggers a reset8ec967ce47dadrm/i915/guc: Workaround reset G2H is received after schedule done G2H2739b8f8966fdrm/i915/guc: Don't dropce->guc_active.lockwhen unwinding context1d414637d838drm/i915/guc: Unwind context requests in reverse order7fe738f56abcdrm/i915/guc: outstanding G2H accountingc9f3859e5dcedrm/i915/guc: Fix blocked context accountingSECURITY NOTE: file ~/.netrc must not be accessible by others