Parallel submission aka multi-bb execbuf
Subsystems (4)
kernel test robot
build botRe: [Intel-gfx] [PATCH 21/26] 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-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master airlied/drm-next v5.15-rc3 next-20210922] [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/20211005-061424 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: i386-randconfig-a004-20211004 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project c0039de2953d15815448b4b3c3bafb45607781e0)
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/758202922dad66c1b302eb34a141961acbefe417
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/20211005-061424 git checkout 758202922dad66c1b302eb34a141961acbefe417
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=i386
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:2361:6: warning: variable 'rq' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
if (throttle)
^~~~~~~~
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2365:6: note: uninitialized use occurs here
if (rq) {
^~
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2361:2: note: remove the 'if' if its condition is always true
if (throttle)
^~~~~~~~~~~~~
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2346:25: note: initialize the variable 'rq' to silence this warning
struct i915_request *rq;
^
= NULL1 warning generated.
vim +2361 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
e5dadff4b09376 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-15 2341
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2342 static int eb_pin_timeline(struct i915_execbuffer *eb, struct intel_context *ce,
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2343 bool throttle)
8f2a1057d6ec21 drivers/gpu/drm/i915/i915_gem_execbuffer.c Chris Wilson 2019-04-25 2344 {
e5dadff4b09376 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-15 2345 struct intel_timeline *tl;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2346 struct i915_request *rq;
8f2a1057d6ec21 drivers/gpu/drm/i915/i915_gem_execbuffer.c Chris Wilson 2019-04-25 2347
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2348 /*
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2349 * Take a local wakeref for preparing to dispatch the execbuf as
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2350 * we expect to access the hardware fairly frequently in the
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2351 * process, and require the engine to be kept awake between accesses.
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2352 * Upon dispatch, we acquire another prolonged wakeref that we hold
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2353 * until the timeline is idle, which in turn releases the wakeref
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2354 * taken on the engine, and the parent device.
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2355 */
e5dadff4b09376 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-15 2356 tl = intel_context_timeline_lock(ce);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2357 if (IS_ERR(tl))
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2358 return PTR_ERR(tl);
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2359
a4e57f9031ccd5 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-04 2360 intel_context_enter(ce);
2bf541ff6d06f4 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Maarten Lankhorst 2020-08-19 @2361 if (throttle)
2bf541ff6d06f4 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Maarten Lankhorst 2020-08-19 2362 rq = eb_throttle(eb, ce);
e5dadff4b09376 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-15 2363 intel_context_timeline_unlock(tl);
e5dadff4b09376 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Chris Wilson 2019-08-15 2364
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2365 if (rq) {
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2366 bool nonblock = eb->file->filp->f_flags & O_NONBLOCK;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2367 long timeout = nonblock ? 0 : MAX_SCHEDULE_TIMEOUT;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2368
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2369 if (i915_request_wait(rq, I915_WAIT_INTERRUPTIBLE,
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2370 timeout) < 0) {
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2371 i915_request_put(rq);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2372
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2373 tl = intel_context_timeline_lock(ce);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2374 intel_context_exit(ce);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2375 intel_context_timeline_unlock(tl);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2376
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2377 if (nonblock)
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2378 return -EWOULDBLOCK;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2379 else
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2380 return -EINTR;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2381 }
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2382 i915_request_put(rq);
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2383 }
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2384
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2385 return 0;
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2386 }
758202922dad66 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Matthew Brost 2021-10-04 2387 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Re: [Intel-gfx] [PATCH 21/26] drm/i915: Multi-BB execbuf
In reply to Matthew BrostQuoted 151 lines · Matthew Brost
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 create all the requests, a loop to submit (emit BB start, etc...) all the requests, a loop to tie the requests to the VMAs they touch, and finally a loop to commit the requests to the backend.
A composite fence is also created for the generated requests to return to the user and to stick in dma resv slots.
No behavior from the existing IOCTL should be changed aside from when throttling because the ring for a context is full, wait on the request while holding the object locks.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: https://github.com/intel/media-driver/pull/1252v2:
(Matthew Brost)
- Return proper error value ifi915_request_createfails
v3:
(John Harrison)
- Add comment explaining create / add order loops + locking
- Update commit message explaining different in IOCTL behavior
- Line wrap some comments
-eb_add_requestreturns void
- Return-EINVALrather triggeringBUG_ONif cmd parser used
(Checkpatch)
- Check eb->batch_len[*current_batch]Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 793 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 10 + .../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, 599 insertions(+), 257 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +38
-12@@ -244,17 +244,25 @@ 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 */ +/** our requests to build */ +struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ]; +/** identity of the batch obj/vma */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];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 +289,8 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];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 +308,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 +552,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 +593,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,
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c eb_add_vma(struct i915_execbuffer *eb, · line 621
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +10
-0+ 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;
else eb->batch_len[*current_batch] = eb->args->batch_len;
The fix should resolve the BAT CI issues as seen in below trybot series:
https://patchwork.freedesktop.org/series/95436/
Matt
Quoted 1,264 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +500
-233+if (unlikely (eb->batch_len[*current_batch] ==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 +771,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;@@ -839,9 +875,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);@@ -861,7 +895,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);@@ -884,26 +920,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:@@ -1636,8 +1652,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;@@ -1653,21 +1668,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. * @@ -1694,28 +1694,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) {@@ -1779,46 +1772,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;@@ -1858,7 +1828,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 @@ -1872,11 +1842,40 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; } +/* +* Using two helper loops for the order of which requests / batches are created +* and added the to backend. Requests are created in order from the parent to +* the last child. Requests are add in the reverse order, from the last child to +* parent. This is down from locking reasons as the timeline lock is acquired +* during request creation and released when the request is added to the +* backend. To make lockdep happy (see intel_context_timeline_lock) this must be +* the ordering. +*/ +#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_added (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];@@ -1889,11 +1888,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; + } } }@@ -1914,14 +1919,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_added (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 @@ -1952,11 +1969,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; }@@ -2051,14 +2073,17 @@ 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; +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent @@ -2072,11 +2097,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);@@ -2101,7 +2126,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);@@ -2123,26 +2148,29 @@ 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); +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + 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 ;@@ -2158,19 +2186,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; }@@ -2181,26 +2208,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; }@@ -2208,6 +2235,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));@@ -2273,26 +2321,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 @@ -2303,33 +2336,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); }@@ -2380,7 +2488,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;@@ -2393,6 +2501,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->parallel.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->parallel.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)) {@@ -2400,6 +2522,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 @@ -2410,7 +2539,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 @@ -2421,6 +2550,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; }@@ -2428,7 +2559,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); }@@ -2651,7 +2786,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;@@ -2665,8 +2801,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; }@@ -2674,9 +2809,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++) {@@ -2724,9 +2859,8 @@ 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 void 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;@@ -2741,11 +2875,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);@@ -2755,6 +2884,42 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)retire_requests (tl, prev);mutex_unlock (&tl->mutex); +} + +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); + } + +eb_request_add (eb, rq); + }return err; }@@ -2785,6 +2950,182 @@ 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_array (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->parallel.fence_context, + eb->context->parallel.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 sync_file * +eb_fences_add (struct i915_execbuffer *eb,struct i915_request *rq, +struct dma_fence *in_fence,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +int err; + +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 (rq, fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (rq, in_fence); +else + err =i915_request_await_dma_fence (rq, in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences) { + err =await_fence_array (eb, rq); +if (err) +return ERR_PTR (err); + } + +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 (&rq->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + +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; + +for_each_batch_create_order (eb, i) { +/* 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])) { + out_fence =ERR_PTR (PTR_ERR (eb->requests[i])); + eb->requests[i] =NULL ; +return out_fence; + } + +/* +* Only the first request added (committed to backend) has to +* take the in fences into account as all subsequent requests +* will have fences inserted inbetween them. +*/ +if (i +1 == eb->num_batches) { + out_fence =eb_fences_add (eb, eb->requests[i], + in_fence, out_fence_fd); +if (IS_ERR (out_fence)) +return out_fence; + } + +/* +* 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 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,@@ -2795,7 +3136,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;@@ -2819,12 +3159,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 )@@ -2908,70 +3251,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) + 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; } -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; - goto err_request; - } - } - -/* -* 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 ) {@@ -2986,10 +3284,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@@ -239,7 +239,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->parallel.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 +10
-0@@ -248,6 +248,16 @@ 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;/** @number_children: number of children if parent */ u8 number_children;/** @child_index: index into child_list if child */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -3094,6 +3094,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->parallel.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
Re: [Intel-gfx] [PATCH 21/26] drm/i915: Multi-BB execbuf
In reply to Matthew BrostQuoted 916 lines · Matthew Brost
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 create all the requests, a loop to submit (emit BB start, etc...) all the requests, a loop to tie the requests to the VMAs they touch, and finally a loop to commit the requests to the backend.
A composite fence is also created for the generated requests to return to the user and to stick in dma resv slots.
No behavior from the existing IOCTL should be changed aside from when throttling because the ring for a context is full, wait on the request while holding the object locks.
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: https://github.com/intel/media-driver/pull/1252v2:
(Matthew Brost)
- Return proper error value ifi915_request_createfails
v3:
(John Harrison)
- Add comment explaining create / add order loops + locking
- Update commit message explaining different in IOCTL behavior
- Line wrap some comments
-eb_add_requestreturns void
- Return-EINVALrather triggeringBUG_ONif cmd parser used
(Checkpatch)
- Check eb->batch_len[*current_batch]Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 793 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 10 + .../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, 599 insertions(+), 257 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +313
-179@@ -244,17 +244,25 @@ 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 */ +/** our requests to build */ +struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ]; +/** identity of the batch obj/vma */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];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 +289,8 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];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 +308,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 +552,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 +593,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[*current_batch] ==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 +771,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;@@ -839,9 +875,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);@@ -861,7 +895,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);@@ -884,26 +920,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:@@ -1636,8 +1652,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;@@ -1653,21 +1668,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. * @@ -1694,28 +1694,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) {@@ -1779,46 +1772,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;@@ -1858,7 +1828,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 @@ -1872,11 +1842,40 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; } +/* +* Using two helper loops for the order of which requests / batches are created +* and added the to backend. Requests are created in order from the parent to +* the last child. Requests are add in the reverse order, from the last child to +* parent. This is down from locking reasons as the timeline lock is acquired +* during request creation and released when the request is added to the +* backend. To make lockdep happy (see intel_context_timeline_lock) this must be +* the ordering. +*/ +#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_added (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];@@ -1889,11 +1888,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; + } } }@@ -1914,14 +1919,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_added (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 @@ -1952,11 +1969,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; }@@ -2051,14 +2073,17 @@ 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; +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent @@ -2072,11 +2097,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);@@ -2101,7 +2126,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);@@ -2123,26 +2148,29 @@ 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); +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + 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 ;@@ -2158,19 +2186,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; }@@ -2181,26 +2208,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; }@@ -2208,6 +2235,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));@@ -2273,26 +2321,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 @@ -2303,33 +2336,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); }@@ -2380,7 +2488,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;@@ -2393,6 +2501,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->parallel.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->parallel.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)) {@@ -2400,6 +2522,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 @@ -2410,7 +2539,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 @@ -2421,6 +2550,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; }@@ -2428,7 +2559,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); }@@ -2651,7 +2786,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;@@ -2665,8 +2801,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; }@@ -2674,9 +2809,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++) {@@ -2724,9 +2859,8 @@ 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 void 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;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_request_add(struct i915_execbuffer *eb, int err) · line 2878
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +0
-5@@ -2741,11 +2875,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 */ }
Moving this appears to be wrong too as this blows up if the __i915_request_skip is done before the __i915_request_commit. The right solution appears be to keep this code as is and pull the parallel check codd into this function.
The below shown in below CI run:
https://intel-gfx-ci.01.org/tree/drm-tip/Trybot_8041/shard-iclb6/igt@[email protected]
Matt
Quoted 500 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +235
-61__i915_request_queue (rq, &attr);@@ -2755,6 +2884,42 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)retire_requests (tl, prev);mutex_unlock (&tl->mutex); +} + +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); + } + +eb_request_add (eb, rq); + }return err; }@@ -2785,6 +2950,182 @@ 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_array (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->parallel.fence_context, + eb->context->parallel.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 sync_file * +eb_fences_add (struct i915_execbuffer *eb,struct i915_request *rq, +struct dma_fence *in_fence,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +int err; + +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 (rq, fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (rq, in_fence); +else + err =i915_request_await_dma_fence (rq, in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences) { + err =await_fence_array (eb, rq); +if (err) +return ERR_PTR (err); + } + +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 (&rq->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + +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; + +for_each_batch_create_order (eb, i) { +/* 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])) { + out_fence =ERR_PTR (PTR_ERR (eb->requests[i])); + eb->requests[i] =NULL ; +return out_fence; + } + +/* +* Only the first request added (committed to backend) has to +* take the in fences into account as all subsequent requests +* will have fences inserted inbetween them. +*/ +if (i +1 == eb->num_batches) { + out_fence =eb_fences_add (eb, eb->requests[i], + in_fence, out_fence_fd); +if (IS_ERR (out_fence)) +return out_fence; + } + +/* +* 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 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,@@ -2795,7 +3136,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;@@ -2819,12 +3159,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 )@@ -2908,70 +3251,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) + 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; } -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; - goto err_request; - } - } - -/* -* 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 ) {@@ -2986,10 +3284,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@@ -239,7 +239,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->parallel.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 +10
-0@@ -248,6 +248,16 @@ 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;/** @number_children: number of children if parent */ u8 number_children;/** @child_index: index into child_list if child */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -3094,6 +3094,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->parallel.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
Re: [PATCH 21/26] drm/i915: Multi-BB execbuf
In reply to Matthew BrostQuoted 10 lines · Matthew Brost
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 create all the requests, a loop to submit (emit BB start, etc...) all the requests, a loop to tie the requests to the VMAs they touch, and finally a loop to commit the requests to the backend.
Quoted 5 lines
A composite fence is also created for the generated requests to return to the user and to stick in dma resv slots.
No behavior from the existing IOCTL should be changed aside from when throttling because the ring for a context is full, wait on the request
throttling because the ring for -> throttling the ring because
full, wait -> full. In this situation, i915 will now wait
Quoted 1 line
while holding the object locks.
, previously it would have dropped the locks for the wait.
And maybe explain why this change is necessary?
Quoted 344 lines
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: https://github.com/intel/media-driver/pull/1252v2:
(Matthew Brost)
- Return proper error value ifi915_request_createfails
v3:
(John Harrison)
- Add comment explaining create / add order loops + locking
- Update commit message explaining different in IOCTL behavior
- Line wrap some comments
-eb_add_requestreturns void
- Return-EINVALrather triggeringBUG_ONif cmd parser used
(Checkpatch)
- Check eb->batch_len[*current_batch]Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 793 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 10 + .../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, 599 insertions(+), 257 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +67
-97@@ -244,17 +244,25 @@ 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 */ +/** our requests to build */ +struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ]; +/** identity of the batch obj/vma */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];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 +289,8 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];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 +308,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 +552,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 +593,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[*current_batch] ==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 +771,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;@@ -839,9 +875,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);@@ -861,7 +895,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);@@ -884,26 +920,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:@@ -1636,8 +1652,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;@@ -1653,21 +1668,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. * @@ -1694,28 +1694,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) {@@ -1779,46 +1772,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;@@ -1858,7 +1828,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 1849
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +5
-0@@ -1872,11 +1842,40 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)return err; } +/* +* Using two helper loops for the order of which requests / batches are created +* and added the to backend. Requests are created in order from the parent to +* the last child. Requests are add in the reverse order, from the last child to +* parent. This is down from locking reasons as the timeline lock is acquired
down from -> done for
John.
Quoted 1,054 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +476
-148+* during request creation and released when the request is added to the +* backend. To make lockdep happy (see intel_context_timeline_lock) this must be +* the ordering. +*/ +#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_added (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];@@ -1889,11 +1888,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; + } } }@@ -1914,14 +1919,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_added (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 @@ -1952,11 +1969,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; }@@ -2051,14 +2073,17 @@ 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; +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent @@ -2072,11 +2097,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);@@ -2101,7 +2126,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);@@ -2123,26 +2148,29 @@ 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); +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + 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 ;@@ -2158,19 +2186,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; }@@ -2181,26 +2208,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; }@@ -2208,6 +2235,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));@@ -2273,26 +2321,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 @@ -2303,33 +2336,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); }@@ -2380,7 +2488,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;@@ -2393,6 +2501,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->parallel.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->parallel.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)) {@@ -2400,6 +2522,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 @@ -2410,7 +2539,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 @@ -2421,6 +2550,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; }@@ -2428,7 +2559,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); }@@ -2651,7 +2786,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;@@ -2665,8 +2801,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; }@@ -2674,9 +2809,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++) {@@ -2724,9 +2859,8 @@ 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 void 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;@@ -2741,11 +2875,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);@@ -2755,6 +2884,42 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)retire_requests (tl, prev);mutex_unlock (&tl->mutex); +} + +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); + } + +eb_request_add (eb, rq); + }return err; }@@ -2785,6 +2950,182 @@ 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_array (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->parallel.fence_context, + eb->context->parallel.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 sync_file * +eb_fences_add (struct i915_execbuffer *eb,struct i915_request *rq, +struct dma_fence *in_fence,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +int err; + +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 (rq, fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (rq, in_fence); +else + err =i915_request_await_dma_fence (rq, in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences) { + err =await_fence_array (eb, rq); +if (err) +return ERR_PTR (err); + } + +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 (&rq->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + +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; + +for_each_batch_create_order (eb, i) { +/* 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])) { + out_fence =ERR_PTR (PTR_ERR (eb->requests[i])); + eb->requests[i] =NULL ; +return out_fence; + } + +/* +* Only the first request added (committed to backend) has to +* take the in fences into account as all subsequent requests +* will have fences inserted inbetween them. +*/ +if (i +1 == eb->num_batches) { + out_fence =eb_fences_add (eb, eb->requests[i], + in_fence, out_fence_fd); +if (IS_ERR (out_fence)) +return out_fence; + } + +/* +* 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 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,@@ -2795,7 +3136,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;@@ -2819,12 +3159,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 )@@ -2908,70 +3251,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) + 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; } -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; - goto err_request; - } - } - -/* -* 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 ) {@@ -2986,10 +3284,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@@ -239,7 +239,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->parallel.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 +10
-0@@ -248,6 +248,16 @@ 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;/** @number_children: number of children if parent */ u8 number_children;/** @child_index: index into child_list if child */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -3094,6 +3094,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->parallel.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)
Re: [PATCH 21/26] drm/i915: Multi-BB execbuf
Quoted 11 lines · John Harrison
Quoted 10 lines · Matthew Brost
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 create all the requests, a loop to submit (emit BB start, etc...) all the requests, a loop to tie the requests to the VMAs they touch, and finally a loop to commit the requests to the backend.
Quoted 9 lines
Quoted 5 lines
A composite fence is also created for the generated requests to return to the user and to stick in dma resv slots.
No behavior from the existing IOCTL should be changed aside from when throttling because the ring for a context is full, wait on the request
throttling because the ring for -> throttling the ring because
full, wait -> full. In this situation, i915 will now wait
Yep.
Quoted 5 lines
Quoted 1 line
while holding the object locks.
, previously it would have dropped the locks for the wait.
And maybe explain why this change is necessary?
We could drop the lock but it would make the code way more complicated and IMO simpler code far out weighs the potential benefit of dropping the lock. The dropping of the lock probably was a premature optimization that landed in the code without any data backing it up that it helped in any meaningful way. I can add a comment stating this.
Quoted 310 lines
Quoted 310 lines
IGT: https://patchwork.freedesktop.org/patch/447008/?series=93071&rev=1
media UMD: https://github.com/intel/media-driver/pull/1252v2:
(Matthew Brost)
- Return proper error value ifi915_request_createfails
v3:
(John Harrison)
- Add comment explaining create / add order loops + locking
- Update commit message explaining different in IOCTL behavior
- Line wrap some comments
-eb_add_requestreturns void
- Return-EINVALrather triggeringBUG_ONif cmd parser used
(Checkpatch)
- Check eb->batch_len[*current_batch]Signed-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 793 ++++++++++++------ drivers/gpu/drm/i915/gt/intel_context.h | 8 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 10 + .../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, 599 insertions(+), 257 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +67
-97@@ -244,17 +244,25 @@ 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 */ +/** our requests to build */ +struct i915_request *requests[MAX_ENGINE_INSTANCE +1 ]; +/** identity of the batch obj/vma */ +struct eb_vma *batches[MAX_ENGINE_INSTANCE +1 ];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 +289,8 @@ struct i915_execbuffer {u64 invalid_flags;/** Set of execobj.flags that are invalid */ -u64 batch_len;/** Length of batch within object */ +/** Length of batch within object */ +u64 batch_len[MAX_ENGINE_INSTANCE +1 ];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 +308,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 +552,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 +593,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[*current_batch] ==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 +771,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;@@ -839,9 +875,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);@@ -861,7 +895,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);@@ -884,26 +920,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:@@ -1636,8 +1652,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;@@ -1653,21 +1668,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. * @@ -1694,28 +1694,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) {@@ -1779,46 +1772,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;@@ -1858,7 +1828,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 @@ -1872,11 +1842,40 @@ static int eb_relocate_parse(struct i915_execbuffer *eb)
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static int eb_relocate_parse(struct i915_execbuffer *eb) · line 1849
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +5
-0return err; } +/* +* Using two helper loops for the order of which requests / batches are created +* and added the to backend. Requests are created in order from the parent to +* the last child. Requests are add in the reverse order, from the last child to +* parent. This is down from locking reasons as the timeline lock is acquired down from -> done for
Yep.
Matt
Quoted 982 lines
John.
Quoted 979 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +476
-148+* during request creation and released when the request is added to the +* backend. To make lockdep happy (see intel_context_timeline_lock) this must be +* the ordering. +*/ +#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_added (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];@@ -1889,11 +1888,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; + } } }@@ -1914,14 +1919,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_added (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 @@ -1952,11 +1969,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; }@@ -2051,14 +2073,17 @@ 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; +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + len = eb->batch_len[0 ];if (!CMDPARSER_USES_GGTT (eb->i915)) {/* * ppGTT backed shadow buffers must be mapped RO, to prevent @@ -2072,11 +2097,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);@@ -2101,7 +2126,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);@@ -2123,26 +2148,29 @@ 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); +if (intel_context_is_parallel (eb->context)) +return -EINVAL ; + + 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 ;@@ -2158,19 +2186,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; }@@ -2181,26 +2208,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; }@@ -2208,6 +2235,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));@@ -2273,26 +2321,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 @@ -2303,33 +2336,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); }@@ -2380,7 +2488,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;@@ -2393,6 +2501,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->parallel.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->parallel.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)) {@@ -2400,6 +2522,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 @@ -2410,7 +2539,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 @@ -2421,6 +2550,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; }@@ -2428,7 +2559,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); }@@ -2651,7 +2786,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;@@ -2665,8 +2801,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; }@@ -2674,9 +2809,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++) {@@ -2724,9 +2859,8 @@ 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 void 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;@@ -2741,11 +2875,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);@@ -2755,6 +2884,42 @@ static int eb_request_add(struct i915_execbuffer *eb, int err)retire_requests (tl, prev);mutex_unlock (&tl->mutex); +} + +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); + } + +eb_request_add (eb, rq); + }return err; }@@ -2785,6 +2950,182 @@ 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_array (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->parallel.fence_context, + eb->context->parallel.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 sync_file * +eb_fences_add (struct i915_execbuffer *eb,struct i915_request *rq, +struct dma_fence *in_fence,int out_fence_fd) +{ +struct sync_file *out_fence =NULL ; +int err; + +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 (rq, fence); +dma_fence_put (fence); +if (err) +return ERR_PTR (err); + } + +if (in_fence) { +if (eb->args->flags &I915_EXEC_FENCE_SUBMIT ) + err =i915_request_await_execution (rq, in_fence); +else + err =i915_request_await_dma_fence (rq, in_fence); +if (err <0 ) +return ERR_PTR (err); + } + +if (eb->fences) { + err =await_fence_array (eb, rq); +if (err) +return ERR_PTR (err); + } + +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 (&rq->fence); +if (!out_fence) +return ERR_PTR (-ENOMEM ); + } + +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; + +for_each_batch_create_order (eb, i) { +/* 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])) { + out_fence =ERR_PTR (PTR_ERR (eb->requests[i])); + eb->requests[i] =NULL ; +return out_fence; + } + +/* +* Only the first request added (committed to backend) has to +* take the in fences into account as all subsequent requests +* will have fences inserted inbetween them. +*/ +if (i +1 == eb->num_batches) { + out_fence =eb_fences_add (eb, eb->requests[i], + in_fence, out_fence_fd); +if (IS_ERR (out_fence)) +return out_fence; + } + +/* +* 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 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,@@ -2795,7 +3136,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;@@ -2819,12 +3159,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 )@@ -2908,70 +3251,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) + 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; } -if (out_fence_fd !=-1 ) { - out_fence =sync_file_create (&eb.request->fence); -if (!out_fence) { - err = -ENOMEM ; - goto err_request; - } - } - -/* -* 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 ) {@@ -2986,10 +3284,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@@ -239,7 +239,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->parallel.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 +10
-0@@ -248,6 +248,16 @@ 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;/** @number_children: number of children if parent */ u8 number_children;/** @child_index: index into child_list if child */ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2
-0@@ -3094,6 +3094,8 @@ guc_create_parallel(struct intel_engine_cs **engines, } } + parent->parallel.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)
PATCH 22/26 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 arises because with multi-lrc breadcrumbs there is a handshake between the parent and children to make forward 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.
v2:
(John Harrison)
- Add comment explaining the skipping of the handshake logic
- Fix typos in the commit message
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 71 ++++++++++++++++++- 1 file changed, 68 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +68 -3
@@ -4072,8 +4072,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;
@@ -4101,6 +4101,46 @@ 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))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_parent_no_preempt_mid_batch, the -6 +* comes of the length emission below. +*/ +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,
@@ -4117,7 +4157,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;struct intel_context *parent =intel_context_to_parent (ce);
@@ -4144,6 +4185,30 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (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))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_child_no_preempt_mid_batch, the -6 +* comes from the length the emission below. +*/ +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: [PATCH 22/26] drm/i915/guc: Handle errors in multi-lrc requests
Quoted 58 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 arises because with multi-lrc breadcrumbs there is a handshake between the parent and children to make forward 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.
v2:
(John Harrison)
- Add comment explaining the skipping of the handshake logic
- Fix typos in the commit messageSigned-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 71 ++++++++++++++++++- 1 file changed, 68 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +23
-2@@ -4072,8 +4072,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;@@ -4101,6 +4101,46 @@ 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 4134
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))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_parent_no_preempt_mid_batch, the -6
The line wrapping makes this look confusing. It seems like the function name should fit on the line before. Even if it is a few characters over (although the limit is now 100 not 80, I think), the checkpatch warning is worth the readability of the code.
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, · line 4135
Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+* comes of the length emission below.
-> comes from the length of the emits below.
John.
Quoted 52 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +34
-1+*/ +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,@@ -4117,7 +4157,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;struct intel_context *parent =intel_context_to_parent (ce);@@ -4144,6 +4185,30 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (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))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_child_no_preempt_mid_batch, the -6 +* comes from the length the emission below. +*/ +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,
Re: [PATCH 22/26] drm/i915/guc: Handle errors in multi-lrc requests
Quoted 63 lines · John Harrison
Quoted 62 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 arises because with multi-lrc breadcrumbs there is a handshake between the parent and children to make forward 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.
v2:
(John Harrison)
- Add comment explaining the skipping of the handshake logic
- Fix typos in the commit messageSigned-off-by Matthew Brost <[email protected]>--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 71 ++++++++++++++++++- 1 file changed, 68 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +29
-2@@ -4072,8 +4072,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;@@ -4101,6 +4101,46 @@ 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)); +
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 4134
Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4
-0+if (unlikely (skip_handshake (rq))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_parent_no_preempt_mid_batch, the -6 The line wrapping makes this look confusing. It seems like the function name should fit on the line before. Even if it is a few characters over (although the limit is now 100 not 80, I think), the checkpatch warning is worth the readability of the code.
My vi setting wrap everything as 80 but agree it would be more readable if __emit_fini_breadcrumb_parent_no_preempt_mid_batch was on the previous line.
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c emit_fini_breadcrumb_parent_no_preempt_mid_batch(struct i915_request *rq, · line 4135
Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1
-0+* comes of the length emission below. -> comes from the length of the emits below.
Sure. Will fix.
Matt
Quoted 53 lines
John.
Quoted 50 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +34
-1+*/ +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,@@ -4117,7 +4157,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;struct intel_context *parent =intel_context_to_parent (ce);@@ -4144,6 +4185,30 @@ emit_fini_breadcrumb_child_no_preempt_mid_batch(struct i915_request *rq, u32 *cs *cs++ =get_children_go_addr (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))) { +/* +* NOP everything in +* __emit_fini_breadcrumb_child_no_preempt_mid_batch, the -6 +* comes from the length the emission below. +*/ +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,
PATCH 23/26 drm/i915: Make request conflict tracking understand parallel submits
In reply to Matthew BrostIf an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand this by comparing the parents parallel fence values and skipping the conflict insertion if the values match.
--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_request.c +29 -14
@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +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 bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to)) +return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)
@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);
@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;
@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
Signature · 1 line
2.32.0
Re: [PATCH 23/26] drm/i915: Make request conflict tracking understand parallel submits
Quoted 4 lines · Matthew Brost
If an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand
ordering already -> ordering is already
Quoted 1 line
this by comparing the parents parallel fence values and skipping the
parents -> parent's
Quoted 1 line
conflict insertion if the values match.
Presumably, this is to cope with the fact that the parallel submit fences do not look like regular submission fences. And hence the existing code that says 'new fence belongs to same context as old fence, so safe to ignore' does not work with parallel submission. However, this change does not appear to be adding parallel submit support to an existing 'same context' check. It seems to be a brand new check that does not exist for single submission. What makes parallel submit different? If we aren't skipping same context fences for single submits, why do we need it for parallel? Conversely, if we need it for parallel then why don't we need it for single?
And if the single submission version is simply somewhere else in the code, why do the parallel version here instead of at the same place?
John.
Quoted 18 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_request.c +4
-0@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +static inline bool is_parallel_rq (struct i915_request *rq) +{ +return intel_context_is_parallel (rq->context); +}
drivers/gpu/drm/i915/i915_request.c i915_request_await_external(struct i915_request *rq, struct dma_fence *fence) · line 1341
Quoted 10 lines
drivers/gpu/drm/i915/i915_request.c +10
-0+ +static inline struct intel_context *request_to_parent (struct i915_request *rq) +{ +return intel_context_to_parent (rq->context); +} + +static bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to))
Should this not say '&& is_parallel_rq(from)'?
Quoted 58 lines
drivers/gpu/drm/i915/i915_request.c +15
-14+return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
Re: [PATCH 23/26] drm/i915: Make request conflict tracking understand parallel submits
Quoted 7 lines · John Harrison
Quoted 4 lines · Matthew Brost
If an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand
ordering already -> ordering is already
Yep.
Quoted 3 lines
Quoted 1 line
this by comparing the parents parallel fence values and skipping the
parents -> parent's
Yep.
Quoted 5 lines
Quoted 1 line
conflict insertion if the values match.
Presumably, this is to cope with the fact that the parallel submit fences do not look like regular submission fences. And hence the existing code that says 'new fence belongs to same context as old fence, so safe to ignore' does not work with parallel submission. However, this change does not appear
Yes. The check for 'if (fence->context == rq->fence.context)' doesn't work with parallel submission as each rq->fence.context corresponds to a timeline. With parallel submission each intel_context in the parallel submit has its own timeline (seqno) so the compare fails for different intel_context within the same parallel submit. This is the reason for the additional compare on parallel submits parents, if they have the same parent it is the same parallel submission and there is no need to enforce additional ordering.
Quoted 6 lines
to be adding parallel submit support to an existing 'same context' check. It seems to be a brand new check that does not exist for single submission. What makes parallel submit different? If we aren't skipping same context fences for single submits, why do we need it for parallel? Conversely, if we need it for parallel then why don't we need it for single?
I'm confused by what you are asking here. The existing same context check is fine for parallel submits - it will just return true when we compare requests with the same intel_context and new additional check only true parallel submissions with the same parent.
Quoted 3 lines
And if the single submission version is simply somewhere else in the code, why do the parallel version here instead of at the same place?
Again I'm confused by what you are asking. We might just need to sync on a quick call.
Matt
Quoted 86 lines
John.
Quoted 17 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_request.c +4
-0@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +static inline bool is_parallel_rq (struct i915_request *rq) +{ +return intel_context_is_parallel (rq->context); +}drivers/gpu/drm/i915/i915_request.c i915_request_await_external(struct i915_request *rq, struct dma_fence *fence) · line 1340
Quoted 10 lines
drivers/gpu/drm/i915/i915_request.c +10
-0+ +static inline struct intel_context *request_to_parent (struct i915_request *rq) +{ +return intel_context_to_parent (rq->context); +} + +static bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to))Should this not say '&&
is_parallel_rq(from)'?Quoted 54 lines
drivers/gpu/drm/i915/i915_request.c +15
-14+return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
Re: [PATCH 23/26] drm/i915: Make request conflict tracking understand parallel submits
Quoted 40 lines · Matthew Brost
Quoted 7 lines · John Harrison
Quoted 4 lines · Matthew Brost
If an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand
ordering already -> ordering is already
Yep.
Quoted 3 lines
Quoted 1 line
this by comparing the parents parallel fence values and skipping the
parents -> parent's
Yep.
Quoted 5 lines
Quoted 1 line
conflict insertion if the values match.
Presumably, this is to cope with the fact that the parallel submit fences do not look like regular submission fences. And hence the existing code that says 'new fence belongs to same context as old fence, so safe to ignore' does not work with parallel submission. However, this change does not appear
Yes. The check for 'if (
fence->context==rq->fence.context)' doesn't work with parallel submission as eachrq->fence.contextcorresponds to a timeline. With parallel submission eachintel_contextin the parallel submit has its own timeline (seqno) so the compare fails for differentintel_contextwithin the same parallel submit. This is the reason for the additional compare on parallel submits parents, if they have the same parent it is the same parallel submission and there is no need to enforce additional ordering.Quoted 6 lines
to be adding parallel submit support to an existing 'same context' check. It seems to be a brand new check that does not exist for single submission. What makes parallel submit different? If we aren't skipping same context fences for single submits, why do we need it for parallel? Conversely, if we need it for parallel then why don't we need it for single?
I'm confused by what you are asking here. The existing same context check is fine for parallel submits - it will just return true when we compare requests with the same
intel_contextand new additional check only true parallel submissions with the same parent.
Quoted 5 lines
Quoted 3 lines
And if the single submission version is simply somewhere else in the code, why do the parallel version here instead of at the same place?
Again I'm confused by what you are asking. We might just need to sync on a quick call.
That's okay. I think I had partly confused myself ;).
I was just meaning that the parallel compliant version of the 'ctxtA == ctxtB -> skip' test should be coded adjacent to the single submission version of the same test. I had somehow completely missed that the single submission version is indeed the line above in i915_request_await_execution(). So the two are indeed very definitely next to each other.
It's all good :).
John.
Quoted 87 lines
Matt
Quoted 84 lines
John.
Quoted 16 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_request.c +4
-0@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +static inline bool is_parallel_rq (struct i915_request *rq) +{ +return intel_context_is_parallel (rq->context); +}drivers/gpu/drm/i915/i915_request.c i915_request_await_external(struct i915_request *rq, struct dma_fence *fence) · line 1340
Quoted 10 lines
drivers/gpu/drm/i915/i915_request.c +10
-0+ +static inline struct intel_context *request_to_parent (struct i915_request *rq) +{ +return intel_context_to_parent (rq->context); +} + +static bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to))Should this not say '&&
is_parallel_rq(from)'?Quoted 54 lines
drivers/gpu/drm/i915/i915_request.c +15
-14+return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
Re: [PATCH 23/26] drm/i915: Make request conflict tracking understand parallel submits
In reply to John HarrisonQuoted 46 lines · John Harrison
Quoted 4 lines · Matthew Brost
If an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand
ordering already -> ordering is already
Quoted 1 line
this by comparing the parents parallel fence values and skipping the
parents -> parent's
Quoted 1 line
conflict insertion if the values match.
Presumably, this is to cope with the fact that the parallel submit fences do not look like regular submission fences. And hence the existing code that says 'new fence belongs to same context as old fence, so safe to ignore' does not work with parallel submission. However, this change does not appear to be adding parallel submit support to an existing 'same context' check. It seems to be a brand new check that does not exist for single submission. What makes parallel submit different? If we aren't skipping same context fences for single submits, why do we need it for parallel? Conversely, if we need it for parallel then why don't we need it for single?
And if the single submission version is simply somewhere else in the code, why do the parallel version here instead of at the same place?
John.
Quoted 20 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_request.c +7
-0@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +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) +{
Quoted 9 lines
drivers/gpu/drm/i915/i915_request.c i915_request_await_external(struct i915_request *rq, struct dma_fence *fence) · line 1341
Quoted 7 lines
drivers/gpu/drm/i915/i915_request.c +7
-0+return intel_context_to_parent (rq->context); +} + +static bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to))Should this not say '&&
is_parallel_rq(from)'?
Missed this one. That isn't necessary as if from is not a parallel submit the following compare of parents will always return false. I could add if you insist as either way works.
Matt
Quoted 55 lines
Quoted 54 lines
drivers/gpu/drm/i915/i915_request.c +15
-14+return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
Re: [PATCH 23/26] drm/i915: Make request conflict tracking understand parallel submits
Quoted 55 lines · Matthew Brost
Quoted 45 lines · John Harrison
Quoted 4 lines · Matthew Brost
If an object in the excl or shared slot is a composite fence from a parallel submit and the current request in the conflict tracking is from the same parallel context there is no need to enforce ordering as the ordering already implicit. Make the request conflict tracking understand
ordering already -> ordering is already
Quoted 1 line
this by comparing the parents parallel fence values and skipping the
parents -> parent's
Quoted 1 line
conflict insertion if the values match.
Presumably, this is to cope with the fact that the parallel submit fences do not look like regular submission fences. And hence the existing code that says 'new fence belongs to same context as old fence, so safe to ignore' does not work with parallel submission. However, this change does not appear to be adding parallel submit support to an existing 'same context' check. It seems to be a brand new check that does not exist for single submission. What makes parallel submit different? If we aren't skipping same context fences for single submits, why do we need it for parallel? Conversely, if we need it for parallel then why don't we need it for single?
And if the single submission version is simply somewhere else in the code, why do the parallel version here instead of at the same place?
John.
Quoted 19 lines
Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/i915_request.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_request.c +7
-0@@ -1325,6 +1325,25 @@ i915_request_await_external(struct i915_request *rq, struct dma_fence *fence)return err; } +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) +{Quoted 9 lines
drivers/gpu/drm/i915/i915_request.c i915_request_await_external(struct i915_request *rq, struct dma_fence *fence) · line 1341
Quoted 7 lines
drivers/gpu/drm/i915/i915_request.c +7
-0+return intel_context_to_parent (rq->context); +} + +static bool is_same_parallel_context (struct i915_request *to, +struct i915_request *from) +{ +if (is_parallel_rq (to))Should this not say '&&
is_parallel_rq(from)'?
Quoted 5 lines
Missed this one. That isn't necessary as if from is not a parallel submit the following compare of parents will always return false. I could add if you insist as either way works.
Matt
It was more a question of whether req_to_parent() works fine irrespective of whether the rq is a parent, child or single?
John.
Quoted 55 lines
Quoted 55 lines
Quoted 55 lines
drivers/gpu/drm/i915/i915_request.c +15
-14+return request_to_parent (to) ==request_to_parent (from); + +return false; +} +int i915_request_await_execution (struct i915_request *rq,struct dma_fence *fence)@@ -1356,11 +1375,14 @@ i915_request_await_execution(struct i915_request *rq,* want to run our callback in all cases. */ -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =__i915_request_await_execution (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret; }while (--nchild);@@ -1461,10 +1483,13 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) fence))continue ; -if (dma_fence_is_i915 (fence)) +if (dma_fence_is_i915 (fence)) { +if (is_same_parallel_context (rq,to_request (fence))) +continue ; ret =i915_request_await_request (rq,to_request (fence)); -else + }else { ret =i915_request_await_external (rq, fence); + }if (ret <0 )return ret;@@ -1539,16 +1564,6 @@ 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_ensure_parallel_ordering (struct i915_request *rq,struct intel_timeline *timeline)
PATCH 24/26 drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences
In reply to Matthew BrostParallel submission create composite fences (dma_fence_array) for excl / shared slots in objects. The I915_GEM_BUSY IOCTL checks these slots to determine the busyness of the object. Prior to patch it only check if the fence in the slot was a i915_request. Update the check to understand composite fences and correctly report the busyness.
--- drivers/gpu/drm/i915/gem/i915_gem_busy.c | 60 +++++++++++++++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- drivers/gpu/drm/i915/i915_request.h | 6 ++ 3 files changed, 58 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_busy.c +48 -12
@@ -4,6 +4,8 @@* Copyright © 2014-2016 Intel Corporation */ +#include <linux/dma-fence-array.h> +#include "gt/intel_engine.h" #include "i915_gem_ioctls.h"
@@ -36,7 +38,7 @@ static __always_inline u32 __busy_write_id(u16 id) } static __always_inline unsigned int -__busy_set_if_active (const struct dma_fence *fence,u32 (*flag)(u16 id)) +__busy_set_if_active (struct dma_fence *fence,u32 (*flag)(u16 id)) {const struct i915_request *rq;
@@ -46,29 +48,63 @@ __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id))* to eventually flush us, but to minimise latency just ask the * hardware. * -* Note we only report on the status of native fences. +* Note we only report on the status of native fences and we currently +* have two native fences: +* +* 1. A composite fence (dma_fence_array) constructed of i915 requests +* created during a parallel submission. In this case we deconstruct the +* composite fence into individual i915 requests and check the status of +* each request. +* +* 2. A single i915 request. */ -if (!dma_fence_is_i915 (fence)) +if (dma_fence_is_array (fence)) { +struct dma_fence_array *array =to_dma_fence_array (fence); +struct dma_fence **child = array->fences; +unsigned int nchild = array->num_fences; + +do { +struct dma_fence *current_fence = *child++; + +/* Not an i915 fence, can't be busy per above */ +if (!dma_fence_is_i915 (current_fence) || + !test_bit (I915_FENCE_FLAG_COMPOSITE , + ¤t_fence->flags)) { +return 0 ; + } + + rq =to_request (current_fence); +if (!i915_request_completed (rq)) { +BUILD_BUG_ON (!typecheck (u16, + rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } + }while (--nchild); + +/* All requests in array complete, not busy */ return 0 ; + }else { +if (!dma_fence_is_i915 (fence)) +return 0 ; -/* opencode to_request() in order to avoid const warnings */ - rq = container_of(fence, const struct i915_request, fence); -if (i915_request_completed (rq)) -return 0 ; + rq =to_request (fence); +if (i915_request_completed (rq)) +return 0 ; -/* Beware type-expansion follies! */ -BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); -return flag (rq->engine->uabi_class); +/* Beware type-expansion follies! */ +BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } } static __always_inline unsigned int -busy_check_reader (const struct dma_fence *fence) +busy_check_reader (struct dma_fence *fence) {return __busy_set_if_active (fence, __busy_read_flag); } static __always_inline unsigned int -busy_check_writer (const struct dma_fence *fence) +busy_check_writer (struct dma_fence *fence) {if (!fence)return 0 ;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +4 -1
@@ -2988,8 +2988,11 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)if (!fences)return ERR_PTR (-ENOMEM ); -for_each_batch_create_order (eb, i) +for_each_batch_create_order (eb, i) { fences[i] = &eb->requests[i]->fence; +__set_bit (I915_FENCE_FLAG_COMPOSITE , + &eb->requests[i]->fence.flags); + } fence_array = dma_fence_array_create(eb->num_batches, fences,
drivers/gpu/drm/i915/i915_request.h +6 -0
@@ -156,6 +156,12 @@ enum {* submission / relationship encoutered an error. */ I915_FENCE_FLAG_SKIP_PARALLEL , + +/* +* I915_FENCE_FLAG_COMPOSITE - Indicates fence is part of a composite +* fence (dma_fence_array) and i915 generated for parallel submission. +*/ + I915_FENCE_FLAG_COMPOSITE, };/**
Signature · 1 line
2.32.0
Re: [PATCH 24/26] drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences
Quoted 7 lines · Matthew Brost
Parallel submission create composite fences (
dma_fence_array) for excl / shared slots in objects. TheI915_GEM_BUSYIOCTL checks these slots to determine the busyness of the object. Prior to patch it only check if the fence in the slot was ai915_request. Update the check to understand composite fences and correctly report the busyness.Signed-off-by Matthew Brost <[email protected]>
Daniele
Quoted 137 lines
--- drivers/gpu/drm/i915/gem/i915_gem_busy.c | 60 +++++++++++++++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- drivers/gpu/drm/i915/i915_request.h | 6 ++ 3 files changed, 58 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_busy.c +48
-12@@ -4,6 +4,8 @@* Copyright © 2014-2016 Intel Corporation */ +#include <linux/dma-fence-array.h> +#include "gt/intel_engine.h" #include "i915_gem_ioctls.h" @@ -36,7 +38,7 @@ static __always_inline u32 __busy_write_id(u16 id) } static __always_inline unsigned int -__busy_set_if_active (const struct dma_fence *fence,u32 (*flag)(u16 id)) +__busy_set_if_active (struct dma_fence *fence,u32 (*flag)(u16 id)) {const struct i915_request *rq;@@ -46,29 +48,63 @@ __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id))* to eventually flush us, but to minimise latency just ask the * hardware. * -* Note we only report on the status of native fences. +* Note we only report on the status of native fences and we currently +* have two native fences: +* +* 1. A composite fence (dma_fence_array) constructed of i915 requests +* created during a parallel submission. In this case we deconstruct the +* composite fence into individual i915 requests and check the status of +* each request. +* +* 2. A single i915 request. */ -if (!dma_fence_is_i915 (fence)) +if (dma_fence_is_array (fence)) { +struct dma_fence_array *array =to_dma_fence_array (fence); +struct dma_fence **child = array->fences; +unsigned int nchild = array->num_fences; + +do { +struct dma_fence *current_fence = *child++; + +/* Not an i915 fence, can't be busy per above */ +if (!dma_fence_is_i915 (current_fence) || + !test_bit (I915_FENCE_FLAG_COMPOSITE , + ¤t_fence->flags)) { +return 0 ; + } + + rq =to_request (current_fence); +if (!i915_request_completed (rq)) { +BUILD_BUG_ON (!typecheck (u16, + rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } + }while (--nchild); + +/* All requests in array complete, not busy */ return 0 ; + }else { +if (!dma_fence_is_i915 (fence)) +return 0 ; -/* opencode to_request() in order to avoid const warnings */ - rq = container_of(fence, const struct i915_request, fence); -if (i915_request_completed (rq)) -return 0 ; + rq =to_request (fence); +if (i915_request_completed (rq)) +return 0 ; -/* Beware type-expansion follies! */ -BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); -return flag (rq->engine->uabi_class); +/* Beware type-expansion follies! */ +BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } } static __always_inline unsigned int -busy_check_reader (const struct dma_fence *fence) +busy_check_reader (struct dma_fence *fence) {return __busy_set_if_active (fence, __busy_read_flag); } static __always_inline unsigned int -busy_check_writer (const struct dma_fence *fence) +busy_check_writer (struct dma_fence *fence) {if (!fence)return 0 ;drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +4
-1@@ -2988,8 +2988,11 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)if (!fences)return ERR_PTR (-ENOMEM ); -for_each_batch_create_order (eb, i) +for_each_batch_create_order (eb, i) { fences[i] = &eb->requests[i]->fence; +__set_bit (I915_FENCE_FLAG_COMPOSITE , + &eb->requests[i]->fence.flags); + } fence_array = dma_fence_array_create(eb->num_batches, fences,drivers/gpu/drm/i915/i915_request.h +6
-0@@ -156,6 +156,12 @@ enum {* submission / relationship encoutered an error. */ I915_FENCE_FLAG_SKIP_PARALLEL , + +/* +* I915_FENCE_FLAG_COMPOSITE - Indicates fence is part of a composite +* fence (dma_fence_array) and i915 generated for parallel submission. +*/ + I915_FENCE_FLAG_COMPOSITE, };/**
Re: [Intel-gfx] [PATCH 24/26] drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences
In reply to Matthew BrostQuoted 63 lines · Matthew Brost
Parallel submission create composite fences (
dma_fence_array) for excl / shared slots in objects. TheI915_GEM_BUSYIOCTL checks these slots to determine the busyness of the object. Prior to patch it only check if the fence in the slot was ai915_request. Update the check to understand composite fences and correctly report the busyness.Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_busy.c | 60 +++++++++++++++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- drivers/gpu/drm/i915/i915_request.h | 6 ++ 3 files changed, 58 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_busy.c +24
-3@@ -4,6 +4,8 @@* Copyright © 2014-2016 Intel Corporation */ +#include <linux/dma-fence-array.h> +#include "gt/intel_engine.h" #include "i915_gem_ioctls.h" @@ -36,7 +38,7 @@ static __always_inline u32 __busy_write_id(u16 id) } static __always_inline unsigned int -__busy_set_if_active (const struct dma_fence *fence,u32 (*flag)(u16 id)) +__busy_set_if_active (struct dma_fence *fence,u32 (*flag)(u16 id)) {const struct i915_request *rq;@@ -46,29 +48,63 @@ __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id))* to eventually flush us, but to minimise latency just ask the * hardware. * -* Note we only report on the status of native fences. +* Note we only report on the status of native fences and we currently +* have two native fences: +* +* 1. A composite fence (dma_fence_array) constructed of i915 requests +* created during a parallel submission. In this case we deconstruct the +* composite fence into individual i915 requests and check the status of +* each request. +* +* 2. A single i915 request. */ -if (!dma_fence_is_i915 (fence)) +if (dma_fence_is_array (fence)) { +struct dma_fence_array *array =to_dma_fence_array (fence); +struct dma_fence **child = array->fences; +unsigned int nchild = array->num_fences; + + do { + struct dma_fence *current_fence = *child++; + + /* Not an i915 fence, can't be busy per above */ + if (!dma_fence_is_i915(current_fence) || + !test_bit(I915_FENCE_FLAG_COMPOSITE, + ¤t_fence->flags)) {
drivers/gpu/drm/i915/gem/i915_gem_busy.c __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id)) · line 82
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_busy.c +10
-0+return 0 ; + } + + rq =to_request (current_fence); +if (!i915_request_completed (rq)) { +BUILD_BUG_ON (!typecheck (u16, + rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } + }while (--nchild);
Do you even need to introduce I915_FENCE_FLAG_COMPOSITE? If parallel submit is the only possible creator of array fences then possibly not. Probably even would result in less code which even keeps working in a hypothetical future. Otherwise you could add a debug bug on if array fence contains a fence without I915_FENCE_FLAG_COMPOSITE set.
Secondly, I'd also run the whole loop and not return on first busy or incompatible for simplicity.
And finally, with all above in place, I think you could have common function for the below (checking one fence) and call that both for a single fence and from an array loop above for less duplication. (Even duplicated BUILD_BUG_ON which makes no sense!)
End result would be a simpler patch like:
__busy_set_if_active_one(...)
{
.. existing __busy_set_if_active ..
}
__busy_set_if_active(..)
{
...
if (dma_fence_is_array(fence)) {
...
for (i = 0; i < array->num_fences; i++)
flags |= __busy_set_if_active_one(...);
} else {
flags = __busy_set_if_active_one(...);}
Regards,
Tvrtko
Quoted 72 lines
drivers/gpu/drm/i915/gem/i915_gem_busy.c +14
-9+ +/* All requests in array complete, not busy */ return 0 ; + }else { +if (!dma_fence_is_i915 (fence)) +return 0 ; -/* opencode to_request() in order to avoid const warnings */ - rq = container_of(fence, const struct i915_request, fence); -if (i915_request_completed (rq)) -return 0 ; + rq =to_request (fence); +if (i915_request_completed (rq)) +return 0 ; -/* Beware type-expansion follies! */ -BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); -return flag (rq->engine->uabi_class); +/* Beware type-expansion follies! */ +BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } } static __always_inline unsigned int -busy_check_reader (const struct dma_fence *fence) +busy_check_reader (struct dma_fence *fence) {return __busy_set_if_active (fence, __busy_read_flag); } static __always_inline unsigned int -busy_check_writer (const struct dma_fence *fence) +busy_check_writer (struct dma_fence *fence) {if (!fence)return 0 ;drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +4
-1@@ -2988,8 +2988,11 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)if (!fences)return ERR_PTR (-ENOMEM ); -for_each_batch_create_order (eb, i) +for_each_batch_create_order (eb, i) { fences[i] = &eb->requests[i]->fence; +__set_bit (I915_FENCE_FLAG_COMPOSITE , + &eb->requests[i]->fence.flags); + } fence_array = dma_fence_array_create(eb->num_batches, fences,drivers/gpu/drm/i915/i915_request.h +6
-0@@ -156,6 +156,12 @@ enum {* submission / relationship encoutered an error. */ I915_FENCE_FLAG_SKIP_PARALLEL , + +/* +* I915_FENCE_FLAG_COMPOSITE - Indicates fence is part of a composite +* fence (dma_fence_array) and i915 generated for parallel submission. +*/ + I915_FENCE_FLAG_COMPOSITE, };/**
Re: [Intel-gfx] [PATCH 24/26] drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences
Quoted 69 lines · Tvrtko Ursulin
Quoted 67 lines · Matthew Brost
Parallel submission create composite fences (
dma_fence_array) for excl / shared slots in objects. TheI915_GEM_BUSYIOCTL checks these slots to determine the busyness of the object. Prior to patch it only check if the fence in the slot was ai915_request. Update the check to understand composite fences and correctly report the busyness.Signed-off-by Matthew Brost <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_busy.c | 60 +++++++++++++++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- drivers/gpu/drm/i915/i915_request.h | 6 ++ 3 files changed, 58 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_busy.c +32
-3@@ -4,6 +4,8 @@* Copyright © 2014-2016 Intel Corporation */ +#include <linux/dma-fence-array.h> +#include "gt/intel_engine.h" #include "i915_gem_ioctls.h" @@ -36,7 +38,7 @@ static __always_inline u32 __busy_write_id(u16 id) } static __always_inline unsigned int -__busy_set_if_active (const struct dma_fence *fence,u32 (*flag)(u16 id)) +__busy_set_if_active (struct dma_fence *fence,u32 (*flag)(u16 id)) {const struct i915_request *rq;@@ -46,29 +48,63 @@ __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id))* to eventually flush us, but to minimise latency just ask the * hardware. * -* Note we only report on the status of native fences. +* Note we only report on the status of native fences and we currently +* have two native fences: +* +* 1. A composite fence (dma_fence_array) constructed of i915 requests +* created during a parallel submission. In this case we deconstruct the +* composite fence into individual i915 requests and check the status of +* each request. +* +* 2. A single i915 request. */ -if (!dma_fence_is_i915 (fence)) +if (dma_fence_is_array (fence)) { +struct dma_fence_array *array =to_dma_fence_array (fence); +struct dma_fence **child = array->fences; +unsigned int nchild = array->num_fences; + + do { + struct dma_fence *current_fence = *child++; + + /* Not an i915 fence, can't be busy per above */ + if (!dma_fence_is_i915(current_fence) || + !test_bit(I915_FENCE_FLAG_COMPOSITE, + ¤t_fence->flags)) { + return 0; + } + + rq = to_request(current_fence); + if (!i915_request_completed(rq)) { + BUILD_BUG_ON(!typecheck(u16, + rq->engine->uabi_class)); + return flag(rq->engine->uabi_class);
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_busy.c __busy_set_if_active(const struct dma_fence *fence, u32 (*flag)(u16 id)) · line 82
Quoted 2 lines
drivers/gpu/drm/i915/gem/i915_gem_busy.c +2
-0+ } + }while (--nchild);Do you even need to introduce
I915_FENCE_FLAG_COMPOSITE? If parallel submit is the only possible creator of array fences then possibly not. Probably even would result in less code which even keeps working in a hypothetical future. Otherwise you could add a debug bug on if array fence contains a fence withoutI915_FENCE_FLAG_COMPOSITEset.
Certainly other drivers can create a dma fence array and in theory could include a i915_request in that array. Adding this flag makes it clear that this fence was created by i915 for parallel submission and future proofs this code.
Quoted 3 lines
Secondly, I'd also run the whole loop and not return on first busy or incompatible for simplicity.
I disagree. Short circuiting when a condition is found is pretty standard and not hard to understand.
Quoted 5 lines
And finally, with all above in place, I think you could have common function for the below (checking one fence) and call that both for a single fence and from an array loop above for less duplication. (Even duplicated
BUILD_BUG_ONwhich makes no sense!)
Yea duplicating the BUILD_BUG_ON doesn't make a ton of sense. Will remove.
Disagree on the helper, the code paths are different enough to just open code this.
Matt
Quoted 87 lines
End result would be a simpler patch like:
__busy_set_if_active_one(...){ .. existing __busy_set_if_active .. }
__busy_set_if_active(..)
{
...if (dma_fence_is_array(fence)) { ... for (i = 0; i < array->num_fences; i++) flags |= __busy_set_if_active_one(...); } else { flags = __busy_set_if_active_one(...);}
Regards,
Tvrtko
Quoted 65 lines
drivers/gpu/drm/i915/gem/i915_gem_busy.c +14
-9+ +/* All requests in array complete, not busy */ return 0 ; + }else { +if (!dma_fence_is_i915 (fence)) +return 0 ; -/* opencode to_request() in order to avoid const warnings */ - rq = container_of(fence, const struct i915_request, fence); -if (i915_request_completed (rq)) -return 0 ; + rq =to_request (fence); +if (i915_request_completed (rq)) +return 0 ; -/* Beware type-expansion follies! */ -BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); -return flag (rq->engine->uabi_class); +/* Beware type-expansion follies! */ +BUILD_BUG_ON (!typecheck (u16, rq->engine->uabi_class)); +return flag (rq->engine->uabi_class); + } } static __always_inline unsigned int -busy_check_reader (const struct dma_fence *fence) +busy_check_reader (struct dma_fence *fence) {return __busy_set_if_active (fence, __busy_read_flag); } static __always_inline unsigned int -busy_check_writer (const struct dma_fence *fence) +busy_check_writer (struct dma_fence *fence) {if (!fence)return 0 ;drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +4
-1@@ -2988,8 +2988,11 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)if (!fences)return ERR_PTR (-ENOMEM ); -for_each_batch_create_order (eb, i) +for_each_batch_create_order (eb, i) { fences[i] = &eb->requests[i]->fence; +__set_bit (I915_FENCE_FLAG_COMPOSITE , + &eb->requests[i]->fence.flags); + } fence_array = dma_fence_array_create(eb->num_batches, fences,drivers/gpu/drm/i915/i915_request.h +6
-0@@ -156,6 +156,12 @@ enum {* submission / relationship encoutered an error. */ I915_FENCE_FLAG_SKIP_PARALLEL , + +/* +* I915_FENCE_FLAG_COMPOSITE - Indicates fence is part of a composite +* fence (dma_fence_array) and i915 generated for parallel submission. +*/ + I915_FENCE_FLAG_COMPOSITE, };/**
PATCH 25/26 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 ; -/* FIXME: This is NIY for execlists */ if (!(intel_uc_uses_guc_submission (&i915->gt.uc)))return -ENODEV ;
Signature · 1 line
2.32.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev4)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e2a47a99bf9d drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct f83d8f1539fa drm/i915/guc: Take GT PM ref when deregistering context -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #79: 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)
-:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #79: 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)
total: 0 errors, 0 warnings, 2 checks, 290 lines checked93e5284929b3 drm/i915/guc: Take engine PM when a context is pinned with GuC submission 4dd6554d994d drm/i915/guc: Don't call switch_to_kernel_context with GuC submission 8629b55f536c drm/i915: Add logical engine mapping8117ec0a1ca7 drm/i915: Expose logical engine instance to useraa8e1eb4dd4e drm/i915/guc: Introduce context parent-child relationship aaf50eacc2fd drm/i915/guc: Add multi-lrc context registratione5f6f50e66d1 drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts adf21ba138f3 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids 40ef33318b81 drm/i915/guc: Implement parallel context pin / unpin functions 1ad560c70346 drm/i915/guc: Implement multi-lrc submission
-:364: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV)
#364: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:771:
+ *wqi++ = child->ring->tail / sizeof(u64);
^
total: 0 errors, 0 warnings, 1 checks, 570 lines checked466c01457dec drm/i915/guc: Insert submit fences between requests in parent-child relationship 2ece815c1f18 drm/i915/guc: Implement multi-lrc reset7add5784199f drm/i915/guc: Update debugfs for GuC multi-lrc
-:23: CHECK:LINE_SPACING: Please don't use multiple blank lines
#23: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3707:
+
total: 0 errors, 0 warnings, 1 checks, 67 lines checked966991d7bbed drm/i915: Fix bug in user proto-context creation that leaked contexts 0eb3d3bf0c84 drm/i915/guc: Connect UAPI to GuC multi-lrc interface68c6596b649a drm/i915/doc: Update parallel submit doc to point to i915_drm.h -:13: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #13:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 checks, 10 lines checked8290f5d15ca2 drm/i915/guc: Add basic GuC multi-lrc selftest
-:22: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #22:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 190 lines checked ade3768c42d5 drm/i915/guc: Implement no mid batch preemption for multi-lrc 57882939d788 drm/i915: Multi-BB execbuf
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #369: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1854:
+#define for_each_batch_create_order(_eb, _i) \
+ for (_i = 0; _i < (_eb)->num_batches; ++_i)
-:371: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #371: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
-:371: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #371: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
total: 1 errors, 0 warnings, 2 checks, 1298 lines checked 28b699ece289 drm/i915/guc: Handle errors in multi-lrc requests 962e6b3dce59 drm/i915: Make request conflict tracking understand parallel submits 368ab12f5205 drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences b52570f01859 drm/i915: Enable multi-bb execbuf8766155832d7 drm/i915/execlists: Weak parallel submission support for execlists
Re: [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev4)
Quoted 19 lines · Patchwork
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning== Summary ==
$ dim checkpatch origin/drm-tip e2a47a99bf9d drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct f83d8f1539fa drm/i915/guc: Take GT PM ref when deregistering context -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #79: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:(quoted diff) +3
-1+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0) -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects?#79: FILE:
drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:
Review
Quoted 3 lines
(quoted diff) +3
-0+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0)
Not sure what these two are complaining about? But 'gt' and 'tmp' should be wrapped with parentheses when used?
Quoted 14 lines
total: 0 errors, 0 warnings, 2 checks, 290 lines checked
93e5284929b3drm/i915/guc: Take engine PM when a context is pinned with GuC submission4dd6554d994ddrm/i915/guc: Don't callswitch_to_kernel_contextwith GuC submission8629b55f536cdrm/i915: Add logical engine mapping8117ec0a1ca7drm/i915: Expose logical engine instance to useraa8e1eb4dd4edrm/i915/guc: Introduce context parent-child relationshipaaf50eacc2fddrm/i915/guc: Add multi-lrc context registratione5f6f50e66d1drm/i915/guc: Ensure GuC schedule operations do not operate on child contextsadf21ba138f3drm/i915/guc: Assign contexts in parent-child relationship consecutiveguc_ids40ef33318b81drm/i915/guc: Implement parallel context pin / unpin functions1ad560c70346drm/i915/guc: Implement multi-lrc submission
-:364: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV)
#364: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:771:
Review
Quoted 2 lines
(quoted diff) +1
-0+ *wqi++ = child->ring->tail / sizeof(u64); ^
This seems like a bogus warning.
Quoted 9 lines
total: 0 errors, 0 warnings, 1 checks, 570 lines checked
466c01457decdrm/i915/guc: Insert submit fences between requests in parent-child relationship2ece815c1f18drm/i915/guc: Implement multi-lrc reset7add5784199fdrm/i915/guc: Update debugfs for GuC multi-lrc
-:23: CHECK:LINE_SPACING: Please don't use multiple blank lines
#23: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3707:+
This should be fixed.
Quoted 9 lines
total: 0 errors, 0 warnings, 1 checks, 67 lines checked
966991d7bbeddrm/i915: Fix bug in user proto-context creation that leaked contexts0eb3d3bf0c84drm/i915/guc: Connect UAPI to GuC multi-lrc interface68c6596b649adrm/i915/doc: Update parallel submit doc to point toi915_drm.h-:13: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #13:
deleted file mode 100644
Quoted 5 lines
total: 0 errors, 1 warnings, 0 checks, 10 lines checked
8290f5d15ca2drm/i915/guc: Add basic GuC multi-lrc selftest
-:22: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #22:
new file mode 100644
These two can be ignored.
Review
Quoted 7 lines
total: 0 errors, 1 warnings, 0 checks, 190 lines checked
ade3768c42d5drm/i915/guc: Implement no mid batch preemption for multi-lrc57882939d788drm/i915: Multi-BB execbuf
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #369: FILE:drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1854:(quoted diff) +2
-0+#define for_each_batch_create_order(_eb, _i) \ + for (_i = 0; _i < (_eb)->num_batches; ++_i)
Again, not sure the 'reuse' comment means but should also use '(_i)'?
Review
Quoted 6 lines
-:371: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
This seems bogus. Wrapping it in a do/while will break the purpose!
Review
Quoted 6 lines
-:371: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
As above.
Quoted 9 lines
total: 1 errors, 0 warnings, 2 checks, 1298 lines checked
28b699ece289drm/i915/guc: Handle errors in multi-lrc requests962e6b3dce59drm/i915: Make request conflict tracking understand parallel submits368ab12f5205drm/i915: UpdateI915_GEM_BUSYIOCTL to understand composite fencesb52570f01859drm/i915: Enable multi-bb execbuf8766155832d7drm/i915/execlists: Weak parallel submission support for execlists
Re: [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev4)
Quoted 18 lines · John Harrison
Quoted 17 lines · Patchwork
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning== Summary ==
$ dim checkpatch origin/drm-tip e2a47a99bf9d drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct f83d8f1539fa drm/i915/guc: Take GT PM ref when deregistering context -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #79: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:(quoted diff) +3
-0+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0)
Quoted 8 lines
Review
Quoted 5 lines
-:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #79: FILE:
drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:(quoted diff) +3
-0+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0)Not sure what these two are complaining about? But 'gt' and 'tmp' should be wrapped with parentheses when used?
Not, sure but I think this one is fine.
Quoted 18 lines
Quoted 14 lines
total: 0 errors, 0 warnings, 2 checks, 290 lines checked
93e5284929b3drm/i915/guc: Take engine PM when a context is pinned with GuC submission4dd6554d994ddrm/i915/guc: Don't callswitch_to_kernel_contextwith GuC submission8629b55f536cdrm/i915: Add logical engine mapping8117ec0a1ca7drm/i915: Expose logical engine instance to useraa8e1eb4dd4edrm/i915/guc: Introduce context parent-child relationshipaaf50eacc2fddrm/i915/guc: Add multi-lrc context registratione5f6f50e66d1drm/i915/guc: Ensure GuC schedule operations do not operate on child contextsadf21ba138f3drm/i915/guc: Assign contexts in parent-child relationship consecutiveguc_ids40ef33318b81drm/i915/guc: Implement parallel context pin / unpin functions1ad560c70346drm/i915/guc: Implement multi-lrc submission
-:364: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV)
#364: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:771:Review
Quoted 2 lines
(quoted diff) +1
-0+ *wqi++ = child->ring->tail / sizeof(u64); ^This seems like a bogus warning.
Agree.
Quoted 10 lines
Quoted 8 lines
total: 0 errors, 0 warnings, 1 checks, 570 lines checked
466c01457decdrm/i915/guc: Insert submit fences between requests in parent-child relationship2ece815c1f18drm/i915/guc: Implement multi-lrc reset7add5784199fdrm/i915/guc: Update debugfs for GuC multi-lrc
-:23: CHECK:LINE_SPACING: Please don't use multiple blank lines
#23: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3707:
+This should be fixed.
Done.
Quoted 9 lines
Quoted 9 lines
total: 0 errors, 0 warnings, 1 checks, 67 lines checked
966991d7bbeddrm/i915: Fix bug in user proto-context creation that leaked contexts0eb3d3bf0c84drm/i915/guc: Connect UAPI to GuC multi-lrc interface68c6596b649adrm/i915/doc: Update parallel submit doc to point toi915_drm.h-:13: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #13:
deleted file mode 100644
Quoted 6 lines
Quoted 5 lines
total: 0 errors, 1 warnings, 0 checks, 10 lines checked
8290f5d15ca2drm/i915/guc: Add basic GuC multi-lrc selftest
-:22: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #22:
new file mode 100644These two can be ignored.
Agree.
Quoted 10 lines
Review
Quoted 8 lines
total: 0 errors, 1 warnings, 0 checks, 190 lines checked
ade3768c42d5drm/i915/guc: Implement no mid batch preemption for multi-lrc57882939d788drm/i915: Multi-BB execbuf
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #369: FILE:drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1854:(quoted diff) +2
-0+#define for_each_batch_create_order(_eb, _i) \ + for (_i = 0; _i < (_eb)->num_batches; ++_i)Again, not sure the 'reuse' comment means but should also use '(_i)'?
I haven't been able to figure out how to fix these ones. I think you only need () if you dref the variable.
Quoted 8 lines
Review
Quoted 6 lines
-:371: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)This seems bogus. Wrapping it in a do/while will break the purpose!
Right. Added the BUILD_BUG_ON here because I did have a bug where I used an unsigned with this macro and that breaks the macro.
Matt
Quoted 18 lines
Review
Quoted 6 lines
-:371: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)As above.
Quoted 9 lines
total: 1 errors, 0 warnings, 2 checks, 1298 lines checked
28b699ece289drm/i915/guc: Handle errors in multi-lrc requests962e6b3dce59drm/i915: Make request conflict tracking understand parallel submits368ab12f5205drm/i915: UpdateI915_GEM_BUSYIOCTL to understand composite fencesb52570f01859drm/i915: Enable multi-bb execbuf8766155832d7drm/i915/execlists: Weak parallel submission support for execlists
Re: [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev4)
Quoted 84 lines · Matthew Brost
Quoted 18 lines · John Harrison
Quoted 17 lines · Patchwork
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning== Summary ==
$ dim checkpatch origin/drm-tip e2a47a99bf9d drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct f83d8f1539fa drm/i915/guc: Take GT PM ref when deregistering context -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #79: FILE: drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:(quoted diff) +3
-0+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0)Quoted 8 lines
Review
Quoted 5 lines
-:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #79: FILE:
drivers/gpu/drm/i915/gt/intel_gt_pm.h:44:(quoted diff) +3
-0+#define with_intel_gt_pm(gt, tmp) \ + for (tmp = 1, intel_gt_pm_get(gt); tmp; \ + intel_gt_pm_put(gt), tmp = 0)Not sure what these two are complaining about? But 'gt' and 'tmp' should be wrapped with parentheses when used?
Not, sure but I think this one is fine.
Quoted 8 lines
Quoted 8 lines
total: 0 errors, 0 warnings, 2 checks, 290 lines checked
93e5284929b3drm/i915/guc: Take engine PM when a context is pinned with GuC submission4dd6554d994ddrm/i915/guc: Don't callswitch_to_kernel_contextwith GuC submission8629b55f536cdrm/i915: Add logical engine mapping8117ec0a1ca7drm/i915: Expose logical engine instance to useraa8e1eb4dd4edrm/i915/guc: Introduce context parent-child relationshipaaf50eacc2fddrm/i915/guc: Add multi-lrc context registratione5f6f50e66d1drm/i915/guc: Ensure GuC schedule operations do not operate on child contextsQuoted 9 lines
Review
Quoted 7 lines
adf21ba138f3drm/i915/guc: Assign contexts in parent-child relationship consecutiveguc_ids40ef33318b81drm/i915/guc: Implement parallel context pin / unpin functions1ad560c70346drm/i915/guc: Implement multi-lrc submission
-:364: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV)
#364: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:771:(quoted diff) +1
-0+ *wqi++ = child->ring->tail / sizeof(u64); ^This seems like a bogus warning.
Agree.
Quoted 9 lines
Quoted 7 lines
total: 0 errors, 0 warnings, 1 checks, 570 lines checked
466c01457decdrm/i915/guc: Insert submit fences between requests in parent-child relationship2ece815c1f18drm/i915/guc: Implement multi-lrc reset7add5784199fdrm/i915/guc: Update debugfs for GuC multi-lrc
-:23: CHECK:LINE_SPACING: Please don't use multiple blank lines
#23: FILE:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3707:
+This should be fixed.
Done.
Quoted 8 lines
Quoted 8 lines
total: 0 errors, 0 warnings, 1 checks, 67 lines checked
966991d7bbeddrm/i915: Fix bug in user proto-context creation that leaked contexts0eb3d3bf0c84drm/i915/guc: Connect UAPI to GuC multi-lrc interface68c6596b649adrm/i915/doc: Update parallel submit doc to point toi915_drm.h-:13: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #13:
deleted file mode 100644Quoted 6 lines
Quoted 5 lines
total: 0 errors, 1 warnings, 0 checks, 10 lines checked
8290f5d15ca2drm/i915/guc: Add basic GuC multi-lrc selftest
-:22: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), doesMAINTAINERSneed updating? #22:
new file mode 100644These two can be ignored.
Agree.
Quoted 9 lines
Review
Quoted 7 lines
total: 0 errors, 1 warnings, 0 checks, 190 lines checked
ade3768c42d5drm/i915/guc: Implement no mid batch preemption for multi-lrc57882939d788drm/i915: Multi-BB execbuf
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #369: FILE:drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1854:(quoted diff) +2
-0+#define for_each_batch_create_order(_eb, _i) \ + for (_i = 0; _i < (_eb)->num_batches; ++_i)Again, not sure the 'reuse' comment means but should also use '(_i)'?
Quoted 2 lines
I haven't been able to figure out how to fix these ones. I think you only need () if you dref the variable.
The () is to prevent any kind of operator precedence confusion when passing in something more exciting than a simple variable. Doesn't have to be a deref, it could be any operator. Granted, extremely unlikely for this particular macro but generally good practice just in case. E.g. someone passes in weird things like 'a, func()' as '_i'.
John.
Quoted 28 lines
Quoted 8 lines
Review
Quoted 6 lines
-:371: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)This seems bogus. Wrapping it in a do/while will break the purpose!
Right. Added the
BUILD_BUG_ONhere because I did have a bug where I used an unsigned with this macro and that breaks the macro.Matt
Quoted 15 lines
Review
Quoted 5 lines
-:371: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #371: FILE:
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:(quoted diff) +3
-0+#define for_each_batch_add_order(_eb, _i) \ + BUILD_BUG_ON(!typecheck(int, _i)); \ + for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)As above.
Quoted 8 lines
total: 1 errors, 0 warnings, 2 checks, 1298 lines checked
28b699ece289drm/i915/guc: Handle errors in multi-lrc requests962e6b3dce59drm/i915: Make request conflict tracking understand parallel submits368ab12f5205drm/i915: UpdateI915_GEM_BUSYIOCTL to understand composite fencesb52570f01859drm/i915: Enable multi-bb execbuf8766155832d7drm/i915/execlists: Weak parallel submission support for execlists
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Parallel submission aka multi-bb execbuf (rev4)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
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/gt/intel_reset.c:1392:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +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:137: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:418:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for Parallel submission aka multi-bb execbuf (rev4)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_stall_reason' not described in 'intel_guc' ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_state' not described in 'intel_guc'
Re: [Intel-gfx] ✗ Fi.CI.DOCS: warning for Parallel submission aka multi-bb execbuf (rev4)
Quoted 6 lines · Patchwork
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
Quoted 7 lines
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_stall_reason' not described in 'intel_guc' ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_state' not described in 'intel_guc'
These seem like valid things that need to be fixed.
John.
Re: [Intel-gfx] ✗ Fi.CI.DOCS: warning for Parallel submission aka multi-bb execbuf (rev4)
Quoted 7 lines · John Harrison
Quoted 6 lines · Patchwork
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
Quoted 9 lines
Quoted 7 lines
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_stall_reason' not described in 'intel_guc' ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_state' not described in 'intel_guc'These seem like valid things that need to be fixed.
Yep, already done.
Matt
Quoted 2 lines
John.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Parallel submission aka multi-bb execbuf (rev4)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev4)
URL : https://patchwork.freedesktop.org/series/92789/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10681 -> Patchwork_21239
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21239 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21239, 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_21239/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21239:
### IGT changes ###
#### Possible regressions ####
* igt@gem_render_tiled_blits@basic:
- fi-ivb-3770: [PASS][1] -> [FAIL][2] +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-ivb-3770/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-ivb-3770/igt@[email protected]
- fi-hsw-4770: [PASS][3] -> [FAIL][4] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-hsw-4770/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-hsw-4770/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_10681 and Patchwork_21239:
### New IGT tests (1) ###
* igt@i915_selftest@live@guc_multi_lrc:
- Statuses : 29 pass(s)
- Exec time: [0.44, 3.89] s
Known issues
------------
Here are the changes found in Patchwork_21239 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-1115g4: NOTRUN -> [SKIP][5] ([fdo#109315])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][6] ([fdo#109271]) +27 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-bdw-5557u/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@nop-gfx0:
- fi-tgl-1115g4: NOTRUN -> [SKIP][7] ([fdo#109315] / [i915#2575]) +16 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][8] ([i915#3718])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-bdw-5557u/igt@[email protected]
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-apl-guc: NOTRUN -> [SKIP][9] ([fdo#109271]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-apl-guc/igt@gem_exec_fence@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-tgl-1115g4: NOTRUN -> [SKIP][10] ([i915#2190])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@i915_hangman@error-state-basic:
- fi-apl-guc: NOTRUN -> [DMESG-WARN][11] ([i915#1610])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-apl-guc/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- fi-tgl-1115g4: NOTRUN -> [SKIP][12] ([i915#1155])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][13] -> [INCOMPLETE][14] ([i915#3921])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-snb-2600/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-tgl-1115g4: NOTRUN -> [SKIP][15] ([fdo#111827]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][16] ([fdo#109271] / [fdo#111827]) +8 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-bdw-5557u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-1115g4: NOTRUN -> [SKIP][17] ([i915#4103]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-1115g4: NOTRUN -> [SKIP][18] ([fdo#109285])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- fi-tgl-1115g4: NOTRUN -> [SKIP][19] ([i915#1072]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@kms_psr@primary_mmap_gtt.html
* igt@prime_vgem@basic-userptr:
- fi-tgl-1115g4: NOTRUN -> [SKIP][20] ([i915#3301])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-tgl-1115g4/igt@[email protected]
* igt@runner@aborted:
- fi-apl-guc: NOTRUN -> [FAIL][21] ([i915#2426] / [i915#3363])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-apl-guc/igt@[email protected]
#### Possible fixes ####
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: [DMESG-WARN][22] ([i915#295]) -> [PASS][23] +12 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-cfl-8109u/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/fi-cfl-8109u/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3718]: https://gitlab.freedesktop.org/drm/intel/issues/3718
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
Participating hosts (36 -> 32)
------------------------------
Additional (2): fi-tgl-1115g4 fi-apl-guc
Missing (6): fi-kbl-soraka bat-dg1-6 fi-bsw-cyan bat-adlp-4 bat-jsl-2 bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10681 -> Patchwork_21239
CI-20190529: 20190529
CI_DRM_10681: fe9b639a95a08713c8ee4ef110ce6a6388c9f9f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6228: 22643ce4014a0b2dc52ce7916b2f657e2a7757c3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21239: 8766155832d72e53d811f8023a4d3e5545190ce9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
8766155832d7 drm/i915/execlists: Weak parallel submission support for execlists b52570f01859 drm/i915: Enable multi-bb execbuf368ab12f5205 drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences 962e6b3dce59 drm/i915: Make request conflict tracking understand parallel submits 28b699ece289 drm/i915/guc: Handle errors in multi-lrc requests57882939d788 drm/i915: Multi-BB execbufade3768c42d5 drm/i915/guc: Implement no mid batch preemption for multi-lrc 8290f5d15ca2 drm/i915/guc: Add basic GuC multi-lrc selftest68c6596b649a drm/i915/doc: Update parallel submit doc to point to i915_drm.h 0eb3d3bf0c84 drm/i915/guc: Connect UAPI to GuC multi-lrc interface 966991d7bbed drm/i915: Fix bug in user proto-context creation that leaked contexts 7add5784199f drm/i915/guc: Update debugfs for GuC multi-lrc2ece815c1f18 drm/i915/guc: Implement multi-lrc reset466c01457dec drm/i915/guc: Insert submit fences between requests in parent-child relationship 1ad560c70346 drm/i915/guc: Implement multi-lrc submission40ef33318b81 drm/i915/guc: Implement parallel context pin / unpin functions adf21ba138f3 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids e5f6f50e66d1 drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts aaf50eacc2fd drm/i915/guc: Add multi-lrc context registrationaa8e1eb4dd4e drm/i915/guc: Introduce context parent-child relationship 8117ec0a1ca7 drm/i915: Expose logical engine instance to user8629b55f536c drm/i915: Add logical engine mapping4dd6554d994d drm/i915/guc: Don't call switch_to_kernel_context with GuC submission 93e5284929b3 drm/i915/guc: Take engine PM when a context is pinned with GuC submission f83d8f1539fa drm/i915/guc: Take GT PM ref when deregistering context e2a47a99bf9d drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21239/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Parallel submission aka multi-bb execbuf (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev5)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip fc9c9fb6630a drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct fa11631fe33a drm/i915/guc: Take GT PM ref when deregistering context -:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt' - possible side-effects? #79: 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)
-:79: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp' - possible side-effects? #79: 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)
total: 0 errors, 0 warnings, 2 checks, 290 lines checkedf26913441370 drm/i915/guc: Take engine PM when a context is pinned with GuC submission 00cd343ff096 drm/i915/guc: Don't call switch_to_kernel_context with GuC submission b94a2d8dd4a6 drm/i915: Add logical engine mappinga352b3260782 drm/i915: Expose logical engine instance to userb00df96b3c7a drm/i915/guc: Introduce context parent-child relationship 4a15247fee14 drm/i915/guc: Add multi-lrc context registrationd99a9b87a2b4 drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts 94fb468f6a15 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids 4fefc07d9141 drm/i915/guc: Implement parallel context pin / unpin functions cce8ed09d2b3 drm/i915/guc: Implement multi-lrc submission
-:364: CHECK:SPACING: spaces preferred around that '*' (ctx:ExV)
#364: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:771:
+ *wqi++ = child->ring->tail / sizeof(u64);
^
total: 0 errors, 0 warnings, 1 checks, 570 lines checked1327655fea5c drm/i915/guc: Insert submit fences between requests in parent-child relationship faaaa22df6f9 drm/i915/guc: Implement multi-lrc reset45f5266f4bc8 drm/i915/guc: Update debugfs for GuC multi-lrc
-:23: CHECK:LINE_SPACING: Please don't use multiple blank lines
#23: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3707:
+
total: 0 errors, 0 warnings, 1 checks, 67 lines checked4121bd97a8b5 drm/i915: Fix bug in user proto-context creation that leaked contexts 1a690133eb25 drm/i915/guc: Connect UAPI to GuC multi-lrc interface2f9e9c7755e0 drm/i915/doc: Update parallel submit doc to point to i915_drm.h -:13: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #13:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 checks, 10 lines checked77f007a50c5c drm/i915/guc: Add basic GuC multi-lrc selftest
-:22: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #22:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 190 lines checked 12e50491ae0d drm/i915/guc: Implement no mid batch preemption for multi-lrc a2d809b95c10 drm/i915: Multi-BB execbuf
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #369: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1854:
+#define for_each_batch_create_order(_eb, _i) \
+ for (_i = 0; _i < (_eb)->num_batches; ++_i)
-:371: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros with multiple statements should be enclosed in a do - while loop #371: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
-:371: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_i' - possible side-effects? #371: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1856:
+#define for_each_batch_add_order(_eb, _i) \
+ BUILD_BUG_ON(!typecheck(int, _i)); \
+ for (_i = (_eb)->num_batches - 1; _i >= 0; --_i)
total: 1 errors, 0 warnings, 2 checks, 1298 lines checked c45d7a15a6cc drm/i915/guc: Handle errors in multi-lrc requests 31ff5626db61 drm/i915: Make request conflict tracking understand parallel submits b73b105b6c29 drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences 54ef99f9936c drm/i915: Enable multi-bb execbufaef348f7f8e8 drm/i915/execlists: Weak parallel submission support for execlists
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Parallel submission aka multi-bb execbuf (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev5)
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/gt/intel_reset.c:1392:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +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:137: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:418:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:418:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for Parallel submission aka multi-bb execbuf (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev5)
URL : https://patchwork.freedesktop.org/series/92789/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_stall_reason' not described in 'intel_guc' ./drivers/gpu/drm/i915/gt/uc/intel_guc.h:166: warning: Function parameter or member 'submission_state' not described in 'intel_guc'
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Parallel submission aka multi-bb execbuf (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Parallel submission aka multi-bb execbuf (rev5)
URL : https://patchwork.freedesktop.org/series/92789/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10681 -> Patchwork_21241
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21241 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21241, 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_21241/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21241:
### IGT changes ###
#### Possible regressions ####
* igt@gem_close_race@basic-threads:
- fi-kbl-7500u: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-kbl-7500u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-7500u/igt@[email protected]
- fi-kbl-r: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-kbl-r/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-r/igt@[email protected]
- fi-ivb-3770: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-ivb-3770/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-ivb-3770/igt@[email protected]
- fi-cml-u2: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-cml-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-cml-u2/igt@[email protected]
* igt@gem_render_linear_blits@basic:
- fi-kbl-soraka: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-kbl-soraka/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-soraka/igt@[email protected]
* igt@gem_render_tiled_blits@basic:
- fi-hsw-4770: [PASS][11] -> [FAIL][12] +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-hsw-4770/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-hsw-4770/igt@[email protected]
* igt@runner@aborted:
- fi-ivb-3770: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-ivb-3770/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_10681 and Patchwork_21241:
### New IGT tests (1) ###
* igt@i915_selftest@live@guc_multi_lrc:
- Statuses : 24 pass(s)
- Exec time: [0.42, 3.86] s
Known issues
------------
Here are the changes found in Patchwork_21241 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-1115g4: NOTRUN -> [SKIP][14] ([fdo#109315])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][15] ([fdo#109271]) +27 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bdw-5557u/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@nop-gfx0:
- fi-tgl-1115g4: NOTRUN -> [SKIP][16] ([fdo#109315] / [i915#2575]) +16 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][17] ([i915#3718])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bdw-5557u/igt@[email protected]
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-apl-guc: NOTRUN -> [SKIP][18] ([fdo#109271]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-apl-guc/igt@gem_exec_fence@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-tgl-1115g4: NOTRUN -> [SKIP][19] ([i915#2190])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@i915_hangman@error-state-basic:
- fi-apl-guc: NOTRUN -> [DMESG-WARN][20] ([i915#1610])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-apl-guc/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- fi-tgl-1115g4: NOTRUN -> [SKIP][21] ([i915#1155])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-bsw-kefka: [PASS][22] -> [INCOMPLETE][23] ([i915#2940])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-bsw-kefka/igt@i915_selftest@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bsw-kefka/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-bdw-samus: [PASS][24] -> [DMESG-FAIL][25] ([i915#2291] / [i915#541])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-bdw-samus/igt@i915_selftest@live@gt_heartbeat.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bdw-samus/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][26] -> [INCOMPLETE][27] ([i915#3921])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-snb-2600/igt@i915_selftest@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-tgl-1115g4: NOTRUN -> [SKIP][28] ([fdo#111827]) +8 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][29] ([fdo#109271] / [fdo#111827]) +8 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bdw-5557u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-1115g4: NOTRUN -> [SKIP][30] ([i915#4103]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-1115g4: NOTRUN -> [SKIP][31] ([fdo#109285])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- fi-tgl-1115g4: NOTRUN -> [SKIP][32] ([i915#1072]) +3 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@kms_psr@primary_mmap_gtt.html
* igt@prime_vgem@basic-userptr:
- fi-tgl-1115g4: NOTRUN -> [SKIP][33] ([i915#3301])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-tgl-1115g4/igt@[email protected]
* igt@runner@aborted:
- fi-bsw-kefka: NOTRUN -> [FAIL][34] ([fdo#109271] / [i915#1436] / [i915#3428])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-bsw-kefka/igt@[email protected]
- fi-apl-guc: NOTRUN -> [FAIL][35] ([i915#2426] / [i915#3363])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-apl-guc/igt@[email protected]
- fi-kbl-r: NOTRUN -> [FAIL][36] ([i915#2722] / [i915#3363])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-r/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [FAIL][37] ([i915#2426] / [i915#3363])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-soraka/igt@[email protected]
- fi-kbl-7500u: NOTRUN -> [FAIL][38] ([i915#2722] / [i915#3363])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-kbl-7500u/igt@[email protected]
- fi-cml-u2: NOTRUN -> [FAIL][39] ([i915#2722] / [i915#3363])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-cml-u2/igt@[email protected]
#### Possible fixes ####
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: [DMESG-WARN][40] ([i915#295]) -> [PASS][41] +12 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10681/fi-cfl-8109u/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/fi-cfl-8109u/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3428]: https://gitlab.freedesktop.org/drm/intel/issues/3428
[i915#3718]: https://gitlab.freedesktop.org/drm/intel/issues/3718
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
Participating hosts (36 -> 33)
------------------------------
Additional (2): fi-tgl-1115g4 fi-apl-guc
Missing (5): bat-dg1-6 fi-bsw-cyan bat-adlp-4 bat-jsl-2 bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10681 -> Patchwork_21241
CI-20190529: 20190529
CI_DRM_10681: fe9b639a95a08713c8ee4ef110ce6a6388c9f9f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6228: 22643ce4014a0b2dc52ce7916b2f657e2a7757c3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21241: aef348f7f8e8286bddfd22314d98b1c1b39503eb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
aef348f7f8e8 drm/i915/execlists: Weak parallel submission support for execlists 54ef99f9936c drm/i915: Enable multi-bb execbufb73b105b6c29 drm/i915: Update I915_GEM_BUSY IOCTL to understand composite fences 31ff5626db61 drm/i915: Make request conflict tracking understand parallel submits c45d7a15a6cc drm/i915/guc: Handle errors in multi-lrc requestsa2d809b95c10 drm/i915: Multi-BB execbuf12e50491ae0d drm/i915/guc: Implement no mid batch preemption for multi-lrc 77f007a50c5c drm/i915/guc: Add basic GuC multi-lrc selftest2f9e9c7755e0 drm/i915/doc: Update parallel submit doc to point to i915_drm.h 1a690133eb25 drm/i915/guc: Connect UAPI to GuC multi-lrc interface 4121bd97a8b5 drm/i915: Fix bug in user proto-context creation that leaked contexts 45f5266f4bc8 drm/i915/guc: Update debugfs for GuC multi-lrcfaaaa22df6f9 drm/i915/guc: Implement multi-lrc reset1327655fea5c drm/i915/guc: Insert submit fences between requests in parent-child relationship cce8ed09d2b3 drm/i915/guc: Implement multi-lrc submission4fefc07d9141 drm/i915/guc: Implement parallel context pin / unpin functions 94fb468f6a15 drm/i915/guc: Assign contexts in parent-child relationship consecutive guc_ids d99a9b87a2b4 drm/i915/guc: Ensure GuC schedule operations do not operate on child contexts 4a15247fee14 drm/i915/guc: Add multi-lrc context registrationb00df96b3c7a drm/i915/guc: Introduce context parent-child relationship a352b3260782 drm/i915: Expose logical engine instance to userb94a2d8dd4a6 drm/i915: Add logical engine mapping00cd343ff096 drm/i915/guc: Don't call switch_to_kernel_context with GuC submission f26913441370 drm/i915/guc: Take engine PM when a context is pinned with GuC submission fa11631fe33a drm/i915/guc: Take GT PM ref when deregistering context fc9c9fb6630a drm/i915/guc: Move GuC guc_id allocation under submission state sub-struct
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21241/index.html
PATCH 26/26 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. 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 | 10 ++-- drivers/gpu/drm/i915/gt/intel_context.c | 4 +- .../drm/i915/gt/intel_execlists_submission.c | 56 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_lrc.c | 2 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 - 5 files changed, 64 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +6 -4
@@ -536,10 +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; -/* FIXME: This is NIY for execlists */ -if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) -return -ENODEV ; -if (get_user (slot, &ext->engine_index))return -EFAULT ;
@@ -549,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 */
@@ -562,7 +563,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 +54 -2
74 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_lrc.c +2 -0
@@ -1065,6 +1065,8 @@ lrc_pin(struct intel_context *ce,void lrc_unpin (struct intel_context *ce) { +if (unlikely (ce->parallel.last_rq)) +i915_request_put (ce->parallel.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
@@ -2961,8 +2961,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->parallel.last_rq) -i915_request_put (ce->parallel.last_rq);unpin_guc_id (guc, ce);lrc_unpin (ce); }
Signature · 1 line
2.32.0