Parallel submission aka multi-bb execbuf
Subsystems (4)
Re: [Intel-gfx] [PATCH 15/27] drm/i915/guc: Implement multi-lrc submission
In reply to Matthew BrostQuoted 21 lines · Matthew Brost
Implement multi-lrc submission via a single workqueue entry and single H2G. The workqueue entry contains an updated tail value for each request, of all the contexts in the multi-lrc submission, and updates these values simultaneously. As such, the tasklet and bypass path have been updated to coalesce requests into a single submission.
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 21 ++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 8 + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 24 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 6 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 312 +++++++++++++++--- drivers/gpu/drm/i915/i915_request.h | 8 + 6 files changed, 317 insertions(+), 62 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0
drivers/gpu/drm/i915/gt/uc/intel_guc.c void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) · line 757
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -748,3 +748,24 @@ void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) } } } + +void intel_guc_write_barrier (struct intel_guc *guc) +{ +struct intel_gt *gt =guc_to_gt (guc); + +if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { +GEM_BUG_ON (guc->send_regs.fw_domains);
Granted, this patch is just moving code from one file to another not changing it. However, I think it would be worth adding a blank line in here. Otherwise the 'this register' comment below can be confusingly read as referring to the send_regs.fw_domain entry above.
And maybe add a comment why it is a bug for the send_regs value to be set? I'm not seeing any obvious connection between it and the reset of this code.
Quoted 88 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +14
-0+/* +* This register is used by the i915 and GuC for MMIO based +* communication. Once we are in this code CTBs are the only +* method the i915 uses to communicate with the GuC so it is +* safe to write to this register (a value of 0 is NOP for MMIO +* communication). If we ever start mixing CTBs and MMIOs a new +* register will have to be chosen. +*/ +intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); + }else { +/* wmb() sufficient for a barrier if in smem */ +wmb (); + } +}drivers/gpu/drm/i915/gt/uc/intel_guc.h +8
-0@@ -37,6 +37,12 @@ struct intel_guc {/* Global engine used to submit requests to GuC */ struct i915_sched_engine *sched_engine;struct i915_request *stalled_request; +enum { +STALL_NONE , +STALL_REGISTER_CONTEXT , +STALL_MOVE_LRC_TAIL , +STALL_ADD_REQUEST , + } submission_stall_reason;/* intel_guc_recv interrupt related state */ spinlock_t irq_lock;@@ -332,4 +338,6 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc);void intel_guc_load_status (struct intel_guc *guc,struct drm_printer *p); +void intel_guc_write_barrier (struct intel_guc *guc); +#endif drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1
-23@@ -377,28 +377,6 @@ static u32 ct_get_next_fence(struct intel_guc_ct *ct)return ++ct->requests.last_fence; } -static void write_barrier (struct intel_guc_ct *ct) -{ -struct intel_guc *guc =ct_to_guc (ct); -struct intel_gt *gt =guc_to_gt (guc); - -if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { -GEM_BUG_ON (guc->send_regs.fw_domains); -/* -* This register is used by the i915 and GuC for MMIO based -* communication. Once we are in this code CTBs are the only -* method the i915 uses to communicate with the GuC so it is -* safe to write to this register (a value of 0 is NOP for MMIO -* communication). If we ever start mixing CTBs and MMIOs a new -* register will have to be chosen. -*/ -intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); - }else { -/* wmb() sufficient for a barrier if in smem */ -wmb (); - } -} - static int ct_write(struct intel_guc_ct *ct, const u32 *action, u32 len /* in dwords */,@@ -468,7 +446,7 @@ static int ct_write(struct intel_guc_ct *ct,* make sure H2G buffer update and LRC tail update (if this triggering a * submission) are visible before updating the descriptor tail */ -write_barrier (ct); +intel_guc_write_barrier (ct_to_guc (ct));/* update local copies */ ctb->tail = tail;drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0@@ -65,12 +65,14 @@#define WQ_TYPE_PSEUDO (0x2 << WQ_TYPE_SHIFT)#define WQ_TYPE_INORDER (0x3 << WQ_TYPE_SHIFT)#define WQ_TYPE_NOOP (0x4 << WQ_TYPE_SHIFT)
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h line 75
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +4
-2-#define WQ_TARGET_SHIFT 10 +#define WQ_TYPE_MULTI_LRC (0x5 << WQ_TYPE_SHIFT) +#define WQ_TARGET_SHIFT 8#define WQ_LEN_SHIFT 16#define WQ_NO_WCFLUSH_WAIT (1 << 27)#define WQ_PRESENT_WORKLOAD (1 << 28) -#define WQ_RING_TAIL_SHIFT 20 +#define WQ_GUC_ID_SHIFT 0 +#define WQ_RING_TAIL_SHIFT 18
Presumably all of these API changes are not actually new? They really came in with the reset of the v40 re-write? It's just that this is the first time we are using them and therefore need to finally update the defines?
Quoted 68 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0#define WQ_RING_TAIL_MAX 0x7FF/* 2^11 QWords */ #define WQ_RING_TAIL_MASK (WQ_RING_TAIL_MAX << WQ_RING_TAIL_SHIFT)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +25
-12@@ -391,6 +391,29 @@ __get_process_desc(struct intel_context *ce) LRC_STATE_OFFSET) / sizeof(u32))); } +static u32 *get_wq_pointer (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Check for space in work queue. Caching a value of head pointer in +* intel_context structure in order reduce the number accesses to shared +* GPU memory which may be across a PCIe bus. +*/ +#define AVAILABLE_SPACE \ + CIRC_SPACE(ce->guc_wqi_tail, ce->guc_wqi_head, GUC_WQ_SIZE) +if (wqi_size >AVAILABLE_SPACE ) { + ce->guc_wqi_head =READ_ONCE (desc->head); + +if (wqi_size >AVAILABLE_SPACE ) +return NULL ; + } +#undef AVAILABLE_SPACE + +return ((u32 *)__get_process_desc (ce)) + + ((WQ_OFFSET + ce->guc_wqi_tail) /sizeof (u32)); +} +static struct guc_lrc_desc *__get_lrc_desc (struct intel_guc *guc,u32 index) {struct guc_lrc_desc *base = guc->lrc_desc_pool_vaddr;@@ -547,10 +570,10 @@ int intel_guc_wait_for_idle(struct intel_guc *guc, long timeout)static int guc_lrc_desc_pin (struct intel_context *ce,bool loop); -static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +static int __guc_add_request (struct intel_guc *guc,struct i915_request *rq) {int err =0 ; -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u32 action[3 ];int len =0 ;u32 g2h_len_dw =0 ;@@ -571,26 +594,17 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)GEM_BUG_ON (!atomic_read (&ce->guc_id.ref));GEM_BUG_ON (context_guc_id_invalid (ce)); -/* -* Corner case where the GuC firmware was blown away and reloaded while -* this context was pinned. -*/ -if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id))) { - err =guc_lrc_desc_pin (ce, false); -if (unlikely (err)) -return err; - } -spin_lock (&ce->guc_state.lock);/* * The request / context will be run on the hardware when scheduling
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int guc_add_request(struct intel_guc *guc, struct i915_request *rq) · line 607
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4
-3-* gets enabled in the unblock. +* gets enabled in the unblock. For multi-lrc we still submit the +* context to move the LRC tails. */ -if (unlikely (context_blocked (ce))) +if (unlikely (context_blocked (ce) && !intel_context_is_parent (ce))) goto out; - enabled =context_enabled (ce); + enabled =context_enabled (ce) ||context_blocked (ce);
Would be better to say '|| is_parent(ce)' rather than blocked? The reason for reason for claiming enabled when not is because it's a multi-LRC parent, right? Or can there be a parent that is neither enabled nor blocked for which we don't want to do the processing? But why would that make sense/be possible?
Quoted 59 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +38
-0if (!enabled) { action[len++] =INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_SET ;@@ -609,6 +623,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)trace_intel_context_sched_enable (ce);atomic_inc (&guc->outstanding_submission_g2h);set_context_enabled (ce); + +/* +* Without multi-lrc KMD does the submission step (moving the +* lrc tail) so enabling scheduling is sufficient to submit the +* context. This isn't the case in multi-lrc submission as the +* GuC needs to move the tails, hence the need for another H2G +* to submit a multi-lrc context after enabling scheduling. +*/ +if (intel_context_is_parent (ce)) { + action[0 ] =INTEL_GUC_ACTION_SCHED_CONTEXT ; + err =intel_guc_send_nb (guc, action, len -1 ,0 ); + } }else if (!enabled) {clr_context_pending_enable (ce);intel_context_put (ce);@@ -621,6 +647,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)return err; } +static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +{ +int ret =__guc_add_request (guc, rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request= rq; + guc->submission_stall_reason =STALL_ADD_REQUEST ; + } + +return ret; +} +static void guc_set_lrc_tail (struct i915_request *rq) { rq->context->lrc_reg_state[CTX_RING_TAIL] =@@ -632,6 +670,127 @@ static int rq_prio(const struct i915_request *rq)return rq->sched.attr.priority; } +static bool is_multi_lrc_rq (struct i915_request *rq) +{ +return intel_context_is_child (rq->context) || +intel_context_is_parent (rq->context); +} + +static bool can_merge_rq (struct i915_request *rq, +struct i915_request *last) +{ +return request_to_scheduling_context (rq) == +request_to_scheduling_context (last); +} + +static u32 wq_space_until_wrap (struct intel_context *ce)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 696
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+{ +return (GUC_WQ_SIZE - ce->guc_wqi_tail); +} + +static void write_wqi (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Ensure WQE are visible before updating tail
WQE or WQI?
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+*/ +intel_guc_write_barrier (ce_to_guc (ce)); + + ce->guc_wqi_tail = (ce->guc_wqi_tail + wqi_size) & (GUC_WQ_SIZE -1 ); +WRITE_ONCE (desc->tail, ce->guc_wqi_tail); +} +
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 713
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+static int guc_wq_noop_append (struct intel_context *ce) +{ +struct guc_process_desc *desc =__get_process_desc (ce); +u32 *wqi =get_wq_pointer (desc, ce,wq_space_until_wrap (ce)); + +if (!wqi) +return -EBUSY ; + + *wqi =WQ_TYPE_NOOP | + ((wq_space_until_wrap (ce) /sizeof (u32) -1 ) <<WQ_LEN_SHIFT );
This should have a BUG_ON check that the requested size fits within the WQ_LEN field?
Indeed, would be better to use the FIELD macros as they do that kind of thing for you.
Quoted 27 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +27
-0+ ce->guc_wqi_tail =0 ; + +return 0 ; +} + +static int __guc_wq_item_append (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +struct intel_context *child; +struct guc_process_desc *desc =__get_process_desc (ce); +unsigned int wqi_size = (ce->guc_number_children +4 ) * +sizeof (u32); +u32 *wqi; +int ret; + +/* Ensure context is in correct state updating work queue */ +GEM_BUG_ON (!atomic_read (&ce->guc_id.ref)); +GEM_BUG_ON (context_guc_id_invalid (ce)); +GEM_BUG_ON (context_wait_for_deregister_to_register (ce)); +GEM_BUG_ON (!lrc_desc_registered (ce_to_guc (ce), ce->guc_id.id)); + +/* Insert NOOP if this work queue item will wrap the tail pointer. */ +if (wqi_size >wq_space_until_wrap (ce)) { + ret =guc_wq_noop_append (ce); +if (ret) +return ret; + }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 750
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ + wqi =get_wq_pointer (desc, ce, wqi_size); +if (!wqi) +return -EBUSY ; + + *wqi++ =WQ_TYPE_MULTI_LRC | + ((wqi_size /sizeof (u32) -1 ) <<WQ_LEN_SHIFT ); + *wqi++ = ce->lrc.lrca; + *wqi++ = (ce->guc_id.id <<WQ_GUC_ID_SHIFT ) | + ((ce->ring->tail /sizeof (u64)) <<WQ_RING_TAIL_SHIFT );
As above, would be better to use FIELD macros instead of manual shifting.
John.
Quoted 278 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +144
-22+ *wqi++ =0 ;/* fence_id */ +for_each_child (ce, child) + *wqi++ = child->ring->tail /sizeof (u64); + +write_wqi (desc, ce, wqi_size); + +return 0 ; +} + +static int guc_wq_item_append (struct intel_guc *guc, +struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +int ret =0 ; + +if (likely (!intel_context_is_banned (ce))) { + ret =__guc_wq_item_append (rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request = rq; + guc->submission_stall_reason =STALL_MOVE_LRC_TAIL ; + } + } + +return ret; +} + +static bool multi_lrc_submit (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); + +intel_ring_set_tail (rq->ring, rq->tail); + +/* +* We expect the front end (execbuf IOCTL) to set this flag on the last +* request generated from a multi-BB submission. This indicates to the +* backend (GuC interface) that we should submit this context thus +* submitting all the requests generated in parallel. +*/ +return test_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , &rq->fence.flags) || +intel_context_is_banned (ce); +} +static int guc_dequeue_one_context (struct intel_guc *guc) {struct i915_sched_engine *const sched_engine = guc->sched_engine;@@ -645,7 +804,17 @@ static int guc_dequeue_one_context(struct intel_guc *guc)if (guc->stalled_request) { submit = true; last = guc->stalled_request; - goto resubmit; + +switch (guc->submission_stall_reason) { +case STALL_REGISTER_CONTEXT : + goto register_context; +case STALL_MOVE_LRC_TAIL : + goto move_lrc_tail; +case STALL_ADD_REQUEST : + goto add_request; +default : +MISSING_CASE (guc->submission_stall_reason); + } }while ((rb =rb_first_cached (&sched_engine->queue))) {@@ -653,8 +822,8 @@ static int guc_dequeue_one_context(struct intel_guc *guc)struct i915_request *rq, *rn;priolist_for_each_request_consume (rq, rn, p) { -if (last && rq->context != last->context) - goto done; +if (last && !can_merge_rq (rq, last)) + goto register_context;list_del_init (&rq->sched.link);@@ -662,33 +831,84 @@ static int guc_dequeue_one_context(struct intel_guc *guc)trace_i915_request_in (rq,0 ); last = rq; - submit = true; + +if (is_multi_lrc_rq (rq)) { +/* +* We need to coalesce all multi-lrc requests in +* a relationship into a single H2G. We are +* guaranteed that all of these requests will be +* submitted sequentially. +*/ +if (multi_lrc_submit (rq)) { + submit = true; + goto register_context; + } + }else { + submit = true; + } }rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); } -done: + +register_context:if (submit) { -guc_set_lrc_tail (last); -resubmit: +struct intel_context *ce =request_to_scheduling_context (last); + +if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id) && + !intel_context_is_banned (ce))) { + ret =guc_lrc_desc_pin (ce, false); +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + guc->stalled_request = last; + guc->submission_stall_reason = +STALL_REGISTER_CONTEXT ; + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + } + +move_lrc_tail: +if (is_multi_lrc_rq (last)) { + ret =guc_wq_item_append (guc, last); +if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + }else { +guc_set_lrc_tail (last); + } + +add_request: ret =guc_add_request (guc, last); -if (unlikely (ret == -EPIPE )) +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ goto deadlk; -else if (ret == -EBUSY ) { -tasklet_schedule (&sched_engine->tasklet); - guc->stalled_request = last; -return false; } } guc->stalled_request =NULL ; + guc->submission_stall_reason =STALL_NONE ;return submit; deadlk: sched_engine->tasklet.callback =NULL ;tasklet_disable_nosync (&sched_engine->tasklet);return false; + +schedule_tasklet: +tasklet_schedule (&sched_engine->tasklet); +return false; }static void guc_submission_tasklet (struct tasklet_struct *t)@@ -1227,10 +1447,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,trace_i915_request_in (rq,0 ); -guc_set_lrc_tail (rq); - ret =guc_add_request (guc, rq); -if (ret == -EBUSY ) - guc->stalled_request = rq; +if (is_multi_lrc_rq (rq)) { +if (multi_lrc_submit (rq)) { + ret =guc_wq_item_append (guc, rq); +if (!ret) + ret =guc_add_request (guc, rq); + } + }else { +guc_set_lrc_tail (rq); + ret =guc_add_request (guc, rq); + }if (unlikely (ret == -EPIPE ))disable_submission (guc);@@ -1238,6 +1464,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,return ret; } +bool need_tasklet (struct intel_guc *guc,struct i915_request *rq) +{ +struct i915_sched_engine *sched_engine = rq->engine->sched_engine; +struct intel_context *ce =request_to_scheduling_context (rq); + +return submission_disabled (guc) || guc->stalled_request || + !i915_sched_engine_is_empty (sched_engine) || + !lrc_desc_registered (guc, ce->guc_id.id); +} +static void guc_submit_request (struct i915_request *rq) {struct i915_sched_engine *sched_engine = rq->engine->sched_engine;@@ -1247,8 +1483,7 @@ static void guc_submit_request(struct i915_request *rq)/* Will be called from irq-context when using foreign fences. */ spin_lock_irqsave (&sched_engine->lock, flags); -if (submission_disabled (guc) || guc->stalled_request || - !i915_sched_engine_is_empty (sched_engine)) +if (need_tasklet (guc, rq))queue_request (sched_engine, rq,rq_prio (rq));else if (guc_bypass_tasklet_submit (guc, rq) == -EBUSY )tasklet_hi_schedule (&sched_engine->tasklet);@@ -2241,9 +2476,10 @@ static bool new_guc_prio_higher(u8 old_guc_prio, u8 new_guc_prio)static void add_to_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (rq_prio (rq)); +GEM_BUG_ON (intel_context_is_child (ce));GEM_BUG_ON (rq->guc_prio ==GUC_PRIO_FINI );spin_lock (&ce->guc_state.lock);@@ -2276,7 +2512,9 @@ static void guc_prio_fini(struct i915_request *rq, struct intel_context *ce)static void remove_from_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq); + +GEM_BUG_ON (intel_context_is_child (ce));spin_lock_irq (&ce->guc_state.lock);@@ -2692,7 +2930,7 @@ static void guc_init_breadcrumbs(struct intel_engine_cs *engine)static void guc_bump_inflight_request_prio (struct i915_request *rq,int prio) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (prio);/* Short circuit function */ @@ -2715,7 +2953,7 @@ static void guc_bump_inflight_request_prio(struct i915_request *rq,static void guc_retire_inflight_request_prio (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);spin_lock (&ce->guc_state.lock);guc_prio_fini (rq, ce);drivers/gpu/drm/i915/i915_request.h +8
-0@@ -139,6 +139,14 @@ enum {* the GPU. Here we track such boost requests on a per-request basis. */ I915_FENCE_FLAG_BOOST , + +/* +* I915_FENCE_FLAG_SUBMIT_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) should +* trigger a submission to the GuC rather than just moving the context +* tail. +*/ + I915_FENCE_FLAG_SUBMIT_PARALLEL, };/**
Re: [Intel-gfx] [PATCH 15/27] drm/i915/guc: Implement multi-lrc submission
Quoted 37 lines · John Harrison
Quoted 21 lines · Matthew Brost
Implement multi-lrc submission via a single workqueue entry and single H2G. The workqueue entry contains an updated tail value for each request, of all the contexts in the multi-lrc submission, and updates these values simultaneously. As such, the tasklet and bypass path have been updated to coalesce requests into a single submission.
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 21 ++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 8 + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 24 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 6 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 312 +++++++++++++++--- drivers/gpu/drm/i915/i915_request.h | 8 + 6 files changed, 317 insertions(+), 62 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0drivers/gpu/drm/i915/gt/uc/intel_guc.c void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) · line 757
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -748,3 +748,24 @@ void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) } } } + +void intel_guc_write_barrier (struct intel_guc *guc) +{ +struct intel_gt *gt =guc_to_gt (guc); + +if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { +GEM_BUG_ON (guc->send_regs.fw_domains);Granted, this patch is just moving code from one file to another not changing it. However, I think it would be worth adding a blank line in here. Otherwise the 'this register' comment below can be confusingly read as referring to the send_regs.fw_domain entry above.
Quoted 3 lines
And maybe add a comment why it is a bug for the
send_regsvalue to be set? I'm not seeing any obvious connection between it and the reset of this code.
Can add a blank line. I think the GEM_BUG_ON relates to being able to use intel_uncore_write_fw vs intel_uncore_write. Can add comment.
Quoted 87 lines
Quoted 87 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +14
-0+/* +* This register is used by the i915 and GuC for MMIO based +* communication. Once we are in this code CTBs are the only +* method the i915 uses to communicate with the GuC so it is +* safe to write to this register (a value of 0 is NOP for MMIO +* communication). If we ever start mixing CTBs and MMIOs a new +* register will have to be chosen. +*/ +intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); + }else { +/* wmb() sufficient for a barrier if in smem */ +wmb (); + } +}drivers/gpu/drm/i915/gt/uc/intel_guc.h +8
-0@@ -37,6 +37,12 @@ struct intel_guc {/* Global engine used to submit requests to GuC */ struct i915_sched_engine *sched_engine;struct i915_request *stalled_request; +enum { +STALL_NONE , +STALL_REGISTER_CONTEXT , +STALL_MOVE_LRC_TAIL , +STALL_ADD_REQUEST , + } submission_stall_reason;/* intel_guc_recv interrupt related state */ spinlock_t irq_lock;@@ -332,4 +338,6 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc);void intel_guc_load_status (struct intel_guc *guc,struct drm_printer *p); +void intel_guc_write_barrier (struct intel_guc *guc); +#endif drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1
-23@@ -377,28 +377,6 @@ static u32 ct_get_next_fence(struct intel_guc_ct *ct)return ++ct->requests.last_fence; } -static void write_barrier (struct intel_guc_ct *ct) -{ -struct intel_guc *guc =ct_to_guc (ct); -struct intel_gt *gt =guc_to_gt (guc); - -if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { -GEM_BUG_ON (guc->send_regs.fw_domains); -/* -* This register is used by the i915 and GuC for MMIO based -* communication. Once we are in this code CTBs are the only -* method the i915 uses to communicate with the GuC so it is -* safe to write to this register (a value of 0 is NOP for MMIO -* communication). If we ever start mixing CTBs and MMIOs a new -* register will have to be chosen. -*/ -intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); - }else { -/* wmb() sufficient for a barrier if in smem */ -wmb (); - } -} - static int ct_write(struct intel_guc_ct *ct, const u32 *action, u32 len /* in dwords */,@@ -468,7 +446,7 @@ static int ct_write(struct intel_guc_ct *ct,* make sure H2G buffer update and LRC tail update (if this triggering a * submission) are visible before updating the descriptor tail */ -write_barrier (ct); +intel_guc_write_barrier (ct_to_guc (ct));/* update local copies */ ctb->tail = tail;drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1@@ -65,12 +65,14 @@#define WQ_TYPE_PSEUDO (0x2 << WQ_TYPE_SHIFT)#define WQ_TYPE_INORDER (0x3 << WQ_TYPE_SHIFT)#define WQ_TYPE_NOOP (0x4 << WQ_TYPE_SHIFT) -#define WQ_TARGET_SHIFT 10 +#define WQ_TYPE_MULTI_LRC (0x5 << WQ_TYPE_SHIFT) +#define WQ_TARGET_SHIFT 8#define WQ_LEN_SHIFT 16
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h line 75
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1#define WQ_NO_WCFLUSH_WAIT (1 << 27)#define WQ_PRESENT_WORKLOAD (1 << 28) -#define WQ_RING_TAIL_SHIFT 20 +#define WQ_GUC_ID_SHIFT 0 +#define WQ_RING_TAIL_SHIFT 18Presumably all of these API changes are not actually new? They really came in with the reset of the v40 re-write? It's just that this is the first time we are using them and therefore need to finally update the defines?
Yes.
Quoted 68 lines
Quoted 68 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0#define WQ_RING_TAIL_MAX 0x7FF/* 2^11 QWords */ #define WQ_RING_TAIL_MASK (WQ_RING_TAIL_MAX << WQ_RING_TAIL_SHIFT)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +28
-14@@ -391,6 +391,29 @@ __get_process_desc(struct intel_context *ce) LRC_STATE_OFFSET) / sizeof(u32))); } +static u32 *get_wq_pointer (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Check for space in work queue. Caching a value of head pointer in +* intel_context structure in order reduce the number accesses to shared +* GPU memory which may be across a PCIe bus. +*/ +#define AVAILABLE_SPACE \ + CIRC_SPACE(ce->guc_wqi_tail, ce->guc_wqi_head, GUC_WQ_SIZE) +if (wqi_size >AVAILABLE_SPACE ) { + ce->guc_wqi_head =READ_ONCE (desc->head); + +if (wqi_size >AVAILABLE_SPACE ) +return NULL ; + } +#undef AVAILABLE_SPACE + +return ((u32 *)__get_process_desc (ce)) + + ((WQ_OFFSET + ce->guc_wqi_tail) /sizeof (u32)); +} +static struct guc_lrc_desc *__get_lrc_desc (struct intel_guc *guc,u32 index) {struct guc_lrc_desc *base = guc->lrc_desc_pool_vaddr;@@ -547,10 +570,10 @@ int intel_guc_wait_for_idle(struct intel_guc *guc, long timeout)static int guc_lrc_desc_pin (struct intel_context *ce,bool loop); -static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +static int __guc_add_request (struct intel_guc *guc,struct i915_request *rq) {int err =0 ; -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u32 action[3 ];int len =0 ;u32 g2h_len_dw =0 ;@@ -571,26 +594,17 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)GEM_BUG_ON (!atomic_read (&ce->guc_id.ref));GEM_BUG_ON (context_guc_id_invalid (ce)); -/* -* Corner case where the GuC firmware was blown away and reloaded while -* this context was pinned. -*/ -if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id))) { - err =guc_lrc_desc_pin (ce, false); -if (unlikely (err)) -return err; - } -spin_lock (&ce->guc_state.lock);/* * The request / context will be run on the hardware when scheduling -* gets enabled in the unblock. +* gets enabled in the unblock. For multi-lrc we still submit the +* context to move the LRC tails. */ -if (unlikely (context_blocked (ce))) +if (unlikely (context_blocked (ce) && !intel_context_is_parent (ce)))
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int guc_add_request(struct intel_guc *guc, struct i915_request *rq) · line 607
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-1goto out; - enabled =context_enabled (ce); + enabled =context_enabled (ce) ||context_blocked (ce);Would be better to say '||
is_parent(ce)' rather than blocked? The reason for reason for claiming enabled when not is because it's a multi-LRC parent, right? Or can there be a parent that is neither enabled nor blocked for which we don't want to do the processing? But why would that make sense/be possible?
No. If it is parent and blocked we want to submit the enable but not enable submission. In the non-multi-lrc case the submit has already been done by the i915 (moving lrc tail).
Quoted 59 lines
Quoted 59 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +41
-0if (!enabled) { action[len++] =INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_SET ;@@ -609,6 +623,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)trace_intel_context_sched_enable (ce);atomic_inc (&guc->outstanding_submission_g2h);set_context_enabled (ce); + +/* +* Without multi-lrc KMD does the submission step (moving the +* lrc tail) so enabling scheduling is sufficient to submit the +* context. This isn't the case in multi-lrc submission as the +* GuC needs to move the tails, hence the need for another H2G +* to submit a multi-lrc context after enabling scheduling. +*/ +if (intel_context_is_parent (ce)) { + action[0 ] =INTEL_GUC_ACTION_SCHED_CONTEXT ; + err =intel_guc_send_nb (guc, action, len -1 ,0 ); + } }else if (!enabled) {clr_context_pending_enable (ce);intel_context_put (ce);@@ -621,6 +647,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)return err; } +static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +{ +int ret =__guc_add_request (guc, rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request= rq; + guc->submission_stall_reason =STALL_ADD_REQUEST ; + } + +return ret; +} +static void guc_set_lrc_tail (struct i915_request *rq) { rq->context->lrc_reg_state[CTX_RING_TAIL] =@@ -632,6 +670,127 @@ static int rq_prio(const struct i915_request *rq)return rq->sched.attr.priority; } +static bool is_multi_lrc_rq (struct i915_request *rq) +{ +return intel_context_is_child (rq->context) || +intel_context_is_parent (rq->context); +} + +static bool can_merge_rq (struct i915_request *rq, +struct i915_request *last) +{ +return request_to_scheduling_context (rq) == +request_to_scheduling_context (last); +} + +static u32 wq_space_until_wrap (struct intel_context *ce) +{ +return (GUC_WQ_SIZE - ce->guc_wqi_tail); +}
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 696
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+ +static void write_wqi (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Ensure WQE are visible before updating tail WQE or WQI?
WQI (work queue instance) is the convention used but I actually like WQE (work queue entry) better. Will change the name to WQE everywhere.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11
-0+*/ +intel_guc_write_barrier (ce_to_guc (ce)); + + ce->guc_wqi_tail = (ce->guc_wqi_tail + wqi_size) & (GUC_WQ_SIZE -1 ); +WRITE_ONCE (desc->tail, ce->guc_wqi_tail); +} + +static int guc_wq_noop_append (struct intel_context *ce) +{ +struct guc_process_desc *desc =__get_process_desc (ce); +u32 *wqi =get_wq_pointer (desc, ce,wq_space_until_wrap (ce));
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 713
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +6
-0+ +if (!wqi) +return -EBUSY ; + + *wqi =WQ_TYPE_NOOP | + ((wq_space_until_wrap (ce) /sizeof (u32) -1 ) <<WQ_LEN_SHIFT );This should have a
BUG_ONcheck that the requested size fits within theWQ_LENfield?
I could add that.
Quoted 3 lines
Indeed, would be better to use the FIELD macros as they do that kind of thing for you.
Yes, they do. I forget how they work, will figure this out and use the macros.
Quoted 31 lines
Quoted 31 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +30
-0+ ce->guc_wqi_tail =0 ; + +return 0 ; +} + +static int __guc_wq_item_append (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +struct intel_context *child; +struct guc_process_desc *desc =__get_process_desc (ce); +unsigned int wqi_size = (ce->guc_number_children +4 ) * +sizeof (u32); +u32 *wqi; +int ret; + +/* Ensure context is in correct state updating work queue */ +GEM_BUG_ON (!atomic_read (&ce->guc_id.ref)); +GEM_BUG_ON (context_guc_id_invalid (ce)); +GEM_BUG_ON (context_wait_for_deregister_to_register (ce)); +GEM_BUG_ON (!lrc_desc_registered (ce_to_guc (ce), ce->guc_id.id)); + +/* Insert NOOP if this work queue item will wrap the tail pointer. */ +if (wqi_size >wq_space_until_wrap (ce)) { + ret =guc_wq_noop_append (ce); +if (ret) +return ret; + } + + wqi =get_wq_pointer (desc, ce, wqi_size); +if (!wqi)
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 750
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+return -EBUSY ; + + *wqi++ =WQ_TYPE_MULTI_LRC | + ((wqi_size /sizeof (u32) -1 ) <<WQ_LEN_SHIFT ); + *wqi++ = ce->lrc.lrca; + *wqi++ = (ce->guc_id.id <<WQ_GUC_ID_SHIFT ) | + ((ce->ring->tail /sizeof (u64)) <<WQ_RING_TAIL_SHIFT );As above, would be better to use FIELD macros instead of manual shifting.
Will do.
Matt
Quoted 258 lines
John.
Quoted 254 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +144
-22+ *wqi++ =0 ;/* fence_id */ +for_each_child (ce, child) + *wqi++ = child->ring->tail /sizeof (u64); + +write_wqi (desc, ce, wqi_size); + +return 0 ; +} + +static int guc_wq_item_append (struct intel_guc *guc, +struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +int ret =0 ; + +if (likely (!intel_context_is_banned (ce))) { + ret =__guc_wq_item_append (rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request = rq; + guc->submission_stall_reason =STALL_MOVE_LRC_TAIL ; + } + } + +return ret; +} + +static bool multi_lrc_submit (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); + +intel_ring_set_tail (rq->ring, rq->tail); + +/* +* We expect the front end (execbuf IOCTL) to set this flag on the last +* request generated from a multi-BB submission. This indicates to the +* backend (GuC interface) that we should submit this context thus +* submitting all the requests generated in parallel. +*/ +return test_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , &rq->fence.flags) || +intel_context_is_banned (ce); +} +static int guc_dequeue_one_context (struct intel_guc *guc) {struct i915_sched_engine *const sched_engine = guc->sched_engine;@@ -645,7 +804,17 @@ static int guc_dequeue_one_context(struct intel_guc *guc)if (guc->stalled_request) { submit = true; last = guc->stalled_request; - goto resubmit; + +switch (guc->submission_stall_reason) { +case STALL_REGISTER_CONTEXT : + goto register_context; +case STALL_MOVE_LRC_TAIL : + goto move_lrc_tail; +case STALL_ADD_REQUEST : + goto add_request; +default : +MISSING_CASE (guc->submission_stall_reason); + } }while ((rb =rb_first_cached (&sched_engine->queue))) {@@ -653,8 +822,8 @@ static int guc_dequeue_one_context(struct intel_guc *guc)struct i915_request *rq, *rn;priolist_for_each_request_consume (rq, rn, p) { -if (last && rq->context != last->context) - goto done; +if (last && !can_merge_rq (rq, last)) + goto register_context;list_del_init (&rq->sched.link);@@ -662,33 +831,84 @@ static int guc_dequeue_one_context(struct intel_guc *guc)trace_i915_request_in (rq,0 ); last = rq; - submit = true; + +if (is_multi_lrc_rq (rq)) { +/* +* We need to coalesce all multi-lrc requests in +* a relationship into a single H2G. We are +* guaranteed that all of these requests will be +* submitted sequentially. +*/ +if (multi_lrc_submit (rq)) { + submit = true; + goto register_context; + } + }else { + submit = true; + } }rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); } -done: + +register_context:if (submit) { -guc_set_lrc_tail (last); -resubmit: +struct intel_context *ce =request_to_scheduling_context (last); + +if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id) && + !intel_context_is_banned (ce))) { + ret =guc_lrc_desc_pin (ce, false); +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + guc->stalled_request = last; + guc->submission_stall_reason = +STALL_REGISTER_CONTEXT ; + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + } + +move_lrc_tail: +if (is_multi_lrc_rq (last)) { + ret =guc_wq_item_append (guc, last); +if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + }else { +guc_set_lrc_tail (last); + } + +add_request: ret =guc_add_request (guc, last); -if (unlikely (ret == -EPIPE )) +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ goto deadlk; -else if (ret == -EBUSY ) { -tasklet_schedule (&sched_engine->tasklet); - guc->stalled_request = last; -return false; } } guc->stalled_request =NULL ; + guc->submission_stall_reason =STALL_NONE ;return submit; deadlk: sched_engine->tasklet.callback =NULL ;tasklet_disable_nosync (&sched_engine->tasklet);return false; + +schedule_tasklet: +tasklet_schedule (&sched_engine->tasklet); +return false; }static void guc_submission_tasklet (struct tasklet_struct *t)@@ -1227,10 +1447,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,trace_i915_request_in (rq,0 ); -guc_set_lrc_tail (rq); - ret =guc_add_request (guc, rq); -if (ret == -EBUSY ) - guc->stalled_request = rq; +if (is_multi_lrc_rq (rq)) { +if (multi_lrc_submit (rq)) { + ret =guc_wq_item_append (guc, rq); +if (!ret) + ret =guc_add_request (guc, rq); + } + }else { +guc_set_lrc_tail (rq); + ret =guc_add_request (guc, rq); + }if (unlikely (ret == -EPIPE ))disable_submission (guc);@@ -1238,6 +1464,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,return ret; } +bool need_tasklet (struct intel_guc *guc,struct i915_request *rq) +{ +struct i915_sched_engine *sched_engine = rq->engine->sched_engine; +struct intel_context *ce =request_to_scheduling_context (rq); + +return submission_disabled (guc) || guc->stalled_request || + !i915_sched_engine_is_empty (sched_engine) || + !lrc_desc_registered (guc, ce->guc_id.id); +} +static void guc_submit_request (struct i915_request *rq) {struct i915_sched_engine *sched_engine = rq->engine->sched_engine;@@ -1247,8 +1483,7 @@ static void guc_submit_request(struct i915_request *rq)/* Will be called from irq-context when using foreign fences. */ spin_lock_irqsave (&sched_engine->lock, flags); -if (submission_disabled (guc) || guc->stalled_request || - !i915_sched_engine_is_empty (sched_engine)) +if (need_tasklet (guc, rq))queue_request (sched_engine, rq,rq_prio (rq));else if (guc_bypass_tasklet_submit (guc, rq) == -EBUSY )tasklet_hi_schedule (&sched_engine->tasklet);@@ -2241,9 +2476,10 @@ static bool new_guc_prio_higher(u8 old_guc_prio, u8 new_guc_prio)static void add_to_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (rq_prio (rq)); +GEM_BUG_ON (intel_context_is_child (ce));GEM_BUG_ON (rq->guc_prio ==GUC_PRIO_FINI );spin_lock (&ce->guc_state.lock);@@ -2276,7 +2512,9 @@ static void guc_prio_fini(struct i915_request *rq, struct intel_context *ce)static void remove_from_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq); + +GEM_BUG_ON (intel_context_is_child (ce));spin_lock_irq (&ce->guc_state.lock);@@ -2692,7 +2930,7 @@ static void guc_init_breadcrumbs(struct intel_engine_cs *engine)static void guc_bump_inflight_request_prio (struct i915_request *rq,int prio) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (prio);/* Short circuit function */ @@ -2715,7 +2953,7 @@ static void guc_bump_inflight_request_prio(struct i915_request *rq,static void guc_retire_inflight_request_prio (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);spin_lock (&ce->guc_state.lock);guc_prio_fini (rq, ce);drivers/gpu/drm/i915/i915_request.h +8
-0@@ -139,6 +139,14 @@ enum {* the GPU. Here we track such boost requests on a per-request basis. */ I915_FENCE_FLAG_BOOST , + +/* +* I915_FENCE_FLAG_SUBMIT_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) should +* trigger a submission to the GuC rather than just moving the context +* tail. +*/ + I915_FENCE_FLAG_SUBMIT_PARALLEL, };/**
Re: [Intel-gfx] [PATCH 15/27] drm/i915/guc: Implement multi-lrc submission
Quoted 291 lines · Matthew Brost
Quoted 37 lines · John Harrison
Quoted 21 lines · Matthew Brost
Implement multi-lrc submission via a single workqueue entry and single H2G. The workqueue entry contains an updated tail value for each request, of all the contexts in the multi-lrc submission, and updates these values simultaneously. As such, the tasklet and bypass path have been updated to coalesce requests into a single submission.
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 21 ++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 8 + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 24 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 6 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 312 +++++++++++++++--- drivers/gpu/drm/i915/i915_request.h | 8 + 6 files changed, 317 insertions(+), 62 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0drivers/gpu/drm/i915/gt/uc/intel_guc.c void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) · line 757
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -748,3 +748,24 @@ void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) } } } + +void intel_guc_write_barrier (struct intel_guc *guc) +{ +struct intel_gt *gt =guc_to_gt (guc); + +if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { +GEM_BUG_ON (guc->send_regs.fw_domains);Granted, this patch is just moving code from one file to another not changing it. However, I think it would be worth adding a blank line in here. Otherwise the 'this register' comment below can be confusingly read as referring to the send_regs.fw_domain entry above.
Quoted 3 lines
And maybe add a comment why it is a bug for the
send_regsvalue to be set? I'm not seeing any obvious connection between it and the reset of this code.Can add a blank line. I think the
GEM_BUG_ONrelates to being able to useintel_uncore_write_fwvsintel_uncore_write. Can add comment.Quoted 87 lines
Quoted 87 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +14
-0+/* +* This register is used by the i915 and GuC for MMIO based +* communication. Once we are in this code CTBs are the only +* method the i915 uses to communicate with the GuC so it is +* safe to write to this register (a value of 0 is NOP for MMIO +* communication). If we ever start mixing CTBs and MMIOs a new +* register will have to be chosen. +*/ +intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); + }else { +/* wmb() sufficient for a barrier if in smem */ +wmb (); + } +}drivers/gpu/drm/i915/gt/uc/intel_guc.h +8
-0@@ -37,6 +37,12 @@ struct intel_guc {/* Global engine used to submit requests to GuC */ struct i915_sched_engine *sched_engine;struct i915_request *stalled_request; +enum { +STALL_NONE , +STALL_REGISTER_CONTEXT , +STALL_MOVE_LRC_TAIL , +STALL_ADD_REQUEST , + } submission_stall_reason;/* intel_guc_recv interrupt related state */ spinlock_t irq_lock;@@ -332,4 +338,6 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc);void intel_guc_load_status (struct intel_guc *guc,struct drm_printer *p); +void intel_guc_write_barrier (struct intel_guc *guc); +#endif drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1
-23@@ -377,28 +377,6 @@ static u32 ct_get_next_fence(struct intel_guc_ct *ct)return ++ct->requests.last_fence; } -static void write_barrier (struct intel_guc_ct *ct) -{ -struct intel_guc *guc =ct_to_guc (ct); -struct intel_gt *gt =guc_to_gt (guc); - -if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { -GEM_BUG_ON (guc->send_regs.fw_domains); -/* -* This register is used by the i915 and GuC for MMIO based -* communication. Once we are in this code CTBs are the only -* method the i915 uses to communicate with the GuC so it is -* safe to write to this register (a value of 0 is NOP for MMIO -* communication). If we ever start mixing CTBs and MMIOs a new -* register will have to be chosen. -*/ -intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); - }else { -/* wmb() sufficient for a barrier if in smem */ -wmb (); - } -} - static int ct_write(struct intel_guc_ct *ct, const u32 *action, u32 len /* in dwords */,@@ -468,7 +446,7 @@ static int ct_write(struct intel_guc_ct *ct,* make sure H2G buffer update and LRC tail update (if this triggering a * submission) are visible before updating the descriptor tail */ -write_barrier (ct); +intel_guc_write_barrier (ct_to_guc (ct));/* update local copies */ ctb->tail = tail;drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1@@ -65,12 +65,14 @@#define WQ_TYPE_PSEUDO (0x2 << WQ_TYPE_SHIFT)#define WQ_TYPE_INORDER (0x3 << WQ_TYPE_SHIFT)#define WQ_TYPE_NOOP (0x4 << WQ_TYPE_SHIFT) -#define WQ_TARGET_SHIFT 10 +#define WQ_TYPE_MULTI_LRC (0x5 << WQ_TYPE_SHIFT) +#define WQ_TARGET_SHIFT 8#define WQ_LEN_SHIFT 16Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h line 75
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1#define WQ_NO_WCFLUSH_WAIT (1 << 27)#define WQ_PRESENT_WORKLOAD (1 << 28) -#define WQ_RING_TAIL_SHIFT 20 +#define WQ_GUC_ID_SHIFT 0 +#define WQ_RING_TAIL_SHIFT 18Presumably all of these API changes are not actually new? They really came in with the reset of the v40 re-write? It's just that this is the first time we are using them and therefore need to finally update the defines?
Yes.
Quoted 68 lines
Quoted 68 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0#define WQ_RING_TAIL_MAX 0x7FF/* 2^11 QWords */ #define WQ_RING_TAIL_MASK (WQ_RING_TAIL_MAX << WQ_RING_TAIL_SHIFT)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +28
-14@@ -391,6 +391,29 @@ __get_process_desc(struct intel_context *ce) LRC_STATE_OFFSET) / sizeof(u32))); } +static u32 *get_wq_pointer (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Check for space in work queue. Caching a value of head pointer in +* intel_context structure in order reduce the number accesses to shared +* GPU memory which may be across a PCIe bus. +*/ +#define AVAILABLE_SPACE \ + CIRC_SPACE(ce->guc_wqi_tail, ce->guc_wqi_head, GUC_WQ_SIZE) +if (wqi_size >AVAILABLE_SPACE ) { + ce->guc_wqi_head =READ_ONCE (desc->head); + +if (wqi_size >AVAILABLE_SPACE ) +return NULL ; + } +#undef AVAILABLE_SPACE + +return ((u32 *)__get_process_desc (ce)) + + ((WQ_OFFSET + ce->guc_wqi_tail) /sizeof (u32)); +} +static struct guc_lrc_desc *__get_lrc_desc (struct intel_guc *guc,u32 index) {struct guc_lrc_desc *base = guc->lrc_desc_pool_vaddr;@@ -547,10 +570,10 @@ int intel_guc_wait_for_idle(struct intel_guc *guc, long timeout)static int guc_lrc_desc_pin (struct intel_context *ce,bool loop); -static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +static int __guc_add_request (struct intel_guc *guc,struct i915_request *rq) {int err =0 ; -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u32 action[3 ];int len =0 ;u32 g2h_len_dw =0 ;@@ -571,26 +594,17 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)GEM_BUG_ON (!atomic_read (&ce->guc_id.ref));GEM_BUG_ON (context_guc_id_invalid (ce)); -/* -* Corner case where the GuC firmware was blown away and reloaded while -* this context was pinned. -*/ -if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id))) { - err =guc_lrc_desc_pin (ce, false); -if (unlikely (err)) -return err; - } -spin_lock (&ce->guc_state.lock);/* * The request / context will be run on the hardware when scheduling -* gets enabled in the unblock. +* gets enabled in the unblock. For multi-lrc we still submit the +* context to move the LRC tails. */ -if (unlikely (context_blocked (ce))) +if (unlikely (context_blocked (ce) && !intel_context_is_parent (ce)))Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int guc_add_request(struct intel_guc *guc, struct i915_request *rq) · line 607
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-1goto out; - enabled =context_enabled (ce); + enabled =context_enabled (ce) ||context_blocked (ce);Would be better to say '||
is_parent(ce)' rather than blocked? The reason for reason for claiming enabled when not is because it's a multi-LRC parent, right? Or can there be a parent that is neither enabled nor blocked for which we don't want to do the processing? But why would that make sense/be possible?No. If it is parent and blocked we want to submit the enable but not enable submission. In the non-multi-lrc case the submit has already been done by the i915 (moving lrc tail).
Quoted 59 lines
Quoted 59 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +41
-0if (!enabled) { action[len++] =INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_SET ;@@ -609,6 +623,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)trace_intel_context_sched_enable (ce);atomic_inc (&guc->outstanding_submission_g2h);set_context_enabled (ce); + +/* +* Without multi-lrc KMD does the submission step (moving the +* lrc tail) so enabling scheduling is sufficient to submit the +* context. This isn't the case in multi-lrc submission as the +* GuC needs to move the tails, hence the need for another H2G +* to submit a multi-lrc context after enabling scheduling. +*/ +if (intel_context_is_parent (ce)) { + action[0 ] =INTEL_GUC_ACTION_SCHED_CONTEXT ; + err =intel_guc_send_nb (guc, action, len -1 ,0 ); + } }else if (!enabled) {clr_context_pending_enable (ce);intel_context_put (ce);@@ -621,6 +647,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)return err; } +static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +{ +int ret =__guc_add_request (guc, rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request= rq; + guc->submission_stall_reason =STALL_ADD_REQUEST ; + } + +return ret; +} +static void guc_set_lrc_tail (struct i915_request *rq) { rq->context->lrc_reg_state[CTX_RING_TAIL] =@@ -632,6 +670,127 @@ static int rq_prio(const struct i915_request *rq)return rq->sched.attr.priority; } +static bool is_multi_lrc_rq (struct i915_request *rq) +{ +return intel_context_is_child (rq->context) || +intel_context_is_parent (rq->context); +} + +static bool can_merge_rq (struct i915_request *rq, +struct i915_request *last) +{ +return request_to_scheduling_context (rq) == +request_to_scheduling_context (last); +} + +static u32 wq_space_until_wrap (struct intel_context *ce) +{ +return (GUC_WQ_SIZE - ce->guc_wqi_tail); +}Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 696
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+ +static void write_wqi (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Ensure WQE are visible before updating tail WQE or WQI?
Quoted 2 lines
WQI (work queue instance) is the convention used but I actually like WQE (work queue entry) better. Will change the name to WQE everywhere.
I thought it was Work Queue Item. Which is basically the same as entry. Ether works but simpler just to change this one instance to WQI. And maybe make sure the abbreviation is actually written out in full somewhere to be clear? I think patch #12 is adding these fields to the ce, maybe update the comments to explain what wqi means.
John.
Quoted 329 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11
-0+*/ +intel_guc_write_barrier (ce_to_guc (ce)); + + ce->guc_wqi_tail = (ce->guc_wqi_tail + wqi_size) & (GUC_WQ_SIZE -1 ); +WRITE_ONCE (desc->tail, ce->guc_wqi_tail); +} + +static int guc_wq_noop_append (struct intel_context *ce) +{ +struct guc_process_desc *desc =__get_process_desc (ce); +u32 *wqi =get_wq_pointer (desc, ce,wq_space_until_wrap (ce));Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 713
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +6
-0+ +if (!wqi) +return -EBUSY ; + + *wqi =WQ_TYPE_NOOP | + ((wq_space_until_wrap (ce) /sizeof (u32) -1 ) <<WQ_LEN_SHIFT );This should have a
BUG_ONcheck that the requested size fits within theWQ_LENfield?I could add that.
Quoted 3 lines
Indeed, would be better to use the FIELD macros as they do that kind of thing for you.
Yes, they do. I forget how they work, will figure this out and use the macros.
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +30
-0+ ce->guc_wqi_tail =0 ; + +return 0 ; +} + +static int __guc_wq_item_append (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +struct intel_context *child; +struct guc_process_desc *desc =__get_process_desc (ce); +unsigned int wqi_size = (ce->guc_number_children +4 ) * +sizeof (u32); +u32 *wqi; +int ret; + +/* Ensure context is in correct state updating work queue */ +GEM_BUG_ON (!atomic_read (&ce->guc_id.ref)); +GEM_BUG_ON (context_guc_id_invalid (ce)); +GEM_BUG_ON (context_wait_for_deregister_to_register (ce)); +GEM_BUG_ON (!lrc_desc_registered (ce_to_guc (ce), ce->guc_id.id)); + +/* Insert NOOP if this work queue item will wrap the tail pointer. */ +if (wqi_size >wq_space_until_wrap (ce)) { + ret =guc_wq_noop_append (ce); +if (ret) +return ret; + } + + wqi =get_wq_pointer (desc, ce, wqi_size); +if (!wqi)Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 750
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+return -EBUSY ; + + *wqi++ =WQ_TYPE_MULTI_LRC | + ((wqi_size /sizeof (u32) -1 ) <<WQ_LEN_SHIFT ); + *wqi++ = ce->lrc.lrca; + *wqi++ = (ce->guc_id.id <<WQ_GUC_ID_SHIFT ) | + ((ce->ring->tail /sizeof (u64)) <<WQ_RING_TAIL_SHIFT );As above, would be better to use FIELD macros instead of manual shifting.
Will do.
Matt
Quoted 257 lines
John.
Quoted 254 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +144
-22+ *wqi++ =0 ;/* fence_id */ +for_each_child (ce, child) + *wqi++ = child->ring->tail /sizeof (u64); + +write_wqi (desc, ce, wqi_size); + +return 0 ; +} + +static int guc_wq_item_append (struct intel_guc *guc, +struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +int ret =0 ; + +if (likely (!intel_context_is_banned (ce))) { + ret =__guc_wq_item_append (rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request = rq; + guc->submission_stall_reason =STALL_MOVE_LRC_TAIL ; + } + } + +return ret; +} + +static bool multi_lrc_submit (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); + +intel_ring_set_tail (rq->ring, rq->tail); + +/* +* We expect the front end (execbuf IOCTL) to set this flag on the last +* request generated from a multi-BB submission. This indicates to the +* backend (GuC interface) that we should submit this context thus +* submitting all the requests generated in parallel. +*/ +return test_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , &rq->fence.flags) || +intel_context_is_banned (ce); +} +static int guc_dequeue_one_context (struct intel_guc *guc) {struct i915_sched_engine *const sched_engine = guc->sched_engine;@@ -645,7 +804,17 @@ static int guc_dequeue_one_context(struct intel_guc *guc)if (guc->stalled_request) { submit = true; last = guc->stalled_request; - goto resubmit; + +switch (guc->submission_stall_reason) { +case STALL_REGISTER_CONTEXT : + goto register_context; +case STALL_MOVE_LRC_TAIL : + goto move_lrc_tail; +case STALL_ADD_REQUEST : + goto add_request; +default : +MISSING_CASE (guc->submission_stall_reason); + } }while ((rb =rb_first_cached (&sched_engine->queue))) {@@ -653,8 +822,8 @@ static int guc_dequeue_one_context(struct intel_guc *guc)struct i915_request *rq, *rn;priolist_for_each_request_consume (rq, rn, p) { -if (last && rq->context != last->context) - goto done; +if (last && !can_merge_rq (rq, last)) + goto register_context;list_del_init (&rq->sched.link);@@ -662,33 +831,84 @@ static int guc_dequeue_one_context(struct intel_guc *guc)trace_i915_request_in (rq,0 ); last = rq; - submit = true; + +if (is_multi_lrc_rq (rq)) { +/* +* We need to coalesce all multi-lrc requests in +* a relationship into a single H2G. We are +* guaranteed that all of these requests will be +* submitted sequentially. +*/ +if (multi_lrc_submit (rq)) { + submit = true; + goto register_context; + } + }else { + submit = true; + } }rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); } -done: + +register_context:if (submit) { -guc_set_lrc_tail (last); -resubmit: +struct intel_context *ce =request_to_scheduling_context (last); + +if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id) && + !intel_context_is_banned (ce))) { + ret =guc_lrc_desc_pin (ce, false); +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + guc->stalled_request = last; + guc->submission_stall_reason = +STALL_REGISTER_CONTEXT ; + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + } + +move_lrc_tail: +if (is_multi_lrc_rq (last)) { + ret =guc_wq_item_append (guc, last); +if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + }else { +guc_set_lrc_tail (last); + } + +add_request: ret =guc_add_request (guc, last); -if (unlikely (ret == -EPIPE )) +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ goto deadlk; -else if (ret == -EBUSY ) { -tasklet_schedule (&sched_engine->tasklet); - guc->stalled_request = last; -return false; } } guc->stalled_request =NULL ; + guc->submission_stall_reason =STALL_NONE ;return submit; deadlk: sched_engine->tasklet.callback =NULL ;tasklet_disable_nosync (&sched_engine->tasklet);return false; + +schedule_tasklet: +tasklet_schedule (&sched_engine->tasklet); +return false; }static void guc_submission_tasklet (struct tasklet_struct *t)@@ -1227,10 +1447,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,trace_i915_request_in (rq,0 ); -guc_set_lrc_tail (rq); - ret =guc_add_request (guc, rq); -if (ret == -EBUSY ) - guc->stalled_request = rq; +if (is_multi_lrc_rq (rq)) { +if (multi_lrc_submit (rq)) { + ret =guc_wq_item_append (guc, rq); +if (!ret) + ret =guc_add_request (guc, rq); + } + }else { +guc_set_lrc_tail (rq); + ret =guc_add_request (guc, rq); + }if (unlikely (ret == -EPIPE ))disable_submission (guc);@@ -1238,6 +1464,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,return ret; } +bool need_tasklet (struct intel_guc *guc,struct i915_request *rq) +{ +struct i915_sched_engine *sched_engine = rq->engine->sched_engine; +struct intel_context *ce =request_to_scheduling_context (rq); + +return submission_disabled (guc) || guc->stalled_request || + !i915_sched_engine_is_empty (sched_engine) || + !lrc_desc_registered (guc, ce->guc_id.id); +} +static void guc_submit_request (struct i915_request *rq) {struct i915_sched_engine *sched_engine = rq->engine->sched_engine;@@ -1247,8 +1483,7 @@ static void guc_submit_request(struct i915_request *rq)/* Will be called from irq-context when using foreign fences. */ spin_lock_irqsave (&sched_engine->lock, flags); -if (submission_disabled (guc) || guc->stalled_request || - !i915_sched_engine_is_empty (sched_engine)) +if (need_tasklet (guc, rq))queue_request (sched_engine, rq,rq_prio (rq));else if (guc_bypass_tasklet_submit (guc, rq) == -EBUSY )tasklet_hi_schedule (&sched_engine->tasklet);@@ -2241,9 +2476,10 @@ static bool new_guc_prio_higher(u8 old_guc_prio, u8 new_guc_prio)static void add_to_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (rq_prio (rq)); +GEM_BUG_ON (intel_context_is_child (ce));GEM_BUG_ON (rq->guc_prio ==GUC_PRIO_FINI );spin_lock (&ce->guc_state.lock);@@ -2276,7 +2512,9 @@ static void guc_prio_fini(struct i915_request *rq, struct intel_context *ce)static void remove_from_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq); + +GEM_BUG_ON (intel_context_is_child (ce));spin_lock_irq (&ce->guc_state.lock);@@ -2692,7 +2930,7 @@ static void guc_init_breadcrumbs(struct intel_engine_cs *engine)static void guc_bump_inflight_request_prio (struct i915_request *rq,int prio) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (prio);/* Short circuit function */ @@ -2715,7 +2953,7 @@ static void guc_bump_inflight_request_prio(struct i915_request *rq,static void guc_retire_inflight_request_prio (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);spin_lock (&ce->guc_state.lock);guc_prio_fini (rq, ce);drivers/gpu/drm/i915/i915_request.h +8
-0@@ -139,6 +139,14 @@ enum {* the GPU. Here we track such boost requests on a per-request basis. */ I915_FENCE_FLAG_BOOST , + +/* +* I915_FENCE_FLAG_SUBMIT_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) should +* trigger a submission to the GuC rather than just moving the context +* tail. +*/ + I915_FENCE_FLAG_SUBMIT_PARALLEL, };/**
Re: [Intel-gfx] [PATCH 15/27] drm/i915/guc: Implement multi-lrc submission
Quoted 292 lines · John Harrison
Quoted 291 lines · Matthew Brost
Quoted 37 lines · John Harrison
Quoted 21 lines · Matthew Brost
Implement multi-lrc submission via a single workqueue entry and single H2G. The workqueue entry contains an updated tail value for each request, of all the contexts in the multi-lrc submission, and updates these values simultaneously. As such, the tasklet and bypass path have been updated to coalesce requests into a single submission.
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 21 ++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 8 + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 24 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 6 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 312 +++++++++++++++--- drivers/gpu/drm/i915/i915_request.h | 8 + 6 files changed, 317 insertions(+), 62 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0drivers/gpu/drm/i915/gt/uc/intel_guc.c void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) · line 757
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -748,3 +748,24 @@ void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p) } } } + +void intel_guc_write_barrier (struct intel_guc *guc) +{ +struct intel_gt *gt =guc_to_gt (guc); + +if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { +GEM_BUG_ON (guc->send_regs.fw_domains);Granted, this patch is just moving code from one file to another not changing it. However, I think it would be worth adding a blank line in here. Otherwise the 'this register' comment below can be confusingly read as referring to the send_regs.fw_domain entry above.
Quoted 3 lines
And maybe add a comment why it is a bug for the
send_regsvalue to be set? I'm not seeing any obvious connection between it and the reset of this code.Can add a blank line. I think the
GEM_BUG_ONrelates to being able to useintel_uncore_write_fwvsintel_uncore_write. Can add comment.Quoted 87 lines
Quoted 87 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +14
-0+/* +* This register is used by the i915 and GuC for MMIO based +* communication. Once we are in this code CTBs are the only +* method the i915 uses to communicate with the GuC so it is +* safe to write to this register (a value of 0 is NOP for MMIO +* communication). If we ever start mixing CTBs and MMIOs a new +* register will have to be chosen. +*/ +intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); + }else { +/* wmb() sufficient for a barrier if in smem */ +wmb (); + } +}drivers/gpu/drm/i915/gt/uc/intel_guc.h +8
-0@@ -37,6 +37,12 @@ struct intel_guc {/* Global engine used to submit requests to GuC */ struct i915_sched_engine *sched_engine;struct i915_request *stalled_request; +enum { +STALL_NONE , +STALL_REGISTER_CONTEXT , +STALL_MOVE_LRC_TAIL , +STALL_ADD_REQUEST , + } submission_stall_reason;/* intel_guc_recv interrupt related state */ spinlock_t irq_lock;@@ -332,4 +338,6 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc);void intel_guc_load_status (struct intel_guc *guc,struct drm_printer *p); +void intel_guc_write_barrier (struct intel_guc *guc); +#endif drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1
-23@@ -377,28 +377,6 @@ static u32 ct_get_next_fence(struct intel_guc_ct *ct)return ++ct->requests.last_fence; } -static void write_barrier (struct intel_guc_ct *ct) -{ -struct intel_guc *guc =ct_to_guc (ct); -struct intel_gt *gt =guc_to_gt (guc); - -if (i915_gem_object_is_lmem (guc->ct.vma->obj)) { -GEM_BUG_ON (guc->send_regs.fw_domains); -/* -* This register is used by the i915 and GuC for MMIO based -* communication. Once we are in this code CTBs are the only -* method the i915 uses to communicate with the GuC so it is -* safe to write to this register (a value of 0 is NOP for MMIO -* communication). If we ever start mixing CTBs and MMIOs a new -* register will have to be chosen. -*/ -intel_uncore_write_fw (gt->uncore,GEN11_SOFT_SCRATCH (0 ),0 ); - }else { -/* wmb() sufficient for a barrier if in smem */ -wmb (); - } -} - static int ct_write(struct intel_guc_ct *ct, const u32 *action, u32 len /* in dwords */,@@ -468,7 +446,7 @@ static int ct_write(struct intel_guc_ct *ct,* make sure H2G buffer update and LRC tail update (if this triggering a * submission) are visible before updating the descriptor tail */ -write_barrier (ct); +intel_guc_write_barrier (ct_to_guc (ct));/* update local copies */ ctb->tail = tail;drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1@@ -65,12 +65,14 @@#define WQ_TYPE_PSEUDO (0x2 << WQ_TYPE_SHIFT)#define WQ_TYPE_INORDER (0x3 << WQ_TYPE_SHIFT)#define WQ_TYPE_NOOP (0x4 << WQ_TYPE_SHIFT) -#define WQ_TARGET_SHIFT 10 +#define WQ_TYPE_MULTI_LRC (0x5 << WQ_TYPE_SHIFT) +#define WQ_TARGET_SHIFT 8#define WQ_LEN_SHIFT 16Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h line 75
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2
-1#define WQ_NO_WCFLUSH_WAIT (1 << 27)#define WQ_PRESENT_WORKLOAD (1 << 28) -#define WQ_RING_TAIL_SHIFT 20 +#define WQ_GUC_ID_SHIFT 0 +#define WQ_RING_TAIL_SHIFT 18Presumably all of these API changes are not actually new? They really came in with the reset of the v40 re-write? It's just that this is the first time we are using them and therefore need to finally update the defines?
Yes.
Quoted 68 lines
Quoted 68 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0#define WQ_RING_TAIL_MAX 0x7FF/* 2^11 QWords */ #define WQ_RING_TAIL_MASK (WQ_RING_TAIL_MAX << WQ_RING_TAIL_SHIFT)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +28
-14@@ -391,6 +391,29 @@ __get_process_desc(struct intel_context *ce) LRC_STATE_OFFSET) / sizeof(u32))); } +static u32 *get_wq_pointer (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Check for space in work queue. Caching a value of head pointer in +* intel_context structure in order reduce the number accesses to shared +* GPU memory which may be across a PCIe bus. +*/ +#define AVAILABLE_SPACE \ + CIRC_SPACE(ce->guc_wqi_tail, ce->guc_wqi_head, GUC_WQ_SIZE) +if (wqi_size >AVAILABLE_SPACE ) { + ce->guc_wqi_head =READ_ONCE (desc->head); + +if (wqi_size >AVAILABLE_SPACE ) +return NULL ; + } +#undef AVAILABLE_SPACE + +return ((u32 *)__get_process_desc (ce)) + + ((WQ_OFFSET + ce->guc_wqi_tail) /sizeof (u32)); +} +static struct guc_lrc_desc *__get_lrc_desc (struct intel_guc *guc,u32 index) {struct guc_lrc_desc *base = guc->lrc_desc_pool_vaddr;@@ -547,10 +570,10 @@ int intel_guc_wait_for_idle(struct intel_guc *guc, long timeout)static int guc_lrc_desc_pin (struct intel_context *ce,bool loop); -static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +static int __guc_add_request (struct intel_guc *guc,struct i915_request *rq) {int err =0 ; -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u32 action[3 ];int len =0 ;u32 g2h_len_dw =0 ;@@ -571,26 +594,17 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)GEM_BUG_ON (!atomic_read (&ce->guc_id.ref));GEM_BUG_ON (context_guc_id_invalid (ce)); -/* -* Corner case where the GuC firmware was blown away and reloaded while -* this context was pinned. -*/ -if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id))) { - err =guc_lrc_desc_pin (ce, false); -if (unlikely (err)) -return err; - } -spin_lock (&ce->guc_state.lock);/* * The request / context will be run on the hardware when scheduling -* gets enabled in the unblock. +* gets enabled in the unblock. For multi-lrc we still submit the +* context to move the LRC tails. */ -if (unlikely (context_blocked (ce))) +if (unlikely (context_blocked (ce) && !intel_context_is_parent (ce)))Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int guc_add_request(struct intel_guc *guc, struct i915_request *rq) · line 607
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-1goto out; - enabled =context_enabled (ce); + enabled =context_enabled (ce) ||context_blocked (ce);Would be better to say '||
is_parent(ce)' rather than blocked? The reason for reason for claiming enabled when not is because it's a multi-LRC parent, right? Or can there be a parent that is neither enabled nor blocked for which we don't want to do the processing? But why would that make sense/be possible?No. If it is parent and blocked we want to submit the enable but not enable submission. In the non-multi-lrc case the submit has already been done by the i915 (moving lrc tail).
Quoted 68 lines
Quoted 56 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +38
-0if (!enabled) { action[len++] =INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_SET ;@@ -609,6 +623,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)trace_intel_context_sched_enable (ce);atomic_inc (&guc->outstanding_submission_g2h);set_context_enabled (ce); + +/* +* Without multi-lrc KMD does the submission step (moving the +* lrc tail) so enabling scheduling is sufficient to submit the +* context. This isn't the case in multi-lrc submission as the +* GuC needs to move the tails, hence the need for another H2G +* to submit a multi-lrc context after enabling scheduling. +*/ +if (intel_context_is_parent (ce)) { + action[0 ] =INTEL_GUC_ACTION_SCHED_CONTEXT ; + err =intel_guc_send_nb (guc, action, len -1 ,0 ); + } }else if (!enabled) {clr_context_pending_enable (ce);intel_context_put (ce);@@ -621,6 +647,18 @@ static int guc_add_request(struct intel_guc *guc, struct i915_request *rq)return err; } +static int guc_add_request (struct intel_guc *guc,struct i915_request *rq) +{ +int ret =__guc_add_request (guc, rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request= rq; + guc->submission_stall_reason =STALL_ADD_REQUEST ; + } + +return ret; +} +static void guc_set_lrc_tail (struct i915_request *rq) { rq->context->lrc_reg_state[CTX_RING_TAIL] =@@ -632,6 +670,127 @@ static int rq_prio(const struct i915_request *rq)return rq->sched.attr.priority; } +static bool is_multi_lrc_rq (struct i915_request *rq) +{ +return intel_context_is_child (rq->context) || +intel_context_is_parent (rq->context); +} + +static bool can_merge_rq (struct i915_request *rq, +struct i915_request *last) +{ +return request_to_scheduling_context (rq) == +request_to_scheduling_context (last); +} + +static u32 wq_space_until_wrap (struct intel_context *ce)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 695
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+{ +return (GUC_WQ_SIZE - ce->guc_wqi_tail); +} + +static void write_wqi (struct guc_process_desc *desc, +struct intel_context *ce, +u32 wqi_size) +{ +/* +* Ensure WQE are visible before updating tail WQE or WQI?
Quoted 8 lines
Quoted 2 lines
WQI (work queue instance) is the convention used but I actually like WQE (work queue entry) better. Will change the name to WQE everywhere.
I thought it was Work Queue Item. Which is basically the same as entry. Ether works but simpler just to change this one instance to WQI. And maybe make sure the abbreviation is actually written out in full somewhere to be clear? I think patch #12 is adding these fields to the ce, maybe update the comments to explain what wqi means.
I think in the GuC spec it is 'work queue item', guess I'll stick with that.
Matt
Quoted 329 lines
John.
Quoted 326 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11
-0+*/ +intel_guc_write_barrier (ce_to_guc (ce)); + + ce->guc_wqi_tail = (ce->guc_wqi_tail + wqi_size) & (GUC_WQ_SIZE -1 ); +WRITE_ONCE (desc->tail, ce->guc_wqi_tail); +} + +static int guc_wq_noop_append (struct intel_context *ce) +{ +struct guc_process_desc *desc =__get_process_desc (ce); +u32 *wqi =get_wq_pointer (desc, ce,wq_space_until_wrap (ce));Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 713
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +6
-0+ +if (!wqi) +return -EBUSY ; + + *wqi =WQ_TYPE_NOOP | + ((wq_space_until_wrap (ce) /sizeof (u32) -1 ) <<WQ_LEN_SHIFT );This should have a
BUG_ONcheck that the requested size fits within theWQ_LENfield?I could add that.
Quoted 3 lines
Indeed, would be better to use the FIELD macros as they do that kind of thing for you.
Yes, they do. I forget how they work, will figure this out and use the macros.
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +30
-0+ ce->guc_wqi_tail =0 ; + +return 0 ; +} + +static int __guc_wq_item_append (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +struct intel_context *child; +struct guc_process_desc *desc =__get_process_desc (ce); +unsigned int wqi_size = (ce->guc_number_children +4 ) * +sizeof (u32); +u32 *wqi; +int ret; + +/* Ensure context is in correct state updating work queue */ +GEM_BUG_ON (!atomic_read (&ce->guc_id.ref)); +GEM_BUG_ON (context_guc_id_invalid (ce)); +GEM_BUG_ON (context_wait_for_deregister_to_register (ce)); +GEM_BUG_ON (!lrc_desc_registered (ce_to_guc (ce), ce->guc_id.id)); + +/* Insert NOOP if this work queue item will wrap the tail pointer. */ +if (wqi_size >wq_space_until_wrap (ce)) { + ret =guc_wq_noop_append (ce); +if (ret) +return ret; + } + + wqi =get_wq_pointer (desc, ce, wqi_size); +if (!wqi)Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static int rq_prio(const struct i915_request *rq) · line 750
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+return -EBUSY ; + + *wqi++ =WQ_TYPE_MULTI_LRC | + ((wqi_size /sizeof (u32) -1 ) <<WQ_LEN_SHIFT ); + *wqi++ = ce->lrc.lrca; + *wqi++ = (ce->guc_id.id <<WQ_GUC_ID_SHIFT ) | + ((ce->ring->tail /sizeof (u64)) <<WQ_RING_TAIL_SHIFT );As above, would be better to use FIELD macros instead of manual shifting.
Will do.
Matt
Quoted 257 lines
John.
Quoted 254 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +144
-22+ *wqi++ =0 ;/* fence_id */ +for_each_child (ce, child) + *wqi++ = child->ring->tail /sizeof (u64); + +write_wqi (desc, ce, wqi_size); + +return 0 ; +} + +static int guc_wq_item_append (struct intel_guc *guc, +struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); +int ret =0 ; + +if (likely (!intel_context_is_banned (ce))) { + ret =__guc_wq_item_append (rq); + +if (unlikely (ret == -EBUSY )) { + guc->stalled_request = rq; + guc->submission_stall_reason =STALL_MOVE_LRC_TAIL ; + } + } + +return ret; +} + +static bool multi_lrc_submit (struct i915_request *rq) +{ +struct intel_context *ce =request_to_scheduling_context (rq); + +intel_ring_set_tail (rq->ring, rq->tail); + +/* +* We expect the front end (execbuf IOCTL) to set this flag on the last +* request generated from a multi-BB submission. This indicates to the +* backend (GuC interface) that we should submit this context thus +* submitting all the requests generated in parallel. +*/ +return test_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , &rq->fence.flags) || +intel_context_is_banned (ce); +} +static int guc_dequeue_one_context (struct intel_guc *guc) {struct i915_sched_engine *const sched_engine = guc->sched_engine;@@ -645,7 +804,17 @@ static int guc_dequeue_one_context(struct intel_guc *guc)if (guc->stalled_request) { submit = true; last = guc->stalled_request; - goto resubmit; + +switch (guc->submission_stall_reason) { +case STALL_REGISTER_CONTEXT : + goto register_context; +case STALL_MOVE_LRC_TAIL : + goto move_lrc_tail; +case STALL_ADD_REQUEST : + goto add_request; +default : +MISSING_CASE (guc->submission_stall_reason); + } }while ((rb =rb_first_cached (&sched_engine->queue))) {@@ -653,8 +822,8 @@ static int guc_dequeue_one_context(struct intel_guc *guc)struct i915_request *rq, *rn;priolist_for_each_request_consume (rq, rn, p) { -if (last && rq->context != last->context) - goto done; +if (last && !can_merge_rq (rq, last)) + goto register_context;list_del_init (&rq->sched.link);@@ -662,33 +831,84 @@ static int guc_dequeue_one_context(struct intel_guc *guc)trace_i915_request_in (rq,0 ); last = rq; - submit = true; + +if (is_multi_lrc_rq (rq)) { +/* +* We need to coalesce all multi-lrc requests in +* a relationship into a single H2G. We are +* guaranteed that all of these requests will be +* submitted sequentially. +*/ +if (multi_lrc_submit (rq)) { + submit = true; + goto register_context; + } + }else { + submit = true; + } }rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); } -done: + +register_context:if (submit) { -guc_set_lrc_tail (last); -resubmit: +struct intel_context *ce =request_to_scheduling_context (last); + +if (unlikely (!lrc_desc_registered (guc, ce->guc_id.id) && + !intel_context_is_banned (ce))) { + ret =guc_lrc_desc_pin (ce, false); +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + guc->stalled_request = last; + guc->submission_stall_reason = +STALL_REGISTER_CONTEXT ; + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + } + +move_lrc_tail: +if (is_multi_lrc_rq (last)) { + ret =guc_wq_item_append (guc, last); +if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ + goto deadlk; + } + }else { +guc_set_lrc_tail (last); + } + +add_request: ret =guc_add_request (guc, last); -if (unlikely (ret == -EPIPE )) +if (unlikely (ret == -EPIPE )) { + goto deadlk; + }else if (ret == -EBUSY ) { + goto schedule_tasklet; + }else if (ret !=0 ) { +GEM_WARN_ON (ret);/* Unexpected */ goto deadlk; -else if (ret == -EBUSY ) { -tasklet_schedule (&sched_engine->tasklet); - guc->stalled_request = last; -return false; } } guc->stalled_request =NULL ; + guc->submission_stall_reason =STALL_NONE ;return submit; deadlk: sched_engine->tasklet.callback =NULL ;tasklet_disable_nosync (&sched_engine->tasklet);return false; + +schedule_tasklet: +tasklet_schedule (&sched_engine->tasklet); +return false; }static void guc_submission_tasklet (struct tasklet_struct *t)@@ -1227,10 +1447,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,trace_i915_request_in (rq,0 ); -guc_set_lrc_tail (rq); - ret =guc_add_request (guc, rq); -if (ret == -EBUSY ) - guc->stalled_request = rq; +if (is_multi_lrc_rq (rq)) { +if (multi_lrc_submit (rq)) { + ret =guc_wq_item_append (guc, rq); +if (!ret) + ret =guc_add_request (guc, rq); + } + }else { +guc_set_lrc_tail (rq); + ret =guc_add_request (guc, rq); + }if (unlikely (ret == -EPIPE ))disable_submission (guc);@@ -1238,6 +1464,16 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc,return ret; } +bool need_tasklet (struct intel_guc *guc,struct i915_request *rq) +{ +struct i915_sched_engine *sched_engine = rq->engine->sched_engine; +struct intel_context *ce =request_to_scheduling_context (rq); + +return submission_disabled (guc) || guc->stalled_request || + !i915_sched_engine_is_empty (sched_engine) || + !lrc_desc_registered (guc, ce->guc_id.id); +} +static void guc_submit_request (struct i915_request *rq) {struct i915_sched_engine *sched_engine = rq->engine->sched_engine;@@ -1247,8 +1483,7 @@ static void guc_submit_request(struct i915_request *rq)/* Will be called from irq-context when using foreign fences. */ spin_lock_irqsave (&sched_engine->lock, flags); -if (submission_disabled (guc) || guc->stalled_request || - !i915_sched_engine_is_empty (sched_engine)) +if (need_tasklet (guc, rq))queue_request (sched_engine, rq,rq_prio (rq));else if (guc_bypass_tasklet_submit (guc, rq) == -EBUSY )tasklet_hi_schedule (&sched_engine->tasklet);@@ -2241,9 +2476,10 @@ static bool new_guc_prio_higher(u8 old_guc_prio, u8 new_guc_prio)static void add_to_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (rq_prio (rq)); +GEM_BUG_ON (intel_context_is_child (ce));GEM_BUG_ON (rq->guc_prio ==GUC_PRIO_FINI );spin_lock (&ce->guc_state.lock);@@ -2276,7 +2512,9 @@ static void guc_prio_fini(struct i915_request *rq, struct intel_context *ce)static void remove_from_context (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq); + +GEM_BUG_ON (intel_context_is_child (ce));spin_lock_irq (&ce->guc_state.lock);@@ -2692,7 +2930,7 @@ static void guc_init_breadcrumbs(struct intel_engine_cs *engine)static void guc_bump_inflight_request_prio (struct i915_request *rq,int prio) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);u8 new_guc_prio =map_i915_prio_to_guc_prio (prio);/* Short circuit function */ @@ -2715,7 +2953,7 @@ static void guc_bump_inflight_request_prio(struct i915_request *rq,static void guc_retire_inflight_request_prio (struct i915_request *rq) { -struct intel_context *ce = rq->context; +struct intel_context *ce =request_to_scheduling_context (rq);spin_lock (&ce->guc_state.lock);guc_prio_fini (rq, ce);drivers/gpu/drm/i915/i915_request.h +8
-0@@ -139,6 +139,14 @@ enum {* the GPU. Here we track such boost requests on a per-request basis. */ I915_FENCE_FLAG_BOOST , + +/* +* I915_FENCE_FLAG_SUBMIT_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) should +* trigger a submission to the GuC rather than just moving the context +* tail. +*/ + I915_FENCE_FLAG_SUBMIT_PARALLEL, };/**
PATCH 16/27 drm/i915/guc: Insert submit fences between requests in parent-child relationship
In reply to Matthew BrostThe GuC must receive requests in the order submitted for contexts in a parent-child relationship to function correctly. To ensure this, insert a submit fence between the current request and last request submitted for requests / contexts in a parent child relationship. This is conceptually similar to a single timeline.
--- drivers/gpu/drm/i915/gt/intel_context.h | 5 + drivers/gpu/drm/i915/gt/intel_context_types.h | 7 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 +- drivers/gpu/drm/i915/i915_request.c | 120 ++++++++++++++---- 4 files changed, 109 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.h +5 -0
@@ -75,6 +75,11 @@ intel_context_to_parent(struct intel_context *ce) } } +static inline bool intel_context_is_parallel (struct intel_context *ce) +{ +return intel_context_is_child (ce) ||intel_context_is_parent (ce); +} +void intel_context_bind_parent_child (struct intel_context *parent,struct intel_context *child);
drivers/gpu/drm/i915/gt/intel_context_types.h +7 -0
@@ -246,6 +246,13 @@ struct intel_context {* work queue descriptor */ u8 parent_page; + +/** +* @last_rq: last request submitted on a parallel context, used +* to insert submit fences between request in the parallel +* context. +*/ +struct i915_request *last_rq; };#ifdef CONFIG_DRM_I915_SELFTEST
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3 -2
@@ -672,8 +672,7 @@ static int rq_prio(const struct i915_request *rq)static bool is_multi_lrc_rq (struct i915_request *rq) { -return intel_context_is_child (rq->context) || -intel_context_is_parent (rq->context); +return intel_context_is_parallel (rq->context); } static bool can_merge_rq(struct i915_request *rq,
@@ -2843,6 +2842,8 @@ static void guc_parent_context_unpin(struct intel_context *ce)GEM_BUG_ON (!intel_context_is_parent (ce));GEM_BUG_ON (!intel_engine_is_virtual (ce->engine)); +if (ce->last_rq) +i915_request_put (ce->last_rq);unpin_guc_id (guc, ce);lrc_unpin (ce); }
drivers/gpu/drm/i915/i915_request.c +94 -26
149 lines not on this page · raw message
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 16/27] drm/i915/guc: Insert submit fences between requests in parent-child relationship
Quoted 36 lines · Matthew Brost
The GuC must receive requests in the order submitted for contexts in a parent-child relationship to function correctly. To ensure this, insert a submit fence between the current request and last request submitted for requests / contexts in a parent child relationship. This is conceptually similar to a single timeline.
Signed-off-by Matthew Brost <[email protected]>Cc John Harrison <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.h | 5 + drivers/gpu/drm/i915/gt/intel_context_types.h | 7 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 +- drivers/gpu/drm/i915/i915_request.c | 120 ++++++++++++++---- 4 files changed, 109 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/gt/intel_context.h +5
-0@@ -75,6 +75,11 @@ intel_context_to_parent(struct intel_context *ce) } } +static inline bool intel_context_is_parallel (struct intel_context *ce) +{ +return intel_context_is_child (ce) ||intel_context_is_parent (ce); +} +void intel_context_bind_parent_child (struct intel_context *parent,struct intel_context *child);drivers/gpu/drm/i915/gt/intel_context_types.h +0
-0
drivers/gpu/drm/i915/gt/intel_context_types.h struct intel_context { · line 252
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_context_types.h +4
-0@@ -246,6 +246,13 @@ struct intel_context {* work queue descriptor */ u8 parent_page; + +/** +* @last_rq: last request submitted on a parallel context, used +* to insert submit fences between request in the parallel
request -> requests
With that fixed:
Quoted 185 lines
drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0+* context. +*/ +struct i915_request *last_rq; };#ifdef CONFIG_DRM_I915_SELFTEST drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-2@@ -672,8 +672,7 @@ static int rq_prio(const struct i915_request *rq)static bool is_multi_lrc_rq (struct i915_request *rq) { -return intel_context_is_child (rq->context) || -intel_context_is_parent (rq->context); +return intel_context_is_parallel (rq->context); } static bool can_merge_rq(struct i915_request *rq,@@ -2843,6 +2842,8 @@ static void guc_parent_context_unpin(struct intel_context *ce)GEM_BUG_ON (!intel_context_is_parent (ce));GEM_BUG_ON (!intel_engine_is_virtual (ce->engine)); +if (ce->last_rq) +i915_request_put (ce->last_rq);unpin_guc_id (guc, ce);lrc_unpin (ce); }drivers/gpu/drm/i915/i915_request.c +94
-26@@ -1546,36 +1546,62 @@ i915_request_await_object(struct i915_request *to,return ret; } +static inline bool is_parallel_rq (struct i915_request *rq) +{ +return intel_context_is_parallel (rq->context); +} + +static inline struct intel_context *request_to_parent (struct i915_request *rq) +{ +return intel_context_to_parent (rq->context); +} +static struct i915_request * -__i915_request_add_to_timeline (struct i915_request *rq) +__i915_request_ensure_parallel_ordering (struct i915_request *rq, +struct intel_timeline *timeline) { -struct intel_timeline *timeline =i915_request_timeline (rq);struct i915_request *prev; -/* -* Dependency tracking and request ordering along the timeline -* is special cased so that we can eliminate redundant ordering -* operations while building the request (we know that the timeline -* itself is ordered, and here we guarantee it). -* -* As we know we will need to emit tracking along the timeline, -* we embed the hooks into our request struct -- at the cost of -* having to have specialised no-allocation interfaces (which will -* be beneficial elsewhere). -* -* A second benefit to open-coding i915_request_await_request is -* that we can apply a slight variant of the rules specialised -* for timelines that jump between engines (such as virtual engines). -* If we consider the case of virtual engine, we must emit a dma-fence -* to prevent scheduling of the second request until the first is -* complete (to maximise our greedy late load balancing) and this -* precludes optimising to use semaphores serialisation of a single -* timeline across engines. -*/ +GEM_BUG_ON (!is_parallel_rq (rq)); + + prev =request_to_parent (rq)->last_rq; +if (prev) { +if (!__i915_request_is_complete (prev)) { +i915_sw_fence_await_sw_fence (&rq->submit, + &prev->submit, + &rq->submitq); + +if (rq->engine->sched_engine->schedule) +__i915_sched_node_add_dependency (&rq->sched, + &prev->sched, + &rq->dep, +0 ); + } +i915_request_put (prev); + } + +request_to_parent (rq)->last_rq =i915_request_get (rq); + +return to_request (__i915_active_fence_set (&timeline->last_request, + &rq->fence)); +} + +static struct i915_request * +__i915_request_ensure_ordering (struct i915_request *rq, +struct intel_timeline *timeline) +{ +struct i915_request *prev; + +GEM_BUG_ON (is_parallel_rq (rq)); + prev =to_request (__i915_active_fence_set (&timeline->last_request, &rq->fence)); +if (prev && !__i915_request_is_complete (prev)) {bool uses_guc =intel_engine_uses_guc (rq->engine); +bool pow2 =is_power_of_2 (READ_ONCE (prev->engine)->mask | + rq->engine->mask); +bool same_context = prev->context == rq->context;/* * The requests are supposed to be kept in order. However, @@ -1583,13 +1609,11 @@ __i915_request_add_to_timeline(struct i915_request *rq)* is used as a barrier for external modification to this * context. */ -GEM_BUG_ON (prev->context == rq->context && +GEM_BUG_ON (same_context &&i915_seqno_passed (prev->fence.seqno, rq->fence.seqno)); -if ((!uses_guc && -is_power_of_2 (READ_ONCE (prev->engine)->mask | rq->engine->mask)) || - (uses_guc && prev->context == rq->context)) +if ((same_context && uses_guc) || (!uses_guc && pow2))i915_sw_fence_await_sw_fence (&rq->submit, &prev->submit, &rq->submitq);@@ -1604,6 +1628,50 @@ __i915_request_add_to_timeline(struct i915_request *rq) 0); } +return prev; +} + +static struct i915_request * +__i915_request_add_to_timeline (struct i915_request *rq) +{ +struct intel_timeline *timeline =i915_request_timeline (rq); +struct i915_request *prev; + +/* +* Dependency tracking and request ordering along the timeline +* is special cased so that we can eliminate redundant ordering +* operations while building the request (we know that the timeline +* itself is ordered, and here we guarantee it). +* +* As we know we will need to emit tracking along the timeline, +* we embed the hooks into our request struct -- at the cost of +* having to have specialised no-allocation interfaces (which will +* be beneficial elsewhere). +* +* A second benefit to open-coding i915_request_await_request is +* that we can apply a slight variant of the rules specialised +* for timelines that jump between engines (such as virtual engines). +* If we consider the case of virtual engine, we must emit a dma-fence +* to prevent scheduling of the second request until the first is +* complete (to maximise our greedy late load balancing) and this +* precludes optimising to use semaphores serialisation of a single +* timeline across engines. +* +* We do not order parallel submission requests on the timeline as each +* parallel submission context has its own timeline and the ordering +* rules for parallel requests are that they must be submitted in the +* order received from the execbuf IOCTL. So rather than using the +* timeline we store a pointer to last request submitted in the +* relationship in the gem context and insert a submission fence +* between that request and request passed into this function or +* alternatively we use completion fence if gem context has a single +* timeline and this is the first submission of an execbuf IOCTL. +*/ +if (likely (!is_parallel_rq (rq))) + prev =__i915_request_ensure_ordering (rq, timeline); +else + prev =__i915_request_ensure_parallel_ordering (rq, timeline); +/* * Make sure that no request gazumped us - if it was allocated after * our i915_request_alloc() and called __i915_request_add() before
PATCH 17/27 drm/i915/guc: Implement multi-lrc reset
In reply to Matthew BrostUpdate context and full GPU reset to work with multi-lrc. The idea is parent context tracks all the active requests inflight for itself and its' children. The parent context owns the reset replaying / canceling requests as needed.
--- drivers/gpu/drm/i915/gt/intel_context.c | 11 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 63 +++++++++++++------ 2 files changed, 51 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.c +6 -5
@@ -528,20 +528,21 @@ struct i915_request *intel_context_create_request(struct intel_context *ce)struct i915_request *intel_context_find_active_request (struct intel_context *ce) { +struct intel_context *parent =intel_context_to_parent (ce);struct i915_request *rq, *active =NULL ;unsigned long flags;GEM_BUG_ON (!intel_engine_uses_guc (ce->engine)); -spin_lock_irqsave (&ce->guc_state.lock, flags); -list_for_each_entry_reverse (rq, &ce->guc_state.requests, +spin_lock_irqsave (&parent->guc_state.lock, flags); +list_for_each_entry_reverse (rq, &parent->guc_state.requests, sched.link) { -if (i915_request_completed (rq)) +if (i915_request_completed (rq) && rq->context == ce)break ; - active = rq; + active = (rq->context == ce) ? rq : active; } -spin_unlock_irqrestore (&ce->guc_state.lock, flags); +spin_unlock_irqrestore (&parent->guc_state.lock, flags);return active; }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +45 -18
136 lines not on this page · raw message
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 17/27] drm/i915/guc: Implement multi-lrc reset
Quoted 3 lines · Matthew Brost
Update context and full GPU reset to work with multi-lrc. The idea is parent context tracks all the active requests inflight for itself and its' children. The parent context owns the reset replaying / canceling
its' -> its
Quoted 13 lines
requests as needed.
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 11 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 63 +++++++++++++------ 2 files changed, 51 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +0
-0
drivers/gpu/drm/i915/gt/intel_context.c struct i915_request *intel_context_create_request(struct intel_context *ce) · line 535
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_context.c +1
-0@@ -528,20 +528,21 @@ struct i915_request *intel_context_create_request(struct intel_context *ce)struct i915_request *intel_context_find_active_request (struct intel_context *ce) { +struct intel_context *parent =intel_context_to_parent (ce);struct i915_request *rq, *active =NULL ;unsigned long flags;GEM_BUG_ON (!intel_engine_uses_guc (ce->engine));
Should this not check the parent as well/instead?
And to be clear, this can be called on regular contexts (where ce == parent) and on both the parent or child contexts of multi-LRC contexts (where ce may or may not match parent)?
drivers/gpu/drm/i915/gt/intel_context.c struct i915_request *intel_context_create_request(struct intel_context *ce) · line 540
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_context.c +3
-3-spin_lock_irqsave (&ce->guc_state.lock, flags); -list_for_each_entry_reverse (rq, &ce->guc_state.requests, +spin_lock_irqsave (&parent->guc_state.lock, flags); +list_for_each_entry_reverse (rq, &parent->guc_state.requests, sched.link) { -if (i915_request_completed (rq)) +if (i915_request_completed (rq) && rq->context == ce)
'rq->context == ce' means:
1. single-LRC context, rq is owned by ce
2. multi-LRC context, ce is child, rq really belongs to ce but is being tracked by parent
3. multi-LRC context, ce is parent, rq really is owned by ce
So when 'rq->ce != ce', it means that the request is owned by a different child to 'ce' but within the same multi-LRC group. So we want to ignore that request and keep searching until we find one that is really owned by the target ce?
drivers/gpu/drm/i915/gt/intel_context.c struct i915_request *intel_context_create_request(struct intel_context *ce) · line 543
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_context.c +1
-1break ; - active = rq; + active = (rq->context == ce) ? rq : active;
Would be clearer to say 'if(rq->ce != ce) continue;' and leave 'active = rq;' alone?
And again, the intention is to ignore requests that are owned by other members of the same multi-LRC group?
Would be good to add some documentation to this function to explain the above (assuming my description is correct?).
Quoted 23 lines
drivers/gpu/drm/i915/gt/intel_context.c +1
-1} -spin_unlock_irqrestore (&ce->guc_state.lock, flags); +spin_unlock_irqrestore (&parent->guc_state.lock, flags);return active; }drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +5
-0@@ -670,6 +670,11 @@ static int rq_prio(const struct i915_request *rq)return rq->sched.attr.priority; } +static inline bool is_multi_lrc (struct intel_context *ce) +{ +return intel_context_is_parallel (ce); +} +static bool is_multi_lrc_rq (struct i915_request *rq) {return intel_context_is_parallel (rq->context);
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c __unwind_incomplete_requests(struct intel_context *ce) · line 1191
Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -1179,10 +1184,13 @@ __unwind_incomplete_requests(struct intel_context *ce)static void __guc_reset_context (struct intel_context *ce,bool stalled) { +bool local_stalled;struct i915_request *rq;unsigned long flags;u32 head; +int i, number_children = ce->guc_number_children;
If this is a child context, does it not need to pull the child count from the parent? Likewise the list/link pointers below? Or does each child context have a full list of its siblings + parent?
Quoted 25 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11
-6bool skip = false; +struct intel_context *parent = ce;intel_context_get (ce);@@ -1209,25 +1217,34 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)if (unlikely (skip)) goto out_put; - rq =intel_context_find_active_request (ce); -if (!rq) { - head = ce->ring->tail; - stalled = false; - goto out_replay; - } +for (i =0 ; i < number_children +1 ; ++i) { +if (!intel_context_is_pinned (ce)) + goto next_context; + + local_stalled = false; + rq =intel_context_find_active_request (ce); +if (!rq) { + head = ce->ring->tail; + goto out_replay; + }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static void __guc_reset_context(struct intel_context *ce, bool stalled) · line 1234
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-5-if (!i915_request_started (rq)) - stalled = false; +GEM_BUG_ON (i915_active_is_idle (&ce->active)); + head =intel_ring_wrap (ce->ring, rq->head); -GEM_BUG_ON (i915_active_is_idle (&ce->active)); - head =intel_ring_wrap (ce->ring, rq->head); -__i915_request_reset (rq, stalled); +if (i915_request_started (rq))
Why change the ordering of the started test versus the wrap/reset call? Is it significant? Why is it now important to be reversed?
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static void __guc_reset_context(struct intel_context *ce, bool stalled) · line 1242
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +6
-2+ local_stalled = true; +__i915_request_reset (rq, local_stalled && stalled); out_replay: -guc_reset_state (ce, head, stalled); -__unwind_incomplete_requests (ce); +guc_reset_state (ce, head, local_stalled && stalled); +next_context: +if (i != number_children) + ce =list_next_entry (ce, guc_child_link);
Can this not be put in to the step clause of the for statement?
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static void __guc_reset_context(struct intel_context *ce, bool stalled) · line 1247
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4
-1+ } + +__unwind_incomplete_requests (parent); out_put: -intel_context_put (ce); +intel_context_put (parent);
As above, I think this function would benefit from some comments to explain exactly what is being done and why.
John.
Quoted 74 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +14
-4}void intel_guc_submission_reset (struct intel_guc *guc,bool stalled)@@ -1248,7 +1265,8 @@ void intel_guc_submission_reset(struct intel_guc *guc, bool stalled)xa_unlock (&guc->context_lookup); -if (intel_context_is_pinned (ce)) +if (intel_context_is_pinned (ce) && + !intel_context_is_child (ce))__guc_reset_context (ce, stalled);intel_context_put (ce);@@ -1340,7 +1358,8 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc)xa_unlock (&guc->context_lookup); -if (intel_context_is_pinned (ce)) +if (intel_context_is_pinned (ce) && + !intel_context_is_child (ce))guc_cancel_context_requests (ce);intel_context_put (ce);@@ -2031,6 +2050,8 @@ static struct i915_sw_fence *guc_context_block(struct intel_context *ce)u16 guc_id;bool enabled; +GEM_BUG_ON (intel_context_is_child (ce)); +spin_lock_irqsave (&ce->guc_state.lock, flags);incr_context_blocked (ce);@@ -2068,6 +2089,7 @@ static void guc_context_unblock(struct intel_context *ce)bool enable;GEM_BUG_ON (context_enabled (ce)); +GEM_BUG_ON (intel_context_is_child (ce));spin_lock_irqsave (&ce->guc_state.lock, flags);@@ -2099,11 +2121,14 @@ static void guc_context_unblock(struct intel_context *ce)static void guc_context_cancel_request (struct intel_context *ce,struct i915_request *rq) { +struct intel_context *block_context = +request_to_scheduling_context (rq); +if (i915_sw_fence_signaled (&rq->submit)) {struct i915_sw_fence *fence;intel_context_get (ce); - fence =guc_context_block (ce); + fence =guc_context_block (block_context);i915_sw_fence_wait (fence);if (!i915_request_completed (rq)) {__i915_request_skip (rq);@@ -2117,7 +2142,7 @@ static void guc_context_cancel_request(struct intel_context *ce,*/ flush_work (&ce_to_guc (ce)->ct.requests.worker); -guc_context_unblock (ce); +guc_context_unblock (block_context);intel_context_put (ce); } }@@ -2143,6 +2168,8 @@ static void guc_context_ban(struct intel_context *ce, struct i915_request *rq)intel_wakeref_t wakeref;unsigned long flags; +GEM_BUG_ON (intel_context_is_child (ce)); +guc_flush_submissions (guc);spin_lock_irqsave (&ce->guc_state.lock, flags);
Re: [Intel-gfx] [PATCH 17/27] drm/i915/guc: Implement multi-lrc reset
Quoted 31 lines · John Harrison
On 8/20/2021 15:44, Matthew Brost wrote:
Update context and full GPU reset to work with multi-lrc. The idea is parent context tracks all the active requests inflight for itself and its' children. The parent context owns the reset replaying / canceling
its' -> its
requests as needed. Signed-off-by: Matthew Brost <[email protected]> --- drivers/gpu/drm/i915/gt/intel_context.c | 11 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 63 +++++++++++++------ 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index 00d1aee6d199..5615be32879c 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -528,20 +528,21 @@ struct i915_request *intel_context_create_request(struct intel_context *ce) struct i915_request *intel_context_find_active_request(struct intel_context *ce) { + struct intel_context *parent = intel_context_to_parent(ce); struct i915_request *rq, *active = NULL; unsigned long flags; GEM_BUG_ON(!intel_engine_uses_guc(ce->engine));
Quoted 2 lines
Should this not check the parent as well/instead?
I don't think so. The 'ce' could be a not parallel context, a parent context, or a child context.
Quoted 4 lines
And to be clear, this can be called on regular contexts (where ce == parent) and on both the parent or child contexts of multi-LRC contexts (where ce may or may not match parent)?
Right. The parent owns the parent->guc_state.lock/requests and search that list for the first non-completed request that matches submitted 'ce'.
Quoted 13 lines
- spin_lock_irqsave(&ce->guc_state.lock, flags); - list_for_each_entry_reverse(rq, &ce->guc_state.requests, + spin_lock_irqsave(&parent->guc_state.lock, flags); + list_for_each_entry_reverse(rq, &parent->guc_state.requests,sched.link) {
- if (i915_request_completed(rq))
+ if (i915_request_completed(rq)&&rq->context== ce)'
rq->context== ce' means:
Quoted 9 lines
1. single-LRC context, rq is owned by ce
2. multi-LRC context, ce is child, rq really belongs to ce but is being tracked by parent
3. multi-LRC context, ce is parent, rq really is owned by ceSo when '
rq->ce!= ce', it means that the request is owned by a different child to 'ce' but within the same multi-LRC group. So we want to ignore that request and keep searching until we find one that is really owned by the target ce?
All correct.
Quoted 9 lines
break;
- active = rq;
+ active = (rq->context== ce) ? rq : active;Would be clearer to say '
if(rq->ce != ce)continue;' and leave 'active = rq;' alone?
Yes, that is probably cleaner.
Quoted 6 lines
And again, the intention is to ignore requests that are owned by other members of the same multi-LRC group?
Would be good to add some documentation to this function to explain the above (assuming my description is correct?).
Will add a comment explaining this.
Quoted 33 lines
}
- spin_unlock_irqrestore(&ce->guc_state.lock, flags);
+ spin_unlock_irqrestore(&parent->guc_state.lock, flags);
return active;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index f0b60fecf253..e34e0ea9136a 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -670,6 +670,11 @@ static int rq_prio(const struct i915_request *rq)
return rq->sched.attr.priority;
}
+static inline bool is_multi_lrc(struct intel_context *ce)
+{
+ return intel_context_is_parallel(ce);
+}
+
static bool is_multi_lrc_rq(struct i915_request *rq)
{
return intel_context_is_parallel(rq->context);
@@ -1179,10 +1184,13 @@ __unwind_incomplete_requests(struct intel_context *ce)
static void __guc_reset_context(struct intel_context *ce, bool stalled)
{
+ bool local_stalled;
struct i915_request *rq;
unsigned long flags;
u32 head;
+ int i, number_children = ce->guc_number_children;Quoted 4 lines
If this is a child context, does it not need to pull the child count from the parent? Likewise the list/link pointers below? Or does each child context have a full list of its siblings + parent?
This function shouldn't be called by a child. Will add GEM_BUG_ON(intel_context_is_child(ce)) to this function.
Quoted 32 lines
bool skip = false;
+ structintel_context*parent = ce;
intel_context_get(ce);@@ -1209,25 +1217,34 @@ static void
__guc_reset_context(struct intel_context *ce, bool stalled)
if (unlikely(skip))
gotoout_put;- rq =
intel_context_find_active_request(ce);
- if (!rq) {
- head =ce->ring->tail;
- stalled = false;
- gotoout_replay;
- }
+ for (i = 0; i <number_children+ 1; ++i) {
+ if (!intel_context_is_pinned(ce))
+ gotonext_context;
+
+local_stalled= false;
+ rq =intel_context_find_active_request(ce);
+ if (!rq) {
+ head =ce->ring->tail;
+ gotoout_replay;
+ }- if (!i915_request_started(rq))
- stalled = false;
+ GEM_BUG_ON(i915_active_is_idle(&ce->active));
+ head =intel_ring_wrap(ce->ring, rq->head);
Quoted 8 lines
- GEM_BUG_ON(i915_active_is_idle(&ce->active));
- head =intel_ring_wrap(ce->ring, rq->head);
-__i915_request_reset(rq, stalled);
+ if (i915_request_started(rq))Why change the ordering of the started test versus the wrap/reset call? Is it significant? Why is it now important to be reversed?
Off the top of my head I'm not sure what the ordering is changed. I'll have to double check on this.
Quoted 12 lines
+
local_stalled= true;+
__i915_request_reset(rq, local_stalled && stalled);
out_replay:
-guc_reset_state(ce, head, stalled);
-__unwind_incomplete_requests(ce);
+guc_reset_state(ce, head, local_stalled && stalled);
+next_context:
+ if (i !=number_children)
+ ce =list_next_entry(ce, guc_child_link);
Quoted 2 lines
Can this not be put in to the step clause of the for statement?
Maybe? Does list_next_entry blow up on that last entry? Idk? If not, then yes this can be added to the loop. Will double check on this.
Quoted 11 lines
+ }
+
+__unwind_incomplete_requests(parent);
out_put:
-intel_context_put(ce);
+intel_context_put(parent);As above, I think this function would benefit from some comments to explain exactly what is being done and why.
Sure. Will add some comments.
Matt
Quoted 80 lines
John.
} void intel_guc_submission_reset(struct intel_guc *guc, bool stalled) @@ -1248,7 +1265,8 @@ void intel_guc_submission_reset(struct intel_guc *guc, bool stalled) xa_unlock(&guc->context_lookup); - if (intel_context_is_pinned(ce)) + if (intel_context_is_pinned(ce) && + !intel_context_is_child(ce)) __guc_reset_context(ce, stalled); intel_context_put(ce); @@ -1340,7 +1358,8 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc) xa_unlock(&guc->context_lookup); - if (intel_context_is_pinned(ce)) + if (intel_context_is_pinned(ce) && + !intel_context_is_child(ce)) guc_cancel_context_requests(ce); intel_context_put(ce); @@ -2031,6 +2050,8 @@ static struct i915_sw_fence *guc_context_block(struct intel_context *ce) u16 guc_id; bool enabled; + GEM_BUG_ON(intel_context_is_child(ce)); + spin_lock_irqsave(&ce->guc_state.lock, flags); incr_context_blocked(ce); @@ -2068,6 +2089,7 @@ static void guc_context_unblock(struct intel_context *ce) bool enable; GEM_BUG_ON(context_enabled(ce)); + GEM_BUG_ON(intel_context_is_child(ce)); spin_lock_irqsave(&ce->guc_state.lock, flags); @@ -2099,11 +2121,14 @@ static void guc_context_unblock(struct intel_context *ce) static void guc_context_cancel_request(struct intel_context *ce, struct i915_request *rq) { + struct intel_context *block_context = + request_to_scheduling_context(rq); + if (i915_sw_fence_signaled(&rq->submit)) { struct i915_sw_fence *fence; intel_context_get(ce); - fence = guc_context_block(ce); + fence = guc_context_block(block_context); i915_sw_fence_wait(fence); if (!i915_request_completed(rq)) { __i915_request_skip(rq); @@ -2117,7 +2142,7 @@ static void guc_context_cancel_request(struct intel_context *ce, */ flush_work(&ce_to_guc(ce)->ct.requests.worker); - guc_context_unblock(ce); + guc_context_unblock(block_context); intel_context_put(ce); } } @@ -2143,6 +2168,8 @@ static void guc_context_ban(struct intel_context *ce, struct i915_request *rq) intel_wakeref_t wakeref; unsigned long flags; + GEM_BUG_ON(intel_context_is_child(ce)); + guc_flush_submissions(guc); spin_lock_irqsave(&ce->guc_state.lock, flags);SECURITY NOTE: file ~/.netrc must not be accessible by others
PATCH 18/27 drm/i915/guc: Update debugfs for GuC multi-lrc
In reply to Matthew BrostDisplay the workqueue status in debugfs for GuC contexts that are in parent-child relationship.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +37 -14
@@ -3673,6 +3673,26 @@ static void guc_log_context_priority(struct drm_printer *p,drm_printf (p,"\n" ); } + +static inline void guc_log_context (struct drm_printer *p, +struct intel_context *ce) +{ +drm_printf (p,"GuC lrc descriptor %u:\n" , ce->guc_id.id); +drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); +drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , + ce->ring->head, + ce->lrc_reg_state[CTX_RING_HEAD ]); +drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , + ce->ring->tail, + ce->lrc_reg_state[CTX_RING_TAIL ]); +drm_printf (p,"\t\tContext Pin Count: %u\n" , +atomic_read (&ce->pin_count)); +drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , +atomic_read (&ce->guc_id.ref)); +drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , + ce->guc_state.sched_state); +} +void intel_guc_submission_print_context_info (struct intel_guc *guc,struct drm_printer *p) {
@@ -3682,22 +3702,25 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,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.id); -drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); -drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , - ce->ring->head, - ce->lrc_reg_state[CTX_RING_HEAD ]); -drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , - ce->ring->tail, - ce->lrc_reg_state[CTX_RING_TAIL ]); -drm_printf (p,"\t\tContext Pin Count: %u\n" , -atomic_read (&ce->pin_count)); -drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , -atomic_read (&ce->guc_id.ref)); -drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , - ce->guc_state.sched_state); +GEM_BUG_ON (intel_context_is_child (ce)); +guc_log_context (p, ce);guc_log_context_priority (p, ce); + +if (intel_context_is_parent (ce)) { +struct guc_process_desc *desc =__get_process_desc (ce); +struct intel_context *child; + +drm_printf (p,"\t\tWQI Head: %u\n" , +READ_ONCE (desc->head)); +drm_printf (p,"\t\tWQI Tail: %u\n" , +READ_ONCE (desc->tail)); +drm_printf (p,"\t\tWQI Status: %u\n\n" , +READ_ONCE (desc->wq_status)); + +for_each_child (ce, child) +guc_log_context (p, child); + } }xa_unlock_irqrestore (&guc->context_lookup, flags); }
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 18/27] drm/i915/guc: Update debugfs for GuC multi-lrc
Quoted 65 lines · Matthew Brost
Display the workqueue status in debugfs for GuC contexts that are in parent-child relationship.
Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +26
-14@@ -3673,6 +3673,26 @@ static void guc_log_context_priority(struct drm_printer *p,drm_printf (p,"\n" ); } + +static inline void guc_log_context (struct drm_printer *p, +struct intel_context *ce) +{ +drm_printf (p,"GuC lrc descriptor %u:\n" , ce->guc_id.id); +drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); +drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , + ce->ring->head, + ce->lrc_reg_state[CTX_RING_HEAD ]); +drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , + ce->ring->tail, + ce->lrc_reg_state[CTX_RING_TAIL ]); +drm_printf (p,"\t\tContext Pin Count: %u\n" , +atomic_read (&ce->pin_count)); +drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , +atomic_read (&ce->guc_id.ref)); +drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , + ce->guc_state.sched_state); +} +void intel_guc_submission_print_context_info (struct intel_guc *guc,struct drm_printer *p) {@@ -3682,22 +3702,25 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,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.id); -drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); -drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , - ce->ring->head, - ce->lrc_reg_state[CTX_RING_HEAD ]); -drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , - ce->ring->tail, - ce->lrc_reg_state[CTX_RING_TAIL ]); -drm_printf (p,"\t\tContext Pin Count: %u\n" , -atomic_read (&ce->pin_count)); -drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , -atomic_read (&ce->guc_id.ref)); -drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , - ce->guc_state.sched_state); +GEM_BUG_ON (intel_context_is_child (ce)); +guc_log_context (p, ce);guc_log_context_priority (p, ce); + +if (intel_context_is_parent (ce)) { +struct guc_process_desc *desc =__get_process_desc (ce); +struct intel_context *child;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_print_context_info(struct intel_guc *guc, · line 3722
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ +drm_printf (p,"\t\tWQI Head: %u\n" , +READ_ONCE (desc->head)); +drm_printf (p,"\t\tWQI Tail: %u\n" , +READ_ONCE (desc->tail)); +drm_printf (p,"\t\tWQI Status: %u\n\n" , +READ_ONCE (desc->wq_status)); + +for_each_child (ce, child) +guc_log_context (p, child);
There should be some indication that this is a child context and/or how many children there are. Otherwise how does the reader differentiation between the list of child contexts and the next parent/single context?
John.
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+ } }xa_unlock_irqrestore (&guc->context_lookup, flags); }
Re: [Intel-gfx] [PATCH 18/27] drm/i915/guc: Update debugfs for GuC multi-lrc
Quoted 70 lines · John Harrison
Quoted 67 lines · Matthew Brost
Display the workqueue status in debugfs for GuC contexts that are in parent-child relationship.
Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +31
-14@@ -3673,6 +3673,26 @@ static void guc_log_context_priority(struct drm_printer *p,drm_printf (p,"\n" ); } + +static inline void guc_log_context (struct drm_printer *p, +struct intel_context *ce) +{ +drm_printf (p,"GuC lrc descriptor %u:\n" , ce->guc_id.id); +drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); +drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , + ce->ring->head, + ce->lrc_reg_state[CTX_RING_HEAD ]); +drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , + ce->ring->tail, + ce->lrc_reg_state[CTX_RING_TAIL ]); +drm_printf (p,"\t\tContext Pin Count: %u\n" , +atomic_read (&ce->pin_count)); +drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , +atomic_read (&ce->guc_id.ref)); +drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , + ce->guc_state.sched_state); +} +void intel_guc_submission_print_context_info (struct intel_guc *guc,struct drm_printer *p) {@@ -3682,22 +3702,25 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,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.id); -drm_printf (p,"\tHW Context Desc: 0x%08x\n" , ce->lrc.lrca); -drm_printf (p,"\t\tLRC Head: Internal %u, Memory %u\n" , - ce->ring->head, - ce->lrc_reg_state[CTX_RING_HEAD ]); -drm_printf (p,"\t\tLRC Tail: Internal %u, Memory %u\n" , - ce->ring->tail, - ce->lrc_reg_state[CTX_RING_TAIL ]); -drm_printf (p,"\t\tContext Pin Count: %u\n" , -atomic_read (&ce->pin_count)); -drm_printf (p,"\t\tGuC ID Ref Count: %u\n" , -atomic_read (&ce->guc_id.ref)); -drm_printf (p,"\t\tSchedule State: 0x%x\n\n" , - ce->guc_state.sched_state); +GEM_BUG_ON (intel_context_is_child (ce)); +guc_log_context (p, ce);guc_log_context_priority (p, ce); + +if (intel_context_is_parent (ce)) { +struct guc_process_desc *desc =__get_process_desc (ce); +struct intel_context *child; + +drm_printf (p,"\t\tWQI Head: %u\n" , +READ_ONCE (desc->head)); +drm_printf (p,"\t\tWQI Tail: %u\n" , +READ_ONCE (desc->tail));
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_print_context_info(struct intel_guc *guc, · line 3722
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +5
-0+drm_printf (p,"\t\tWQI Status: %u\n\n" , +READ_ONCE (desc->wq_status)); + +for_each_child (ce, child) +guc_log_context (p, child);There should be some indication that this is a child context and/or how many children there are. Otherwise how does the reader differentiation between the list of child contexts and the next parent/single context?
We don't log the priority info or work queue info for child contexts so it is actually pretty easy to parse. That being said, I'll output the number of children if the context is a parent.
Matt
Quoted 7 lines
John.
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+ } }xa_unlock_irqrestore (&guc->context_lookup, flags); }
PATCH 19/27 drm/i915: Fix bug in user proto-context creation that leaked contexts
In reply to Matthew BrostSet number of engines before attempting to create contexts so the function free_engines can clean up properly.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +1 -1
@@ -944,6 +944,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,unsigned int n; e =alloc_engines (num_engines); + e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) {struct intel_context *ce;int ret;
@@ -977,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, goto free_engines; } } - e->num_engines = num_engines;return e;
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 19/27] drm/i915: Fix bug in user proto-context creation that leaked contexts
Quoted 15 lines · Matthew Brost
Set number of engines before attempting to create contexts so the function
free_enginescan clean up properly.Fixes d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")Signed-off-by Matthew Brost <[email protected]>Cc <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_context.c +0
-0
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, · line 946
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +0
-0@@ -944,6 +944,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,unsigned int n; e =alloc_engines (num_engines);
This can return null when out of memory. There needs to be an early exit check before dereferencing a null pointer. Not sure if that is a worse bug or not than leaking memory! Either way, it would be good to fix that too.
John.
Quoted 12 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-1+ e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) {struct intel_context *ce;int ret;@@ -977,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, goto free_engines; } } - e->num_engines = num_engines;return e;
Re: [Intel-gfx] [PATCH 19/27] drm/i915: Fix bug in user proto-context creation that leaked contexts
Quoted 11 lines · John Harrison
Quoted 10 lines · Matthew Brost
Set number of engines before attempting to create contexts so the function
free_enginescan clean up properly.Fixes d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")Signed-off-by Matthew Brost <[email protected]>Cc <[email protected]>---
drivers/gpu/drm/i915/gem/i915_gem_context.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines · line 946
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +0
-0@@ -944,6 +944,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, unsigned int n; e = alloc_engines(num_engines);This can return null when out of memory. There needs to be an early exit check before dereferencing a null pointer. Not sure if that is a worse bug or not than leaking memory! Either way, it would be good to fix that too.
Pull out from the series and send a fix standalone ASAP? Also suggest adding author and reviewer to cc for typically quicker turnaround time.
Regards,
Tvrtko
Quoted 14 lines
John.
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-1+ e->num_engines = num_engines; for (n = 0; n < num_engines; n++) { struct intel_context *ce; int ret;@@ -977,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, goto free_engines; } } - e->num_engines = num_engines; return e;
Re: [Intel-gfx] [PATCH 19/27] drm/i915: Fix bug in user proto-context creation that leaked contexts
Quoted 28 lines · Tvrtko Ursulin
Quoted 12 lines · John Harrison
Quoted 11 lines · Matthew Brost
Set number of engines before attempting to create contexts so the function
free_enginescan clean up properly.Fixes d4433c7600f7 ("drm/i915/gem: Use the proto-context to handlecreate parameters (v5)")
Signed-off-by Matthew Brost <[email protected]>Cc <[email protected]>---
drivers/gpu/drm/i915/gem/i915_gem_context.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)Quoted 13 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines · line 946
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +0
-0@@ -944,6 +944,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, unsigned int n; e = alloc_engines(num_engines);This can return null when out of memory. There needs to be an early exit check before dereferencing a null pointer. Not sure if that is a worse bug or not than leaking memory! Either way, it would be good to fix that too.
Quoted 1 line
Pull out from the series and send a fix standalone ASAP? Also suggest adding
Sure, will do.
Matt
Quoted 21 lines
author and reviewer to cc for typically quicker turnaround time.
Regards,
Tvrtko
Quoted 14 lines
John.
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-1+ e->num_engines = num_engines; for (n = 0; n < num_engines; n++) { struct intel_context *ce; int ret;@@ -977,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, goto free_engines; } } - e->num_engines = num_engines; return e;
Re: [Intel-gfx] [PATCH 19/27] drm/i915: Fix bug in user proto-context creation that leaked contexts
In reply to John HarrisonQuoted 11 lines · John Harrison
Quoted 10 lines · Matthew Brost
Set number of engines before attempting to create contexts so the function
free_enginescan clean up properly.Fixes d4433c7600f7 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")Signed-off-by Matthew Brost <[email protected]>Cc <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, · line 945
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +0
-0@@ -944,6 +944,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,unsigned int n; e =alloc_engines (num_engines);This can return null when out of memory. There needs to be an early exit check before dereferencing a null pointer. Not sure if that is a worse bug or not than leaking memory! Either way, it would be good to fix that too.
Indeed there is another bug. Will fix that one too.
Matt
Quoted 13 lines
John.
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-1+ e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) {struct intel_context *ce;int ret;@@ -977,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, goto free_engines; } } - e->num_engines = num_engines;return e;
PATCH 20/27 drm/i915/guc: Connect UAPI to GuC multi-lrc interface
In reply to Matthew BrostIntroduce 'set parallel submit' extension to connect UAPI to GuC multi-lrc interface. Kernel doc in new uAPI should explain it all.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: link to come
v2:
(Daniel Vetter)
- Add IGT link and placeholder for media UMD link
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 220 +++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_context_types.h | 6 + drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- drivers/gpu/drm/i915/gt/intel_engine.h | 12 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- .../drm/i915/gt/intel_execlists_submission.c | 6 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 114 ++++++++- include/uapi/drm/i915_drm.h | 128 ++++++++++ 9 files changed, 485 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +218 -2
@@ -522,9 +522,149 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data)return 0 ; } +static int +set_proto_ctx_engines_parallel_submit (struct i915_user_extension __user *base, +void *data) +{ +struct i915_context_engines_parallel_submit __user *ext = +container_of_user (base,typeof (*ext), base); +const struct set_proto_ctx_engines *set = data; +struct drm_i915_private *i915 = set->i915; +u64 flags; +int err =0 , n, i, j; +u16 slot, width, num_siblings; +struct intel_engine_cs **siblings =NULL ; +intel_engine_mask_t prev_mask; + +/* Disabling for now */ +return -ENODEV ; + +if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) +return -ENODEV ; + +if (get_user (slot, &ext->engine_index)) +return -EFAULT ; + +if (get_user (width, &ext->width)) +return -EFAULT ; + +if (get_user (num_siblings, &ext->num_siblings)) +return -EFAULT ; + +if (slot >= set->num_engines) { +drm_dbg (&i915->drm,"Invalid placement value, %d >= %d\n" , + slot, set->num_engines); +return -EINVAL ; + } + +if (set->engines[slot].type !=I915_GEM_ENGINE_TYPE_INVALID ) { +drm_dbg (&i915->drm, +"Invalid placement[%d], already occupied\n" , slot); +return -EINVAL ; + } + +if (get_user (flags, &ext->flags)) +return -EFAULT ; + +if (flags) { +drm_dbg (&i915->drm,"Unknown flags 0x%02llx" , flags); +return -EINVAL ; + } + +for (n =0 ; n <ARRAY_SIZE (ext->mbz64); n++) { + err =check_user_mbz (&ext->mbz64[n]); +if (err) +return err; + } + +if (width <2 ) { +drm_dbg (&i915->drm,"Width (%d) < 2\n" , width); +return -EINVAL ; + } + +if (num_siblings <1 ) { +drm_dbg (&i915->drm,"Number siblings (%d) < 1\n" , + num_siblings); +return -EINVAL ; + } + + siblings =kmalloc_array (num_siblings * width, +sizeof (*siblings), +GFP_KERNEL ); +if (!siblings) +return -ENOMEM ; + +/* Create contexts / engines */ +for (i =0 ; i < width; ++i) { +intel_engine_mask_t current_mask =0 ; +struct i915_engine_class_instance prev_engine; + +for (j =0 ; j < num_siblings; ++j) { +struct i915_engine_class_instance ci; + + n = i * num_siblings + j; +if (copy_from_user (&ci, &ext->engines[n],sizeof (ci))) { + err = -EFAULT ; + goto out_err; + } + + siblings[n] = +intel_engine_lookup_user (i915, ci.engine_class, + ci.engine_instance); +if (!siblings[n]) { +drm_dbg (&i915->drm, +"Invalid sibling[%d]: { class:%d, inst:%d }\n" , + n, ci.engine_class, ci.engine_instance); + err = -EINVAL ; + goto out_err; + } + +if (n) { +if (prev_engine.engine_class != + ci.engine_class) { +drm_dbg (&i915->drm, +"Mismatched class %d, %d\n" , + prev_engine.engine_class, + ci.engine_class); + err = -EINVAL ; + goto out_err; + } + } + + prev_engine = ci; + current_mask |= siblings[n]->logical_mask; + } + +if (i >0 ) { +if (current_mask != prev_mask <<1 ) { +drm_dbg (&i915->drm, +"Non contiguous logical mask 0x%x, 0x%x\n" , + prev_mask, current_mask); + err = -EINVAL ; + goto out_err; + } + } + prev_mask = current_mask; + } + + set->engines[slot].type =I915_GEM_ENGINE_TYPE_PARALLEL ; + set->engines[slot].num_siblings = num_siblings; + set->engines[slot].width = width; + set->engines[slot].siblings = siblings; + +return 0 ; + +out_err: +kfree (siblings); + +return err; +} +static const i915_user_extension_fn set_proto_ctx_engines_extensions[] = { [I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE ] = set_proto_ctx_engines_balance, [I915_CONTEXT_ENGINES_EXT_BOND ] = set_proto_ctx_engines_bond, + [I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT ] = + set_proto_ctx_engines_parallel_submit, }; static int set_proto_ctx_engines(struct drm_i915_file_private *fpriv,
@@ -821,6 +961,25 @@ static int intel_context_set_gem(struct intel_context *ce,return ret; } +static void __unpin_engines (struct i915_gem_engines *e,unsigned int count) +{ +while (count--) { +struct intel_context *ce = e->engines[count], *child; + +if (!ce || !test_bit (CONTEXT_PERMA_PIN , &ce->flags)) +continue ; + +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); + } +} + +static void unpin_engines (struct i915_gem_engines *e) +{ +__unpin_engines (e, e->num_engines); +} +static void __free_engines (struct i915_gem_engines *e,unsigned int count) {while (count--) {
@@ -936,6 +1095,40 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,return err; } +static int perma_pin_contexts (struct intel_context *ce) +{ +struct intel_context *child; +int i =0 , j =0 , ret; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + ret =intel_context_pin (ce); +if (unlikely (ret)) +return ret; + +for_each_child (ce, child) { + ret =intel_context_pin (child); +if (unlikely (ret)) + goto unwind; + ++i; + } + +set_bit (CONTEXT_PERMA_PIN , &ce->flags); + +return 0 ; + +unwind: +intel_context_unpin (ce); +for_each_child (ce, child) { +if (j++ < i) +intel_context_unpin (child); +else +break ; + } + +return ret; +} +static struct i915_gem_engines *user_engines (struct i915_gem_context *ctx,unsigned int num_engines,struct i915_gem_proto_engine *pe)
@@ -946,7 +1139,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, e =alloc_engines (num_engines); e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) { -struct intel_context *ce; +struct intel_context *ce, *child;int ret;switch (pe[n].type) {
@@ -956,7 +1149,13 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,case I915_GEM_ENGINE_TYPE_BALANCED : ce =intel_engine_create_virtual (pe[n].siblings, - pe[n].num_siblings); + pe[n].num_siblings,0 ); +break ; + +case I915_GEM_ENGINE_TYPE_PARALLEL : + ce =intel_engine_create_parallel (pe[n].siblings, + pe[n].num_siblings, + pe[n].width);break ;case I915_GEM_ENGINE_TYPE_INVALID :
@@ -977,6 +1176,22 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, err =ERR_PTR (ret); goto free_engines; } +for_each_child (ce, child) { + ret =intel_context_set_gem (child, ctx, pe->sseu); +if (ret) { + err =ERR_PTR (ret); + goto free_engines; + } + } + +/* XXX: Must be done after setting gem context */ +if (pe[n].type ==I915_GEM_ENGINE_TYPE_PARALLEL ) { + ret =perma_pin_contexts (ce); +if (ret) { + err =ERR_PTR (ret); + goto free_engines; + } + } }return e;
@@ -1200,6 +1415,7 @@ static void context_close(struct i915_gem_context *ctx)/* Flush any concurrent set_engines() */ mutex_lock (&ctx->engines_mutex); +unpin_engines (ctx->engines);engines_idle_release (ctx,rcu_replace_pointer (ctx->engines,NULL ,1 ));i915_gem_context_set_closed (ctx);mutex_unlock (&ctx->engines_mutex);
drivers/gpu/drm/i915/gem/i915_gem_context_types.h +6 -0
@@ -78,6 +78,9 @@ enum i915_gem_engine_type {/** @I915_GEM_ENGINE_TYPE_BALANCED: A load-balanced engine set */ I915_GEM_ENGINE_TYPE_BALANCED , + +/** @I915_GEM_ENGINE_TYPE_PARALLEL: A parallel engine set */ + I915_GEM_ENGINE_TYPE_PARALLEL, };/**
@@ -108,6 +111,9 @@ struct i915_gem_proto_engine {/** @num_siblings: Number of balanced siblings */ unsigned int num_siblings; +/** @width: Width of each sibling */ +unsigned int width; +/** @siblings: Balanced siblings */ struct intel_engine_cs **siblings;
drivers/gpu/drm/i915/gt/intel_context_types.h +7 -2
@@ -55,9 +55,13 @@ struct intel_context_ops {void (*reset)(struct intel_context *ce);void (*destroy)(struct kref *kref); -/* virtual engine/context interface */ +/* virtual/parallel engine/context interface */ struct intel_context *(*create_virtual)(struct intel_engine_cs **engine, -unsigned int count); +unsigned int count, +unsigned long flags); +struct intel_context *(*create_parallel)(struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width);struct intel_engine_cs *(*get_sibling)(struct intel_engine_cs *engine,unsigned int sibling); };
@@ -113,6 +117,7 @@ struct intel_context {#define CONTEXT_NOPREEMPT 8#define CONTEXT_LRCA_DIRTY 9#define CONTEXT_GUC_INIT 10 +#define CONTEXT_PERMA_PIN 11struct {u64 timeout_us;
drivers/gpu/drm/i915/gt/intel_engine.h +11 -1
@@ -279,9 +279,19 @@ intel_engine_has_preempt_reset(const struct intel_engine_cs *engine)return intel_engine_has_preemption (engine); } +#define FORCE_VIRTUAL BIT(0)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count); +unsigned int count,unsigned long flags); + +static inline struct intel_context * +intel_engine_create_parallel (struct intel_engine_cs **engines, +unsigned int num_engines, +unsigned int width) +{ +GEM_BUG_ON (!engines[0 ]->cops->create_parallel); +return engines[0 ]->cops->create_parallel (engines, num_engines, width); +}static inline bool intel_virtual_engine_has_heartbeat (const struct intel_engine_cs *engine)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +3 -3
@@ -1923,16 +1923,16 @@ ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count) +unsigned int count,unsigned long flags) {if (count ==0 )return ERR_PTR (-EINVAL ); -if (count ==1 ) +if (count ==1 && !(flags &FORCE_VIRTUAL ))return intel_context_create (siblings[0 ]);GEM_BUG_ON (!siblings[0 ]->cops->create_virtual); -return siblings[0 ]->cops->create_virtual (siblings, count); +return siblings[0 ]->cops->create_virtual (siblings, count, flags); } struct i915_request *
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +4 -2
@@ -201,7 +201,8 @@ static struct virtual_engine *to_virtual_engine(struct intel_engine_cs *engine) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count); +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags);static struct i915_request * __active_request(const struct intel_timeline * const tl,
@@ -3782,7 +3783,8 @@ static void virtual_submit_request(struct i915_request *rq) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count) +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags) {struct virtual_engine *ve;unsigned int n;
drivers/gpu/drm/i915/gt/selftest_execlists.c +6 -6
@@ -3733,7 +3733,7 @@ static int nop_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (!nctx || nctx >ARRAY_SIZE (ve));for (n =0 ; n < nctx; n++) { - ve[n] =intel_engine_create_virtual (siblings, nsibling); + ve[n] =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve[n])) { err =PTR_ERR (ve[n]); nctx = n;
@@ -3929,7 +3929,7 @@ static int mask_virtual_engine(struct intel_gt *gt,* restrict it to our desired engine within the virtual engine. */ - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_close;
@@ -4060,7 +4060,7 @@ static int slicein_virtual_engine(struct intel_gt *gt,i915_request_add (rq); } - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;
@@ -4112,7 +4112,7 @@ static int sliceout_virtual_engine(struct intel_gt *gt,/* XXX We do not handle oversubscription and fairness with normal rq */ for (n =0 ; n < nsibling; n++) { - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;
@@ -4214,7 +4214,7 @@ static int preserved_virtual_engine(struct intel_gt *gt,if (err) goto out_scratch; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_scratch;
@@ -4354,7 +4354,7 @@ static int reset_virtual_engine(struct intel_gt *gt,if (igt_spinner_init (&spin, gt))return -ENOMEM ; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_spin;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +102 -12
168 lines not on this page · raw message
include/uapi/drm/i915_drm.h +128 -0
146 lines not on this page · raw message
Signature · 1 line
2.32.0
kernel test robot
build botRe: [Intel-gfx] [PATCH 20/27] drm/i915/guc: Connect UAPI to GuC multi-lrc interface
Thank you for the patch! Perhaps something to improve:
Hi Matthew,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm-exynos/exynos-drm-next next-20210827] [cannot apply to tegra-drm/drm/tegra/for-next linus/master drm/drm-next v5.14-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-rhel-8.3-kselftests (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-348-gf0e6938b-dirty # https://github.com/0day-ci/linux/commit/0741c4627df7b17e3e1b06c5967aed4371c688f7 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 git checkout 0741c4627df7b17e3e1b06c5967aed4371c688f7 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct i915_gem_engines *e @@ got struct i915_gem_engines [noderef] __rcu *engines @@
drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: expected struct i915_gem_engines *e
drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: got struct i915_gem_engines [noderef] __rcu *engines
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct i915_address_space *vm @@ got struct i915_address_space [noderef] __rcu *vm @@
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: expected struct i915_address_space *vm
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: got struct i915_address_space [noderef] __rcu *vm
vim +1411 drivers/gpu/drm/i915/gem/i915_gem_context.c
1404
1405 static void context_close(struct i915_gem_context *ctx)
1406 {
1407 struct i915_address_space *vm;
1408
1409 /* Flush any concurrent set_engines() */
1410 mutex_lock(&ctx->engines_mutex);
> 1411 unpin_engines(ctx->engines);
1412 engines_idle_release(ctx, rcu_replace_pointer(ctx->engines, NULL, 1));
1413 i915_gem_context_set_closed(ctx);
1414 mutex_unlock(&ctx->engines_mutex);
1415
1416 mutex_lock(&ctx->mutex);
1417
1418 set_closed_name(ctx);
1419
1420 vm = i915_gem_context_vm(ctx);
1421 if (vm)
1422 i915_vm_close(vm);
1423
1424 if (ctx->syncobj)
1425 drm_syncobj_put(ctx->syncobj);
1426
1427 ctx->file_priv = ERR_PTR(-EBADF);
1428
1429 /*
1430 * The LUT uses the VMA as a backpointer to unref the object,
1431 * so we need to clear the LUT before we close all the VMA (inside
1432 * the ppgtt).
1433 */
1434 lut_close(ctx);
1435
1436 spin_lock(&ctx->i915->gem.contexts.lock);
1437 list_del(&ctx->link);
1438 spin_unlock(&ctx->i915->gem.contexts.lock);
1439
1440 mutex_unlock(&ctx->mutex);
1441
1442 /*
1443 * If the user has disabled hangchecking, we can not be sure that
1444 * the batches will ever complete after the context is closed,
1445 * keeping the context and all resources pinned forever. So in this
1446 * case we opt to forcibly kill off all remaining requests on
1447 * context close.
1448 */
1449 kill_context(ctx);
1450
1451 i915_gem_context_put(ctx);
1452 }
1453
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 20/27] drm/i915/guc: Connect UAPI to GuC multi-lrc interface
In reply to Matthew BrostThank you for the patch! Perhaps something to improve:
Hi Matthew,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm-exynos/exynos-drm-next next-20210827] [cannot apply to tegra-drm/drm/tegra/for-next linus/master drm/drm-next v5.14-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-rhel-8.3-kselftests (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-348-gf0e6938b-dirty # https://github.com/0day-ci/linux/commit/0741c4627df7b17e3e1b06c5967aed4371c688f7 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 git checkout 0741c4627df7b17e3e1b06c5967aed4371c688f7 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct i915_gem_engines *e @@ got struct i915_gem_engines [noderef] __rcu *engines @@
drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: expected struct i915_gem_engines *e
drivers/gpu/drm/i915/gem/i915_gem_context.c:1411:26: sparse: got struct i915_gem_engines [noderef] __rcu *engines
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct i915_address_space *vm @@ got struct i915_address_space [noderef] __rcu *vm @@
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: expected struct i915_address_space *vm
drivers/gpu/drm/i915/gem/i915_gem_context.c:1626:34: sparse: got struct i915_address_space [noderef] __rcu *vm
vim +1411 drivers/gpu/drm/i915/gem/i915_gem_context.c
1404
1405 static void context_close(struct i915_gem_context *ctx)
1406 {
1407 struct i915_address_space *vm;
1408
1409 /* Flush any concurrent set_engines() */
1410 mutex_lock(&ctx->engines_mutex);
> 1411 unpin_engines(ctx->engines);
1412 engines_idle_release(ctx, rcu_replace_pointer(ctx->engines, NULL, 1));
1413 i915_gem_context_set_closed(ctx);
1414 mutex_unlock(&ctx->engines_mutex);
1415
1416 mutex_lock(&ctx->mutex);
1417
1418 set_closed_name(ctx);
1419
1420 vm = i915_gem_context_vm(ctx);
1421 if (vm)
1422 i915_vm_close(vm);
1423
1424 if (ctx->syncobj)
1425 drm_syncobj_put(ctx->syncobj);
1426
1427 ctx->file_priv = ERR_PTR(-EBADF);
1428
1429 /*
1430 * The LUT uses the VMA as a backpointer to unref the object,
1431 * so we need to clear the LUT before we close all the VMA (inside
1432 * the ppgtt).
1433 */
1434 lut_close(ctx);
1435
1436 spin_lock(&ctx->i915->gem.contexts.lock);
1437 list_del(&ctx->link);
1438 spin_unlock(&ctx->i915->gem.contexts.lock);
1439
1440 mutex_unlock(&ctx->mutex);
1441
1442 /*
1443 * If the user has disabled hangchecking, we can not be sure that
1444 * the batches will ever complete after the context is closed,
1445 * keeping the context and all resources pinned forever. So in this
1446 * case we opt to forcibly kill off all remaining requests on
1447 * context close.
1448 */
1449 kill_context(ctx);
1450
1451 i915_gem_context_put(ctx);
1452 }
1453
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [Intel-gfx] [PATCH 20/27] drm/i915/guc: Connect UAPI to GuC multi-lrc interface
In reply to Matthew BrostQuoted 5 lines · Matthew Brost
Introduce 'set parallel submit' extension to connect UAPI to GuC multi-lrc interface. Kernel doc in new uAPI should explain it all.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: link to come
Is this link still not available?
Also, see 'kernel test robot' emails saying that sparse is complaining about something I don't understand but presumably needs to be fixed.
Quoted 36 lines
v2:
(Daniel Vetter)
- Add IGT link and placeholder for media UMD linkCc Tvrtko Ursulin <[email protected]>Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 220 +++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_context_types.h | 6 + drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- drivers/gpu/drm/i915/gt/intel_engine.h | 12 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- .../drm/i915/gt/intel_execlists_submission.c | 6 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 114 ++++++++- include/uapi/drm/i915_drm.h | 128 ++++++++++ 9 files changed, 485 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_context.c +9
-0@@ -522,9 +522,149 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data)return 0 ; } +static int +set_proto_ctx_engines_parallel_submit (struct i915_user_extension __user *base, +void *data) +{ +struct i915_context_engines_parallel_submit __user *ext = +container_of_user (base,typeof (*ext), base); +const struct set_proto_ctx_engines *set = data; +struct drm_i915_private *i915 = set->i915; +u64 flags;
drivers/gpu/drm/i915/gem/i915_gem_context.c set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) · line 543
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +10
-0+int err =0 , n, i, j; +u16 slot, width, num_siblings; +struct intel_engine_cs **siblings =NULL ; +intel_engine_mask_t prev_mask; + +/* Disabling for now */ +return -ENODEV ; + +if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) +return -ENODEV ;
This needs a FIXME comment to say that exec list will be added later.
Quoted 154 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +140
-0+ +if (get_user (slot, &ext->engine_index)) +return -EFAULT ; + +if (get_user (width, &ext->width)) +return -EFAULT ; + +if (get_user (num_siblings, &ext->num_siblings)) +return -EFAULT ; + +if (slot >= set->num_engines) { +drm_dbg (&i915->drm,"Invalid placement value, %d >= %d\n" , + slot, set->num_engines); +return -EINVAL ; + } + +if (set->engines[slot].type !=I915_GEM_ENGINE_TYPE_INVALID ) { +drm_dbg (&i915->drm, +"Invalid placement[%d], already occupied\n" , slot); +return -EINVAL ; + } + +if (get_user (flags, &ext->flags)) +return -EFAULT ; + +if (flags) { +drm_dbg (&i915->drm,"Unknown flags 0x%02llx" , flags); +return -EINVAL ; + } + +for (n =0 ; n <ARRAY_SIZE (ext->mbz64); n++) { + err =check_user_mbz (&ext->mbz64[n]); +if (err) +return err; + } + +if (width <2 ) { +drm_dbg (&i915->drm,"Width (%d) < 2\n" , width); +return -EINVAL ; + } + +if (num_siblings <1 ) { +drm_dbg (&i915->drm,"Number siblings (%d) < 1\n" , + num_siblings); +return -EINVAL ; + } + + siblings =kmalloc_array (num_siblings * width, +sizeof (*siblings), +GFP_KERNEL ); +if (!siblings) +return -ENOMEM ; + +/* Create contexts / engines */ +for (i =0 ; i < width; ++i) { +intel_engine_mask_t current_mask =0 ; +struct i915_engine_class_instance prev_engine; + +for (j =0 ; j < num_siblings; ++j) { +struct i915_engine_class_instance ci; + + n = i * num_siblings + j; +if (copy_from_user (&ci, &ext->engines[n],sizeof (ci))) { + err = -EFAULT ; + goto out_err; + } + + siblings[n] = +intel_engine_lookup_user (i915, ci.engine_class, + ci.engine_instance); +if (!siblings[n]) { +drm_dbg (&i915->drm, +"Invalid sibling[%d]: { class:%d, inst:%d }\n" , + n, ci.engine_class, ci.engine_instance); + err = -EINVAL ; + goto out_err; + } + +if (n) { +if (prev_engine.engine_class != + ci.engine_class) { +drm_dbg (&i915->drm, +"Mismatched class %d, %d\n" , + prev_engine.engine_class, + ci.engine_class); + err = -EINVAL ; + goto out_err; + } + } + + prev_engine = ci; + current_mask |= siblings[n]->logical_mask; + } + +if (i >0 ) { +if (current_mask != prev_mask <<1 ) { +drm_dbg (&i915->drm, +"Non contiguous logical mask 0x%x, 0x%x\n" , + prev_mask, current_mask); + err = -EINVAL ; + goto out_err; + } + } + prev_mask = current_mask; + } + + set->engines[slot].type =I915_GEM_ENGINE_TYPE_PARALLEL ; + set->engines[slot].num_siblings = num_siblings; + set->engines[slot].width = width; + set->engines[slot].siblings = siblings; + +return 0 ; + +out_err: +kfree (siblings); + +return err; +} +static const i915_user_extension_fn set_proto_ctx_engines_extensions[] = { [I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE ] = set_proto_ctx_engines_balance, [I915_CONTEXT_ENGINES_EXT_BOND ] = set_proto_ctx_engines_bond, + [I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT ] = + set_proto_ctx_engines_parallel_submit, }; static int set_proto_ctx_engines(struct drm_i915_file_private *fpriv,@@ -821,6 +961,25 @@ static int intel_context_set_gem(struct intel_context *ce,return ret; } +static void __unpin_engines (struct i915_gem_engines *e,unsigned int count) +{ +while (count--) { +struct intel_context *ce = e->engines[count], *child; + +if (!ce || !test_bit (CONTEXT_PERMA_PIN , &ce->flags)) +continue ; + +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); + } +} + +static void unpin_engines (struct i915_gem_engines *e) +{ +__unpin_engines (e, e->num_engines); +} +static void __free_engines (struct i915_gem_engines *e,unsigned int count) {while (count--) {
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, · line 1098
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-0@@ -936,6 +1095,40 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,return err; } +static int perma_pin_contexts (struct intel_context *ce)
What is this perma_ping thing about?
Quoted 63 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +41
-2+{ +struct intel_context *child; +int i =0 , j =0 , ret; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + ret =intel_context_pin (ce); +if (unlikely (ret)) +return ret; + +for_each_child (ce, child) { + ret =intel_context_pin (child); +if (unlikely (ret)) + goto unwind; + ++i; + } + +set_bit (CONTEXT_PERMA_PIN , &ce->flags); + +return 0 ; + +unwind: +intel_context_unpin (ce); +for_each_child (ce, child) { +if (j++ < i) +intel_context_unpin (child); +else +break ; + } + +return ret; +} +static struct i915_gem_engines *user_engines (struct i915_gem_context *ctx,unsigned int num_engines,struct i915_gem_proto_engine *pe)@@ -946,7 +1139,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, e =alloc_engines (num_engines); e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) { -struct intel_context *ce; +struct intel_context *ce, *child;int ret;switch (pe[n].type) {@@ -956,7 +1149,13 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,case I915_GEM_ENGINE_TYPE_BALANCED : ce =intel_engine_create_virtual (pe[n].siblings, - pe[n].num_siblings); + pe[n].num_siblings,0 ); +break ; + +case I915_GEM_ENGINE_TYPE_PARALLEL : + ce =intel_engine_create_parallel (pe[n].siblings, + pe[n].num_siblings, + pe[n].width);break ;case I915_GEM_ENGINE_TYPE_INVALID :@@ -977,6 +1176,22 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, err =ERR_PTR (ret); goto free_engines;
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, · line 1187
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +9
-0} +for_each_child (ce, child) { + ret =intel_context_set_gem (child, ctx, pe->sseu); +if (ret) { + err =ERR_PTR (ret); + goto free_engines; + } + } + +/* XXX: Must be done after setting gem context */
Why the 'XXX'? Is it saying that the ordering is a problem that needs to be fixed?
Quoted 395 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +8
-0+if (pe[n].type ==I915_GEM_ENGINE_TYPE_PARALLEL ) { + ret =perma_pin_contexts (ce); +if (ret) { + err =ERR_PTR (ret); + goto free_engines; + } + } }return e;@@ -1200,6 +1415,7 @@ static void context_close(struct i915_gem_context *ctx)/* Flush any concurrent set_engines() */ mutex_lock (&ctx->engines_mutex); +unpin_engines (ctx->engines);engines_idle_release (ctx,rcu_replace_pointer (ctx->engines,NULL ,1 ));i915_gem_context_set_closed (ctx);mutex_unlock (&ctx->engines_mutex);drivers/gpu/drm/i915/gem/i915_gem_context_types.h +6
-0@@ -78,6 +78,9 @@ enum i915_gem_engine_type {/** @I915_GEM_ENGINE_TYPE_BALANCED: A load-balanced engine set */ I915_GEM_ENGINE_TYPE_BALANCED , + +/** @I915_GEM_ENGINE_TYPE_PARALLEL: A parallel engine set */ + I915_GEM_ENGINE_TYPE_PARALLEL, };/** @@ -108,6 +111,9 @@ struct i915_gem_proto_engine {/** @num_siblings: Number of balanced siblings */ unsigned int num_siblings; +/** @width: Width of each sibling */ +unsigned int width; +/** @siblings: Balanced siblings */ struct intel_engine_cs **siblings;drivers/gpu/drm/i915/gt/intel_context_types.h +7
-2@@ -55,9 +55,13 @@ struct intel_context_ops {void (*reset)(struct intel_context *ce);void (*destroy)(struct kref *kref); -/* virtual engine/context interface */ +/* virtual/parallel engine/context interface */ struct intel_context *(*create_virtual)(struct intel_engine_cs **engine, -unsigned int count); +unsigned int count, +unsigned long flags); +struct intel_context *(*create_parallel)(struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width);struct intel_engine_cs *(*get_sibling)(struct intel_engine_cs *engine,unsigned int sibling); };@@ -113,6 +117,7 @@ struct intel_context {#define CONTEXT_NOPREEMPT 8#define CONTEXT_LRCA_DIRTY 9#define CONTEXT_GUC_INIT 10 +#define CONTEXT_PERMA_PIN 11struct {u64 timeout_us;drivers/gpu/drm/i915/gt/intel_engine.h +11
-1@@ -279,9 +279,19 @@ intel_engine_has_preempt_reset(const struct intel_engine_cs *engine)return intel_engine_has_preemption (engine); } +#define FORCE_VIRTUAL BIT(0)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count); +unsigned int count,unsigned long flags); + +static inline struct intel_context * +intel_engine_create_parallel (struct intel_engine_cs **engines, +unsigned int num_engines, +unsigned int width) +{ +GEM_BUG_ON (!engines[0 ]->cops->create_parallel); +return engines[0 ]->cops->create_parallel (engines, num_engines, width); +}static inline bool intel_virtual_engine_has_heartbeat (const struct intel_engine_cs *engine)drivers/gpu/drm/i915/gt/intel_engine_cs.c +3
-3@@ -1923,16 +1923,16 @@ ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count) +unsigned int count,unsigned long flags) {if (count ==0 )return ERR_PTR (-EINVAL ); -if (count ==1 ) +if (count ==1 && !(flags &FORCE_VIRTUAL ))return intel_context_create (siblings[0 ]);GEM_BUG_ON (!siblings[0 ]->cops->create_virtual); -return siblings[0 ]->cops->create_virtual (siblings, count); +return siblings[0 ]->cops->create_virtual (siblings, count, flags); } struct i915_request *drivers/gpu/drm/i915/gt/intel_execlists_submission.c +4
-2@@ -201,7 +201,8 @@ static struct virtual_engine *to_virtual_engine(struct intel_engine_cs *engine) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count); +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags);static struct i915_request * __active_request(const struct intel_timeline * const tl,@@ -3782,7 +3783,8 @@ static void virtual_submit_request(struct i915_request *rq) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count) +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags) {struct virtual_engine *ve;unsigned int n;drivers/gpu/drm/i915/gt/selftest_execlists.c +6
-6@@ -3733,7 +3733,7 @@ static int nop_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (!nctx || nctx >ARRAY_SIZE (ve));for (n =0 ; n < nctx; n++) { - ve[n] =intel_engine_create_virtual (siblings, nsibling); + ve[n] =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve[n])) { err =PTR_ERR (ve[n]); nctx = n;@@ -3929,7 +3929,7 @@ static int mask_virtual_engine(struct intel_gt *gt,* restrict it to our desired engine within the virtual engine. */ - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_close;@@ -4060,7 +4060,7 @@ static int slicein_virtual_engine(struct intel_gt *gt,i915_request_add (rq); } - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;@@ -4112,7 +4112,7 @@ static int sliceout_virtual_engine(struct intel_gt *gt,/* XXX We do not handle oversubscription and fairness with normal rq */ for (n =0 ; n < nsibling; n++) { - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;@@ -4214,7 +4214,7 @@ static int preserved_virtual_engine(struct intel_gt *gt,if (err) goto out_scratch; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_scratch;@@ -4354,7 +4354,7 @@ static int reset_virtual_engine(struct intel_gt *gt,if (igt_spinner_init (&spin, gt))return -ENOMEM ; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_spin;drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +102
-12@@ -121,7 +121,13 @@ struct guc_virtual_engine { };static struct intel_context * -guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count); +guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags); + +static struct intel_context * +guc_create_parallel (struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width);#define GUC_REQUEST_SIZE 64/* bytes */ @@ -2581,6 +2587,7 @@ static const struct intel_context_ops guc_context_ops = { .destroy = guc_context_destroy, .create_virtual = guc_create_virtual, + .create_parallel = guc_create_parallel, };static void submit_work_cb (struct irq_work *wrk)@@ -2827,8 +2834,6 @@ static const struct intel_context_ops virtual_guc_context_ops = { .get_sibling = guc_virtual_get_sibling, }; -/* Future patches will use this function */ -__maybe_unused static int guc_parent_context_pin (struct intel_context *ce,void *vaddr) {struct intel_engine_cs *engine =guc_virtual_get_sibling (ce->engine,0 );@@ -2845,8 +2850,6 @@ static int guc_parent_context_pin(struct intel_context *ce, void *vaddr)return __guc_context_pin (ce, engine, vaddr); } -/* Future patches will use this function */ -__maybe_unused static int guc_child_context_pin (struct intel_context *ce,void *vaddr) {struct intel_engine_cs *engine =guc_virtual_get_sibling (ce->engine,0 );@@ -2858,8 +2861,6 @@ static int guc_child_context_pin(struct intel_context *ce, void *vaddr)return __guc_context_pin (ce, engine, vaddr); } -/* Future patches will use this function */ -__maybe_unused static void guc_parent_context_unpin (struct intel_context *ce) {struct intel_guc *guc =ce_to_guc (ce);@@ -2875,8 +2876,6 @@ static void guc_parent_context_unpin(struct intel_context *ce)lrc_unpin (ce); } -/* Future patches will use this function */ -__maybe_unused static void guc_child_context_unpin (struct intel_context *ce) {GEM_BUG_ON (context_enabled (ce));@@ -2887,8 +2886,6 @@ static void guc_child_context_unpin(struct intel_context *ce)lrc_unpin (ce); } -/* Future patches will use this function */ -__maybe_unused static void guc_child_context_post_unpin (struct intel_context *ce) {GEM_BUG_ON (!intel_context_is_child (ce));@@ -2899,6 +2896,98 @@ static void guc_child_context_post_unpin(struct intel_context *ce)intel_context_unpin (ce->parent); } +static void guc_child_context_destroy (struct kref *kref) +{ +struct intel_context *ce =container_of (kref,typeof (*ce), ref); + +__guc_context_destroy (ce); +} + +static const struct intel_context_ops virtual_parent_context_ops = { + .alloc = guc_virtual_context_alloc, + + .pre_pin = guc_context_pre_pin, + .pin = guc_parent_context_pin, + .unpin = guc_parent_context_unpin, + .post_unpin = guc_context_post_unpin, + + .ban = guc_context_ban, + + .cancel_request = guc_context_cancel_request, + + .enter = guc_virtual_context_enter, + .exit = guc_virtual_context_exit, + + .sched_disable = guc_context_sched_disable, + + .destroy = guc_context_destroy, + + .get_sibling = guc_virtual_get_sibling, +}; + +static const struct intel_context_ops virtual_child_context_ops = { + .alloc = guc_virtual_context_alloc, + + .pre_pin = guc_context_pre_pin, + .pin = guc_child_context_pin, + .unpin = guc_child_context_unpin, + .post_unpin = guc_child_context_post_unpin, + + .cancel_request = guc_context_cancel_request, + + .enter = guc_virtual_context_enter, + .exit = guc_virtual_context_exit, + + .destroy = guc_child_context_destroy, + + .get_sibling = guc_virtual_get_sibling, +}; + +static struct intel_context * +guc_create_parallel (struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width) +{ +struct intel_engine_cs **siblings =NULL ; +struct intel_context *parent =NULL , *ce, *err; +int i, j; + + siblings =kmalloc_array (num_siblings, +sizeof (*siblings), +GFP_KERNEL ); +if (!siblings) +return ERR_PTR (-ENOMEM ); + +for (i =0 ; i < width; ++i) { +for (j =0 ; j < num_siblings; ++j) + siblings[j] = engines[i * num_siblings + j]; + + ce =intel_engine_create_virtual (siblings, num_siblings, +FORCE_VIRTUAL ); +if (!ce) { + err =ERR_PTR (-ENOMEM ); + goto unwind; + } + +if (i ==0 ) { + parent = ce; + parent->ops = &virtual_parent_context_ops; + }else { + ce->ops = &virtual_child_context_ops; +intel_context_bind_parent_child (parent, ce); + } + } + +kfree (siblings); +return parent; + +unwind: +if (parent) +intel_context_put (parent); +kfree (siblings); +return err; +} +static bool guc_irq_enable_breadcrumbs (struct intel_breadcrumbs *b) {@@ -3726,7 +3815,8 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc, }static struct intel_context * -guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count) +guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags) {struct guc_virtual_engine *ve;struct intel_guc *guc;include/uapi/drm/i915_drm.h +1
-0@@ -1824,6 +1824,7 @@ struct drm_i915_gem_context_param {* Extensions: * i915_context_engines_load_balance (I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE) * i915_context_engines_bond (I915_CONTEXT_ENGINES_EXT_BOND) +* i915_context_engines_parallel_submit (I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT) */ #define I915_CONTEXT_PARAM_ENGINES 0xa
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2059
Quoted 10 lines
include/uapi/drm/i915_drm.h +7
-0@@ -2049,6 +2050,132 @@ struct i915_context_engines_bond {struct i915_engine_class_instance engines[N__ ]; \ } __attribute__((packed))name__ +/** +* struct i915_context_engines_parallel_submit - Configure engine for +* parallel submission. +* +* Setup a slot in the context engine map to allow multiple BBs to be submitted +* in a single execbuf IOCTL. Those BBs will then be scheduled to run on the GPU +* in parallel. Multiple hardware contexts are created internally in the i915
i915 run -> i915 to run
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2070
Quoted 11 lines
include/uapi/drm/i915_drm.h +11
-0+* run these BBs. Once a slot is configured for N BBs only N BBs can be +* submitted in each execbuf IOCTL and this is implicit behavior e.g. The user +* doesn't tell the execbuf IOCTL there are N BBs, the execbuf IOCTL knows how +* many BBs there are based on the slot's configuration. The N BBs are the last +* N buffer objects or first N if I915_EXEC_BATCH_FIRST is set. +* +* The default placement behavior is to create implicit bonds between each +* context if each context maps to more than 1 physical engine (e.g. context is +* a virtual engine). Also we only allow contexts of same engine class and these +* contexts must be in logically contiguous order. Examples of the placement +* behavior described below. Lastly, the default is to not allow BBs to
behaviour described -> behaviour are described
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2071
Quoted 1 line
include/uapi/drm/i915_drm.h +1
-0+* preempted mid BB rather insert coordinated preemption on all hardware
to preempted mid BB rather -> to be preempted mid-batch. Rather
coordinated preemption on -> coordinated preemption points on
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2072
Quoted 1 line
include/uapi/drm/i915_drm.h +1
-0+* contexts between each set of BBs. Flags may be added in the future to change
may -> could - 'may' implies we are thinking about doing it (maybe just for fun or because we're bored), 'could' implies a user has to ask for the facility if they need it.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2085
Quoted 13 lines
include/uapi/drm/i915_drm.h +13
-0+* both of these default behaviors. +* +* Returns -EINVAL if hardware context placement configuration is invalid or if +* the placement configuration isn't supported on the platform / submission +* interface. +* Returns -ENODEV if extension isn't supported on the platform / submission +* interface. +* +* .. code-block:: none +* +* Example 1 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE
I would put these two terminology explanations above the 'example 1' line given that they are generic to all examples.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2095
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=1, +* engines=CS[0],CS[1]) +* +* Results in the following valid placement: +* CS[0], CS[1] +* +* Example 2 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE
And drop them from here.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2107
Quoted 12 lines
include/uapi/drm/i915_drm.h +12
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=2, +* engines=CS[0],CS[2],CS[1],CS[3]) +* +* Results in the following valid placements: +* CS[0], CS[1] +* CS[2], CS[3] +* +* This can also be thought of as 2 virtual engines described by 2-D array +* in the engines the field with bonds placed between each index of the +* virtual engines. e.g. CS[0] is bonded to CS[1], CS[2] is bonded to +* CS[3].
I find this description just adds to the confusion. It doesn't help that the sentence is broken/unparsable - 'described by 2-D array in the engines the field with bonds'?
"This can be thought of as two virtual engines, each containing two engines thereby making a 2D array. However, there are bonds tying the entries together and placing restrictions on how they can be scheduled. Specifically, the scheduler can choose only vertical columns from the 2D array. That is, CS[0] is bonded to CS[1] and CS[2] to CS[3]. So if the scheduler wants to submit to CS[0], it must also choose CS[1] and vice versa. Same for CS[2] requires also using CS[3]."
Does that make sense?
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2113
Quoted 6 lines
include/uapi/drm/i915_drm.h +6
-0+* VE[0] = CS[0], CS[2] +* VE[1] = CS[1], CS[3] +* +* Example 3 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE
And again.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2120
Quoted 7 lines
include/uapi/drm/i915_drm.h +7
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=2, +* engines=CS[0],CS[1],CS[1],CS[3]) +* +* Results in the following valid and invalid placements: +* CS[0], CS[1] +* CS[1], CS[3] - Not logical contiguous, return -EINVAL
logical -> logically
Quoted 4 lines
include/uapi/drm/i915_drm.h +4
-0+*/ +struct i915_context_engines_parallel_submit { +/** +* @base: base user extension.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2134
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+*/ +struct i915_user_extension base; + +/** +* @engine_index: slot for parallel engine +*/ +__u16 engine_index; + +/** +* @width: number of contexts per parallel engine
Meaning number of engines in the virtual engine? As in, width = 3 means that the scheduler has a choice of three different engines to submit the one single batch buffer to?
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2141
Quoted 7 lines
include/uapi/drm/i915_drm.h +7
-0+*/ +__u16 width; + +/** +* @num_siblings: number of siblings per context +*/ +__u16 num_siblings;
Meaning the number of engines which must run in parallel. As in, num_siblings = 2 means that there will be two batch buffers submitted to every execbuf IOCTL call and that both must execute concurrently on two separate engines?
John.
Quoted 48 lines
include/uapi/drm/i915_drm.h +38
-0+ +/** +* @mbz16: reserved for future use; must be zero +*/ +__u16 mbz16; + +/** +* @flags: all undefined flags must be zero, currently not defined flags +*/ +__u64 flags; + +/** +* @mbz64: reserved for future use; must be zero +*/ +__u64 mbz64[3 ]; + +/** +* @engines: 2-d array of engine instances to configure parallel engine +* +* length = width (i) * num_siblings (j) +* index = j + i * num_siblings +*/ +struct i915_engine_class_instance engines[0 ]; + +} __packed; + +#define I915_DEFINE_CONTEXT_ENGINES_PARALLEL_SUBMIT (name__,N__ ) struct { \ + struct i915_user_extension base; \ + __u16 engine_index; \ + __u16 width; \ + __u16 num_siblings; \ + __u16 mbz16; \ + __u64 flags; \ + __u64 mbz64[3]; \ + struct i915_engine_class_instance engines[N__]; \ +} __attribute__((packed)) name__ +/** * DOC: Context Engine Map uAPI * @@ -2108,6 +2235,7 @@ struct i915_context_param_engines {__u64 extensions;/* linked chain of extension blocks, 0 terminates */ #define I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE 0/* see i915_context_engines_load_balance */ #define I915_CONTEXT_ENGINES_EXT_BOND 1/* see i915_context_engines_bond */ +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2/* see i915_context_engines_parallel_submit */ struct i915_engine_class_instance engines[0 ]; } __attribute__((packed));
Re: [Intel-gfx] [PATCH 20/27] drm/i915/guc: Connect UAPI to GuC multi-lrc interface
Quoted 8 lines · John Harrison
Quoted 5 lines · Matthew Brost
Introduce 'set parallel submit' extension to connect UAPI to GuC multi-lrc interface. Kernel doc in new uAPI should explain it all.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: link to comeIs this link still not available?
Have it now: https://github.com/intel/media-driver/pull/1252
Quoted 3 lines
Also, see 'kernel test robot' emails saying that sparse is complaining about something I don't understand but presumably needs to be fixed.
Yea, those warning need to be fixed.
Quoted 39 lines
Quoted 39 lines
v2:
(Daniel Vetter)
- Add IGT link and placeholder for media UMD linkCc Tvrtko Ursulin <[email protected]>Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 220 +++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_context_types.h | 6 + drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- drivers/gpu/drm/i915/gt/intel_engine.h | 12 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- .../drm/i915/gt/intel_execlists_submission.c | 6 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 114 ++++++++- include/uapi/drm/i915_drm.h | 128 ++++++++++ 9 files changed, 485 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_context.c +12
-0@@ -522,9 +522,149 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data)return 0 ; } +static int +set_proto_ctx_engines_parallel_submit (struct i915_user_extension __user *base, +void *data) +{ +struct i915_context_engines_parallel_submit __user *ext = +container_of_user (base,typeof (*ext), base); +const struct set_proto_ctx_engines *set = data; +struct drm_i915_private *i915 = set->i915; +u64 flags; +int err =0 , n, i, j; +u16 slot, width, num_siblings; +struct intel_engine_cs **siblings =NULL ;
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) · line 543
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +7
-0+intel_engine_mask_t prev_mask; + +/* Disabling for now */ +return -ENODEV ; + +if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) +return -ENODEV ;This needs a FIXME comment to say that exec list will be added later.
Sure.
Quoted 148 lines
Quoted 148 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +140
-0+ +if (get_user (slot, &ext->engine_index)) +return -EFAULT ; + +if (get_user (width, &ext->width)) +return -EFAULT ; + +if (get_user (num_siblings, &ext->num_siblings)) +return -EFAULT ; + +if (slot >= set->num_engines) { +drm_dbg (&i915->drm,"Invalid placement value, %d >= %d\n" , + slot, set->num_engines); +return -EINVAL ; + } + +if (set->engines[slot].type !=I915_GEM_ENGINE_TYPE_INVALID ) { +drm_dbg (&i915->drm, +"Invalid placement[%d], already occupied\n" , slot); +return -EINVAL ; + } + +if (get_user (flags, &ext->flags)) +return -EFAULT ; + +if (flags) { +drm_dbg (&i915->drm,"Unknown flags 0x%02llx" , flags); +return -EINVAL ; + } + +for (n =0 ; n <ARRAY_SIZE (ext->mbz64); n++) { + err =check_user_mbz (&ext->mbz64[n]); +if (err) +return err; + } + +if (width <2 ) { +drm_dbg (&i915->drm,"Width (%d) < 2\n" , width); +return -EINVAL ; + } + +if (num_siblings <1 ) { +drm_dbg (&i915->drm,"Number siblings (%d) < 1\n" , + num_siblings); +return -EINVAL ; + } + + siblings =kmalloc_array (num_siblings * width, +sizeof (*siblings), +GFP_KERNEL ); +if (!siblings) +return -ENOMEM ; + +/* Create contexts / engines */ +for (i =0 ; i < width; ++i) { +intel_engine_mask_t current_mask =0 ; +struct i915_engine_class_instance prev_engine; + +for (j =0 ; j < num_siblings; ++j) { +struct i915_engine_class_instance ci; + + n = i * num_siblings + j; +if (copy_from_user (&ci, &ext->engines[n],sizeof (ci))) { + err = -EFAULT ; + goto out_err; + } + + siblings[n] = +intel_engine_lookup_user (i915, ci.engine_class, + ci.engine_instance); +if (!siblings[n]) { +drm_dbg (&i915->drm, +"Invalid sibling[%d]: { class:%d, inst:%d }\n" , + n, ci.engine_class, ci.engine_instance); + err = -EINVAL ; + goto out_err; + } + +if (n) { +if (prev_engine.engine_class != + ci.engine_class) { +drm_dbg (&i915->drm, +"Mismatched class %d, %d\n" , + prev_engine.engine_class, + ci.engine_class); + err = -EINVAL ; + goto out_err; + } + } + + prev_engine = ci; + current_mask |= siblings[n]->logical_mask; + } + +if (i >0 ) { +if (current_mask != prev_mask <<1 ) { +drm_dbg (&i915->drm, +"Non contiguous logical mask 0x%x, 0x%x\n" , + prev_mask, current_mask); + err = -EINVAL ; + goto out_err; + } + } + prev_mask = current_mask; + } + + set->engines[slot].type =I915_GEM_ENGINE_TYPE_PARALLEL ; + set->engines[slot].num_siblings = num_siblings; + set->engines[slot].width = width; + set->engines[slot].siblings = siblings; + +return 0 ; + +out_err: +kfree (siblings); + +return err; +} +static const i915_user_extension_fn set_proto_ctx_engines_extensions[] = { [I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE ] = set_proto_ctx_engines_balance, [I915_CONTEXT_ENGINES_EXT_BOND ] = set_proto_ctx_engines_bond, + [I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT ] = + set_proto_ctx_engines_parallel_submit, }; static int set_proto_ctx_engines(struct drm_i915_file_private *fpriv,@@ -821,6 +961,25 @@ static int intel_context_set_gem(struct intel_context *ce,return ret; } +static void __unpin_engines (struct i915_gem_engines *e,unsigned int count) +{ +while (count--) { +struct intel_context *ce = e->engines[count], *child; + +if (!ce || !test_bit (CONTEXT_PERMA_PIN , &ce->flags)) +continue ; + +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); + } +} + +static void unpin_engines (struct i915_gem_engines *e) +{ +__unpin_engines (e, e->num_engines); +} +
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, · line 1097
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-0static void __free_engines (struct i915_gem_engines *e,unsigned int count) {while (count--) {@@ -936,6 +1095,40 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,return err; } +static int perma_pin_contexts (struct intel_context *ce)What is this
perma_pingthing about?
This is per Daniel Vetters suggestion in previous rev. Basically to simplify the parallel submit implementation pin the contexts are creation time and unpin when the contexts get destroyed. It removes complexity from gt/intel_context.c, the execbuf IOCTL, and backend pinning / unpinning functions.
Quoted 64 lines
Quoted 64 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +44
-2+{ +struct intel_context *child; +int i =0 , j =0 , ret; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + ret =intel_context_pin (ce); +if (unlikely (ret)) +return ret; + +for_each_child (ce, child) { + ret =intel_context_pin (child); +if (unlikely (ret)) + goto unwind; + ++i; + } + +set_bit (CONTEXT_PERMA_PIN , &ce->flags); + +return 0 ; + +unwind: +intel_context_unpin (ce); +for_each_child (ce, child) { +if (j++ < i) +intel_context_unpin (child); +else +break ; + } + +return ret; +} +static struct i915_gem_engines *user_engines (struct i915_gem_context *ctx,unsigned int num_engines,struct i915_gem_proto_engine *pe)@@ -946,7 +1139,7 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, e =alloc_engines (num_engines); e->num_engines = num_engines;for (n =0 ; n < num_engines; n++) { -struct intel_context *ce; +struct intel_context *ce, *child;int ret;switch (pe[n].type) {@@ -956,7 +1149,13 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,case I915_GEM_ENGINE_TYPE_BALANCED : ce =intel_engine_create_virtual (pe[n].siblings, - pe[n].num_siblings); + pe[n].num_siblings,0 ); +break ; + +case I915_GEM_ENGINE_TYPE_PARALLEL : + ce =intel_engine_create_parallel (pe[n].siblings, + pe[n].num_siblings, + pe[n].width);break ;case I915_GEM_ENGINE_TYPE_INVALID :@@ -977,6 +1176,22 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, err =ERR_PTR (ret); goto free_engines; } +for_each_child (ce, child) { + ret =intel_context_set_gem (child, ctx, pe->sseu); +if (ret) {
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, · line 1187
Quoted 6 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +6
-0+ err =ERR_PTR (ret); + goto free_engines; + } + } + +/* XXX: Must be done after setting gem context */ Why the 'XXX'? Is it saying that the ordering is a problem that needs to be fixed?
Add 'XXX' because originally I hid this behavior in the vfunc used in intel_engine_create_parallel but as I say we need the gem context set first. In theory we could fix this with a bit more of rework so all of this is in the backend, thus the 'XXX'.
Quoted 384 lines
Quoted 359 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +8
-0+if (pe[n].type ==I915_GEM_ENGINE_TYPE_PARALLEL ) { + ret =perma_pin_contexts (ce); +if (ret) { + err =ERR_PTR (ret); + goto free_engines; + } + } }return e;@@ -1200,6 +1415,7 @@ static void context_close(struct i915_gem_context *ctx)/* Flush any concurrent set_engines() */ mutex_lock (&ctx->engines_mutex); +unpin_engines (ctx->engines);engines_idle_release (ctx,rcu_replace_pointer (ctx->engines,NULL ,1 ));i915_gem_context_set_closed (ctx);mutex_unlock (&ctx->engines_mutex);drivers/gpu/drm/i915/gem/i915_gem_context_types.h +6
-0@@ -78,6 +78,9 @@ enum i915_gem_engine_type {/** @I915_GEM_ENGINE_TYPE_BALANCED: A load-balanced engine set */ I915_GEM_ENGINE_TYPE_BALANCED , + +/** @I915_GEM_ENGINE_TYPE_PARALLEL: A parallel engine set */ + I915_GEM_ENGINE_TYPE_PARALLEL, };/** @@ -108,6 +111,9 @@ struct i915_gem_proto_engine {/** @num_siblings: Number of balanced siblings */ unsigned int num_siblings; +/** @width: Width of each sibling */ +unsigned int width; +/** @siblings: Balanced siblings */ struct intel_engine_cs **siblings;drivers/gpu/drm/i915/gt/intel_context_types.h +7
-2@@ -55,9 +55,13 @@ struct intel_context_ops {void (*reset)(struct intel_context *ce);void (*destroy)(struct kref *kref); -/* virtual engine/context interface */ +/* virtual/parallel engine/context interface */ struct intel_context *(*create_virtual)(struct intel_engine_cs **engine, -unsigned int count); +unsigned int count, +unsigned long flags); +struct intel_context *(*create_parallel)(struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width);struct intel_engine_cs *(*get_sibling)(struct intel_engine_cs *engine,unsigned int sibling); };@@ -113,6 +117,7 @@ struct intel_context {#define CONTEXT_NOPREEMPT 8#define CONTEXT_LRCA_DIRTY 9#define CONTEXT_GUC_INIT 10 +#define CONTEXT_PERMA_PIN 11struct {u64 timeout_us;drivers/gpu/drm/i915/gt/intel_engine.h +11
-1@@ -279,9 +279,19 @@ intel_engine_has_preempt_reset(const struct intel_engine_cs *engine)return intel_engine_has_preemption (engine); } +#define FORCE_VIRTUAL BIT(0)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count); +unsigned int count,unsigned long flags); + +static inline struct intel_context * +intel_engine_create_parallel (struct intel_engine_cs **engines, +unsigned int num_engines, +unsigned int width) +{ +GEM_BUG_ON (!engines[0 ]->cops->create_parallel); +return engines[0 ]->cops->create_parallel (engines, num_engines, width); +}static inline bool intel_virtual_engine_has_heartbeat (const struct intel_engine_cs *engine)drivers/gpu/drm/i915/gt/intel_engine_cs.c +3
-3@@ -1923,16 +1923,16 @@ ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)struct intel_context *intel_engine_create_virtual (struct intel_engine_cs **siblings, -unsigned int count) +unsigned int count,unsigned long flags) {if (count ==0 )return ERR_PTR (-EINVAL ); -if (count ==1 ) +if (count ==1 && !(flags &FORCE_VIRTUAL ))return intel_context_create (siblings[0 ]);GEM_BUG_ON (!siblings[0 ]->cops->create_virtual); -return siblings[0 ]->cops->create_virtual (siblings, count); +return siblings[0 ]->cops->create_virtual (siblings, count, flags); } struct i915_request *drivers/gpu/drm/i915/gt/intel_execlists_submission.c +4
-2@@ -201,7 +201,8 @@ static struct virtual_engine *to_virtual_engine(struct intel_engine_cs *engine) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count); +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags);static struct i915_request * __active_request(const struct intel_timeline * const tl,@@ -3782,7 +3783,8 @@ static void virtual_submit_request(struct i915_request *rq) }static struct intel_context * -execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count) +execlists_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags) {struct virtual_engine *ve;unsigned int n;drivers/gpu/drm/i915/gt/selftest_execlists.c +6
-6@@ -3733,7 +3733,7 @@ static int nop_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (!nctx || nctx >ARRAY_SIZE (ve));for (n =0 ; n < nctx; n++) { - ve[n] =intel_engine_create_virtual (siblings, nsibling); + ve[n] =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve[n])) { err =PTR_ERR (ve[n]); nctx = n;@@ -3929,7 +3929,7 @@ static int mask_virtual_engine(struct intel_gt *gt,* restrict it to our desired engine within the virtual engine. */ - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_close;@@ -4060,7 +4060,7 @@ static int slicein_virtual_engine(struct intel_gt *gt,i915_request_add (rq); } - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;@@ -4112,7 +4112,7 @@ static int sliceout_virtual_engine(struct intel_gt *gt,/* XXX We do not handle oversubscription and fairness with normal rq */ for (n =0 ; n < nsibling; n++) { - ce =intel_engine_create_virtual (siblings, nsibling); + ce =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ce)) { err =PTR_ERR (ce); goto out;@@ -4214,7 +4214,7 @@ static int preserved_virtual_engine(struct intel_gt *gt,if (err) goto out_scratch; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_scratch;@@ -4354,7 +4354,7 @@ static int reset_virtual_engine(struct intel_gt *gt,if (igt_spinner_init (&spin, gt))return -ENOMEM ; - ve =intel_engine_create_virtual (siblings, nsibling); + ve =intel_engine_create_virtual (siblings, nsibling,0 );if (IS_ERR (ve)) { err =PTR_ERR (ve); goto out_spin;drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +102
-12@@ -121,7 +121,13 @@ struct guc_virtual_engine { };static struct intel_context * -guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count); +guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags); + +static struct intel_context * +guc_create_parallel (struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width);#define GUC_REQUEST_SIZE 64/* bytes */ @@ -2581,6 +2587,7 @@ static const struct intel_context_ops guc_context_ops = { .destroy = guc_context_destroy, .create_virtual = guc_create_virtual, + .create_parallel = guc_create_parallel, };static void submit_work_cb (struct irq_work *wrk)@@ -2827,8 +2834,6 @@ static const struct intel_context_ops virtual_guc_context_ops = { .get_sibling = guc_virtual_get_sibling, }; -/* Future patches will use this function */ -__maybe_unused static int guc_parent_context_pin (struct intel_context *ce,void *vaddr) {struct intel_engine_cs *engine =guc_virtual_get_sibling (ce->engine,0 );@@ -2845,8 +2850,6 @@ static int guc_parent_context_pin(struct intel_context *ce, void *vaddr)return __guc_context_pin (ce, engine, vaddr); } -/* Future patches will use this function */ -__maybe_unused static int guc_child_context_pin (struct intel_context *ce,void *vaddr) {struct intel_engine_cs *engine =guc_virtual_get_sibling (ce->engine,0 );@@ -2858,8 +2861,6 @@ static int guc_child_context_pin(struct intel_context *ce, void *vaddr)return __guc_context_pin (ce, engine, vaddr); } -/* Future patches will use this function */ -__maybe_unused static void guc_parent_context_unpin (struct intel_context *ce) {struct intel_guc *guc =ce_to_guc (ce);@@ -2875,8 +2876,6 @@ static void guc_parent_context_unpin(struct intel_context *ce)lrc_unpin (ce); } -/* Future patches will use this function */ -__maybe_unused static void guc_child_context_unpin (struct intel_context *ce) {GEM_BUG_ON (context_enabled (ce));@@ -2887,8 +2886,6 @@ static void guc_child_context_unpin(struct intel_context *ce)lrc_unpin (ce); } -/* Future patches will use this function */ -__maybe_unused static void guc_child_context_post_unpin (struct intel_context *ce) {GEM_BUG_ON (!intel_context_is_child (ce));@@ -2899,6 +2896,98 @@ static void guc_child_context_post_unpin(struct intel_context *ce)intel_context_unpin (ce->parent); } +static void guc_child_context_destroy (struct kref *kref) +{ +struct intel_context *ce =container_of (kref,typeof (*ce), ref); + +__guc_context_destroy (ce); +} + +static const struct intel_context_ops virtual_parent_context_ops = { + .alloc = guc_virtual_context_alloc, + + .pre_pin = guc_context_pre_pin, + .pin = guc_parent_context_pin, + .unpin = guc_parent_context_unpin, + .post_unpin = guc_context_post_unpin, + + .ban = guc_context_ban, + + .cancel_request = guc_context_cancel_request, + + .enter = guc_virtual_context_enter, + .exit = guc_virtual_context_exit, + + .sched_disable = guc_context_sched_disable, + + .destroy = guc_context_destroy, + + .get_sibling = guc_virtual_get_sibling, +}; + +static const struct intel_context_ops virtual_child_context_ops = { + .alloc = guc_virtual_context_alloc, + + .pre_pin = guc_context_pre_pin, + .pin = guc_child_context_pin, + .unpin = guc_child_context_unpin, + .post_unpin = guc_child_context_post_unpin, + + .cancel_request = guc_context_cancel_request, + + .enter = guc_virtual_context_enter, + .exit = guc_virtual_context_exit, + + .destroy = guc_child_context_destroy, + + .get_sibling = guc_virtual_get_sibling, +}; + +static struct intel_context * +guc_create_parallel (struct intel_engine_cs **engines, +unsigned int num_siblings, +unsigned int width) +{ +struct intel_engine_cs **siblings =NULL ; +struct intel_context *parent =NULL , *ce, *err; +int i, j; + + siblings =kmalloc_array (num_siblings, +sizeof (*siblings), +GFP_KERNEL ); +if (!siblings) +return ERR_PTR (-ENOMEM ); + +for (i =0 ; i < width; ++i) { +for (j =0 ; j < num_siblings; ++j) + siblings[j] = engines[i * num_siblings + j]; + + ce =intel_engine_create_virtual (siblings, num_siblings, +FORCE_VIRTUAL ); +if (!ce) { + err =ERR_PTR (-ENOMEM ); + goto unwind; + } + +if (i ==0 ) { + parent = ce; + parent->ops = &virtual_parent_context_ops; + }else { + ce->ops = &virtual_child_context_ops; +intel_context_bind_parent_child (parent, ce); + } + } + +kfree (siblings); +return parent; + +unwind: +if (parent) +intel_context_put (parent); +kfree (siblings); +return err; +} +static bool guc_irq_enable_breadcrumbs (struct intel_breadcrumbs *b) {@@ -3726,7 +3815,8 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc, }static struct intel_context * -guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count) +guc_create_virtual (struct intel_engine_cs **siblings,unsigned int count, +unsigned long flags) {struct guc_virtual_engine *ve;struct intel_guc *guc;include/uapi/drm/i915_drm.h +1
-0@@ -1824,6 +1824,7 @@ struct drm_i915_gem_context_param {* Extensions: * i915_context_engines_load_balance (I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE) * i915_context_engines_bond (I915_CONTEXT_ENGINES_EXT_BOND) +* i915_context_engines_parallel_submit (I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT) */ #define I915_CONTEXT_PARAM_ENGINES 0xainclude/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2058
Quoted 9 lines
include/uapi/drm/i915_drm.h +7
-0@@ -2049,6 +2050,132 @@ struct i915_context_engines_bond {struct i915_engine_class_instance engines[N__ ]; \ } __attribute__((packed))name__ +/** +* struct i915_context_engines_parallel_submit - Configure engine for +* parallel submission. +* +* Setup a slot in the context engine map to allow multiple BBs to be submitted +* in a single execbuf IOCTL. Those BBs will then be scheduled to run on the GPU +* in parallel. Multiple hardware contexts are created internally in the i915 i915 run -> i915 to run
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2070
Quoted 11 lines
include/uapi/drm/i915_drm.h +11
-0+* run these BBs. Once a slot is configured for N BBs only N BBs can be +* submitted in each execbuf IOCTL and this is implicit behavior e.g. The user +* doesn't tell the execbuf IOCTL there are N BBs, the execbuf IOCTL knows how +* many BBs there are based on the slot's configuration. The N BBs are the last +* N buffer objects or first N if I915_EXEC_BATCH_FIRST is set. +* +* The default placement behavior is to create implicit bonds between each +* context if each context maps to more than 1 physical engine (e.g. context is +* a virtual engine). Also we only allow contexts of same engine class and these +* contexts must be in logically contiguous order. Examples of the placement +* behavior described below. Lastly, the default is to not allow BBs to behaviour described -> behaviour are described
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2071
Quoted 1 line
include/uapi/drm/i915_drm.h +1
-0+* preempted mid BB rather insert coordinated preemption on all hardware
Quoted 9 lines
to preempted mid BB rather -> to be preempted mid-batch. Rather
coordinated preemption on -> coordinated preemption points on
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2072
Quoted 1 line
include/uapi/drm/i915_drm.h +1
-0+* contexts between each set of BBs. Flags may be added in the future to change may -> could - 'may' implies we are thinking about doing it (maybe just for fun or because we're bored), 'could' implies a user has to ask for the facility if they need it.
Will reword all of this.
Quoted 26 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2085
Quoted 13 lines
include/uapi/drm/i915_drm.h +13
-0+* both of these default behaviors. +* +* Returns -EINVAL if hardware context placement configuration is invalid or if +* the placement configuration isn't supported on the platform / submission +* interface. +* Returns -ENODEV if extension isn't supported on the platform / submission +* interface. +* +* .. code-block:: none +* +* Example 1 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE I would put these two terminology explanations above the 'example 1' line given that they are generic to all examples.
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2095
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=1, +* engines=CS[0],CS[1]) +* +* Results in the following valid placement: +* CS[0], CS[1] +* +* Example 2 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE
Quoted 2 lines
And drop them from here.
Sure.
Quoted 24 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2107
Quoted 12 lines
include/uapi/drm/i915_drm.h +12
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=2, +* engines=CS[0],CS[2],CS[1],CS[3]) +* +* Results in the following valid placements: +* CS[0], CS[1] +* CS[2], CS[3] +* +* This can also be thought of as 2 virtual engines described by 2-D array +* in the engines the field with bonds placed between each index of the +* virtual engines. e.g. CS[0] is bonded to CS[1], CS[2] is bonded to +* CS[3]. I find this description just adds to the confusion. It doesn't help that the sentence is broken/unparsable - 'described by 2-D array in the engines the field with bonds'?
"This can be thought of as two virtual engines, each containing two engines thereby making a 2D array. However, there are bonds tying the entries together and placing restrictions on how they can be scheduled. Specifically, the scheduler can choose only vertical columns from the 2D array. That is, CS[0] is bonded to CS[1] and CS[2] to CS[3]. So if the scheduler wants to submit to CS[0], it must also choose CS[1] and vice versa. Same for CS[2] requires also using CS[3]."
Quoted 2 lines
Does that make sense?
Yours is better. Will add.
Quoted 8 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2113
Quoted 6 lines
include/uapi/drm/i915_drm.h +6
-0+* VE[0] = CS[0], CS[2] +* VE[1] = CS[1], CS[3] +* +* Example 3 pseudo code: +* CS[X] = generic engine of same class, logical instance X +* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE And again.
Quoted 9 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2120
Quoted 7 lines
include/uapi/drm/i915_drm.h +7
-0+* set_engines(INVALID) +* set_parallel(engine_index=0, width=2, num_siblings=2, +* engines=CS[0],CS[1],CS[1],CS[3]) +* +* Results in the following valid and invalid placements: +* CS[0], CS[1] +* CS[1], CS[3] - Not logical contiguous, return -EINVAL logical -> logically
Yep.
Quoted 9 lines
Quoted 9 lines
include/uapi/drm/i915_drm.h +9
-0+*/ +struct i915_context_engines_parallel_submit { +/** +* @base: base user extension. +*/ +struct i915_user_extension base; + +/** +* @engine_index: slot for parallel engine
Quoted 9 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2134
Quoted 5 lines
include/uapi/drm/i915_drm.h +5
-0+*/ +__u16 engine_index; + +/** +* @width: number of contexts per parallel engine Meaning number of engines in the virtual engine? As in, width = 3 means that the scheduler has a choice of three different engines to submit the one single batch buffer to?
No, width is number of BBs in a single submission. Will update the comment to reflect that.
Quoted 12 lines
include/uapi/drm/i915_drm.h struct i915_context_engines_bond { · line 2141
Quoted 7 lines
include/uapi/drm/i915_drm.h +7
-0+*/ +__u16 width; + +/** +* @num_siblings: number of siblings per context +*/ +__u16 num_siblings;Meaning the number of engines which must run in parallel. As in,
num_siblings= 2 means that there will be two batch buffers submitted to every execbuf IOCTL call and that both must execute concurrently on two separate engines?
This means the number of possible different engine sets the N (width) batch buffers could be placed on. Will update this comment too.
Matt
Quoted 50 lines
John.
Quoted 47 lines
include/uapi/drm/i915_drm.h +38
-0+ +/** +* @mbz16: reserved for future use; must be zero +*/ +__u16 mbz16; + +/** +* @flags: all undefined flags must be zero, currently not defined flags +*/ +__u64 flags; + +/** +* @mbz64: reserved for future use; must be zero +*/ +__u64 mbz64[3 ]; + +/** +* @engines: 2-d array of engine instances to configure parallel engine +* +* length = width (i) * num_siblings (j) +* index = j + i * num_siblings +*/ +struct i915_engine_class_instance engines[0 ]; + +} __packed; + +#define I915_DEFINE_CONTEXT_ENGINES_PARALLEL_SUBMIT (name__,N__ ) struct { \ + struct i915_user_extension base; \ + __u16 engine_index; \ + __u16 width; \ + __u16 num_siblings; \ + __u16 mbz16; \ + __u64 flags; \ + __u64 mbz64[3]; \ + struct i915_engine_class_instance engines[N__]; \ +} __attribute__((packed)) name__ +/** * DOC: Context Engine Map uAPI * @@ -2108,6 +2235,7 @@ struct i915_context_param_engines {__u64 extensions;/* linked chain of extension blocks, 0 terminates */ #define I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE 0/* see i915_context_engines_load_balance */ #define I915_CONTEXT_ENGINES_EXT_BOND 1/* see i915_context_engines_bond */ +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2/* see i915_context_engines_parallel_submit */ struct i915_engine_class_instance engines[0 ]; } __attribute__((packed));
PATCH 21/27 drm/i915/doc: Update parallel submit doc to point to i915_drm.h
In reply to Matthew BrostUpdate parallel submit doc to point to i915_drm.h
--- Documentation/gpu/rfc/i915_parallel_execbuf.h | 122 ------------------ Documentation/gpu/rfc/i915_scheduler.rst | 4 +- 2 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h
Documentation/gpu/rfc/i915_parallel_execbuf.h deleted +0 -122
@@ -1,122 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* -* Copyright © 2021 Intel Corporation -*/ - -#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2/* see i915_context_engines_parallel_submit */ - -/** -* struct drm_i915_context_engines_parallel_submit - Configure engine for -* parallel submission. -* -* Setup a slot in the context engine map to allow multiple BBs to be submitted -* in a single execbuf IOCTL. Those BBs will then be scheduled to run on the GPU -* in parallel. Multiple hardware contexts are created internally in the i915 -* run these BBs. Once a slot is configured for N BBs only N BBs can be -* submitted in each execbuf IOCTL and this is implicit behavior e.g. The user -* doesn't tell the execbuf IOCTL there are N BBs, the execbuf IOCTL knows how -* many BBs there are based on the slot's configuration. The N BBs are the last -* N buffer objects or first N if I915_EXEC_BATCH_FIRST is set. -* -* The default placement behavior is to create implicit bonds between each -* context if each context maps to more than 1 physical engine (e.g. context is -* a virtual engine). Also we only allow contexts of same engine class and these -* contexts must be in logically contiguous order. Examples of the placement -* behavior described below. Lastly, the default is to not allow BBs to -* preempted mid BB rather insert coordinated preemption on all hardware -* contexts between each set of BBs. Flags may be added in the future to change -* both of these default behaviors. -* -* Returns -EINVAL if hardware context placement configuration is invalid or if -* the placement configuration isn't supported on the platform / submission -* interface. -* Returns -ENODEV if extension isn't supported on the platform / submission -* interface. -* -* .. code-block:: none -* -* Example 1 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=1, -* engines=CS[0],CS[1]) -* -* Results in the following valid placement: -* CS[0], CS[1] -* -* Example 2 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=2, -* engines=CS[0],CS[2],CS[1],CS[3]) -* -* Results in the following valid placements: -* CS[0], CS[1] -* CS[2], CS[3] -* -* This can also be thought of as 2 virtual engines described by 2-D array -* in the engines the field with bonds placed between each index of the -* virtual engines. e.g. CS[0] is bonded to CS[1], CS[2] is bonded to -* CS[3]. -* VE[0] = CS[0], CS[2] -* VE[1] = CS[1], CS[3] -* -* Example 3 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=2, -* engines=CS[0],CS[1],CS[1],CS[3]) -* -* Results in the following valid and invalid placements: -* CS[0], CS[1] -* CS[1], CS[3] - Not logical contiguous, return -EINVAL -*/ -struct drm_i915_context_engines_parallel_submit { -/** -* @base: base user extension. -*/ -struct i915_user_extension base; - -/** -* @engine_index: slot for parallel engine -*/ -__u16 engine_index; - -/** -* @width: number of contexts per parallel engine -*/ -__u16 width; - -/** -* @num_siblings: number of siblings per context -*/ -__u16 num_siblings; - -/** -* @mbz16: reserved for future use; must be zero -*/ -__u16 mbz16; - -/** -* @flags: all undefined flags must be zero, currently not defined flags -*/ -__u64 flags; - -/** -* @mbz64: reserved for future use; must be zero -*/ -__u64 mbz64[3 ]; - -/** -* @engines: 2-d array of engine instances to configure parallel engine -* -* length = width (i) * num_siblings (j) -* index = j + i * num_siblings -*/ -struct i915_engine_class_instance engines[0 ]; - -} __packed; -
Documentation/gpu/rfc/i915_scheduler.rst +2 -2
@@ -135,8 +135,8 @@ Add I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT and drm_i915_context_engines_parallel_submit to the uAPI to implement this extension. -.. kernel-doc:: Documentation/gpu/rfc/i915_parallel_execbuf.h - :functions: drm_i915_context_engines_parallel_submit +.. kernel-doc:: include/uapi/drm/i915_drm.h + :functions: i915_context_engines_parallel_submit Extend execbuf2 IOCTL to support submitting N BBs in a single IOCTL -------------------------------------------------------------------
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 21/27] drm/i915/doc: Update parallel submit doc to point to i915_drm.h
Quoted 3 lines · Matthew Brost
Update parallel submit doc to point to
i915_drm.hSigned-off-by Matthew Brost <[email protected]>
Quoted 149 lines
--- Documentation/gpu/rfc/i915_parallel_execbuf.h | 122 ------------------ Documentation/gpu/rfc/i915_scheduler.rst | 4 +- 2 files changed, 2 insertions(+), 124 deletions(-)delete mode 100644
Documentation/gpu/rfc/i915_parallel_execbuf.hDocumentation/gpu/rfc/i915_parallel_execbuf.h deleted +0
-122@@ -1,122 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* -* Copyright © 2021 Intel Corporation -*/ - -#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2/* see i915_context_engines_parallel_submit */ - -/** -* struct drm_i915_context_engines_parallel_submit - Configure engine for -* parallel submission. -* -* Setup a slot in the context engine map to allow multiple BBs to be submitted -* in a single execbuf IOCTL. Those BBs will then be scheduled to run on the GPU -* in parallel. Multiple hardware contexts are created internally in the i915 -* run these BBs. Once a slot is configured for N BBs only N BBs can be -* submitted in each execbuf IOCTL and this is implicit behavior e.g. The user -* doesn't tell the execbuf IOCTL there are N BBs, the execbuf IOCTL knows how -* many BBs there are based on the slot's configuration. The N BBs are the last -* N buffer objects or first N if I915_EXEC_BATCH_FIRST is set. -* -* The default placement behavior is to create implicit bonds between each -* context if each context maps to more than 1 physical engine (e.g. context is -* a virtual engine). Also we only allow contexts of same engine class and these -* contexts must be in logically contiguous order. Examples of the placement -* behavior described below. Lastly, the default is to not allow BBs to -* preempted mid BB rather insert coordinated preemption on all hardware -* contexts between each set of BBs. Flags may be added in the future to change -* both of these default behaviors. -* -* Returns -EINVAL if hardware context placement configuration is invalid or if -* the placement configuration isn't supported on the platform / submission -* interface. -* Returns -ENODEV if extension isn't supported on the platform / submission -* interface. -* -* .. code-block:: none -* -* Example 1 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=1, -* engines=CS[0],CS[1]) -* -* Results in the following valid placement: -* CS[0], CS[1] -* -* Example 2 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=2, -* engines=CS[0],CS[2],CS[1],CS[3]) -* -* Results in the following valid placements: -* CS[0], CS[1] -* CS[2], CS[3] -* -* This can also be thought of as 2 virtual engines described by 2-D array -* in the engines the field with bonds placed between each index of the -* virtual engines. e.g. CS[0] is bonded to CS[1], CS[2] is bonded to -* CS[3]. -* VE[0] = CS[0], CS[2] -* VE[1] = CS[1], CS[3] -* -* Example 3 pseudo code: -* CS[X] = generic engine of same class, logical instance X -* INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE -* set_engines(INVALID) -* set_parallel(engine_index=0, width=2, num_siblings=2, -* engines=CS[0],CS[1],CS[1],CS[3]) -* -* Results in the following valid and invalid placements: -* CS[0], CS[1] -* CS[1], CS[3] - Not logical contiguous, return -EINVAL -*/ -struct drm_i915_context_engines_parallel_submit { -/** -* @base: base user extension. -*/ -struct i915_user_extension base; - -/** -* @engine_index: slot for parallel engine -*/ -__u16 engine_index; - -/** -* @width: number of contexts per parallel engine -*/ -__u16 width; - -/** -* @num_siblings: number of siblings per context -*/ -__u16 num_siblings; - -/** -* @mbz16: reserved for future use; must be zero -*/ -__u16 mbz16; - -/** -* @flags: all undefined flags must be zero, currently not defined flags -*/ -__u64 flags; - -/** -* @mbz64: reserved for future use; must be zero -*/ -__u64 mbz64[3 ]; - -/** -* @engines: 2-d array of engine instances to configure parallel engine -* -* length = width (i) * num_siblings (j) -* index = j + i * num_siblings -*/ -struct i915_engine_class_instance engines[0 ]; - -} __packed; -Documentation/gpu/rfc/i915_scheduler.rst +2
-2@@ -135,8 +135,8 @@ Add I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT and drm_i915_context_engines_parallel_submit to the uAPI to implement this extension. -.. kernel-doc:: Documentation/gpu/rfc/i915_parallel_execbuf.h - :functions: drm_i915_context_engines_parallel_submit +.. kernel-doc:: include/uapi/drm/i915_drm.h + :functions: i915_context_engines_parallel_submit Extend execbuf2 IOCTL to support submitting N BBs in a single IOCTL -------------------------------------------------------------------
PATCH 22/27 drm/i915/guc: Add basic GuC multi-lrc selftest
In reply to Matthew BrostAdd very basic (single submission) multi-lrc selftest.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 + .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 180 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 3 files changed, 182 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -0
@@ -3924,4 +3924,5 @@ bool intel_guc_virtual_engine_has_heartbeat(const struct intel_engine_cs *ve)#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftest_guc.c" +#include "selftest_guc_multi_lrc.c" #endif
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c new file +180 -0
180 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
@@ -48,5 +48,6 @@ 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) +selftest (guc_multi_lrc, intel_guc_multi_lrc_live_selftests) /* Here be dragons: keep last to run last! */selftest (late_gt_pm, intel_gt_pm_late_selftests)
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 22/27] drm/i915/guc: Add basic GuC multi-lrc selftest
Quoted 138 lines · Matthew Brost
Add very basic (single submission) multi-lrc selftest.
Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 + .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 180 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 3 files changed, 182 insertions(+)create mode 100644
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.cdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0@@ -3924,4 +3924,5 @@ bool intel_guc_virtual_engine_has_heartbeat(const struct intel_engine_cs *ve)#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftest_guc.c" +#include "selftest_guc_multi_lrc.c" #endif drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c new file +112
-0@@ -0,0 +1,180 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright �� 2019 Intel Corporation +*/ + +#include "selftests/igt_spinner.h" +#include "selftests/igt_reset.h" +#include "selftests/intel_scheduler_helpers.h" +#include "gt/intel_engine_heartbeat.h" +#include "gem/selftests/mock_context.h" + +static void logical_sort (struct intel_engine_cs **engines,int num_engines) +{ +struct intel_engine_cs *sorted[MAX_ENGINE_INSTANCE +1 ]; +int i, j; + +for (i =0 ; i < num_engines; ++i) +for (j =0 ; j <MAX_ENGINE_INSTANCE +1 ; ++j) { +if (engines[j]->logical_mask &BIT (i)) { + sorted[i] = engines[j]; +break ; + } + } + +memcpy (*engines, *sorted, +sizeof (struct intel_engine_cs *) * num_engines); +} + +static struct intel_context * +multi_lrc_create_parent (struct intel_gt *gt,u8 class, +unsigned long flags) +{ +struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE +1 ]; +struct intel_engine_cs *engine; +enum intel_engine_id id; +int i =0 ; + +for_each_engine (engine, gt, id) { +if (engine->class != class) +continue ; + + siblings[i++] = engine; + } + +if (i <=1 ) +return ERR_PTR (0 ); + +logical_sort (siblings, i); + +return intel_engine_create_parallel (siblings,1 , i); +} + +static void multi_lrc_context_unpin (struct intel_context *ce) +{ +struct intel_context *child; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); +} + +static void multi_lrc_context_put (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* +* Only the parent gets the creation ref put in the uAPI, the parent +* itself is responsible for creation ref put on the children. +*/ +intel_context_put (ce); +} + +static struct i915_request * +multi_lrc_nop_request (struct intel_context *ce) +{ +struct intel_context *child; +struct i915_request *rq, *child_rq; +int i =0 ; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + rq =intel_context_create_request (ce); +if (IS_ERR (rq)) +return rq; + +i915_request_get (rq); +i915_request_add (rq); + +for_each_child (ce, child) { + child_rq =intel_context_create_request (child); +if (IS_ERR (child_rq)) + goto child_error; + +if (++i == ce->guc_number_children) +set_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , + &child_rq->fence.flags); +i915_request_add (child_rq); + } + +return rq; + +child_error: +i915_request_put (rq); + +return ERR_PTR (-ENOMEM ); +} + +static int __intel_guc_multi_lrc_basic (struct intel_gt *gt,unsigned int class) +{ +struct intel_context *parent;
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c line 122
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c new file +10
-0+struct i915_request *rq; +int ret; + + parent =multi_lrc_create_parent (gt, class,0 ); +if (IS_ERR (parent)) { +pr_err ("Failed creating contexts: %ld" ,PTR_ERR (parent)); +return PTR_ERR (parent); + }else if (!parent) { +pr_debug ("Not enough engines in class: %d" , +VIDEO_DECODE_CLASS );
Should be 'class'.
With that fixed:
Quoted 69 lines
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c new file +58
-0+return 0 ; + } + + rq =multi_lrc_nop_request (parent); +if (IS_ERR (rq)) { + ret =PTR_ERR (rq); +pr_err ("Failed creating requests: %d" , ret); + goto out; + } + + ret =intel_selftest_wait_for_rq (rq); +if (ret) +pr_err ("Failed waiting on request: %d" , ret); + +i915_request_put (rq); + +if (ret >=0 ) { + ret =intel_gt_wait_for_idle (gt,HZ *5 ); +if (ret <0 ) +pr_err ("GT failed to idle: %d\n" , ret); + } + +out: +multi_lrc_context_unpin (parent); +multi_lrc_context_put (parent); +return ret; +} + +static int intel_guc_multi_lrc_basic (void *arg) +{ +struct intel_gt *gt = arg; +unsigned int class; +int ret; + +for (class =0 ; class <MAX_ENGINE_CLASS +1 ; ++class) { + ret =__intel_guc_multi_lrc_basic (gt, class); +if (ret) +return ret; + } + +return 0 ; +} + +int intel_guc_multi_lrc_live_selftests (struct drm_i915_private *i915) +{ +static const struct i915_subtest tests[] = { +SUBTEST (intel_guc_multi_lrc_basic), + }; +struct intel_gt *gt = &i915->gt; + +if (intel_gt_is_wedged (gt)) +return 0 ; + +if (!intel_uc_uses_guc_submission (>->uc)) +return 0 ; + +return intel_gt_live_subtests (tests, gt); +}drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1
-0@@ -48,5 +48,6 @@ 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) +selftest (guc_multi_lrc, intel_guc_multi_lrc_live_selftests) /* Here be dragons: keep last to run last! */selftest (late_gt_pm, intel_gt_pm_late_selftests)
PATCH 23/27 drm/i915/guc: Implement no mid batch preemption for multi-lrc
In reply to Matthew BrostFor some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom emit_bb_start & emit_fini_breadcrumb functions and enabled via by default if a context is configured by set parallel extension.
--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.c +1 -1
@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;
drivers/gpu/drm/i915/gt/intel_context_types.h +3 -0
@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1 -1
@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ]; } __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +282 -1
334 lines not on this page · raw message
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 5 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via by default if a context is configured by set parallel extension.
FWIW I think it's wrong to hardcode the requirements of a particular hardware generation fixed media pipeline into the uapi. IMO better solution was when concept of parallel submission was decoupled from the no preemption mid batch preambles. Otherwise might as well call the extension I915_CONTEXT_ENGINES_EXT_MEDIA_SPLIT_FRAME_SUBMIT or something.
Regards,
Tvrtko
Quoted 395 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ]; } __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +282
-1@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/* * When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts. * * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ... * ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 8 lines · Tvrtko Ursulin
Quoted 5 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via by default if a context is configured by set parallel extension.
Quoted 6 lines
FWIW I think it's wrong to hardcode the requirements of a particular hardware generation fixed media pipeline into the uapi. IMO better solution was when concept of parallel submission was decoupled from the no preemption mid batch preambles. Otherwise might as well call the extension
I915_CONTEXT_ENGINES_EXT_MEDIA_SPLIT_FRAME_SUBMITor something.
I don't disagree but this where we landed per Daniel Vetter's feedback - default to what our current hardware supports and extend it later to newer hardware / requirements as needed.
Matt
Quoted 387 lines
Regards,
Tvrtko
Quoted 384 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ]; } __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +282
-1@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/* * When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts. * * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ... * ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 16 lines · Matthew Brost
Quoted 8 lines · Tvrtko Ursulin
Quoted 5 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via by default if a context is configured by set parallel extension.Quoted 6 lines
FWIW I think it's wrong to hardcode the requirements of a particular hardware generation fixed media pipeline into the uapi. IMO better solution was when concept of parallel submission was decoupled from the no preemption mid batch preambles. Otherwise might as well call the extension
I915_CONTEXT_ENGINES_EXT_MEDIA_SPLIT_FRAME_SUBMITor something.
Quoted 3 lines
I don't disagree but this where we landed per Daniel Vetter's feedback - default to what our current hardware supports and extend it later to newer hardware / requirements as needed.
I think this only re-affirms my argument - no point giving the extension a generic name if it is so tightly coupled to a specific use case. But I wrote FWIW so whatever.
It will be mighty awkward if compute multi-lrc will need to specify a flag to allow preemption, when turning off preemption is otherwise not something we allow unprivileged clients to do. So it will be kind of opt-out from unfriendly/dangerous default behaviour instead of explicit requesting it.
Regards,
Tvrtko
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
In reply to Matthew BrostQuoted 4 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via by
via by -> by
Quoted 1 line
default if a context is configured by set parallel extension.
I tend to agree with Tvrtko that this should probably be an opt in change. Is there a flags word passed in when creating the context?
Also, it's not just a change in pre-emption behaviour but a change in synchronisation too, right? Previously, if you had a whole bunch of back to back submissions then one child could run ahead of another and/or the parent. After this change, there is a forced regroup at the end of each batch. So while one could end sooner/later than the others, they can't ever get an entire batch (or more) ahead or behind. Or was that synchronisation already in there through other means anyway?
Quoted 41 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h struct guc_process_desc { · line 191
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ];
What is this extra space for? All the extra storage is grabbed from after the end of this structure, isn't it?
Quoted 18 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0} __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/*
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static struct i915_priolist *to_priolist(struct rb_node *rb) · line 377
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +5
-1* When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts. * * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ...
Would be better written as '[num_children]' instead of '...' to make it clear it is a per child array.
Also, maybe create a struct for this to get rid of the magic '+1's and 'BYTES / sizeof' constructs in the functions below.
Quoted 126 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +91
-0* ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3470
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+u32 *cs; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */
chidlren -> children
Quoted 43 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +43
-0+for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs))
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3523
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+return PTR_ERR (cs); + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */
parent on -> on parent
Quoted 75 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +75
-0+ *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3608
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); +
This is backwards compared to the parent?
Parent: wait on children then enable pre-emption
Child: enable pre-emption then signal parent
Makes for a window where the parent is waiting in atomic context for a signal from a child that has been pre-empted and might not get to run for some time?
John.
Quoted 47 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +37
-0+/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 11 lines · John Harrison
Quoted 4 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via byvia by -> by
Quoted 1 line
default if a context is configured by set parallel extension.
I tend to agree with Tvrtko that this should probably be an opt in change. Is there a flags word passed in when creating the context?
I don't disagree but the uAPI in this series is where we landed. It has been acked all by the relevant parties in the RFC, ported to our internal tree, and the media UMD has been updated / posted. Concerns with the uAPI should've been raised in the RFC phase, not now. I really don't feel like changing this uAPI another time.
Quoted 8 lines
Also, it's not just a change in pre-emption behaviour but a change in synchronisation too, right? Previously, if you had a whole bunch of back to back submissions then one child could run ahead of another and/or the parent. After this change, there is a forced regroup at the end of each batch. So while one could end sooner/later than the others, they can't ever get an entire batch (or more) ahead or behind. Or was that synchronisation already in there through other means anyway?
Yes, each parent / child sync at the of each batch - this is the only way safely insert preemption points. Without this the GuC could attempt a preemption and hang the batches.
Quoted 38 lines
Quoted 38 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h struct guc_process_desc { · line 191
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ];What is this extra space for? All the extra storage is grabbed from after the end of this structure, isn't it?
This is the size of process descriptor in the GuC spec. Even though this is unused space we really don't want the child go / join memory using anything within the process descriptor.
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0} __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-1@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/* * When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts.
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static struct i915_priolist *to_priolist(struct rb_node *rb) · line 377
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-0* * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ... Would be better written as '[
num_children]' instead of '...' to make it clear it is a per child array.
I think this description is pretty clear.
Quoted 3 lines
Also, maybe create a struct for this to get rid of the magic '+1's and 'BYTES / sizeof' constructs in the functions below.
Let me see if I can create a struct that describes the layout.
Quoted 123 lines
Quoted 123 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +94
-0* ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; +u8 i; +
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3470
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */ chidlren -> children
Yep.
Quoted 46 lines
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +46
-0+for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Signal parent */
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3523
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+ cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ parent on -> on parent
Yep.
Quoted 87 lines
Quoted 75 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +75
-0+ *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3608
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); +This is backwards compared to the parent?
Quoted 7 lines
Parent: wait on children then enable pre-emption
Child: enable pre-emption then signal parentMakes for a window where the parent is waiting in atomic context for a signal from a child that has been pre-empted and might not get to run for some time?
No, this is correct. The rule is if the parent can be preempted all the children can be preempted, thus we can't enable preemption on the parent until all the children have preemption enabled, thus the parent waits for all the children to join before enabling its preemption.
Matt
Quoted 50 lines
John.
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +37
-0+/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 9 lines · Matthew Brost
Quoted 8 lines · John Harrison
Quoted 4 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via byvia by -> by
Quoted 1 line
default if a context is configured by set parallel extension.
Quoted 8 lines
Quoted 3 lines
I tend to agree with Tvrtko that this should probably be an opt in change. Is there a flags word passed in when creating the context?
I don't disagree but the uAPI in this series is where we landed. It has been acked all by the relevant parties in the RFC, ported to our internal tree, and the media UMD has been updated / posted. Concerns with the uAPI should've been raised in the RFC phase, not now. I really don't feel like changing this uAPI another time.
The counter argument is that once a UAPI has been merged, it cannot be changed. Ever. So it is worth taking the trouble to get it right first time.
The proposal isn't a major re-write of the interface. It is simply a request to set an extra flag when creating the context.
Quoted 9 lines
Quoted 9 lines
Also, it's not just a change in pre-emption behaviour but a change in synchronisation too, right? Previously, if you had a whole bunch of back to back submissions then one child could run ahead of another and/or the parent. After this change, there is a forced regroup at the end of each batch. So while one could end sooner/later than the others, they can't ever get an entire batch (or more) ahead or behind. Or was that synchronisation already in there through other means anyway?
Quoted 3 lines
Yes, each parent / child sync at the of each batch - this is the only way safely insert preemption points. Without this the GuC could attempt a preemption and hang the batches.
To be clear, I'm not saying that this is wrong. I'm just saying that this appears to be new behaviour with this patch but it is not explicitly called out in the description of the patch.
Quoted 47 lines
Quoted 38 lines
Quoted 38 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h struct guc_process_desc { · line 191
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ];What is this extra space for? All the extra storage is grabbed from after the end of this structure, isn't it?
Quoted 3 lines
This is the size of process descriptor in the GuC spec. Even though this is unused space we really don't want the child go / join memory using anything within the process descriptor.
Okay. So it's more that the code was previously broken and we just hadn't hit a problem because of it? Again, worth adding a comment in the description to call it out as a bug fix.
Quoted 30 lines
Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0} __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-1@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/* * When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts. Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static struct i915_priolist *to_priolist(struct rb_node *rb) · line 377
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-0* * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ... Would be better written as '[
num_children]' instead of '...' to make it clear it is a per child array.
Quoted 1 line
I think this description is pretty clear.
Evidently not because it confused me for a moment.
Quoted 5 lines
Quoted 4 lines
Also, maybe create a struct for this to get rid of the magic '+1's and 'BYTES / sizeof' constructs in the functions below.
Let me see if I can create a struct that describes the layout.
That would definitely make the code a lot clearer.
Quoted 286 lines
Quoted 124 lines
Quoted 124 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +94
-0* ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; +u8 i; +Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3470
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */ chidlren -> children
Yep.
Quoted 46 lines
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +46
-0+for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Signal parent */ Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3523
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+ cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ parent on -> on parent
Yep.
Quoted 87 lines
Quoted 75 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +75
-0+ *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3608
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); +This is backwards compared to the parent?
Quoted 7 lines
Parent: wait on children then enable pre-emption
Child: enable pre-emption then signal parentMakes for a window where the parent is waiting in atomic context for a signal from a child that has been pre-empted and might not get to run for some time?
Quoted 6 lines
No, this is correct. The rule is if the parent can be preempted all the children can be preempted, thus we can't enable preemption on the parent until all the children have preemption enabled, thus the parent waits for all the children to join before enabling its preemption.
Matt
But,
The write to PARENT_GO_FINI can't fail or stall, right? So if it happens before the ARB_ON then the child is guaranteed to execute the ARB_ON once it has signalled the parent. Indeed, by the time the parent context gets to see the update memory value, the child is practically certain to have passed the ARB_ON. So, by the time the parent becomes pre-emptible, the children will all be pre-emptible. Even if the parent is superfast, the children are guaranteed to become pre-emptible immediately - certainly before any fail-to-preempt timeout could occur.
Whereas, with the current ordering, it is possible for the child to be preempted before it has issued the signal to the parent. So now you have a non-preemptible parent hogging the hardware, waiting for a signal that isn't going to come for an entire execution quantum. Indeed, it is actually quite likely the child would be preempted before it can signal the parent because any pre-emption request that was issued at any time during the child's execution will take effect immediately on the ARB_ON instruction.
John.
Quoted 50 lines
Quoted 50 lines
John.
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +37
-0+/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
Re: [Intel-gfx] [PATCH 23/27] drm/i915/guc: Implement no mid batch preemption for multi-lrc
Quoted 18 lines · John Harrison
Quoted 9 lines · Matthew Brost
Quoted 8 lines · John Harrison
Quoted 4 lines · Matthew Brost
For some users of multi-lrc, e.g. split frame, it isn't safe to preempt mid BB. To safely enable preemption at the BB boundary, a handshake between to parent and child is needed. This is implemented via custom
emit_bb_start&emit_fini_breadcrumbfunctions and enabled via byvia by -> by
Quoted 1 line
default if a context is configured by set parallel extension.
Quoted 8 lines
Quoted 3 lines
I tend to agree with Tvrtko that this should probably be an opt in change. Is there a flags word passed in when creating the context?
I don't disagree but the uAPI in this series is where we landed. It has been acked all by the relevant parties in the RFC, ported to our internal tree, and the media UMD has been updated / posted. Concerns with the uAPI should've been raised in the RFC phase, not now. I really don't feel like changing this uAPI another time.
Quoted 6 lines
The counter argument is that once a UAPI has been merged, it cannot be changed. Ever. So it is worth taking the trouble to get it right first time.
The proposal isn't a major re-write of the interface. It is simply a request to set an extra flag when creating the context.
We are basically just talking about the polarity of a flag at this point. Either by default you can't be preempted mid batch (current GPU / UMD requirement) or by default you can be preempted mid-batch (no current GPU / UMD can do this yet but add flags that everyone opts into). I think Daniel's opinion was just default to what the current GPU / UMD wants and if future requirements arise we add flags to the interface. I understand both points of view for flag / not flag but in the end it doesn't really matter. Either way the interface works now and will in the future too.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Also, it's not just a change in pre-emption behaviour but a change in synchronisation too, right? Previously, if you had a whole bunch of back to back submissions then one child could run ahead of another and/or the parent. After this change, there is a forced regroup at the end of each batch. So while one could end sooner/later than the others, they can't ever get an entire batch (or more) ahead or behind. Or was that synchronisation already in there through other means anyway?
Quoted 7 lines
Quoted 3 lines
Yes, each parent / child sync at the of each batch - this is the only way safely insert preemption points. Without this the GuC could attempt a preemption and hang the batches.
To be clear, I'm not saying that this is wrong. I'm just saying that this appears to be new behaviour with this patch but it is not explicitly called out in the description of the patch.
Will add some comments explaining this behavior (unless I already have them).
Quoted 48 lines
Quoted 48 lines
Quoted 48 lines
Quoted 40 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gt/intel_context.c | 2 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 283 +++++++++++++++++- 4 files changed, 287 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_context.c +1
-1@@ -561,7 +561,7 @@ void intel_context_bind_parent_child(struct intel_context *parent,GEM_BUG_ON (intel_context_is_child (child));GEM_BUG_ON (intel_context_is_parent (child)); - parent->guc_number_children++; + child->guc_child_index = parent->guc_number_children++;list_add_tail (&child->guc_child_link, &parent->guc_child_list); child->parent = parent;drivers/gpu/drm/i915/gt/intel_context_types.h +3
-0@@ -246,6 +246,9 @@ struct intel_context {/** @guc_number_children: number of children if parent */ u8 guc_number_children; +/** @guc_child_index: index into guc_child_list if child */ +u8 guc_child_index; +/** * @parent_page: page in context used by parent for work queue, * work queue descriptor drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h struct guc_process_desc { · line 191
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1
-1@@ -188,7 +188,7 @@ struct guc_process_desc {u32 wq_status;u32 engine_presence;u32 priority; -u32 reserved[30 ]; +u32 reserved[36 ];What is this extra space for? All the extra storage is grabbed from after the end of this structure, isn't it?
Quoted 7 lines
Quoted 3 lines
This is the size of process descriptor in the GuC spec. Even though this is unused space we really don't want the child go / join memory using anything within the process descriptor.
Okay. So it's more that the code was previously broken and we just hadn't hit a problem because of it? Again, worth adding a comment in the description to call it out as a bug fix.
Sure.
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 17 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0
-0} __packed;#define CONTEXT_REGISTRATION_FLAG_KMD BIT(0)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0@@ -11,6 +11,7 @@#include "gt/intel_context.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_heartbeat.h" +#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm.h" @@ -366,10 +367,14 @@ static struct i915_priolist *to_priolist(struct rb_node *rb)/* drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c static struct i915_priolist *to_priolist(struct rb_node *rb) · line 376
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +5
-1* When using multi-lrc submission an extra page in the context state is -* reserved for the process descriptor and work queue. +* reserved for the process descriptor, work queue, and preempt BB boundary +* handshake between the parent + childlren contexts. * * The layout of this page is below: * 0 guc_process_desc +* + sizeof(struct guc_process_desc) child go +* + CACHELINE_BYTES child join ... +* + CACHELINE_BYTES ... Would be better written as '[
num_children]' instead of '...' to make it clear it is a per child array.
Quoted 3 lines
Quoted 1 line
I think this description is pretty clear.
Evidently not because it confused me for a moment.
Ok, let me see if I can make this a bit more clear.
Quoted 308 lines
Quoted 5 lines
Quoted 4 lines
Also, maybe create a struct for this to get rid of the magic '+1's and 'BYTES / sizeof' constructs in the functions below.
Let me see if I can create a struct that describes the layout.
That would definitely make the code a lot clearer.
Quoted 284 lines
Quoted 124 lines
Quoted 124 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +94
-0* ... unused * PAGE_SIZE / 2 work queue start * ... work queue @@ -1785,6 +1790,30 @@ static int deregister_context(struct intel_context *ce, u32 guc_id, bool loop)return __guc_action_deregister_context (guc, guc_id, loop); } +static inline void clear_children_join_go_memory (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); +u8 i; + +for (i =0 ; i < ce->guc_number_children +1 ; ++i) + mem[i * (CACHELINE_BYTES /sizeof (u32))] =0 ; +} + +static inline u32 get_children_go_value (struct intel_context *ce) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[0 ]; +} + +static inline u32 get_children_join_value (struct intel_context *ce, +u8 child_index) +{ +u32 *mem = (u32 *)(__get_process_desc (ce) +1 ); + +return mem[(child_index +1 ) * (CACHELINE_BYTES /sizeof (u32))]; +} +static void guc_context_policy_init (struct intel_engine_cs *engine,struct guc_lrc_desc *desc) {@@ -1867,6 +1896,8 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) desc->context_flags =CONTEXT_REGISTRATION_FLAG_KMD ;guc_context_policy_init (engine, desc); } + +clear_children_join_go_memory (ce); }/* @@ -2943,6 +2974,31 @@ static const struct intel_context_ops virtual_child_context_ops = { .get_sibling = guc_virtual_get_sibling, }; +/* +* The below override of the breadcrumbs is enabled when the user configures a +* context for parallel submission (multi-lrc, parent-child). +* +* The overridden breadcrumbs implements an algorithm which allows the GuC to +* safely preempt all the hw contexts configured for parallel submission +* between each BB. The contract between the i915 and GuC is if the parent +* context can be preempted, all the children can be preempted, and the GuC will +* always try to preempt the parent before the children. A handshake between the +* parent / children breadcrumbs ensures the i915 holds up its end of the deal +* creating a window to preempt between each set of BBs. +*/ +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags); +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs); +static struct intel_context * guc_create_parallel(struct intel_engine_cs **engines, unsigned int num_siblings,@@ -2978,6 +3034,20 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->engine->emit_bb_start = + emit_bb_start_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_parent_no_preempt_mid_batch; + parent->engine->emit_fini_breadcrumb_dw = +12 +4 * parent->guc_number_children; +for_each_child (parent, ce) { + ce->engine->emit_bb_start = + emit_bb_start_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb = + emit_fini_breadcrumb_child_no_preempt_mid_batch; + ce->engine->emit_fini_breadcrumb_dw =16 ; + } +kfree (siblings);return parent;@@ -3362,6 +3432,204 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected =__guc_submission_selected (guc); } +static inline u32 get_children_go_addr (struct intel_context *ce) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return i915_ggtt_offset (ce->state) + +__get_process_desc_offset (ce) + +sizeof (struct guc_process_desc ); +} + +static inline u32 get_children_join_addr (struct intel_context *ce, +u8 child_index) +{ +GEM_BUG_ON (!intel_context_is_parent (ce)); + +return get_children_go_addr (ce) + (child_index +1 ) *CACHELINE_BYTES ; +} + +#define PARENT_GO_BB 1 +#define PARENT_GO_FINI_BREADCRUMB 0 +#define CHILD_GO_BB 1 +#define CHILD_GO_FINI_BREADCRUMB 0 +static int emit_bb_start_parent_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; +u8 i; +Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3470
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+GEM_BUG_ON (!intel_context_is_parent (ce)); + + cs =intel_ring_begin (rq,10 +4 * ce->guc_number_children); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Wait on chidlren */ chidlren -> children
Yep.
Quoted 46 lines
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +46
-0+for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_BB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_BB , +get_children_go_addr (ce), +0 ); + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + *cs++ =MI_NOOP ; + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static int emit_bb_start_child_no_preempt_mid_batch (struct i915_request *rq, +u64 offset,u32 len, +const unsigned int flags) +{ +struct intel_context *ce = rq->context; +u32 *cs; + +GEM_BUG_ON (!intel_context_is_child (ce)); + + cs =intel_ring_begin (rq,12 ); +if (IS_ERR (cs)) +return PTR_ERR (cs); + +/* Signal parent */ Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3523
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +7
-0+ cs =gen8_emit_ggtt_write (cs, +PARENT_GO_BB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); + +/* Wait parent on for go */ parent on -> on parent
Yep.
Quoted 87 lines
Quoted 75 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +75
-0+ *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_BB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Turn off preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; + +/* Jump to batch */ + *cs++ =MI_BATCH_BUFFER_START_GEN8 | + (flags &I915_DISPATCH_SECURE ?0 :BIT (8 )); + *cs++ =lower_32_bits (offset); + *cs++ =upper_32_bits (offset); + +intel_ring_advance (rq, cs); + +return 0 ; +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; +u8 i; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +/* Wait on children */ +for (i =0 ; i < ce->guc_number_children; ++i) { + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =PARENT_GO_FINI_BREADCRUMB ; + *cs++ =get_children_join_addr (ce, i); + *cs++ =0 ; + } + +/* Turn on preemption */ + *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Tell children go */ + cs =gen8_emit_ggtt_write (cs, +CHILD_GO_FINI_BREADCRUMB , +get_children_go_addr (ce), +0 ); + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +/* Turn on preemption */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c void intel_guc_submission_init_early(struct intel_guc *guc) · line 3608
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ *cs++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; + *cs++ =MI_NOOP ; + +/* Signal parent */ + cs =gen8_emit_ggtt_write (cs, +PARENT_GO_FINI_BREADCRUMB , +get_children_join_addr (ce->parent, + ce->guc_child_index), +0 ); +This is backwards compared to the parent?
Quoted 7 lines
Parent: wait on children then enable pre-emption
Child: enable pre-emption then signal parentMakes for a window where the parent is waiting in atomic context for a signal from a child that has been pre-empted and might not get to run for some time?
Quoted 6 lines
No, this is correct. The rule is if the parent can be preempted all the children can be preempted, thus we can't enable preemption on the parent until all the children have preemption enabled, thus the parent waits for all the children to join before enabling its preemption.
Matt
But,
The write to
PARENT_GO_FINIcan't fail or stall, right? So if it happens before theARB_ONthen the child is guaranteed to execute theARB_ONonce it has signalled the parent. Indeed, by the time the parent context gets to see the update memory value, the child is practically certain to have passed theARB_ON. So, by the time the parent becomes pre-emptible, the children will all be pre-emptible. Even if the parent is superfast, the children are guaranteed to become pre-emptible immediately - certainly before any fail-to-preempt timeout could occur.
Quoted 3 lines
Whereas, with the current ordering, it is possible for the child to be preempted before it has issued the signal to the parent. So now you have a non-preemptible parent hogging the hardware, waiting for a signal that isn't
To be clear the parent is always preempted first by the GuC. The parent can't be running if the child preempt is attempted.
Quoted 5 lines
going to come for an entire execution quantum. Indeed, it is actually quite likely the child would be preempted before it can signal the parent because any pre-emption request that was issued at any time during the child's execution will take effect immediately on the
ARB_ONinstruction.
Looking at the code, I do think I have a bug though.
I think I'm missing a MI_ARB_CHECK in the parent after turning on preemption before releasing the children, right?
This covers the case where the GuC issues a preemption to the parent while it is waiting on the children, all the children join, the parent turns on preemption and is preempted with the added MI_ARB_CHECK instruction, and the children all can be preempted waiting on the parent go semaphore. Does that sound correct?
Matt
Quoted 53 lines
John.
Quoted 49 lines
Quoted 49 lines
John.
Quoted 46 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +37
-0+/* Wait parent on for go */ + *cs++ = (MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL | +MI_SEMAPHORE_SAD_EQ_SDD ); + *cs++ =CHILD_GO_FINI_BREADCRUMB ; + *cs++ =get_children_go_addr (ce->parent); + *cs++ =0 ; + +/* Emit fini breadcrumb */ + cs =gen8_emit_ggtt_write (cs, + rq->fence.seqno, +i915_request_active_timeline (rq)->hwsp_offset, +0 ); + +/* User interrupt */ + *cs++ =MI_USER_INTERRUPT ; + *cs++ =MI_NOOP ; + + rq->tail =intel_ring_offset (rq, cs); + +return cs; +} +static struct intel_context *g2h_context_lookup (struct intel_guc *guc,u32 desc_idx) {@@ -3807,6 +4075,19 @@ void intel_guc_submission_print_context_info(struct intel_guc *guc,drm_printf (p,"\t\tWQI Status: %u\n\n" ,READ_ONCE (desc->wq_status)); +drm_printf (p,"\t\tNumber Children: %u\n\n" , + ce->guc_number_children); +if (ce->engine->emit_bb_start == + emit_bb_start_parent_no_preempt_mid_batch) { +u8 i; + +drm_printf (p,"\t\tChildren Go: %u\n\n" , +get_children_go_value (ce)); +for (i =0 ; i < ce->guc_number_children; ++i) +drm_printf (p,"\t\tChildren Join: %u\n" , +get_children_join_value (ce, i)); + } +for_each_child (ce, child)guc_log_context (p, child); }
PATCH 24/27 drm/i915: Multi-BB execbuf
In reply to Matthew BrostAllow multiple batch buffers to be submitted in a single execbuf IOCTL after a context has been configured with the 'set_parallel' extension. The number batches is implicit based on the contexts configuration.
This is implemented with a series of loops. First a loop is used to find all the batches, a loop to pin all the HW contexts, a loop to generate all the requests, a loop to submit all the requests, a loop to commit all the requests, and finally a loop to tie the requests to the VMAs they touch.
A composite fence is also created for the also the generated requests to return to the user and to stick in dma resv slots.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: link to come
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 765 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 12 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 + drivers/gpu/drm/i915/i915_request.h | 9 + drivers/gpu/drm/i915/i915_vma.c | 21 +- drivers/gpu/drm/i915/i915_vma.h | 13 +- 7 files changed, 573 insertions(+), 257 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +520 -245
@@ -244,17 +244,23 @@ struct i915_execbuffer {struct drm_i915_gem_exec_object2 *exec;/** ioctl execobj[] */ struct eb_vma *vma; -struct intel_engine_cs *engine;/** engine to queue the request to */ +struct intel_gt *gt;/* gt for the execbuf */ struct intel_context *context;/* logical state for the request */ struct i915_gem_context *gem_context;/** caller's context */ -struct i915_request *request;/** our request to build */ -struct eb_vma *batch;/** identity of the batch obj/vma */ +struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ];/** our requests to build */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];/** identity of the batch obj/vma */ struct i915_vma *trampoline;/** trampoline used for chaining */ +/** used for excl fence in dma_resv objects when > 1 BB submitted */ +struct dma_fence *composite_fence; +/** actual size of execobj[] as we may extend it for the cmdparser */ unsigned int buffer_count; +/* number of batches in execbuf IOCTL */ +unsigned int num_batches; +/** list of vma not yet bound during reservation phase */ struct list_head unbound;
@@ -281,7 +287,7 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];/** Length of batch within object */ u32 batch_start_offset;/** Location within object of batch */ u32 batch_flags;/** Flags composed for emit_bb_start() */ struct intel_gt_buffer_pool_node *batch_pool;/** pool node for batch buffer */
@@ -299,14 +305,13 @@ struct i915_execbuffer { };static int eb_parse (struct i915_execbuffer *eb); -static struct i915_request *eb_pin_engine (struct i915_execbuffer *eb, -bool throttle); +static int eb_pin_engine (struct i915_execbuffer *eb,bool throttle);static void eb_unpin_engine (struct i915_execbuffer *eb);static inline bool eb_use_cmdparser (const struct i915_execbuffer *eb) { -return intel_engine_requires_cmd_parser (eb->engine) || - (intel_engine_using_cmd_parser (eb->engine) && +return intel_engine_requires_cmd_parser (eb->context->engine) || + (intel_engine_using_cmd_parser (eb->context->engine) && eb->args->batch_len); }
@@ -544,11 +549,21 @@ eb_validate_vma(struct i915_execbuffer *eb,return 0 ; } -static void +static inline bool +is_batch_buffer (struct i915_execbuffer *eb,unsigned int buffer_idx) +{ +return eb->args->flags &I915_EXEC_BATCH_FIRST ? + buffer_idx < eb->num_batches : + buffer_idx >= eb->args->buffer_count - eb->num_batches; +} + +static int eb_add_vma (struct i915_execbuffer *eb, -unsigned int i,unsigned batch_idx, +unsigned int *current_batch, +unsigned int i,struct i915_vma *vma) { +struct drm_i915_private *i915 = eb->i915;struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];struct eb_vma *ev = &eb->vma[i];
@@ -575,15 +590,41 @@ eb_add_vma(struct i915_execbuffer *eb,* Note that actual hangs have only been observed on gen7, but for * paranoia do it everywhere. */ -if (i == batch_idx) { +if (is_batch_buffer (eb, i)) {if (entry->relocation_count && !(ev->flags &EXEC_OBJECT_PINNED )) ev->flags |= __EXEC_OBJECT_NEEDS_BIAS;if (eb->reloc_cache.has_fence) ev->flags |=EXEC_OBJECT_NEEDS_FENCE ; - eb->batch = ev; + eb->batches[*current_batch] = ev; + +if (unlikely (ev->flags &EXEC_OBJECT_WRITE )) { +drm_dbg (&i915->drm, +"Attempting to use self-modifying batch buffer\n" ); +return -EINVAL ; + } + +if (range_overflows_t (u64, + eb->batch_start_offset, + eb->args->batch_len, + ev->vma->size)) { +drm_dbg (&i915->drm,"Attempting to use out-of-bounds batch\n" ); +return -EINVAL ; + } + +if (eb->args->batch_len ==0 ) + eb->batch_len[*current_batch] = ev->vma->size - + eb->batch_start_offset; +if (unlikely (eb->batch_len ==0 )) {/* impossible! */ +drm_dbg (&i915->drm,"Invalid batch length\n" ); +return -EINVAL ; + } + + ++*current_batch; } + +return 0 ; } static inline int use_cpu_reloc(const struct reloc_cache *cache,
@@ -727,14 +768,6 @@ static int eb_reserve(struct i915_execbuffer *eb) }while (1 ); } -static unsigned int eb_batch_index (const struct i915_execbuffer *eb) -{ -if (eb->args->flags &I915_EXEC_BATCH_FIRST ) -return 0 ; -else -return eb->buffer_count -1 ; -} -static int eb_select_context (struct i915_execbuffer *eb) {struct i915_gem_context *ctx;
@@ -843,9 +876,7 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle)static int eb_lookup_vmas (struct i915_execbuffer *eb) { -struct drm_i915_private *i915 = eb->i915; -unsigned int batch =eb_batch_index (eb); -unsigned int i; +unsigned int i, current_batch =0 ;int err =0 ;INIT_LIST_HEAD (&eb->relocs);
@@ -865,7 +896,9 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) goto err; } -eb_add_vma (eb, i, batch, vma); + err =eb_add_vma (eb, ¤t_batch, i, vma); +if (err) +return err;if (i915_gem_object_is_userptr (vma->obj)) { err =i915_gem_object_userptr_submit_init (vma->obj);
@@ -888,26 +921,6 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) } } -if (unlikely (eb->batch->flags &EXEC_OBJECT_WRITE )) { -drm_dbg (&i915->drm, -"Attempting to use self-modifying batch buffer\n" ); -return -EINVAL ; - } - -if (range_overflows_t (u64, - eb->batch_start_offset, eb->batch_len, - eb->batch->vma->size)) { -drm_dbg (&i915->drm,"Attempting to use out-of-bounds batch\n" ); -return -EINVAL ; - } - -if (eb->batch_len ==0 ) - eb->batch_len = eb->batch->vma->size - eb->batch_start_offset; -if (unlikely (eb->batch_len ==0 )) {/* impossible! */ -drm_dbg (&i915->drm,"Invalid batch length\n" ); -return -EINVAL ; - } -return 0 ; err:
@@ -1640,8 +1653,7 @@ static int eb_reinit_userptr(struct i915_execbuffer *eb)return 0 ; } -static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, -struct i915_request *rq) +static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb) {bool have_copy = false;struct eb_vma *ev;
@@ -1657,21 +1669,6 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb,eb_release_vmas (eb, false);i915_gem_ww_ctx_fini (&eb->ww); -if (rq) { -/* nonblocking is always false */ -if (i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE , -MAX_SCHEDULE_TIMEOUT ) <0 ) { -i915_request_put (rq); - rq =NULL ; - - err = -EINTR ; - goto err_relock; - } - -i915_request_put (rq); - rq =NULL ; - } -/* * We take 3 passes through the slowpatch. *
@@ -1698,28 +1695,21 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb,if (!err) err =eb_reinit_userptr (eb); -err_relock:i915_gem_ww_ctx_init (&eb->ww, true);if (err) goto out;/* reacquire the objects */ repeat_validate: - rq =eb_pin_engine (eb, false); -if (IS_ERR (rq)) { - err =PTR_ERR (rq); - rq =NULL ; + err =eb_pin_engine (eb, false); +if (err) goto err; - } - -/* We didn't throttle, should be NULL */ -GEM_WARN_ON (rq); err =eb_validate_vmas (eb);if (err) goto err; -GEM_BUG_ON (!eb->batch); +GEM_BUG_ON (!eb->batches[0 ]);list_for_each_entry (ev, &eb->relocs, reloc_link) {if (!have_copy) {
@@ -1783,46 +1773,23 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, } } -if (rq) -i915_request_put (rq); -return err; }static int eb_relocate_parse (struct i915_execbuffer *eb) {int err; -struct i915_request *rq =NULL ;bool throttle = true; retry: - rq =eb_pin_engine (eb, throttle); -if (IS_ERR (rq)) { - err =PTR_ERR (rq); - rq =NULL ; + err =eb_pin_engine (eb, throttle); +if (err) {if (err != -EDEADLK )return err; goto err; } -if (rq) { -bool nonblock = eb->file->filp->f_flags &O_NONBLOCK ; - -/* Need to drop all locks now for throttling, take slowpath */ - err =i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE ,0 ); -if (err == -ETIME ) { -if (nonblock) { - err = -EWOULDBLOCK ; -i915_request_put (rq); - goto err; - } - goto slow; - } -i915_request_put (rq); - rq =NULL ; - } -/* only throttle once, even if we didn't need to throttle */ throttle = false;
@@ -1862,7 +1829,7 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; slow: - err =eb_relocate_parse_slow (eb, rq); + err =eb_relocate_parse_slow (eb);if (err)/* * If the user expects the execobject.offset and
@@ -1876,11 +1843,31 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; } +#define for_each_batch_create_order (_eb, _i) \ + for (_i = 0; _i < _eb->num_batches; ++_i) +#define for_each_batch_add_order (_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = _eb->num_batches - 1; _i >= 0; --_i) + +static struct i915_request * +eb_find_first_request (struct i915_execbuffer *eb) +{ +int i; + +for_each_batch_add_order (eb, i) +if (eb->requests[i]) +return eb->requests[i]; + +GEM_BUG_ON ("Request not found" ); + +return NULL ; +} +static int eb_move_to_gpu (struct i915_execbuffer *eb) {const unsigned int count = eb->buffer_count;unsigned int i = count; -int err =0 ; +int err =0 , j;while (i--) {struct eb_vma *ev = &eb->vma[i];
@@ -1893,11 +1880,17 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)if (flags &EXEC_OBJECT_CAPTURE ) {struct i915_capture_list *capture; - capture =kmalloc (sizeof (*capture),GFP_KERNEL ); -if (capture) { - capture->next = eb->request->capture_list; - capture->vma = vma; - eb->request->capture_list = capture; +for_each_batch_create_order (eb, j) { +if (!eb->requests[j]) +break ; + + capture =kmalloc (sizeof (*capture),GFP_KERNEL ); +if (capture) { + capture->next = + eb->requests[j]->capture_list; + capture->vma = vma; + eb->requests[j]->capture_list = capture; + } } }
@@ -1918,14 +1911,26 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) flags &= ~EXEC_OBJECT_ASYNC ; } +/* We only need to await on the first request */ if (err ==0 && !(flags &EXEC_OBJECT_ASYNC )) { err =i915_request_await_object - (eb->request, obj, flags &EXEC_OBJECT_WRITE ); + (eb_find_first_request (eb), obj, + flags &EXEC_OBJECT_WRITE ); } -if (err ==0 ) - err =i915_vma_move_to_active (vma, eb->request, - flags | __EXEC_OBJECT_NO_RESERVE); +for_each_batch_add_order (eb, j) { +if (err) +break ; +if (!eb->requests[j]) +continue ; + + err =_i915_vma_move_to_active (vma, eb->requests[j], + j ?NULL : + eb->composite_fence ? + eb->composite_fence : + &eb->requests[j]->fence, + flags | __EXEC_OBJECT_NO_RESERVE); + } }#ifdef CONFIG_MMU_NOTIFIER
@@ -1956,11 +1961,16 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) goto err_skip;/* Unconditionally flush any chipset caches (for streaming writes). */ -intel_gt_chipset_flush (eb->engine->gt); +intel_gt_chipset_flush (eb->gt);return 0 ; err_skip: -i915_request_set_error_once (eb->request, err); +for_each_batch_create_order (eb, j) { +if (!eb->requests[j]) +break ; + +i915_request_set_error_once (eb->requests[j], err); + }return err; }
@@ -2055,14 +2065,16 @@ static int eb_parse(struct i915_execbuffer *eb)int err;if (!eb_use_cmdparser (eb)) { - batch =eb_dispatch_secure (eb, eb->batch->vma); + batch =eb_dispatch_secure (eb, eb->batches[0 ]->vma);if (IS_ERR (batch))return PTR_ERR (batch); goto secure_batch; } - len = eb->batch_len; +GEM_BUG_ON (intel_context_is_parallel (eb->context)); + + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent
@@ -2076,11 +2088,11 @@ static int eb_parse(struct i915_execbuffer *eb) }else { len +=I915_CMD_PARSER_TRAMPOLINE_SIZE ; } -if (unlikely (len < eb->batch_len))/* last paranoid check of overflow */ +if (unlikely (len < eb->batch_len[0 ]))/* last paranoid check of overflow */ return -EINVAL ;if (!pool) { - pool =intel_gt_get_buffer_pool (eb->engine->gt, len, + pool =intel_gt_get_buffer_pool (eb->gt, len,I915_MAP_WB );if (IS_ERR (pool))return PTR_ERR (pool);
@@ -2105,7 +2117,7 @@ static int eb_parse(struct i915_execbuffer *eb) trampoline = shadow; shadow =shadow_batch_pin (eb, pool->obj, - &eb->engine->gt->ggtt->vm, + &eb->gt->ggtt->vm,PIN_GLOBAL );if (IS_ERR (shadow)) { err =PTR_ERR (shadow);
@@ -2127,26 +2139,27 @@ static int eb_parse(struct i915_execbuffer *eb)if (err) goto err_trampoline; - err =intel_engine_cmd_parser (eb->engine, - eb->batch->vma, + err =intel_engine_cmd_parser (eb->context->engine, + eb->batches[0 ]->vma, eb->batch_start_offset, - eb->batch_len, + eb->batch_len[0 ], shadow, trampoline);if (err) goto err_unpin_batch; - eb->batch = &eb->vma[eb->buffer_count++]; - eb->batch->vma =i915_vma_get (shadow); - eb->batch->flags = __EXEC_OBJECT_HAS_PIN; + eb->batches[0 ] = &eb->vma[eb->buffer_count++]; + eb->batches[0 ]->vma =i915_vma_get (shadow); + eb->batches[0 ]->flags = __EXEC_OBJECT_HAS_PIN; eb->trampoline = trampoline; eb->batch_start_offset =0 ; secure_batch:if (batch) { - eb->batch = &eb->vma[eb->buffer_count++]; - eb->batch->flags = __EXEC_OBJECT_HAS_PIN; - eb->batch->vma =i915_vma_get (batch); +GEM_BUG_ON (intel_context_is_parallel (eb->context)); + eb->batches[0 ] = &eb->vma[eb->buffer_count++]; + eb->batches[0 ]->flags = __EXEC_OBJECT_HAS_PIN; + eb->batches[0 ]->vma =i915_vma_get (batch); }return 0 ;
@@ -2162,19 +2175,18 @@ static int eb_parse(struct i915_execbuffer *eb)return err; } -static int eb_submit (struct i915_execbuffer *eb,struct i915_vma *batch) +static int eb_request_submit (struct i915_execbuffer *eb, +struct i915_request *rq, +struct i915_vma *batch, +u64 batch_len) {int err; -if (intel_context_nopreempt (eb->context)) -__set_bit (I915_FENCE_FLAG_NOPREEMPT , &eb->request->fence.flags); - - err =eb_move_to_gpu (eb); -if (err) -return err; +if (intel_context_nopreempt (rq->context)) +__set_bit (I915_FENCE_FLAG_NOPREEMPT , &rq->fence.flags);if (eb->args->flags &I915_EXEC_GEN7_SOL_RESET ) { - err =i915_reset_gen7_sol_offsets (eb->request); + err =i915_reset_gen7_sol_offsets (rq);if (err)return err; }
@@ -2185,26 +2197,26 @@ static int eb_submit(struct i915_execbuffer *eb, struct i915_vma *batch)* allows us to determine if the batch is still waiting on the GPU * or actually running by checking the breadcrumb. */ -if (eb->engine->emit_init_breadcrumb) { - err = eb->engine->emit_init_breadcrumb (eb->request); +if (rq->context->engine->emit_init_breadcrumb) { + err = rq->context->engine->emit_init_breadcrumb (rq);if (err)return err; } - err = eb->engine->emit_bb_start (eb->request, - batch->node.start + - eb->batch_start_offset, - eb->batch_len, - eb->batch_flags); + err = rq->context->engine->emit_bb_start (rq, + batch->node.start + + eb->batch_start_offset, + batch_len, + eb->batch_flags);if (err)return err;if (eb->trampoline) { +GEM_BUG_ON (intel_context_is_parallel (rq->context));GEM_BUG_ON (eb->batch_start_offset); - err = eb->engine->emit_bb_start (eb->request, - eb->trampoline->node.start + - eb->batch_len, -0 ,0 ); + err = rq->context->engine->emit_bb_start (rq, + eb->trampoline->node.start + + batch_len,0 ,0 );if (err)return err; }
@@ -2212,6 +2224,27 @@ static int eb_submit(struct i915_execbuffer *eb, struct i915_vma *batch)return 0 ; } +static int eb_submit (struct i915_execbuffer *eb) +{ +unsigned int i; +int err; + + err =eb_move_to_gpu (eb); + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +trace_i915_request_queue (eb->requests[i], eb->batch_flags); +if (!err) + err =eb_request_submit (eb, eb->requests[i], + eb->batches[i]->vma, + eb->batch_len[i]); + } + +return err; +} +static int num_vcs_engines (const struct drm_i915_private *i915) {return hweight_long (VDBOX_MASK (&i915->gt));
@@ -2277,26 +2310,11 @@ static struct i915_request *eb_throttle(struct i915_execbuffer *eb, struct intelreturn i915_request_get (rq); } -static struct i915_request *eb_pin_engine (struct i915_execbuffer *eb,bool throttle) +static int eb_pin_timeline (struct i915_execbuffer *eb,struct intel_context *ce, +bool throttle) { -struct intel_context *ce = eb->context;struct intel_timeline *tl; -struct i915_request *rq =NULL ; -int err; - -GEM_BUG_ON (eb->args->flags & __EXEC_ENGINE_PINNED); - -if (unlikely (intel_context_is_banned (ce))) -return ERR_PTR (-EIO ); - -/* -* Pinning the contexts may generate requests in order to acquire -* GGTT space, so do this first before we reserve a seqno for -* ourselves. -*/ - err =intel_context_pin_ww (ce, &eb->ww); -if (err) -return ERR_PTR (err); +struct i915_request *rq;/* * Take a local wakeref for preparing to dispatch the execbuf as
@@ -2307,33 +2325,108 @@ static struct i915_request *eb_pin_engine(struct i915_execbuffer *eb, bool throt* taken on the engine, and the parent device. */ tl =intel_context_timeline_lock (ce); -if (IS_ERR (tl)) { -intel_context_unpin (ce); -return ERR_CAST (tl); - } +if (IS_ERR (tl)) +return PTR_ERR (tl);intel_context_enter (ce);if (throttle) rq =eb_throttle (eb, ce);intel_context_timeline_unlock (tl); +if (rq) { +bool nonblock = eb->file->filp->f_flags &O_NONBLOCK ; +long timeout = nonblock ?0 :MAX_SCHEDULE_TIMEOUT ; + +if (i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE , + timeout) <0 ) { +i915_request_put (rq); + + tl =intel_context_timeline_lock (ce); +intel_context_exit (ce); +intel_context_timeline_unlock (tl); + +if (nonblock) +return -EWOULDBLOCK ; +else +return -EINTR ; + } +i915_request_put (rq); + } + +return 0 ; +} + +static int eb_pin_engine (struct i915_execbuffer *eb,bool throttle) +{ +struct intel_context *ce = eb->context, *child; +int err; +int i =0 , j =0 ; + +GEM_BUG_ON (eb->args->flags & __EXEC_ENGINE_PINNED); + +if (unlikely (intel_context_is_banned (ce))) +return -EIO ; + +/* +* Pinning the contexts may generate requests in order to acquire +* GGTT space, so do this first before we reserve a seqno for +* ourselves. +*/ + err =intel_context_pin_ww (ce, &eb->ww); +if (err) +return err; +for_each_child (ce, child) { + err =intel_context_pin_ww (child, &eb->ww); +GEM_BUG_ON (err);/* perma-pinned should incr a counter */ + } + +for_each_child (ce, child) { + err =eb_pin_timeline (eb, child, throttle); +if (err) + goto unwind; + ++i; + } + err =eb_pin_timeline (eb, ce, throttle); +if (err) + goto unwind; + eb->args->flags |= __EXEC_ENGINE_PINNED; -return rq; +return 0 ; + +unwind: +for_each_child (ce, child) { +if (j++ < i) { +mutex_lock (&child->timeline->mutex); +intel_context_exit (child); +mutex_unlock (&child->timeline->mutex); + } + } +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); +return err; }static void eb_unpin_engine (struct i915_execbuffer *eb) { -struct intel_context *ce = eb->context; -struct intel_timeline *tl = ce->timeline; +struct intel_context *ce = eb->context, *child;if (!(eb->args->flags & __EXEC_ENGINE_PINNED))return ; eb->args->flags &= ~__EXEC_ENGINE_PINNED; -mutex_lock (&tl->mutex); +for_each_child (ce, child) { +mutex_lock (&child->timeline->mutex); +intel_context_exit (child); +mutex_unlock (&child->timeline->mutex); + +intel_context_unpin (child); + } + +mutex_lock (&ce->timeline->mutex);intel_context_exit (ce); -mutex_unlock (&tl->mutex); +mutex_unlock (&ce->timeline->mutex);intel_context_unpin (ce); }
@@ -2384,7 +2477,7 @@ eb_select_legacy_ring(struct i915_execbuffer *eb)static int eb_select_engine (struct i915_execbuffer *eb) { -struct intel_context *ce; +struct intel_context *ce, *child;unsigned int idx;int err;
@@ -2397,6 +2490,20 @@ eb_select_engine(struct i915_execbuffer *eb)if (IS_ERR (ce))return PTR_ERR (ce); +if (intel_context_is_parallel (ce)) { +if (eb->buffer_count < ce->guc_number_children +1 ) { +intel_context_put (ce); +return -EINVAL ; + } +if (eb->batch_start_offset || eb->args->batch_len) { +intel_context_put (ce); +return -EINVAL ; + } + } + eb->num_batches = ce->guc_number_children +1 ; + +for_each_child (ce, child) +intel_context_get (child);intel_gt_pm_get (ce->engine->gt);if (!test_bit (CONTEXT_ALLOC_BIT , &ce->flags)) {
@@ -2404,6 +2511,13 @@ eb_select_engine(struct i915_execbuffer *eb)if (err) goto err; } +for_each_child (ce, child) { +if (!test_bit (CONTEXT_ALLOC_BIT , &child->flags)) { + err =intel_context_alloc_state (child); +if (err) + goto err; + } + }/* * ABI: Before userspace accesses the GPU (e.g. execbuffer), report
@@ -2414,7 +2528,7 @@ eb_select_engine(struct i915_execbuffer *eb) goto err; eb->context = ce; - eb->engine = ce->engine; + eb->gt = ce->engine->gt;/* * Make sure engine pool stays alive even if we call intel_context_put
@@ -2425,6 +2539,8 @@ eb_select_engine(struct i915_execbuffer *eb) err:intel_gt_pm_put (ce->engine->gt); +for_each_child (ce, child) +intel_context_put (child);intel_context_put (ce);return err; }
@@ -2432,7 +2548,11 @@ eb_select_engine(struct i915_execbuffer *eb)static void eb_put_engine (struct i915_execbuffer *eb) { -intel_gt_pm_put (eb->engine->gt); +struct intel_context *child; + +intel_gt_pm_put (eb->gt); +for_each_child (eb->context, child) +intel_context_put (child);intel_context_put (eb->context); }
@@ -2655,7 +2775,8 @@ static void put_fence_array(struct eb_fence *fences, int num_fences) }static int -await_fence_array (struct i915_execbuffer *eb) +await_fence_array (struct i915_execbuffer *eb, +struct i915_request *rq) {unsigned int n;int err;
@@ -2669,8 +2790,7 @@ await_fence_array(struct i915_execbuffer *eb)if (!eb->fences[n].dma_fence)continue ; - err =i915_request_await_dma_fence (eb->request, - eb->fences[n].dma_fence); + err =i915_request_await_dma_fence (rq, eb->fences[n].dma_fence);if (err <0 )return err; }
@@ -2678,9 +2798,9 @@ await_fence_array(struct i915_execbuffer *eb)return 0 ; } -static void signal_fence_array (const struct i915_execbuffer *eb) +static void signal_fence_array (const struct i915_execbuffer *eb, +struct dma_fence *const fence) { -struct dma_fence *const fence = &eb->request->fence;unsigned int n;for (n =0 ; n < eb->num_fences; n++) {
@@ -2728,12 +2848,12 @@ static void retire_requests(struct intel_timeline *tl, struct i915_request *end)break ; } -static int eb_request_add (struct i915_execbuffer *eb,int err) +static int eb_request_add (struct i915_execbuffer *eb,struct i915_request *rq) { -struct i915_request *rq = eb->request;struct intel_timeline *const tl =i915_request_timeline (rq);struct i915_sched_attr attr = {};struct i915_request *prev; +int err =0 ;lockdep_assert_held (&tl->mutex);lockdep_unpin_lock (&tl->mutex, rq->cookie);
@@ -2745,11 +2865,6 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)/* Check that the context wasn't destroyed before submission */ if (likely (!intel_context_is_closed (eb->context))) { attr = eb->gem_context->sched; - }else { -/* Serialise with context_close via the add_to_timeline */ -i915_request_set_error_once (rq, -ENOENT ); -__i915_request_skip (rq); - err = -ENOENT ;/* override any transient errors */ }__i915_request_queue (rq, &attr);
@@ -2763,6 +2878,44 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)return err; } +static int eb_requests_add (struct i915_execbuffer *eb,int err) +{ +int i; + +/* +* We iterate in reverse order of creation to release timeline mutexes in +* same order. +*/ +for_each_batch_add_order (eb, i) { +struct i915_request *rq = eb->requests[i]; + +if (!rq) +continue ; + +if (unlikely (intel_context_is_closed (eb->context))) { +/* Serialise with context_close via the add_to_timeline */ +i915_request_set_error_once (rq, -ENOENT ); +__i915_request_skip (rq); + err = -ENOENT ;/* override any transient errors */ + } + +if (intel_context_is_parallel (eb->context)) { +if (err) { +__i915_request_skip (rq); +set_bit (I915_FENCE_FLAG_SKIP_PARALLEL , + &rq->fence.flags); + } +if (i ==0 ) +set_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , + &rq->fence.flags); + } + + err |=eb_request_add (eb, rq); + } + +return err; +} +static const i915_user_extension_fn execbuf_extensions[] = { [DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES ] = parse_timeline_fences, };
@@ -2789,6 +2942,166 @@ parse_execbuf2_extensions(struct drm_i915_gem_execbuffer2 *args, eb); } +static void eb_requests_get (struct i915_execbuffer *eb) +{ +unsigned int i; + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +i915_request_get (eb->requests[i]); + } +} + +static void eb_requests_put (struct i915_execbuffer *eb) +{ +unsigned int i; + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +i915_request_put (eb->requests[i]); + } +} +static struct sync_file * +eb_composite_fence_create (struct i915_execbuffer *eb,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +struct dma_fence_array *fence_array; +struct dma_fence **fences; +unsigned int i; + +GEM_BUG_ON (!intel_context_is_parent (eb->context)); + + fences =kmalloc (eb->num_batches *sizeof (*fences),GFP_KERNEL ); +if (!fences) +return ERR_PTR (-ENOMEM ); + +for_each_batch_create_order (eb, i) + fences[i] = &eb->requests[i]->fence; + + fence_array =dma_fence_array_create (eb->num_batches, + fences, + eb->context->fence_context, + eb->context->seqno, + false); +if (!fence_array) { +kfree (fences); +return ERR_PTR (-ENOMEM ); + } + +/* Move ownership to the dma_fence_array created above */ +for_each_batch_create_order (eb, i) +dma_fence_get (fences[i]); + +if (out_fence_fd !=-1 ) { + out_fence =sync_file_create (&fence_array->base); +/* sync_file now owns fence_arry, drop creation ref */ +dma_fence_put (&fence_array->base); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + + eb->composite_fence = &fence_array->base; + +return out_fence; +} + +static struct intel_context * +eb_find_context (struct i915_execbuffer *eb,unsigned int context_number) +{ +struct intel_context *child; + +if (likely (context_number ==0 )) +return eb->context; + +for_each_child (eb->context, child) +if (!--context_number) +return child; + +GEM_BUG_ON ("Context not found" ); + +return NULL ; +} + +static struct sync_file * +eb_requests_create (struct i915_execbuffer *eb,struct dma_fence *in_fence, +int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +unsigned int i; +int err; + +for_each_batch_create_order (eb, i) { +bool first_request_to_add = i +1 == eb->num_batches; + +/* Allocate a request for this batch buffer nice and early. */ + eb->requests[i] =i915_request_create (eb_find_context (eb, i)); +if (IS_ERR (eb->requests[i])) { + eb->requests[i] =NULL ; +return ERR_PTR (PTR_ERR (eb->requests[i])); + } + +if (unlikely (eb->gem_context->syncobj && + first_request_to_add)) { +struct dma_fence *fence; + + fence =drm_syncobj_fence_get (eb->gem_context->syncobj); + err =i915_request_await_dma_fence (eb->requests[i], fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence && first_request_to_add) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (eb->requests[i], + in_fence); +else + err =i915_request_await_dma_fence (eb->requests[i], + in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences && first_request_to_add) { + err =await_fence_array (eb, eb->requests[i]); +if (err) +return ERR_PTR (err); + } + +if (first_request_to_add) { +if (intel_context_is_parallel (eb->context)) { + out_fence =eb_composite_fence_create (eb, out_fence_fd); +if (IS_ERR (out_fence)) +return ERR_PTR (-ENOMEM ); + }else if (out_fence_fd !=-1 ) { + out_fence =sync_file_create (&eb->requests[i]->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + } + +/* +* Whilst this request exists, batch_obj will be on the +* active_list, and so will hold the active reference. Only when +* this request is retired will the the batch_obj be moved onto +* the inactive_list and lose its active reference. Hence we do +* not need to explicitly hold another reference here. +*/ + eb->requests[i]->batch = eb->batches[i]->vma; +if (eb->batch_pool) { +GEM_BUG_ON (intel_context_is_parallel (eb->context)); +intel_gt_buffer_pool_mark_active (eb->batch_pool, + eb->requests[i]); + } + } + +return out_fence; +} + static int i915_gem_do_execbuffer(struct drm_device *dev, struct drm_file *file,
@@ -2799,7 +3112,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,struct i915_execbuffer eb;struct dma_fence *in_fence =NULL ;struct sync_file *out_fence =NULL ; -struct i915_vma *batch;int out_fence_fd =-1 ;int err;
@@ -2823,12 +3135,15 @@ i915_gem_do_execbuffer(struct drm_device *dev, eb.buffer_count = args->buffer_count; eb.batch_start_offset = args->batch_start_offset; - eb.batch_len = args->batch_len; eb.trampoline =NULL ; eb.fences =NULL ; eb.num_fences =0 ; +memset (eb.requests,0 ,sizeof (struct i915_request *) * +ARRAY_SIZE (eb.requests)); + eb.composite_fence =NULL ; + eb.batch_flags =0 ;if (args->flags &I915_EXEC_SECURE ) {if (GRAPHICS_VER (i915) >=11 )
@@ -2912,70 +3227,25 @@ i915_gem_do_execbuffer(struct drm_device *dev,ww_acquire_done (&eb.ww.ctx); - batch = eb.batch->vma; - -/* Allocate a request for this batch buffer nice and early. */ - eb.request =i915_request_create (eb.context); -if (IS_ERR (eb.request)) { - err =PTR_ERR (eb.request); - goto err_vma; - } - -if (unlikely (eb.gem_context->syncobj)) { -struct dma_fence *fence; - - fence =drm_syncobj_fence_get (eb.gem_context->syncobj); - err =i915_request_await_dma_fence (eb.request, fence); -dma_fence_put (fence); -if (err) - goto err_ext; - } - -if (in_fence) { -if (args->flags &I915_EXEC_FENCE_SUBMIT ) - err =i915_request_await_execution (eb.request, - in_fence); -else - err =i915_request_await_dma_fence (eb.request, - in_fence); -if (err <0 ) - goto err_request; - } - -if (eb.fences) { - err =await_fence_array (&eb); -if (err) - goto err_request; - } - -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; + out_fence =eb_requests_create (&eb, in_fence, out_fence_fd); +if (IS_ERR (out_fence)) { + err =PTR_ERR (out_fence); +if (eb.requests[0 ]) goto err_request; - } +else + goto err_vma; } -/* -* Whilst this request exists, batch_obj will be on the -* active_list, and so will hold the active reference. Only when this -* request is retired will the the batch_obj be moved onto the -* inactive_list and lose its active reference. Hence we do not need -* to explicitly hold another reference here. -*/ - eb.request->batch = batch; -if (eb.batch_pool) -intel_gt_buffer_pool_mark_active (eb.batch_pool, eb.request); - -trace_i915_request_queue (eb.request, eb.batch_flags); - err =eb_submit (&eb, batch); + err =eb_submit (&eb); err_request: -i915_request_get (eb.request); - err =eb_request_add (&eb, err); +eb_requests_get (&eb); + err =eb_requests_add (&eb, err);if (eb.fences) -signal_fence_array (&eb); +signal_fence_array (&eb, eb.composite_fence ? + eb.composite_fence : + &eb.requests[0 ]->fence);if (out_fence) {if (err ==0 ) {
@@ -2990,10 +3260,15 @@ i915_gem_do_execbuffer(struct drm_device *dev,if (unlikely (eb.gem_context->syncobj)) {drm_syncobj_replace_fence (eb.gem_context->syncobj, - &eb.request->fence); + eb.composite_fence ? + eb.composite_fence : + &eb.requests[0 ]->fence); } -i915_request_put (eb.request); +if (!out_fence && eb.composite_fence) +dma_fence_put (eb.composite_fence); + +eb_requests_put (&eb); err_vma:eb_release_vmas (&eb, true);
drivers/gpu/drm/i915/gt/intel_context.h +7 -1
@@ -237,7 +237,13 @@ intel_context_timeline_lock(struct intel_context *ce)struct intel_timeline *tl = ce->timeline;int err; - err =mutex_lock_interruptible (&tl->mutex); +if (intel_context_is_parent (ce)) + err =mutex_lock_interruptible_nested (&tl->mutex,0 ); +else if (intel_context_is_child (ce)) + err =mutex_lock_interruptible_nested (&tl->mutex, + ce->guc_child_index +1 ); +else + err =mutex_lock_interruptible (&tl->mutex);if (err)return ERR_PTR (err);
drivers/gpu/drm/i915/gt/intel_context_types.h +12 -0
@@ -261,6 +261,18 @@ struct intel_context {* context. */ struct i915_request *last_rq; + +/** +* @fence_context: fence context composite fence when doing +* parallel submission +*/ +u64 fence_context; + +/** +* @seqno: seqno for composite fence when doing parallel +* submission +*/ +u32 seqno; };#ifdef CONFIG_DRM_I915_SELFTEST
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2 -0
@@ -3034,6 +3034,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->fence_context =dma_fence_context_alloc (1 ); + parent->engine->emit_bb_start = emit_bb_start_parent_no_preempt_mid_batch; parent->engine->emit_fini_breadcrumb =
drivers/gpu/drm/i915/i915_request.h +9 -0
@@ -147,6 +147,15 @@ enum {* tail. */ I915_FENCE_FLAG_SUBMIT_PARALLEL , + +/* +* I915_FENCE_FLAG_SKIP_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) that +* hit an error while generating requests in the execbuf IOCTL. +* Indicates this request should be skipped as another request in +* submission / relationship encoutered an error. +*/ + I915_FENCE_FLAG_SKIP_PARALLEL, };/**
drivers/gpu/drm/i915/i915_vma.c +13 -8
@@ -1234,9 +1234,10 @@ int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request *rq)return i915_active_add_request (&vma->active, rq); } -int i915_vma_move_to_active (struct i915_vma *vma, -struct i915_request *rq, -unsigned int flags) +int _i915_vma_move_to_active (struct i915_vma *vma, +struct i915_request *rq, +struct dma_fence *fence, +unsigned int flags) {struct drm_i915_gem_object *obj = vma->obj;int err;
@@ -1257,9 +1258,11 @@ int i915_vma_move_to_active(struct i915_vma *vma,intel_frontbuffer_put (front); } -dma_resv_add_excl_fence (vma->resv, &rq->fence); - obj->write_domain =I915_GEM_DOMAIN_RENDER ; - obj->read_domains =0 ; +if (fence) { +dma_resv_add_excl_fence (vma->resv, fence); + obj->write_domain =I915_GEM_DOMAIN_RENDER ; + obj->read_domains =0 ; + } }else {if (!(flags & __EXEC_OBJECT_NO_RESERVE)) { err =dma_resv_reserve_shared (vma->resv,1 );
@@ -1267,8 +1270,10 @@ int i915_vma_move_to_active(struct i915_vma *vma,return err; } -dma_resv_add_shared_fence (vma->resv, &rq->fence); - obj->write_domain =0 ; +if (fence) { +dma_resv_add_shared_fence (vma->resv, fence); + obj->write_domain =0 ; + } }if (flags &EXEC_OBJECT_NEEDS_FENCE && vma->fence)
drivers/gpu/drm/i915/i915_vma.h +10 -3
@@ -57,9 +57,16 @@ static inline bool i915_vma_is_active(const struct i915_vma *vma)int __must_check __i915_vma_move_to_active (struct i915_vma *vma,struct i915_request *rq); -int __must_check i915_vma_move_to_active (struct i915_vma *vma, -struct i915_request *rq, -unsigned int flags); +int __must_check _i915_vma_move_to_active (struct i915_vma *vma, +struct i915_request *rq, +struct dma_fence *fence, +unsigned int flags); +static inline int __must_check +i915_vma_move_to_active (struct i915_vma *vma,struct i915_request *rq, +unsigned int flags) +{ +return _i915_vma_move_to_active (vma, rq, &rq->fence, flags); +}#define __i915_vma_flags (v) ((unsigned long *)&(v)->flags.counter)
Signature · 1 line
2.32.0
kernel test robot
build botRe: [Intel-gfx] [PATCH 24/27] drm/i915: Multi-BB execbuf
Thank you for the patch! Perhaps something to improve:
Hi Matthew,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm-exynos/exynos-drm-next next-20210820] [cannot apply to tegra-drm/drm/tegra/for-next linus/master drm/drm-next v5.14-rc6] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-buildonly-randconfig-r002-20210821 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 9e9d70591e72fc6762b4b9a226b68ed1307419bf)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/7e7ae2111b2855ac3d63aa5c806c6936daaa6bbc
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 git checkout 7e7ae2111b2855ac3d63aa5c806c6936daaa6bbc
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:608:20: warning: comparison of array 'eb->batch_len' equal to a null pointer is always false [-Wtautological-pointer-compare]
if (unlikely(eb->batch_len == 0)) { /* impossible! */
~~~~^~~~~~~~~ ~
include/linux/compiler.h:78:42: note: expanded from macro 'unlikely'
# define unlikely(x) __builtin_expect(!!(x), 0)
^
1 warning generated.vim +608 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
548
549 static int
550 eb_add_vma(struct i915_execbuffer *eb,
551 unsigned int *current_batch,
552 unsigned int i,
553 struct i915_vma *vma)
554 {
555 struct drm_i915_private *i915 = eb->i915;
556 struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];
557 struct eb_vma *ev = &eb->vma[i];
558
559 ev->vma = vma;
560 ev->exec = entry;
561 ev->flags = entry->flags;
562
563 if (eb->lut_size > 0) {
564 ev->handle = entry->handle;
565 hlist_add_head(&ev->node,
566 &eb->buckets[hash_32(entry->handle,
567 eb->lut_size)]);
568 }
569
570 if (entry->relocation_count)
571 list_add_tail(&ev->reloc_link, &eb->relocs);
572
573 /*
574 * SNA is doing fancy tricks with compressing batch buffers, which leads
575 * to negative relocation deltas. Usually that works out ok since the
576 * relocate address is still positive, except when the batch is placed
577 * very low in the GTT. Ensure this doesn't happen.
578 *
579 * Note that actual hangs have only been observed on gen7, but for
580 * paranoia do it everywhere.
581 */
582 if (is_batch_buffer(eb, i)) {
583 if (entry->relocation_count &&
584 !(ev->flags & EXEC_OBJECT_PINNED))
585 ev->flags |= __EXEC_OBJECT_NEEDS_BIAS;
586 if (eb->reloc_cache.has_fence)
587 ev->flags |= EXEC_OBJECT_NEEDS_FENCE;
588
589 eb->batches[*current_batch] = ev;
590
591 if (unlikely(ev->flags & EXEC_OBJECT_WRITE)) {
592 drm_dbg(&i915->drm,
593 "Attempting to use self-modifying batch buffer\n");
594 return -EINVAL;
595 }
596
597 if (range_overflows_t(u64,
598 eb->batch_start_offset,
599 eb->args->batch_len,
600 ev->vma->size)) {
601 drm_dbg(&i915->drm, "Attempting to use out-of-bounds batch\n");
602 return -EINVAL;
603 }
604
605 if (eb->args->batch_len == 0)
606 eb->batch_len[*current_batch] = ev->vma->size -
607 eb->batch_start_offset;
> 608 if (unlikely(eb->batch_len == 0)) { /* impossible! */ 609 drm_dbg(&i915->drm, "Invalid batch length\n");
610 return -EINVAL;
611 }
612
613 ++*current_batch;
614 }
615
616 return 0;
617 }
618
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 24/27] drm/i915: Multi-BB execbuf
In reply to Matthew BrostThank you for the patch! Perhaps something to improve:
Hi Matthew,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm-exynos/exynos-drm-next next-20210827] [cannot apply to tegra-drm/drm/tegra/for-next linus/master drm/drm-next v5.14] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-rhel-8.3-kselftests (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-348-gf0e6938b-dirty # https://github.com/0day-ci/linux/commit/7e7ae2111b2855ac3d63aa5c806c6936daaa6bbc git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Matthew-Brost/Parallel-submission-aka-multi-bb-execbuf/20210821-065348 git checkout 7e7ae2111b2855ac3d63aa5c806c6936daaa6bbc # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:608:21: sparse: sparse: Using plain integer as NULL pointer
vim +608 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
548
549 static int
550 eb_add_vma(struct i915_execbuffer *eb,
551 unsigned int *current_batch,
552 unsigned int i,
553 struct i915_vma *vma)
554 {
555 struct drm_i915_private *i915 = eb->i915;
556 struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];
557 struct eb_vma *ev = &eb->vma[i];
558
559 ev->vma = vma;
560 ev->exec = entry;
561 ev->flags = entry->flags;
562
563 if (eb->lut_size > 0) {
564 ev->handle = entry->handle;
565 hlist_add_head(&ev->node,
566 &eb->buckets[hash_32(entry->handle,
567 eb->lut_size)]);
568 }
569
570 if (entry->relocation_count)
571 list_add_tail(&ev->reloc_link, &eb->relocs);
572
573 /*
574 * SNA is doing fancy tricks with compressing batch buffers, which leads
575 * to negative relocation deltas. Usually that works out ok since the
576 * relocate address is still positive, except when the batch is placed
577 * very low in the GTT. Ensure this doesn't happen.
578 *
579 * Note that actual hangs have only been observed on gen7, but for
580 * paranoia do it everywhere.
581 */
582 if (is_batch_buffer(eb, i)) {
583 if (entry->relocation_count &&
584 !(ev->flags & EXEC_OBJECT_PINNED))
585 ev->flags |= __EXEC_OBJECT_NEEDS_BIAS;
586 if (eb->reloc_cache.has_fence)
587 ev->flags |= EXEC_OBJECT_NEEDS_FENCE;
588
589 eb->batches[*current_batch] = ev;
590
591 if (unlikely(ev->flags & EXEC_OBJECT_WRITE)) {
592 drm_dbg(&i915->drm,
593 "Attempting to use self-modifying batch buffer\n");
594 return -EINVAL;
595 }
596
597 if (range_overflows_t(u64,
598 eb->batch_start_offset,
599 eb->args->batch_len,
600 ev->vma->size)) {
601 drm_dbg(&i915->drm, "Attempting to use out-of-bounds batch\n");
602 return -EINVAL;
603 }
604
605 if (eb->args->batch_len == 0)
606 eb->batch_len[*current_batch] = ev->vma->size -
607 eb->batch_start_offset;
> 608 if (unlikely(eb->batch_len == 0)) { /* impossible! */ 609 drm_dbg(&i915->drm, "Invalid batch length\n");
610 return -EINVAL;
611 }
612
613 ++*current_batch;
614 }
615
616 return 0;
617 }
618
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [Intel-gfx] [PATCH 24/27] drm/i915: Multi-BB execbuf
In reply to Matthew BrostOn Fri, Aug 20, 2021 at 03:44:43PM -0700, Matthew Brost wrote:
Did a review offline with John Harrison, adding notes for what we found.
Quoted 9 lines
Allow multiple batch buffers to be submitted in a single execbuf IOCTL after a context has been configured with the '
set_parallel' extension. The number batches is implicit based on the contexts configuration.This is implemented with a series of loops. First a loop is used to find all the batches, a loop to pin all the HW contexts, a loop to generate all the requests, a loop to submit all the requests, a loop to commit all the requests, and finally a loop to tie the requests to the VMAs they touch.
Clarify these steps a bit, also tieing requests to the VMAs is the 2nd to last step with commiting requests to be the last.
Quoted 4 lines
A composite fence is also created for the also the generated requests to return to the user and to stick in dma resv slots.
Add a comment saying there should be no change in behavior for existing IOCTLs expect if throttling because to space in the ring, the wait is done with the VMA locks being held rather than dropping the locks and putting to the slow path.
Quoted 19 lines
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: link to comeSigned-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 765 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 12 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 + drivers/gpu/drm/i915/i915_request.h | 9 + drivers/gpu/drm/i915/i915_vma.c | 21 +- drivers/gpu/drm/i915/i915_vma.h | 13 +- 7 files changed, 573 insertions(+), 257 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +0
-0
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c struct i915_execbuffer { · line 252
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1
-3@@ -244,17 +244,23 @@ struct i915_execbuffer {struct drm_i915_gem_exec_object2 *exec;/** ioctl execobj[] */ struct eb_vma *vma; -struct intel_engine_cs *engine;/** engine to queue the request to */ +struct intel_gt *gt;/* gt for the execbuf */ struct intel_context *context;/* logical state for the request */ struct i915_gem_context *gem_context;/** caller's context */ -struct i915_request *request;/** our request to build */ -struct eb_vma *batch;/** identity of the batch obj/vma */
Line wrap of these comments.
Quoted 298 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +63
-94+struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ];/** our requests to build */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];/** identity of the batch obj/vma */ struct i915_vma *trampoline;/** trampoline used for chaining */ +/** used for excl fence in dma_resv objects when > 1 BB submitted */ +struct dma_fence *composite_fence; +/** actual size of execobj[] as we may extend it for the cmdparser */ unsigned int buffer_count; +/* number of batches in execbuf IOCTL */ +unsigned int num_batches; +/** list of vma not yet bound during reservation phase */ struct list_head unbound;@@ -281,7 +287,7 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];/** Length of batch within object */ u32 batch_start_offset;/** Location within object of batch */ u32 batch_flags;/** Flags composed for emit_bb_start() */ struct intel_gt_buffer_pool_node *batch_pool;/** pool node for batch buffer */ @@ -299,14 +305,13 @@ struct i915_execbuffer { };static int eb_parse (struct i915_execbuffer *eb); -static struct i915_request *eb_pin_engine (struct i915_execbuffer *eb, -bool throttle); +static int eb_pin_engine (struct i915_execbuffer *eb,bool throttle);static void eb_unpin_engine (struct i915_execbuffer *eb);static inline bool eb_use_cmdparser (const struct i915_execbuffer *eb) { -return intel_engine_requires_cmd_parser (eb->engine) || - (intel_engine_using_cmd_parser (eb->engine) && +return intel_engine_requires_cmd_parser (eb->context->engine) || + (intel_engine_using_cmd_parser (eb->context->engine) && eb->args->batch_len); }@@ -544,11 +549,21 @@ eb_validate_vma(struct i915_execbuffer *eb,return 0 ; } -static void +static inline bool +is_batch_buffer (struct i915_execbuffer *eb,unsigned int buffer_idx) +{ +return eb->args->flags &I915_EXEC_BATCH_FIRST ? + buffer_idx < eb->num_batches : + buffer_idx >= eb->args->buffer_count - eb->num_batches; +} + +static int eb_add_vma (struct i915_execbuffer *eb, -unsigned int i,unsigned batch_idx, +unsigned int *current_batch, +unsigned int i,struct i915_vma *vma) { +struct drm_i915_private *i915 = eb->i915;struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];struct eb_vma *ev = &eb->vma[i];@@ -575,15 +590,41 @@ eb_add_vma(struct i915_execbuffer *eb,* Note that actual hangs have only been observed on gen7, but for * paranoia do it everywhere. */ -if (i == batch_idx) { +if (is_batch_buffer (eb, i)) {if (entry->relocation_count && !(ev->flags &EXEC_OBJECT_PINNED )) ev->flags |= __EXEC_OBJECT_NEEDS_BIAS;if (eb->reloc_cache.has_fence) ev->flags |=EXEC_OBJECT_NEEDS_FENCE ; - eb->batch = ev; + eb->batches[*current_batch] = ev; + +if (unlikely (ev->flags &EXEC_OBJECT_WRITE )) { +drm_dbg (&i915->drm, +"Attempting to use self-modifying batch buffer\n" ); +return -EINVAL ; + } + +if (range_overflows_t (u64, + eb->batch_start_offset, + eb->args->batch_len, + ev->vma->size)) { +drm_dbg (&i915->drm,"Attempting to use out-of-bounds batch\n" ); +return -EINVAL ; + } + +if (eb->args->batch_len ==0 ) + eb->batch_len[*current_batch] = ev->vma->size - + eb->batch_start_offset; +if (unlikely (eb->batch_len ==0 )) {/* impossible! */ +drm_dbg (&i915->drm,"Invalid batch length\n" ); +return -EINVAL ; + } + + ++*current_batch; } + +return 0 ; } static inline int use_cpu_reloc(const struct reloc_cache *cache,@@ -727,14 +768,6 @@ static int eb_reserve(struct i915_execbuffer *eb) }while (1 ); } -static unsigned int eb_batch_index (const struct i915_execbuffer *eb) -{ -if (eb->args->flags &I915_EXEC_BATCH_FIRST ) -return 0 ; -else -return eb->buffer_count -1 ; -} -static int eb_select_context (struct i915_execbuffer *eb) {struct i915_gem_context *ctx;@@ -843,9 +876,7 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle)static int eb_lookup_vmas (struct i915_execbuffer *eb) { -struct drm_i915_private *i915 = eb->i915; -unsigned int batch =eb_batch_index (eb); -unsigned int i; +unsigned int i, current_batch =0 ;int err =0 ;INIT_LIST_HEAD (&eb->relocs);@@ -865,7 +896,9 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) goto err; } -eb_add_vma (eb, i, batch, vma); + err =eb_add_vma (eb, ¤t_batch, i, vma); +if (err) +return err;if (i915_gem_object_is_userptr (vma->obj)) { err =i915_gem_object_userptr_submit_init (vma->obj);@@ -888,26 +921,6 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) } } -if (unlikely (eb->batch->flags &EXEC_OBJECT_WRITE )) { -drm_dbg (&i915->drm, -"Attempting to use self-modifying batch buffer\n" ); -return -EINVAL ; - } - -if (range_overflows_t (u64, - eb->batch_start_offset, eb->batch_len, - eb->batch->vma->size)) { -drm_dbg (&i915->drm,"Attempting to use out-of-bounds batch\n" ); -return -EINVAL ; - } - -if (eb->batch_len ==0 ) - eb->batch_len = eb->batch->vma->size - eb->batch_start_offset; -if (unlikely (eb->batch_len ==0 )) {/* impossible! */ -drm_dbg (&i915->drm,"Invalid batch length\n" ); -return -EINVAL ; - } -return 0 ; err:@@ -1640,8 +1653,7 @@ static int eb_reinit_userptr(struct i915_execbuffer *eb)return 0 ; } -static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, -struct i915_request *rq) +static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb) {bool have_copy = false;struct eb_vma *ev;@@ -1657,21 +1669,6 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb,eb_release_vmas (eb, false);i915_gem_ww_ctx_fini (&eb->ww); -if (rq) { -/* nonblocking is always false */ -if (i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE , -MAX_SCHEDULE_TIMEOUT ) <0 ) { -i915_request_put (rq); - rq =NULL ; - - err = -EINTR ; - goto err_relock; - } - -i915_request_put (rq); - rq =NULL ; - } -/* * We take 3 passes through the slowpatch. * @@ -1698,28 +1695,21 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb,if (!err) err =eb_reinit_userptr (eb); -err_relock:i915_gem_ww_ctx_init (&eb->ww, true);if (err) goto out;/* reacquire the objects */ repeat_validate: - rq =eb_pin_engine (eb, false); -if (IS_ERR (rq)) { - err =PTR_ERR (rq); - rq =NULL ; + err =eb_pin_engine (eb, false); +if (err) goto err; - } - -/* We didn't throttle, should be NULL */ -GEM_WARN_ON (rq); err =eb_validate_vmas (eb);if (err) goto err; -GEM_BUG_ON (!eb->batch); +GEM_BUG_ON (!eb->batches[0 ]);list_for_each_entry (ev, &eb->relocs, reloc_link) {if (!have_copy) {@@ -1783,46 +1773,23 @@ static noinline int eb_relocate_parse_slow(struct i915_execbuffer *eb, } } -if (rq) -i915_request_put (rq); -return err; }static int eb_relocate_parse (struct i915_execbuffer *eb) {int err; -struct i915_request *rq =NULL ;bool throttle = true; retry: - rq =eb_pin_engine (eb, throttle); -if (IS_ERR (rq)) { - err =PTR_ERR (rq); - rq =NULL ; + err =eb_pin_engine (eb, throttle); +if (err) {if (err != -EDEADLK )return err; goto err; } -if (rq) { -bool nonblock = eb->file->filp->f_flags &O_NONBLOCK ; - -/* Need to drop all locks now for throttling, take slowpath */ - err =i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE ,0 ); -if (err == -ETIME ) { -if (nonblock) { - err = -EWOULDBLOCK ; -i915_request_put (rq); - goto err; - } - goto slow; - } -i915_request_put (rq); - rq =NULL ; - } -/* only throttle once, even if we didn't need to throttle */ throttle = false;@@ -1862,7 +1829,7 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; slow: - err =eb_relocate_parse_slow (eb, rq); + err =eb_relocate_parse_slow (eb);if (err)/* * If the user expects the execobject.offset and
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_relocate_parse(struct i915_execbuffer *eb) · line 1845
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +0
-0@@ -1876,11 +1843,31 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; }
Add comments in generally about lock nesting of timeline mutexes.
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_relocate_parse(struct i915_execbuffer *eb) · line 1853
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +8
-0+#define for_each_batch_create_order (_eb, _i) \ + for (_i = 0; _i < _eb->num_batches; ++_i) +#define for_each_batch_add_order (_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = _eb->num_batches - 1; _i >= 0; --_i) + +static struct i915_request * +eb_find_first_request (struct i915_execbuffer *eb)
eb_find_first_request_added
Quoted 98 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +47
-12+{ +int i; + +for_each_batch_add_order (eb, i) +if (eb->requests[i]) +return eb->requests[i]; + +GEM_BUG_ON ("Request not found" ); + +return NULL ; +} +static int eb_move_to_gpu (struct i915_execbuffer *eb) {const unsigned int count = eb->buffer_count;unsigned int i = count; -int err =0 ; +int err =0 , j;while (i--) {struct eb_vma *ev = &eb->vma[i];@@ -1893,11 +1880,17 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)if (flags &EXEC_OBJECT_CAPTURE ) {struct i915_capture_list *capture; - capture =kmalloc (sizeof (*capture),GFP_KERNEL ); -if (capture) { - capture->next = eb->request->capture_list; - capture->vma = vma; - eb->request->capture_list = capture; +for_each_batch_create_order (eb, j) { +if (!eb->requests[j]) +break ; + + capture =kmalloc (sizeof (*capture),GFP_KERNEL ); +if (capture) { + capture->next = + eb->requests[j]->capture_list; + capture->vma = vma; + eb->requests[j]->capture_list = capture; + } } }@@ -1918,14 +1911,26 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) flags &= ~EXEC_OBJECT_ASYNC ; } +/* We only need to await on the first request */ if (err ==0 && !(flags &EXEC_OBJECT_ASYNC )) { err =i915_request_await_object - (eb->request, obj, flags &EXEC_OBJECT_WRITE ); + (eb_find_first_request (eb), obj, + flags &EXEC_OBJECT_WRITE ); } -if (err ==0 ) - err =i915_vma_move_to_active (vma, eb->request, - flags | __EXEC_OBJECT_NO_RESERVE); +for_each_batch_add_order (eb, j) { +if (err) +break ; +if (!eb->requests[j]) +continue ; + + err =_i915_vma_move_to_active (vma, eb->requests[j], + j ?NULL : + eb->composite_fence ? + eb->composite_fence : + &eb->requests[j]->fence, + flags | __EXEC_OBJECT_NO_RESERVE); + } }#ifdef CONFIG_MMU_NOTIFIER @@ -1956,11 +1961,16 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) goto err_skip;/* Unconditionally flush any chipset caches (for streaming writes). */ -intel_gt_chipset_flush (eb->engine->gt); +intel_gt_chipset_flush (eb->gt);return 0 ; err_skip: -i915_request_set_error_once (eb->request, err); +for_each_batch_create_order (eb, j) { +if (!eb->requests[j]) +break ; + +i915_request_set_error_once (eb->requests[j], err); + }return err; }@@ -2055,14 +2065,16 @@ static int eb_parse(struct i915_execbuffer *eb)int err;if (!eb_use_cmdparser (eb)) {
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_parse(struct i915_execbuffer *eb) · line 2075
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2
-2- batch =eb_dispatch_secure (eb, eb->batch->vma); + batch =eb_dispatch_secure (eb, eb->batches[0 ]->vma);if (IS_ERR (batch))return PTR_ERR (batch); goto secure_batch; } - len = eb->batch_len; +GEM_BUG_ON (intel_context_is_parallel (eb->context));
Return -EINVAL (or -ENODEV) rather than BUG_ON
Quoted 49 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +11
-9+ + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent @@ -2076,11 +2088,11 @@ static int eb_parse(struct i915_execbuffer *eb) }else { len +=I915_CMD_PARSER_TRAMPOLINE_SIZE ; } -if (unlikely (len < eb->batch_len))/* last paranoid check of overflow */ +if (unlikely (len < eb->batch_len[0 ]))/* last paranoid check of overflow */ return -EINVAL ;if (!pool) { - pool =intel_gt_get_buffer_pool (eb->engine->gt, len, + pool =intel_gt_get_buffer_pool (eb->gt, len,I915_MAP_WB );if (IS_ERR (pool))return PTR_ERR (pool);@@ -2105,7 +2117,7 @@ static int eb_parse(struct i915_execbuffer *eb) trampoline = shadow; shadow =shadow_batch_pin (eb, pool->obj, - &eb->engine->gt->ggtt->vm, + &eb->gt->ggtt->vm,PIN_GLOBAL );if (IS_ERR (shadow)) { err =PTR_ERR (shadow);@@ -2127,26 +2139,27 @@ static int eb_parse(struct i915_execbuffer *eb)if (err) goto err_trampoline; - err =intel_engine_cmd_parser (eb->engine, - eb->batch->vma, + err =intel_engine_cmd_parser (eb->context->engine, + eb->batches[0 ]->vma, eb->batch_start_offset, - eb->batch_len, + eb->batch_len[0 ], shadow, trampoline);if (err) goto err_unpin_batch; - eb->batch = &eb->vma[eb->buffer_count++]; - eb->batch->vma =i915_vma_get (shadow); - eb->batch->flags = __EXEC_OBJECT_HAS_PIN; + eb->batches[0 ] = &eb->vma[eb->buffer_count++]; + eb->batches[0 ]->vma =i915_vma_get (shadow); + eb->batches[0 ]->flags = __EXEC_OBJECT_HAS_PIN;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_parse(struct i915_execbuffer *eb) · line 2159
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1
-3eb->trampoline = trampoline; eb->batch_start_offset =0 ; secure_batch:if (batch) { - eb->batch = &eb->vma[eb->buffer_count++]; - eb->batch->flags = __EXEC_OBJECT_HAS_PIN; - eb->batch->vma =i915_vma_get (batch); +GEM_BUG_ON (intel_context_is_parallel (eb->context));
Same as above, no BUG_ON
Quoted 278 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +144
-47+ eb->batches[0 ] = &eb->vma[eb->buffer_count++]; + eb->batches[0 ]->flags = __EXEC_OBJECT_HAS_PIN; + eb->batches[0 ]->vma =i915_vma_get (batch); }return 0 ;@@ -2162,19 +2175,18 @@ static int eb_parse(struct i915_execbuffer *eb)return err; } -static int eb_submit (struct i915_execbuffer *eb,struct i915_vma *batch) +static int eb_request_submit (struct i915_execbuffer *eb, +struct i915_request *rq, +struct i915_vma *batch, +u64 batch_len) {int err; -if (intel_context_nopreempt (eb->context)) -__set_bit (I915_FENCE_FLAG_NOPREEMPT , &eb->request->fence.flags); - - err =eb_move_to_gpu (eb); -if (err) -return err; +if (intel_context_nopreempt (rq->context)) +__set_bit (I915_FENCE_FLAG_NOPREEMPT , &rq->fence.flags);if (eb->args->flags &I915_EXEC_GEN7_SOL_RESET ) { - err =i915_reset_gen7_sol_offsets (eb->request); + err =i915_reset_gen7_sol_offsets (rq);if (err)return err; }@@ -2185,26 +2197,26 @@ static int eb_submit(struct i915_execbuffer *eb, struct i915_vma *batch)* allows us to determine if the batch is still waiting on the GPU * or actually running by checking the breadcrumb. */ -if (eb->engine->emit_init_breadcrumb) { - err = eb->engine->emit_init_breadcrumb (eb->request); +if (rq->context->engine->emit_init_breadcrumb) { + err = rq->context->engine->emit_init_breadcrumb (rq);if (err)return err; } - err = eb->engine->emit_bb_start (eb->request, - batch->node.start + - eb->batch_start_offset, - eb->batch_len, - eb->batch_flags); + err = rq->context->engine->emit_bb_start (rq, + batch->node.start + + eb->batch_start_offset, + batch_len, + eb->batch_flags);if (err)return err;if (eb->trampoline) { +GEM_BUG_ON (intel_context_is_parallel (rq->context));GEM_BUG_ON (eb->batch_start_offset); - err = eb->engine->emit_bb_start (eb->request, - eb->trampoline->node.start + - eb->batch_len, -0 ,0 ); + err = rq->context->engine->emit_bb_start (rq, + eb->trampoline->node.start + + batch_len,0 ,0 );if (err)return err; }@@ -2212,6 +2224,27 @@ static int eb_submit(struct i915_execbuffer *eb, struct i915_vma *batch)return 0 ; } +static int eb_submit (struct i915_execbuffer *eb) +{ +unsigned int i; +int err; + + err =eb_move_to_gpu (eb); + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +trace_i915_request_queue (eb->requests[i], eb->batch_flags); +if (!err) + err =eb_request_submit (eb, eb->requests[i], + eb->batches[i]->vma, + eb->batch_len[i]); + } + +return err; +} +static int num_vcs_engines (const struct drm_i915_private *i915) {return hweight_long (VDBOX_MASK (&i915->gt));@@ -2277,26 +2310,11 @@ static struct i915_request *eb_throttle(struct i915_execbuffer *eb, struct intelreturn i915_request_get (rq); } -static struct i915_request *eb_pin_engine (struct i915_execbuffer *eb,bool throttle) +static int eb_pin_timeline (struct i915_execbuffer *eb,struct intel_context *ce, +bool throttle) { -struct intel_context *ce = eb->context;struct intel_timeline *tl; -struct i915_request *rq =NULL ; -int err; - -GEM_BUG_ON (eb->args->flags & __EXEC_ENGINE_PINNED); - -if (unlikely (intel_context_is_banned (ce))) -return ERR_PTR (-EIO ); - -/* -* Pinning the contexts may generate requests in order to acquire -* GGTT space, so do this first before we reserve a seqno for -* ourselves. -*/ - err =intel_context_pin_ww (ce, &eb->ww); -if (err) -return ERR_PTR (err); +struct i915_request *rq;/* * Take a local wakeref for preparing to dispatch the execbuf as @@ -2307,33 +2325,108 @@ static struct i915_request *eb_pin_engine(struct i915_execbuffer *eb, bool throt* taken on the engine, and the parent device. */ tl =intel_context_timeline_lock (ce); -if (IS_ERR (tl)) { -intel_context_unpin (ce); -return ERR_CAST (tl); - } +if (IS_ERR (tl)) +return PTR_ERR (tl);intel_context_enter (ce);if (throttle) rq =eb_throttle (eb, ce);intel_context_timeline_unlock (tl); +if (rq) { +bool nonblock = eb->file->filp->f_flags &O_NONBLOCK ; +long timeout = nonblock ?0 :MAX_SCHEDULE_TIMEOUT ; + +if (i915_request_wait (rq,I915_WAIT_INTERRUPTIBLE , + timeout) <0 ) { +i915_request_put (rq); + + tl =intel_context_timeline_lock (ce); +intel_context_exit (ce); +intel_context_timeline_unlock (tl); + +if (nonblock) +return -EWOULDBLOCK ; +else +return -EINTR ; + } +i915_request_put (rq); + } + +return 0 ; +} + +static int eb_pin_engine (struct i915_execbuffer *eb,bool throttle) +{ +struct intel_context *ce = eb->context, *child; +int err; +int i =0 , j =0 ; + +GEM_BUG_ON (eb->args->flags & __EXEC_ENGINE_PINNED); + +if (unlikely (intel_context_is_banned (ce))) +return -EIO ; + +/* +* Pinning the contexts may generate requests in order to acquire +* GGTT space, so do this first before we reserve a seqno for +* ourselves. +*/ + err =intel_context_pin_ww (ce, &eb->ww); +if (err) +return err; +for_each_child (ce, child) { + err =intel_context_pin_ww (child, &eb->ww); +GEM_BUG_ON (err);/* perma-pinned should incr a counter */ + } + +for_each_child (ce, child) { + err =eb_pin_timeline (eb, child, throttle); +if (err) + goto unwind; + ++i; + } + err =eb_pin_timeline (eb, ce, throttle); +if (err) + goto unwind; + eb->args->flags |= __EXEC_ENGINE_PINNED; -return rq; +return 0 ; + +unwind: +for_each_child (ce, child) { +if (j++ < i) { +mutex_lock (&child->timeline->mutex); +intel_context_exit (child); +mutex_unlock (&child->timeline->mutex); + } + } +for_each_child (ce, child) +intel_context_unpin (child); +intel_context_unpin (ce); +return err; }static void eb_unpin_engine (struct i915_execbuffer *eb) { -struct intel_context *ce = eb->context; -struct intel_timeline *tl = ce->timeline; +struct intel_context *ce = eb->context, *child;if (!(eb->args->flags & __EXEC_ENGINE_PINNED))return ; eb->args->flags &= ~__EXEC_ENGINE_PINNED; -mutex_lock (&tl->mutex); +for_each_child (ce, child) { +mutex_lock (&child->timeline->mutex); +intel_context_exit (child); +mutex_unlock (&child->timeline->mutex); + +intel_context_unpin (child); + } + +mutex_lock (&ce->timeline->mutex);intel_context_exit (ce); -mutex_unlock (&tl->mutex); +mutex_unlock (&ce->timeline->mutex);intel_context_unpin (ce); }@@ -2384,7 +2477,7 @@ eb_select_legacy_ring(struct i915_execbuffer *eb)static int eb_select_engine (struct i915_execbuffer *eb) { -struct intel_context *ce; +struct intel_context *ce, *child;unsigned int idx;int err;@@ -2397,6 +2490,20 @@ eb_select_engine(struct i915_execbuffer *eb)if (IS_ERR (ce))return PTR_ERR (ce); +if (intel_context_is_parallel (ce)) { +if (eb->buffer_count < ce->guc_number_children +1 ) { +intel_context_put (ce); +return -EINVAL ; + } +if (eb->batch_start_offset || eb->args->batch_len) { +intel_context_put (ce); +return -EINVAL ; + } + } + eb->num_batches = ce->guc_number_children +1 ; + +for_each_child (ce, child) +intel_context_get (child);intel_gt_pm_get (ce->engine->gt);if (!test_bit (CONTEXT_ALLOC_BIT , &ce->flags)) {
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c eb_select_engine(struct i915_execbuffer *eb) · line 2520
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +7
-0@@ -2404,6 +2511,13 @@ eb_select_engine(struct i915_execbuffer *eb)if (err) goto err; } +for_each_child (ce, child) { +if (!test_bit (CONTEXT_ALLOC_BIT , &child->flags)) { + err =intel_context_alloc_state (child); +if (err) + goto err; + } + }
Probably could delete this as this should be done when context is perma-pinned but harmless to leave so may leave it.
Quoted 67 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +13
-7/* * ABI: Before userspace accesses the GPU (e.g. execbuffer), report @@ -2414,7 +2528,7 @@ eb_select_engine(struct i915_execbuffer *eb) goto err; eb->context = ce; - eb->engine = ce->engine; + eb->gt = ce->engine->gt;/* * Make sure engine pool stays alive even if we call intel_context_put @@ -2425,6 +2539,8 @@ eb_select_engine(struct i915_execbuffer *eb) err:intel_gt_pm_put (ce->engine->gt); +for_each_child (ce, child) +intel_context_put (child);intel_context_put (ce);return err; }@@ -2432,7 +2548,11 @@ eb_select_engine(struct i915_execbuffer *eb)static void eb_put_engine (struct i915_execbuffer *eb) { -intel_gt_pm_put (eb->engine->gt); +struct intel_context *child; + +intel_gt_pm_put (eb->gt); +for_each_child (eb->context, child) +intel_context_put (child);intel_context_put (eb->context); }@@ -2655,7 +2775,8 @@ static void put_fence_array(struct eb_fence *fences, int num_fences) }static int -await_fence_array (struct i915_execbuffer *eb) +await_fence_array (struct i915_execbuffer *eb, +struct i915_request *rq) {unsigned int n;int err;@@ -2669,8 +2790,7 @@ await_fence_array(struct i915_execbuffer *eb)if (!eb->fences[n].dma_fence)continue ; - err =i915_request_await_dma_fence (eb->request, - eb->fences[n].dma_fence); + err =i915_request_await_dma_fence (rq, eb->fences[n].dma_fence);if (err <0 )return err; }@@ -2678,9 +2798,9 @@ await_fence_array(struct i915_execbuffer *eb)return 0 ; } -static void signal_fence_array (const struct i915_execbuffer *eb) +static void signal_fence_array (const struct i915_execbuffer *eb, +struct dma_fence *const fence) { -struct dma_fence *const fence = &eb->request->fence;unsigned int n;for (n =0 ; n < eb->num_fences; n++) {
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static void retire_requests(struct intel_timeline *tl, struct i915_request *end) · line 2851
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1
-1@@ -2728,12 +2848,12 @@ static void retire_requests(struct intel_timeline *tl, struct i915_request *end)break ; } -static int eb_request_add (struct i915_execbuffer *eb,int err) +static int eb_request_add (struct i915_execbuffer *eb,struct i915_request *rq)
static void
Matt
Quoted 507 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +222
-67{ -struct i915_request *rq = eb->request;struct intel_timeline *const tl =i915_request_timeline (rq);struct i915_sched_attr attr = {};struct i915_request *prev; +int err =0 ;lockdep_assert_held (&tl->mutex);lockdep_unpin_lock (&tl->mutex, rq->cookie);@@ -2745,11 +2865,6 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)/* Check that the context wasn't destroyed before submission */ if (likely (!intel_context_is_closed (eb->context))) { attr = eb->gem_context->sched; - }else { -/* Serialise with context_close via the add_to_timeline */ -i915_request_set_error_once (rq, -ENOENT ); -__i915_request_skip (rq); - err = -ENOENT ;/* override any transient errors */ }__i915_request_queue (rq, &attr);@@ -2763,6 +2878,44 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)return err; } +static int eb_requests_add (struct i915_execbuffer *eb,int err) +{ +int i; + +/* +* We iterate in reverse order of creation to release timeline mutexes in +* same order. +*/ +for_each_batch_add_order (eb, i) { +struct i915_request *rq = eb->requests[i]; + +if (!rq) +continue ; + +if (unlikely (intel_context_is_closed (eb->context))) { +/* Serialise with context_close via the add_to_timeline */ +i915_request_set_error_once (rq, -ENOENT ); +__i915_request_skip (rq); + err = -ENOENT ;/* override any transient errors */ + } + +if (intel_context_is_parallel (eb->context)) { +if (err) { +__i915_request_skip (rq); +set_bit (I915_FENCE_FLAG_SKIP_PARALLEL , + &rq->fence.flags); + } +if (i ==0 ) +set_bit (I915_FENCE_FLAG_SUBMIT_PARALLEL , + &rq->fence.flags); + } + + err |=eb_request_add (eb, rq); + } + +return err; +} +static const i915_user_extension_fn execbuf_extensions[] = { [DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES ] = parse_timeline_fences, };@@ -2789,6 +2942,166 @@ parse_execbuf2_extensions(struct drm_i915_gem_execbuffer2 *args, eb); } +static void eb_requests_get (struct i915_execbuffer *eb) +{ +unsigned int i; + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +i915_request_get (eb->requests[i]); + } +} + +static void eb_requests_put (struct i915_execbuffer *eb) +{ +unsigned int i; + +for_each_batch_create_order (eb, i) { +if (!eb->requests[i]) +break ; + +i915_request_put (eb->requests[i]); + } +} +static struct sync_file * +eb_composite_fence_create (struct i915_execbuffer *eb,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +struct dma_fence_array *fence_array; +struct dma_fence **fences; +unsigned int i; + +GEM_BUG_ON (!intel_context_is_parent (eb->context)); + + fences =kmalloc (eb->num_batches *sizeof (*fences),GFP_KERNEL ); +if (!fences) +return ERR_PTR (-ENOMEM ); + +for_each_batch_create_order (eb, i) + fences[i] = &eb->requests[i]->fence; + + fence_array =dma_fence_array_create (eb->num_batches, + fences, + eb->context->fence_context, + eb->context->seqno, + false); +if (!fence_array) { +kfree (fences); +return ERR_PTR (-ENOMEM ); + } + +/* Move ownership to the dma_fence_array created above */ +for_each_batch_create_order (eb, i) +dma_fence_get (fences[i]); + +if (out_fence_fd !=-1 ) { + out_fence =sync_file_create (&fence_array->base); +/* sync_file now owns fence_arry, drop creation ref */ +dma_fence_put (&fence_array->base); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + + eb->composite_fence = &fence_array->base; + +return out_fence; +} + +static struct intel_context * +eb_find_context (struct i915_execbuffer *eb,unsigned int context_number) +{ +struct intel_context *child; + +if (likely (context_number ==0 )) +return eb->context; + +for_each_child (eb->context, child) +if (!--context_number) +return child; + +GEM_BUG_ON ("Context not found" ); + +return NULL ; +} + +static struct sync_file * +eb_requests_create (struct i915_execbuffer *eb,struct dma_fence *in_fence, +int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +unsigned int i; +int err; + +for_each_batch_create_order (eb, i) { +bool first_request_to_add = i +1 == eb->num_batches; + +/* Allocate a request for this batch buffer nice and early. */ + eb->requests[i] =i915_request_create (eb_find_context (eb, i)); +if (IS_ERR (eb->requests[i])) { + eb->requests[i] =NULL ; +return ERR_PTR (PTR_ERR (eb->requests[i])); + } + +if (unlikely (eb->gem_context->syncobj && + first_request_to_add)) { +struct dma_fence *fence; + + fence =drm_syncobj_fence_get (eb->gem_context->syncobj); + err =i915_request_await_dma_fence (eb->requests[i], fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence && first_request_to_add) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (eb->requests[i], + in_fence); +else + err =i915_request_await_dma_fence (eb->requests[i], + in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences && first_request_to_add) { + err =await_fence_array (eb, eb->requests[i]); +if (err) +return ERR_PTR (err); + } + +if (first_request_to_add) { +if (intel_context_is_parallel (eb->context)) { + out_fence =eb_composite_fence_create (eb, out_fence_fd); +if (IS_ERR (out_fence)) +return ERR_PTR (-ENOMEM ); + }else if (out_fence_fd !=-1 ) { + out_fence =sync_file_create (&eb->requests[i]->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + } + +/* +* Whilst this request exists, batch_obj will be on the +* active_list, and so will hold the active reference. Only when +* this request is retired will the the batch_obj be moved onto +* the inactive_list and lose its active reference. Hence we do +* not need to explicitly hold another reference here. +*/ + eb->requests[i]->batch = eb->batches[i]->vma; +if (eb->batch_pool) { +GEM_BUG_ON (intel_context_is_parallel (eb->context)); +intel_gt_buffer_pool_mark_active (eb->batch_pool, + eb->requests[i]); + } + } + +return out_fence; +} + static int i915_gem_do_execbuffer(struct drm_device *dev, struct drm_file *file,@@ -2799,7 +3112,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,struct i915_execbuffer eb;struct dma_fence *in_fence =NULL ;struct sync_file *out_fence =NULL ; -struct i915_vma *batch;int out_fence_fd =-1 ;int err;@@ -2823,12 +3135,15 @@ i915_gem_do_execbuffer(struct drm_device *dev, eb.buffer_count = args->buffer_count; eb.batch_start_offset = args->batch_start_offset; - eb.batch_len = args->batch_len; eb.trampoline =NULL ; eb.fences =NULL ; eb.num_fences =0 ; +memset (eb.requests,0 ,sizeof (struct i915_request *) * +ARRAY_SIZE (eb.requests)); + eb.composite_fence =NULL ; + eb.batch_flags =0 ;if (args->flags &I915_EXEC_SECURE ) {if (GRAPHICS_VER (i915) >=11 )@@ -2912,70 +3227,25 @@ i915_gem_do_execbuffer(struct drm_device *dev,ww_acquire_done (&eb.ww.ctx); - batch = eb.batch->vma; - -/* Allocate a request for this batch buffer nice and early. */ - eb.request =i915_request_create (eb.context); -if (IS_ERR (eb.request)) { - err =PTR_ERR (eb.request); - goto err_vma; - } - -if (unlikely (eb.gem_context->syncobj)) { -struct dma_fence *fence; - - fence =drm_syncobj_fence_get (eb.gem_context->syncobj); - err =i915_request_await_dma_fence (eb.request, fence); -dma_fence_put (fence); -if (err) - goto err_ext; - } - -if (in_fence) { -if (args->flags &I915_EXEC_FENCE_SUBMIT ) - err =i915_request_await_execution (eb.request, - in_fence); -else - err =i915_request_await_dma_fence (eb.request, - in_fence); -if (err <0 ) - goto err_request; - } - -if (eb.fences) { - err =await_fence_array (&eb); -if (err) - goto err_request; - } - -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; + out_fence =eb_requests_create (&eb, in_fence, out_fence_fd); +if (IS_ERR (out_fence)) { + err =PTR_ERR (out_fence); +if (eb.requests[0 ]) goto err_request; - } +else + goto err_vma; } -/* -* Whilst this request exists, batch_obj will be on the -* active_list, and so will hold the active reference. Only when this -* request is retired will the the batch_obj be moved onto the -* inactive_list and lose its active reference. Hence we do not need -* to explicitly hold another reference here. -*/ - eb.request->batch = batch; -if (eb.batch_pool) -intel_gt_buffer_pool_mark_active (eb.batch_pool, eb.request); - -trace_i915_request_queue (eb.request, eb.batch_flags); - err =eb_submit (&eb, batch); + err =eb_submit (&eb); err_request: -i915_request_get (eb.request); - err =eb_request_add (&eb, err); +eb_requests_get (&eb); + err =eb_requests_add (&eb, err);if (eb.fences) -signal_fence_array (&eb); +signal_fence_array (&eb, eb.composite_fence ? + eb.composite_fence : + &eb.requests[0 ]->fence);if (out_fence) {if (err ==0 ) {@@ -2990,10 +3260,15 @@ i915_gem_do_execbuffer(struct drm_device *dev,if (unlikely (eb.gem_context->syncobj)) {drm_syncobj_replace_fence (eb.gem_context->syncobj, - &eb.request->fence); + eb.composite_fence ? + eb.composite_fence : + &eb.requests[0 ]->fence); } -i915_request_put (eb.request); +if (!out_fence && eb.composite_fence) +dma_fence_put (eb.composite_fence); + +eb_requests_put (&eb); err_vma:eb_release_vmas (&eb, true);drivers/gpu/drm/i915/gt/intel_context.h +7
-1@@ -237,7 +237,13 @@ intel_context_timeline_lock(struct intel_context *ce)struct intel_timeline *tl = ce->timeline;int err; - err =mutex_lock_interruptible (&tl->mutex); +if (intel_context_is_parent (ce)) + err =mutex_lock_interruptible_nested (&tl->mutex,0 ); +else if (intel_context_is_child (ce)) + err =mutex_lock_interruptible_nested (&tl->mutex, + ce->guc_child_index +1 ); +else + err =mutex_lock_interruptible (&tl->mutex);if (err)return ERR_PTR (err);drivers/gpu/drm/i915/gt/intel_context_types.h +12
-0@@ -261,6 +261,18 @@ struct intel_context {* context. */ struct i915_request *last_rq; + +/** +* @fence_context: fence context composite fence when doing +* parallel submission +*/ +u64 fence_context; + +/** +* @seqno: seqno for composite fence when doing parallel +* submission +*/ +u32 seqno; };#ifdef CONFIG_DRM_I915_SELFTEST drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -3034,6 +3034,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->fence_context =dma_fence_context_alloc (1 ); + parent->engine->emit_bb_start = emit_bb_start_parent_no_preempt_mid_batch; parent->engine->emit_fini_breadcrumb =drivers/gpu/drm/i915/i915_request.h +9
-0@@ -147,6 +147,15 @@ enum {* tail. */ I915_FENCE_FLAG_SUBMIT_PARALLEL , + +/* +* I915_FENCE_FLAG_SKIP_PARALLEL - request with a context in a +* parent-child relationship (parallel submission, multi-lrc) that +* hit an error while generating requests in the execbuf IOCTL. +* Indicates this request should be skipped as another request in +* submission / relationship encoutered an error. +*/ + I915_FENCE_FLAG_SKIP_PARALLEL, };/** drivers/gpu/drm/i915/i915_vma.c +13
-8@@ -1234,9 +1234,10 @@ int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request *rq)return i915_active_add_request (&vma->active, rq); } -int i915_vma_move_to_active (struct i915_vma *vma, -struct i915_request *rq, -unsigned int flags) +int _i915_vma_move_to_active (struct i915_vma *vma, +struct i915_request *rq, +struct dma_fence *fence, +unsigned int flags) {struct drm_i915_gem_object *obj = vma->obj;int err;@@ -1257,9 +1258,11 @@ int i915_vma_move_to_active(struct i915_vma *vma,intel_frontbuffer_put (front); } -dma_resv_add_excl_fence (vma->resv, &rq->fence); - obj->write_domain =I915_GEM_DOMAIN_RENDER ; - obj->read_domains =0 ; +if (fence) { +dma_resv_add_excl_fence (vma->resv, fence); + obj->write_domain =I915_GEM_DOMAIN_RENDER ; + obj->read_domains =0 ; + } }else {if (!(flags & __EXEC_OBJECT_NO_RESERVE)) { err =dma_resv_reserve_shared (vma->resv,1 );@@ -1267,8 +1270,10 @@ int i915_vma_move_to_active(struct i915_vma *vma,return err; } -dma_resv_add_shared_fence (vma->resv, &rq->fence); - obj->write_domain =0 ; +if (fence) { +dma_resv_add_shared_fence (vma->resv, fence); + obj->write_domain =0 ; + } }if (flags &EXEC_OBJECT_NEEDS_FENCE && vma->fence)drivers/gpu/drm/i915/i915_vma.h +10
-3@@ -57,9 +57,16 @@ static inline bool i915_vma_is_active(const struct i915_vma *vma)int __must_check __i915_vma_move_to_active (struct i915_vma *vma,struct i915_request *rq); -int __must_check i915_vma_move_to_active (struct i915_vma *vma, -struct i915_request *rq, -unsigned int flags); +int __must_check _i915_vma_move_to_active (struct i915_vma *vma, +struct i915_request *rq, +struct dma_fence *fence, +unsigned int flags); +static inline int __must_check +i915_vma_move_to_active (struct i915_vma *vma,struct i915_request *rq, +unsigned int flags) +{ +return _i915_vma_move_to_active (vma, rq, &rq->fence, flags); +}#define __i915_vma_flags (v) ((unsigned long *)&(v)->flags.counter)Signature · 1 line
2.32.0
PATCH 25/27 drm/i915/guc: Handle errors in multi-lrc requests
In reply to Matthew BrostIf an error occurs in the front end when multi-lrc requests are getting generated we need to skip these in the backend but we still need to emit the breadcrumbs seqno. An issues arrises because with multi-lrc breadcrumbs there is a handshake between the parent and children to make forwad progress. If all the requests are not present this handshake doesn't work. To work around this, if multi-lrc request has an error we skip the handshake but still emit the breadcrumbs seqno.
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +58 -3
@@ -3546,8 +3546,8 @@ static int emit_bb_start_child_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, -u32 *cs) +__emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;u8 i;
@@ -3575,6 +3575,41 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq,get_children_go_addr (ce), 0); +return cs; +} + +/* +* If this true, a submission of multi-lrc requests had an error and the +* requests need to be skipped. The front end (execuf IOCTL) should've called +* i915_request_skip which squashes the BB but we still need to emit the fini +* breadrcrumbs seqno write. At this point we don't know how many of the +* requests in the multi-lrc submission were generated so we can't do the +* handshake between the parent and children (e.g. if 4 requests should be +* generated but 2nd hit an error only 1 would be seen by the GuC backend). +* Simply skip the handshake, but still emit the breadcrumbd seqno, if an error +* has occurred on any of the requests in submission / relationship. +*/ +static inline bool skip_handshake (struct i915_request *rq) +{ +return test_bit (I915_FENCE_FLAG_SKIP_PARALLEL , &rq->fence.flags); +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +if (unlikely (skip_handshake (rq))) { +memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ; + }else { + cs =__emit_fini_breadcrumb_parent_no_preempt_mid_batch (rq, cs); + } +/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,
@@ -3591,7 +3626,8 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +__emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;
@@ -3617,6 +3653,25 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (ce->parent); *cs++ =0 ; +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +if (unlikely (skip_handshake (rq))) { +memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ; + }else { + cs =__emit_fini_breadcrumb_child_no_preempt_mid_batch (rq, cs); + } +/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,
Signature · 1 line
2.32.0
Re: [Intel-gfx] [PATCH 25/27] drm/i915/guc: Handle errors in multi-lrc requests
Quoted 3 lines · Matthew Brost
If an error occurs in the front end when multi-lrc requests are getting generated we need to skip these in the backend but we still need to emit the breadcrumbs seqno. An issues arrises because with multi-lrc
arrises -> arises
Quoted 2 lines
breadcrumbs there is a handshake between the parent and children to make forwad progress. If all the requests are not present this handshake
forwad -> forward
Quoted 48 lines
doesn't work. To work around this, if multi-lrc request has an error we skip the handshake but still emit the breadcrumbs seqno.
Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +23
-2@@ -3546,8 +3546,8 @@ static int emit_bb_start_child_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, -u32 *cs) +__emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;u8 i;@@ -3575,6 +3575,41 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq,get_children_go_addr (ce), 0); +return cs; +} + +/* +* If this true, a submission of multi-lrc requests had an error and the +* requests need to be skipped. The front end (execuf IOCTL) should've called +* i915_request_skip which squashes the BB but we still need to emit the fini +* breadrcrumbs seqno write. At this point we don't know how many of the +* requests in the multi-lrc submission were generated so we can't do the +* handshake between the parent and children (e.g. if 4 requests should be +* generated but 2nd hit an error only 1 would be seen by the GuC backend). +* Simply skip the handshake, but still emit the breadcrumbd seqno, if an error +* has occurred on any of the requests in submission / relationship. +*/ +static inline bool skip_handshake (struct i915_request *rq) +{ +return test_bit (I915_FENCE_FLAG_SKIP_PARALLEL , &rq->fence.flags); +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq,
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, · line 3608
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +if (unlikely (skip_handshake (rq))) { +memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ;
Why -6? There are 12 words about to be written. Indeed the value of emit_..._dw is '12 + 4*num_children'. This should only be skipping over the 4*children, right? As it stands, it will skip all but the last six words, then write an extra twelve words and thus overflow the reservation by six. Unless I am totally confused?
I assume there is some reason why the amount of data written must exactly match the space reserved? It's a while since I've looked at the ring buffer code!
Seems like it would be clearer to not split the semaphore writes out but have them right next to the skip code that is meant to replicate them but with no-ops.
Quoted 29 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +14
-1+ }else { + cs =__emit_fini_breadcrumb_parent_no_preempt_mid_batch (rq, cs); + } +/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,@@ -3591,7 +3626,8 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +__emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;@@ -3617,6 +3653,25 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (ce->parent); *cs++ =0 ; +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs · line 3673
Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10
-0+ +GEM_BUG_ON (!intel_context_is_child (ce)); + +if (unlikely (skip_handshake (rq))) { +memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ; + }else { + cs =__emit_fini_breadcrumb_child_no_preempt_mid_batch (rq, cs); + }
Same points as above - why -6 not -12 and would be clearer to keep the no-ops and the writes adjacent.
John.
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,
Re: [Intel-gfx] [PATCH 25/27] drm/i915/guc: Handle errors in multi-lrc requests
Quoted 6 lines · John Harrison
Quoted 3 lines · Matthew Brost
If an error occurs in the front end when multi-lrc requests are getting generated we need to skip these in the backend but we still need to emit the breadcrumbs seqno. An issues arrises because with multi-lrc
arrises -> arises
Yep.
Quoted 4 lines
Quoted 2 lines
breadcrumbs there is a handshake between the parent and children to make forwad progress. If all the requests are not present this handshake
forwad -> forward
Yep.
Quoted 53 lines
Quoted 53 lines
doesn't work. To work around this, if multi-lrc request has an error we skip the handshake but still emit the breadcrumbs seqno.
Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +30
-2@@ -3546,8 +3546,8 @@ static int emit_bb_start_child_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, -u32 *cs) +__emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;u8 i;@@ -3575,6 +3575,41 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq,get_children_go_addr (ce), 0); +return cs; +} + +/* +* If this true, a submission of multi-lrc requests had an error and the +* requests need to be skipped. The front end (execuf IOCTL) should've called +* i915_request_skip which squashes the BB but we still need to emit the fini +* breadrcrumbs seqno write. At this point we don't know how many of the +* requests in the multi-lrc submission were generated so we can't do the +* handshake between the parent and children (e.g. if 4 requests should be +* generated but 2nd hit an error only 1 would be seen by the GuC backend). +* Simply skip the handshake, but still emit the breadcrumbd seqno, if an error +* has occurred on any of the requests in submission / relationship. +*/ +static inline bool skip_handshake (struct i915_request *rq) +{ +return test_bit (I915_FENCE_FLAG_SKIP_PARALLEL , &rq->fence.flags); +} + +static u32 * +emit_fini_breadcrumb_parent_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_parent (ce)); + +if (unlikely (skip_handshake (rq))) {
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, · line 3608
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3
-0+memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ;Why -6? There are 12 words about to be written. Indeed the value of emit_..._dw is '12 + 4*num_children'. This should only be skipping over the 4*children, right? As it stands, it will skip all but the last six words, then write an extra twelve words and thus overflow the reservation by six. Unless I am totally confused?
Let me decode the length:
'Wait on children' (in __emit_fini_breadcrumb_parent_no_preempt_mid_batch) = 4 * num_children 'Turn on preemption' (in __emit_fini_breadcrumb_parent_no_preempt_mid_batch) = 2 'Tell children go' (in __emit_fini_breadcrumb_parent_no_preempt_mid_batch) = 4 'Emit fini breadcrumb' (in emit_fini_breadcrumb_child_no_preempt_mid_batch) = 4 'User interrupt' (in emit_fini_breadcrumb_child_no_preempt_mid_batch) = 2
So for a total (emit_fini_breadcrumb_dw) we have '12 + 4 * num_children'
We want skip everything in __emit_fini_breadcrumb_parent_no_preempt_mid_batch, so that is '6 + 4 * num_children' or 'emit_fini_breadcrumb_dw - 6'
Make sense?
Quoted 4 lines
I assume there is some reason why the amount of data written must exactly match the space reserved? It's a while since I've looked at the ring buffer code!
I think it because the ring space is reserved at request creation time but the fini breadcrumbs are not written until submission time.
Quoted 4 lines
Seems like it would be clearer to not split the semaphore writes out but have them right next to the skip code that is meant to replicate them but with no-ops.
I guess that works too, I personally like the way it is but if you insist I can change it.
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +18
-1+ }else { + cs =__emit_fini_breadcrumb_parent_no_preempt_mid_batch (rq, cs); + } +/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,@@ -3591,7 +3626,8 @@ emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, }static u32 * -emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq,u32 *cs) +__emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) {struct intel_context *ce = rq->context;@@ -3617,6 +3653,25 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (ce->parent); *cs++ =0 ; +return cs; +} + +static u32 * +emit_fini_breadcrumb_child_no_preempt_mid_batch (struct i915_request *rq, +u32 *cs) +{ +struct intel_context *ce = rq->context; + +GEM_BUG_ON (!intel_context_is_child (ce)); + +if (unlikely (skip_handshake (rq))) {
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs · line 3673
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +6
-0+memset (cs,0 ,sizeof (u32) * + (ce->engine->emit_fini_breadcrumb_dw -6 )); + cs += ce->engine->emit_fini_breadcrumb_dw -6 ; + }else { + cs =__emit_fini_breadcrumb_child_no_preempt_mid_batch (rq, cs); + }Same points as above - why -6 not -12 and would be clearer to keep the no-ops and the writes adjacent.
Same as above we are NOP the length of __emit_fini_breadcrumb_child_no_preempt_mid_batch and still want the emit breadcrumbs below.
Matt
Quoted 7 lines
John.
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+/* Emit fini breadcrumb */ cs = gen8_emit_ggtt_write(cs, rq->fence.seqno,
PATCH 26/27 drm/i915: Enable multi-bb execbuf
In reply to Matthew BrostEnable multi-bb execbuf by enabling the set_parallel extension.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +0 -3
@@ -536,9 +536,6 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base,struct intel_engine_cs **siblings =NULL ;intel_engine_mask_t prev_mask; -/* Disabling for now */ -return -ENODEV ; -if (!(intel_uc_uses_guc_submission (&i915->gt.uc)))return -ENODEV ;
Signature · 1 line
2.32.0
PATCH 27/27 drm/i915/execlists: Weak parallel submission support for execlists
In reply to Matthew BrostA weak implementation of parallel submission (multi-bb execbuf IOCTL) for execlists. Basically doing as little as possible to support this interface for execlists - basically just passing submit fences between each request generated and virtual engines are not allowed. This is on par with what is there for the existing (hopefully soon deprecated) bonding interface.
We perma-pin these execlists contexts to align with GuC implementation.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 9 ++- drivers/gpu/drm/i915/gt/intel_context.c | 4 +- .../drm/i915/gt/intel_execlists_submission.c | 57 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_lrc.c | 2 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 - 5 files changed, 65 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +6 -3
@@ -536,9 +536,6 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base,struct intel_engine_cs **siblings =NULL ;intel_engine_mask_t prev_mask; -if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) -return -ENODEV ; -if (get_user (slot, &ext->engine_index))return -EFAULT ;
@@ -548,6 +545,12 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base,if (get_user (num_siblings, &ext->num_siblings))return -EFAULT ; +if (!intel_uc_uses_guc_submission (&i915->gt.uc) && num_siblings !=1 ) { +drm_dbg (&i915->drm,"Only 1 sibling (%d) supported in non-GuC mode\n" , + num_siblings); +return -EINVAL ; + } +if (slot >= set->num_engines) {drm_dbg (&i915->drm,"Invalid placement value, %d >= %d\n" , slot, set->num_engines);
drivers/gpu/drm/i915/gt/intel_context.c +2 -2
@@ -79,7 +79,8 @@ static int intel_context_active_acquire(struct intel_context *ce)__i915_active_acquire (&ce->active); -if (intel_context_is_barrier (ce) ||intel_engine_uses_guc (ce->engine)) +if (intel_context_is_barrier (ce) ||intel_engine_uses_guc (ce->engine) || +intel_context_is_parallel (ce))return 0 ;/* Preallocate tracking nodes */
@@ -554,7 +555,6 @@ void intel_context_bind_parent_child(struct intel_context *parent,* Callers responsibility to validate that this function is used * correctly but we use GEM_BUG_ON here ensure that they do. */ -GEM_BUG_ON (!intel_engine_uses_guc (parent->engine));GEM_BUG_ON (intel_context_is_pinned (parent));GEM_BUG_ON (intel_context_is_child (parent));GEM_BUG_ON (intel_context_is_pinned (child));
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +55 -2
75 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_lrc.c +2 -0
@@ -983,6 +983,8 @@ lrc_pin(struct intel_context *ce,void lrc_unpin (struct intel_context *ce) { +if (unlikely (ce->last_rq)) +i915_request_put (ce->last_rq);check_redzone ((void *)ce->lrc_reg_state -LRC_STATE_OFFSET , ce->engine); }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +0 -2
@@ -2901,8 +2901,6 @@ static void guc_parent_context_unpin(struct intel_context *ce)GEM_BUG_ON (!intel_context_is_parent (ce));GEM_BUG_ON (!intel_engine_is_virtual (ce->engine)); -if (ce->last_rq) -i915_request_put (ce->last_rq);unpin_guc_id (guc, ce);lrc_unpin (ce); }
Signature · 1 line
2.32.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev3)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev3)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
77206ddfd7e8 drm/i915/guc: Squash Clean up GuC CI failures, simplify locking, and kernel DOC
-:1400: WARNING:BRACES: braces {} are not necessary for single statement blocks
#1400: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:1491:
+ if (unlikely(ret == -ENODEV)) {
ret = 0; /* Will get registered later */
}-:2274: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #2274:
new file mode 100644
total: 0 errors, 2 warnings, 0 checks, 2619 lines checked 4a9a78aa06a7 drm/i915/guc: Allow flexible number of context ids ce904de73b0d drm/i915/guc: Connect the number of guc_ids to debugfs 48e7785b7cb4 drm/i915/guc: Take GT PM ref when deregistering context -:87: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #87: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:
+#define with_intel_gt_pm(gt, tmp) \
+ for (tmp = 1, intel_gt_pm_get(gt); tmp; \
+ intel_gt_pm_put(gt), tmp = 0)
-:87: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #87: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:
+#define with_intel_gt_pm(gt, tmp) \
+ for (tmp = 1, intel_gt_pm_get(gt); tmp; \
+ intel_gt_pm_put(gt), tmp = 0)
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:47:
+#define with_intel_gt_pm_async(gt, tmp) \
+ for (tmp = 1, intel_gt_pm_get(gt); tmp; \
+ intel_gt_pm_put_async(gt), tmp = 0)
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:47:
+#define with_intel_gt_pm_async(gt, tmp) \
+ for (tmp = 1, intel_gt_pm_get(gt); tmp; \
+ intel_gt_pm_put_async(gt), tmp = 0)
-:93: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #93: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:50:
+#define with_intel_gt_pm_if_awake(gt, tmp) \
+ for (tmp = intel_gt_pm_get_if_awake(gt); tmp; \
+ intel_gt_pm_put(gt), tmp = 0)
-:93: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #93: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:50:
+#define with_intel_gt_pm_if_awake(gt, tmp) \
+ for (tmp = intel_gt_pm_get_if_awake(gt); tmp; \
+ intel_gt_pm_put(gt), tmp = 0)
-:96: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #96: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:53:
+#define with_intel_gt_pm_if_awake_async(gt, tmp) \
+ for (tmp = intel_gt_pm_get_if_awake(gt); tmp; \
+ intel_gt_pm_put_async(gt), tmp = 0)
-:96: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #96: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:53:
+#define with_intel_gt_pm_if_awake_async(gt, tmp) \
+ for (tmp = intel_gt_pm_get_if_awake(gt); tmp; \
+ intel_gt_pm_put_async(gt), tmp = 0)
total: 0 errors, 0 warnings, 8 checks, 552 lines checked08b1d791ac1a drm/i915: Add GT PM unpark worker
-:71: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #71:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 213 lines checkede0617461e1ec drm/i915/guc: Take engine PM when a context is pinned with GuC submission cb16e92153bb drm/i915/guc: Don't call switch_to_kernel_context with GuC submission 0222d44e38b8 drm/i915: Add logical engine mappingb398df972aaa drm/i915: Expose logical engine instance to user 02d0b3f0499f drm/i915/guc: Introduce context parent-child relationship -:105: ERROR:CODE_INDENT: code indent should use tabs where possible #105: FILE: drivers/gpu/drm/i915/gt/intel_context.h:62:
+ if (intel_context_is_child(ce)) {$
-:105: WARNING:LEADING_SPACE: please, no spaces at the start of a line #105: FILE: drivers/gpu/drm/i915/gt/intel_context.h:62:
+ if (intel_context_is_child(ce)) {$
-:113: ERROR:CODE_INDENT: code indent should use tabs where possible #113: FILE: drivers/gpu/drm/i915/gt/intel_context.h:70:
+ GEM_BUG_ON(!intel_context_is_pinned(ce->parent));$
-:113: WARNING:LEADING_SPACE: please, no spaces at the start of a line #113: FILE: drivers/gpu/drm/i915/gt/intel_context.h:70:
+ GEM_BUG_ON(!intel_context_is_pinned(ce->parent));$
-:115: ERROR:CODE_INDENT: code indent should use tabs where possible #115: FILE: drivers/gpu/drm/i915/gt/intel_context.h:72:
+ return ce->parent;$
-:115: WARNING:LEADING_SPACE: please, no spaces at the start of a line #115: FILE: drivers/gpu/drm/i915/gt/intel_context.h:72:
+ return ce->parent;$
-:116: ERROR:CODE_INDENT: code indent should use tabs where possible #116: FILE: drivers/gpu/drm/i915/gt/intel_context.h:73:
+ } else {$
-:116: WARNING:LEADING_SPACE: please, no spaces at the start of a line #116: FILE: drivers/gpu/drm/i915/gt/intel_context.h:73:
+ } else {$
-:117: ERROR:CODE_INDENT: code indent should use tabs where possible #117: FILE: drivers/gpu/drm/i915/gt/intel_context.h:74:
+ return ce;$
-:117: WARNING:LEADING_SPACE: please, no spaces at the start of a line #117: FILE: drivers/gpu/drm/i915/gt/intel_context.h:74:
+ return ce;$
-:118: ERROR:CODE_INDENT: code indent should use tabs where possible #118: FILE: drivers/gpu/drm/i915/gt/intel_context.h:75:
+ }$
-:118: WARNING:LEADING_SPACE: please, no spaces at the start of a line #118: FILE: drivers/gpu/drm/i915/gt/intel_context.h:75:
+ }$
-:144: WARNING:REPEATED_WORD: Possible repeated word: 'of' #144: FILE: drivers/gpu/drm/i915/gt/intel_context_types.h:220:
+ * @guc_child_list: parent's list of of children
total: 6 errors, 7 warnings, 0 checks, 125 lines checked bff8a93386b8 drm/i915/guc: Implement parallel context pin / unpin functions 2b3d3ef5cb7c drm/i915/guc: Add multi-lrc context registration -:20: CHECK:LINE_SPACING: Please don't use multiple blank lines #20: FILE: drivers/gpu/drm/i915/gt/intel_context_types.h:235:
+
total: 0 errors, 0 warnings, 1 checks, 192 lines checkedf671cf6be29a drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts 4397e2c32688 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids -:19: WARNING:TYPO_SPELLING: 'Explictly' may be misspelled - perhaps 'Explicitly'? #19:
- Explictly state why we assign consecutive guc_ids
^^^^^^^^^
-:58: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'guc' - possible side-effects? #58: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:136:
+#define NUMBER_MULTI_LRC_GUC_ID(guc) \
+ ((guc)->submission_state.num_guc_ids / 16 > 32 ? \
+ (guc)->submission_state.num_guc_ids / 16 : 32)
total: 0 errors, 1 warnings, 1 checks, 195 lines checked 279b43791c6d drm/i915/guc: Implement multi-lrc submission -:236: ERROR:SPACING: spaces required around that '=' (ctx:VxW) #236: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:655:
+ guc->stalled_request= rq;
^
-:330: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV) #330: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:753:
+ *wqi++ = child->ring->tail / sizeof(u64);
^
total: 1 errors, 0 warnings, 1 checks, 545 lines checkedf0eaf349580b drm/i915/guc: Insert submit fences between requests in parent-child relationship d20a9f8066d0 drm/i915/guc: Implement multi-lrc reset28a6b590e69c drm/i915/guc: Update debugfs for GuC multi-lrc
-:19: CHECK:LINE_SPACING: Please don't use multiple blank lines
#19: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3676:
+
total: 0 errors, 0 warnings, 1 checks, 65 lines checkedf3e9fcd665da drm/i915: Fix bug in user proto-context creation that leaked contexts 24d24d71c346 drm/i915/guc: Connect UAPI to GuC multi-lrc interfaced7635607ca11 drm/i915/doc: Update parallel submit doc to point to i915_drm.h -:12: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #12:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 checks, 10 lines checked166ae35845ec drm/i915/guc: Add basic GuC multi-lrc selftest
-:21: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #21:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 191 lines checked2f8c2ac84f38 drm/i915/guc: Implement no mid batch preemption for multi-lrc1deecbc917a6 drm/i915: Multi-BB execbuf
-:340: CHECK:MACRO_ARG_PRECEDENCE: Macro argument '_eb' may be better as '(_eb)' to avoid precedence issues #340: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1846:
+#define for_each_batch_create_order(_eb, _i) \
+ for (_i = 0; _i < _eb->num_batches; ++_i)
-:340: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #340: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1846:
+#define for_each_batch_create_order(_eb, _i) \
+ for (_i = 0; _i < _eb->num_batches; ++_i)
-:342: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #342: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1848:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = _eb->num_batches - 1; _i >= 0; --_i)
-:342: CHECK:MACRO_ARG_PRECEDENCE: Macro argument '_eb' may be better as '(_eb)' to avoid precedence issues #342: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1848:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = _eb->num_batches - 1; _i >= 0; --_i)
-:342: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #342: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1848:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = _eb->num_batches - 1; _i >= 0; --_i)
-:905: WARNING:BLOCK_COMMENT_STYLE: Block comments should align the * on each line #905: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2886:
+ /*
+ * We iterate in reverse order of creation to release timeline mutexes in
-:968: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #968: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2968:
+}
+static struct sync_file *
-:978: WARNING:ALLOC_WITH_MULTIPLY: Prefer kmalloc_array over kmalloc with multiply #978: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2978:
+ fences = kmalloc(eb->num_batches * sizeof(*fences), GFP_KERNEL);
-:1090: WARNING:REPEATED_WORD: Possible repeated word: 'the' #1090: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:3090:
+ * this request is retired will the the batch_obj be moved onto
total: 1 errors, 3 warnings, 5 checks, 1275 lines checked 41dc4f27399e drm/i915/guc: Handle errors in multi-lrc requests 668649e1b343 drm/i915: Enable multi-bb execbuf17b0d07e7aec drm/i915/execlists: Weak parallel submission support for execlists -:112: WARNING:BRACES: braces {} are not necessary for any arm of this statement #112: FILE: drivers/gpu/drm/i915/gt/intel_execlists_submission.c:2627:
+ if (i == 0) {
[...]
+ } else {
[...]
total: 0 errors, 1 warnings, 0 checks, 128 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Parallel submission aka multi-bb execbuf (rev3)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev3)
URL : https://patchwork.freedesktop.org/series/92789/
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/display/intel_display.c:1902:21: expected struct i915_vma *[assigned] vma +drivers/gpu/drm/i915/display/intel_display.c:1902:21: got void [noderef] __iomem *[assigned] iomem +drivers/gpu/drm/i915/display/intel_display.c:1902:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gem/i915_gem_context.c:1418:26: expected struct i915_gem_engines *e +drivers/gpu/drm/i915/gem/i915_gem_context.c:1418:26: got struct i915_gem_engines [noderef] __rcu *engines +drivers/gpu/drm/i915/gem/i915_gem_context.c:1418:26: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:619:21: warning: Using plain integer as NULL pointer +drivers/gpu/drm/i915/gt/intel_reset.c:1392:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/intel_ring_submission.c:1268:24: warning: Using plain integer as NULL pointer +drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:1496:6: warning: symbol 'need_tasklet' was not declared. Should it be static? +drivers/gpu/drm/i915/i915_perf.c:1442:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1496:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/intel_wakeref.c:142:19: warning: context imbalance in 'wakeref_auto_timeout' - unexpected unlock +drivers/gpu/drm/i915/selftests/i915_syncmap.c:80:54: warning: dubious: x | !y +./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080) +./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +./include/linux/stddef.h:17:9: this was the original definition +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined +/usr/lib/gcc/x86_64-linux-gnu/8/include/stddef.h:417:9: warning: preprocessor token offsetof redefined
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Parallel submission aka multi-bb execbuf (rev3)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev3)
URL : https://patchwork.freedesktop.org/series/92789/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10505 -> Patchwork_20861
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20861 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20861, 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_20861/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20861:
### IGT changes ###
#### Possible regressions ####
* igt@gem_close_race@basic-threads:
- fi-skl-guc: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-skl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-skl-guc/igt@[email protected]
- fi-kbl-7567u: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-kbl-7567u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-7567u/igt@[email protected]
- fi-kbl-7500u: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-kbl-7500u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-7500u/igt@[email protected]
* igt@gem_exec_gttfill@basic:
- fi-icl-y: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-icl-y/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-icl-y/igt@[email protected]
- fi-bdw-5557u: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-bdw-5557u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-bdw-5557u/igt@[email protected]
- fi-rkl-11600: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-rkl-11600/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-rkl-11600/igt@[email protected]
- fi-icl-u2: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-icl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-icl-u2/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [DMESG-WARN][15]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-tgl-1115g4/igt@[email protected]
* igt@gem_render_tiled_blits@basic:
- fi-ivb-3770: [PASS][16] -> [FAIL][17] +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-ivb-3770/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-ivb-3770/igt@[email protected]
- fi-hsw-4770: [PASS][18] -> [FAIL][19] +2 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-hsw-4770/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-hsw-4770/igt@[email protected]
* igt@runner@aborted:
- fi-rkl-11600: NOTRUN -> [FAIL][20]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-rkl-11600/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_gttfill@basic:
- {fi-ehl-2}: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-ehl-2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-ehl-2/igt@[email protected]
- {fi-jsl-1}: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-jsl-1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-jsl-1/igt@[email protected]
- {fi-tgl-dsi}: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-tgl-dsi/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-tgl-dsi/igt@[email protected]
* igt@gem_render_tiled_blits@basic:
- {fi-hsw-gt1}: [PASS][27] -> [FAIL][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-hsw-gt1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-hsw-gt1/igt@[email protected]
* igt@runner@aborted:
- {fi-jsl-1}: NOTRUN -> [FAIL][29]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-jsl-1/igt@[email protected]
- {fi-ehl-2}: NOTRUN -> [FAIL][30]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-ehl-2/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_10505 and Patchwork_20861:
### New IGT tests (2) ###
* igt@i915_selftest@live@guc:
- Statuses : 15 pass(s)
- Exec time: [0.51, 5.15] s
* igt@i915_selftest@live@guc_multi_lrc:
- Statuses : 15 pass(s)
- Exec time: [0.47, 5.22] s
Known issues
------------
Here are the changes found in Patchwork_20861 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-rkl-guc: NOTRUN -> [SKIP][31] ([fdo#109315]) +17 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-rkl-guc/igt@amdgpu/[email protected]
* igt@debugfs_test@read_all_entries:
- fi-tgl-1115g4: NOTRUN -> [DMESG-WARN][32] ([i915#4002])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-tgl-1115g4/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_gttfill@basic:
- fi-cfl-8109u: [PASS][33] -> [DMESG-WARN][34] ([i915#1610])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-cfl-8109u/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-8109u/igt@[email protected]
- fi-kbl-8809g: [PASS][35] -> [DMESG-WARN][36] ([i915#1610])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-kbl-8809g/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-8809g/igt@[email protected]
- fi-kbl-guc: [PASS][37] -> [DMESG-WARN][38] ([i915#1610])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-kbl-guc/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-guc/igt@[email protected]
- fi-cml-u2: [PASS][39] -> [DMESG-WARN][40] ([i915#1610])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-cml-u2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cml-u2/igt@[email protected]
- fi-cfl-8700k: [PASS][41] -> [DMESG-WARN][42] ([i915#1610])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-cfl-8700k/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-8700k/igt@[email protected]
- fi-apl-guc: [PASS][43] -> [DMESG-WARN][44] ([i915#1610])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-apl-guc/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-apl-guc/igt@[email protected]
- fi-cfl-guc: [PASS][45] -> [DMESG-WARN][46] ([i915#1610])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-cfl-guc/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-guc/igt@[email protected]
- fi-skl-6700k2: [PASS][47] -> [DMESG-WARN][48] ([i915#1610])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-skl-6700k2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-skl-6700k2/igt@[email protected]
* igt@runner@aborted:
- fi-cfl-8700k: NOTRUN -> [FAIL][49] ([i915#2426] / [i915#3363])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-8700k/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [FAIL][50] ([i915#2426] / [i915#3363])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-8109u/igt@[email protected]
- fi-icl-u2: NOTRUN -> [FAIL][51] ([i915#2426] / [i915#3363] / [i915#3690])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-icl-u2/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][52] ([i915#2426])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-bdw-5557u/igt@[email protected]
- fi-kbl-7500u: NOTRUN -> [FAIL][53] ([i915#2722] / [i915#3363])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-7500u/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][54] ([i915#2426] / [i915#3363])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-guc/igt@[email protected]
- fi-cml-u2: NOTRUN -> [FAIL][55] ([i915#2082] / [i915#2426] / [i915#3363])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cml-u2/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [FAIL][56] ([i915#3690])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-tgl-1115g4/igt@[email protected]
- fi-cfl-guc: NOTRUN -> [FAIL][57] ([i915#2426] / [i915#3363])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-cfl-guc/igt@[email protected]
- fi-icl-y: NOTRUN -> [FAIL][58] ([i915#3690])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-icl-y/igt@[email protected]
- fi-kbl-7567u: NOTRUN -> [FAIL][59] ([i915#2722] / [i915#3363])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-7567u/igt@[email protected]
- fi-skl-guc: NOTRUN -> [FAIL][60] ([i915#2722] / [i915#3363])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-skl-guc/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][61] ([i915#2426] / [i915#3363])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-skl-6700k2/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@workarounds:
- fi-rkl-guc: [INCOMPLETE][62] ([i915#3920]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-rkl-guc/igt@i915_selftest@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-rkl-guc/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][64] ([i915#180] / [i915#3363]) -> [FAIL][65] ([i915#2426] / [i915#3363])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10505/fi-kbl-8809g/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/fi-kbl-8809g/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#2082]: https://gitlab.freedesktop.org/drm/intel/issues/2082
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2932]: https://gitlab.freedesktop.org/drm/intel/issues/2932
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#3920]: https://gitlab.freedesktop.org/drm/intel/issues/3920
[i915#4002]: https://gitlab.freedesktop.org/drm/intel/issues/4002
Participating hosts (40 -> 36)
------------------------------
Additional (1): fi-tgl-1115g4
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan bat-jsl-1 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10505 -> Patchwork_20861
CI-20190529: 20190529
CI_DRM_10505: 7c36ed237585ed2f645439e62dafccac070d5e33 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6181: e7a9ab2f21a67b1ab3f4093ec0bd775647308ba6 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20861: 17b0d07e7aecf1b25b5386d7c461d6b8ab861fb3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
17b0d07e7aec drm/i915/execlists: Weak parallel submission support for execlists 668649e1b343 drm/i915: Enable multi-bb execbuf41dc4f27399e drm/i915/guc: Handle errors in multi-lrc requests1deecbc917a6 drm/i915: Multi-BB execbuf2f8c2ac84f38 drm/i915/guc: Implement no mid batch preemption for multi-lrc 166ae35845ec drm/i915/guc: Add basic GuC multi-lrc selftestd7635607ca11 drm/i915/doc: Update parallel submit doc to point to i915_drm.h 24d24d71c346 drm/i915/guc: Connect UAPI to GuC multi-lrc interface f3e9fcd665da drm/i915: Fix bug in user proto-context creation that leaked contexts 28a6b590e69c drm/i915/guc: Update debugfs for GuC multi-lrcd20a9f8066d0 drm/i915/guc: Implement multi-lrc resetf0eaf349580b drm/i915/guc: Insert submit fences between requests in parent-child relationship 279b43791c6d drm/i915/guc: Implement multi-lrc submission4397e2c32688 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids f671cf6be29a drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts 2b3d3ef5cb7c drm/i915/guc: Add multi-lrc context registrationbff8a93386b8 drm/i915/guc: Implement parallel context pin / unpin functions 02d0b3f0499f drm/i915/guc: Introduce context parent-child relationship b398df972aaa drm/i915: Expose logical engine instance to user0222d44e38b8 drm/i915: Add logical engine mappingcb16e92153bb drm/i915/guc: Don't call switch_to_kernel_context with GuC submission e0617461e1ec drm/i915/guc: Take engine PM when a context is pinned with GuC submission 08b1d791ac1a drm/i915: Add GT PM unpark worker48e7785b7cb4 drm/i915/guc: Take GT PM ref when deregistering context ce904de73b0d drm/i915/guc: Connect the number of guc_ids to debugfs 4a9a78aa06a7 drm/i915/guc: Allow flexible number of context ids77206ddfd7e8 drm/i915/guc: Squash Clean up GuC CI failures, simplify locking, and kernel DOC
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20861/index.html