* [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines
@ 2023-10-04 22:07 Jonathan Cavitt
2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags Jonathan Cavitt
` (8 more replies)
0 siblings, 9 replies; 16+ messages in thread
From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw)
To: intel-gfx
Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt,
chris.p.wilson, nirmoy.das
The GuC firmware had defined the interface for Translation Look-Aside
Buffer (TLB) invalidation. We should use this interface when
invalidating the engine and GuC TLBs.
Add additional functionality to intel_gt_invalidate_tlb, invalidating
the GuC TLBs and falling back to GT invalidation when the GuC is
disabled.
The invalidation is done by sending a request directly to the GuC
tlb_lookup that invalidates the table. The invalidation is submitted as
a wait request and is performed in the CT event handler. This means we
cannot perform this TLB invalidation path if the CT is not enabled.
If the request isn't fulfilled in two seconds, this would constitute
an error in the invalidation as that would constitute either a lost
request or a severe GuC overload.
The tlb_lookup table is allocated as an xarray because the set of
pending TLB invalidations may have no upper bound. The consequence of
this is that all actions interfacting with this table need to use the
xarray functions, such as xa_alloc_cyclic_irq for array insertion.
With this new invalidation routine, we can perform GuC-based GGTT
invalidations. GuC-based GGTT invalidation is incompatible with
MMIO invalidation so we should not perform MMIO invalidation when
GuC-based GGTT invalidation is expected.
v2:
- Add missing supporting patches.
v3:
- Split suspend/resume changes and multi-gt support into separate
patches.
- Only perform GuC TLB invalidation functions when supported.
- Move intel_guc_is_enabled check function to usage location.
- Address comments.
v4:
- Change conditions for GuC-based tlb invalidation support
to a pci tag that's only active for MTL.
- Address some FIXMEs and formatting issues.
- Move suspend/resume changes to helper functions in intel_gt.h
- Improve comment for ct_handle_event change.
- Use cleaner if-else conditions.
- Address comments.
v5:
- Reintroduce missing change to selftest msleep duration
- Move suspend/resume loops from intel_gt.h to intel_tlb.c,
making them no longer static inlines.
- Remove superfluous blocking and error checks.
- Move ct_handle_event exception to general case in
ct_process_request.
- Explain usage of xa_alloc_cyclic_irq.
- Modify explanation of purpose of
OUTSTANDING_GUC_TIMEOUT_PERIOD macro.
- Explain purpose of performing tlb invalidation twice in
intel_gt_tlb_resume_all.
v6:
- Add this cover letter.
- Fix explanation of purpose of
OUTSTANDING_GUC_TIMEOUT_PERIOD macro again.
- s/pci tags/pci flags
- Enable GuC TLB Invalidations separately from adding the
flags to do so.
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
CC: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com>
CC: Bruce Chang <yu.bruce.chang@intel.com>
CC: Chris Wilson <chris.p.wilson@intel.com>
CC: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
CC: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
CC: Fei Yang <fei.yang@intel.com>
CC: Andi Shyti <andi.shyti@linux.intel.com>
CC: John Harrison <john.c.harrison@intel.com>
CC: Nirmoy Das <nirmoy.das@intel.com>
CC: Janusz Krzysztofik <janusz.krzysztofik@intel.com>
CC: Matt Roper <matthew.d.roper@intel.com>
CC: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Jonathan Cavitt (4):
drm/i915: Add GuC TLB Invalidation pci flags
drm/i915: No TLB invalidation on wedged or suspended GT
drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck
drm/i915: Enable GuC TLB invalidations for MTL
Prathap Kumar Valsan (1):
drm/i915: Define and use GuC and CTB TLB invalidation routines
drivers/gpu/drm/i915/gt/intel_ggtt.c | 42 +++-
drivers/gpu/drm/i915/gt/intel_gt.h | 1 +
drivers/gpu/drm/i915/gt/intel_tlb.c | 39 ++-
drivers/gpu/drm/i915/gt/intel_tlb.h | 3 +
drivers/gpu/drm/i915/gt/selftest_tlb.c | 2 +-
.../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 33 +++
drivers/gpu/drm/i915/gt/uc/intel_guc.h | 23 ++
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 6 +
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 1 +
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 236 +++++++++++++++++-
drivers/gpu/drm/i915/i915_driver.c | 6 +
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_pci.c | 1 +
drivers/gpu/drm/i915/intel_device_info.h | 3 +-
14 files changed, 379 insertions(+), 18 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 16+ messages in thread* [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-04 22:27 ` Michal Wajdeczko 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/4] drm/i915: Add GuC TLB Invalidation pci tags Jonathan Cavitt ` (7 subsequent siblings) 8 siblings, 1 reply; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das Add pci (device info) flags for if GuC TLB Invalidation is enabled. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_device_info.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cb60fc9cf8737..c53c5586c40c8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -801,4 +801,5 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define HAS_LMEMBAR_SMEM_STOLEN(i915) (!HAS_LMEM(i915) && \ GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) +#define HAS_GUC_TLB_INVALIDATION(i915) (INTEL_INFO(i915)->has_guc_tlb_invalidation) #endif diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 39817490b13fd..ad54db0a22470 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -173,7 +173,8 @@ enum intel_ppgtt_type { func(has_coherent_ggtt); \ func(tuning_thread_rr_after_dep); \ func(unfenced_needs_alignment); \ - func(hws_needs_physical); + func(hws_needs_physical); \ + func(has_guc_tlb_invalidation); struct intel_ip_version { u8 ver; -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags Jonathan Cavitt @ 2023-10-04 22:27 ` Michal Wajdeczko 2023-10-05 13:15 ` Jani Nikula 0 siblings, 1 reply; 16+ messages in thread From: Michal Wajdeczko @ 2023-10-04 22:27 UTC (permalink / raw) To: Jonathan Cavitt, intel-gfx Cc: matthew.d.roper, janusz.krzysztofik, nirmoy.das, andi.shyti, chris.p.wilson On 05.10.2023 00:07, Jonathan Cavitt wrote: > Add pci (device info) flags for if GuC TLB Invalidation is enabled. nit: maybe avoid using "PCI flag" term here (and in the title) as this could be little misleading - better stick to "device info flag" > > Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_device_info.h | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index cb60fc9cf8737..c53c5586c40c8 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -801,4 +801,5 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define HAS_LMEMBAR_SMEM_STOLEN(i915) (!HAS_LMEM(i915) && \ > GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) > > +#define HAS_GUC_TLB_INVALIDATION(i915) (INTEL_INFO(i915)->has_guc_tlb_invalidation) > #endif > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index 39817490b13fd..ad54db0a22470 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -173,7 +173,8 @@ enum intel_ppgtt_type { > func(has_coherent_ggtt); \ > func(tuning_thread_rr_after_dep); \ > func(unfenced_needs_alignment); \ > - func(hws_needs_physical); > + func(hws_needs_physical); \ > + func(has_guc_tlb_invalidation); nit: there is already another "has_guc_deprivilege" flag so maybe we want to keep all GuC flags together ? > > struct intel_ip_version { > u8 ver; ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags 2023-10-04 22:27 ` Michal Wajdeczko @ 2023-10-05 13:15 ` Jani Nikula 0 siblings, 0 replies; 16+ messages in thread From: Jani Nikula @ 2023-10-05 13:15 UTC (permalink / raw) To: Michal Wajdeczko, Jonathan Cavitt, intel-gfx Cc: andi.shyti, janusz.krzysztofik, chris.p.wilson, matthew.d.roper, nirmoy.das On Thu, 05 Oct 2023, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote: > On 05.10.2023 00:07, Jonathan Cavitt wrote: >> Add pci (device info) flags for if GuC TLB Invalidation is enabled. > > nit: maybe avoid using "PCI flag" term here (and in the title) as this > could be little misleading - better stick to "device info flag" > >> >> Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> >> --- >> drivers/gpu/drm/i915/i915_drv.h | 1 + >> drivers/gpu/drm/i915/intel_device_info.h | 3 ++- >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index cb60fc9cf8737..c53c5586c40c8 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -801,4 +801,5 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, >> #define HAS_LMEMBAR_SMEM_STOLEN(i915) (!HAS_LMEM(i915) && \ >> GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) >> >> +#define HAS_GUC_TLB_INVALIDATION(i915) (INTEL_INFO(i915)->has_guc_tlb_invalidation) >> #endif >> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h >> index 39817490b13fd..ad54db0a22470 100644 >> --- a/drivers/gpu/drm/i915/intel_device_info.h >> +++ b/drivers/gpu/drm/i915/intel_device_info.h >> @@ -173,7 +173,8 @@ enum intel_ppgtt_type { >> func(has_coherent_ggtt); \ >> func(tuning_thread_rr_after_dep); \ >> func(unfenced_needs_alignment); \ >> - func(hws_needs_physical); >> + func(hws_needs_physical); \ >> + func(has_guc_tlb_invalidation); > > nit: there is already another "has_guc_deprivilege" flag so maybe we > want to keep all GuC flags together ? /* Keep has_* in alphabetical order */ \ > >> >> struct intel_ip_version { >> u8 ver; -- Jani Nikula, Intel ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH dii-client v6 1/4] drm/i915: Add GuC TLB Invalidation pci tags 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (6 subsequent siblings) 8 siblings, 0 replies; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das Add pci (device info) tags for if GuC TLB Invalidation is enabled. Since GuC based TLB invalidation is only strictly necessary for MTL resently, only enable GuC based TLB invalidations for MTL. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cb60fc9cf8737..c53c5586c40c8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -801,4 +801,5 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define HAS_LMEMBAR_SMEM_STOLEN(i915) (!HAS_LMEM(i915) && \ GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) +#define HAS_GUC_TLB_INVALIDATION(i915) (INTEL_INFO(i915)->has_guc_tlb_invalidation) #endif diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index df7c261410f79..c3a5d5efb45d1 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -837,6 +837,7 @@ static const struct intel_device_info mtl_info = { .memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0), .require_force_probe = 1, + .has_guc_tlb_invalidation = 1, MTL_CACHELEVEL, }; diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 39817490b13fd..ad54db0a22470 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -173,7 +173,8 @@ enum intel_ppgtt_type { func(has_coherent_ggtt); \ func(tuning_thread_rr_after_dep); \ func(unfenced_needs_alignment); \ - func(hws_needs_physical); + func(hws_needs_physical); \ + func(has_guc_tlb_invalidation); struct intel_ip_version { u8 ver; -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/4] drm/i915: Add GuC TLB Invalidation pci tags Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-04 22:48 ` Michal Wajdeczko 2023-10-05 13:58 ` Andi Shyti 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 3/5] drm/i915: No TLB invalidation on wedged or suspended GT Jonathan Cavitt ` (5 subsequent siblings) 8 siblings, 2 replies; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das From: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com> The GuC firmware had defined the interface for Translation Look-Aside Buffer (TLB) invalidation. We should use this interface when invalidating the engine and GuC TLBs. Add additional functionality to intel_gt_invalidate_tlb, invalidating the GuC TLBs and falling back to GT invalidation when the GuC is disabled. The invalidation is done by sending a request directly to the GuC tlb_lookup that invalidates the table. The invalidation is submitted as a wait request and is performed in the CT event handler. This means we cannot perform this TLB invalidation path if the CT is not enabled. If the request isn't fulfilled in two seconds, this would constitute an error in the invalidation as that would constitute either a lost request or a severe GuC overload. The tlb_lookup table is allocated as an xarray because the set of pending TLB invalidations may have no upper bound. The consequence of this is that all actions interfacting with this table need to use the xarray functions, such as xa_alloc_cyclic_irq for array insertion. With this new invalidation routine, we can perform GuC-based GGTT invalidations. GuC-based GGTT invalidation is incompatible with MMIO invalidation so we should not perform MMIO invalidation when GuC-based GGTT invalidation is expected. Signed-off-by: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com> Signed-off-by: Bruce Chang <yu.bruce.chang@intel.com> Signed-off-by: Chris Wilson <chris.p.wilson@intel.com> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com> Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> Signed-off-by: Fei Yang <fei.yang@intel.com> CC: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 42 ++-- drivers/gpu/drm/i915/gt/intel_tlb.c | 14 +- .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 33 +++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 22 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 211 +++++++++++++++++- 7 files changed, 313 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 4d7d88b92632b..be8c216d29f91 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -206,22 +206,38 @@ static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); } -static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) +static void guc_ggtt_ct_invalidate(struct intel_gt *gt) { - struct drm_i915_private *i915 = ggtt->vm.i915; + struct intel_uncore *uncore = gt->uncore; + intel_wakeref_t wakeref; - gen8_ggtt_invalidate(ggtt); + with_intel_runtime_pm_if_active(uncore->rpm, wakeref) { + struct intel_guc *guc = >->uc.guc; - if (GRAPHICS_VER(i915) >= 12) { - struct intel_gt *gt; + intel_guc_invalidate_tlb(guc); + } +} - list_for_each_entry(gt, &ggtt->gt_list, ggtt_link) - intel_uncore_write_fw(gt->uncore, - GEN12_GUC_TLB_INV_CR, - GEN12_GUC_TLB_INV_CR_INVALIDATE); - } else { - intel_uncore_write_fw(ggtt->vm.gt->uncore, - GEN8_GTCR, GEN8_GTCR_INVALIDATE); +static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) +{ + struct drm_i915_private *i915 = ggtt->vm.i915; + struct intel_gt *gt; + + if (!IS_GEN9_LP(i915) && GRAPHICS_VER(i915) < 11) + gen8_ggtt_invalidate(ggtt); + + list_for_each_entry(gt, &ggtt->gt_list, ggtt_link) { + if (HAS_GUC_TLB_INVALIDATION(i915) && + intel_guc_is_ready(>->uc.guc)) { + guc_ggtt_ct_invalidate(gt); + } else if (GRAPHICS_VER(i915) >= 12) { + intel_uncore_write(gt->uncore, + GEN12_GUC_TLB_INV_CR, + GEN12_GUC_TLB_INV_CR_INVALIDATE); + } else { + intel_uncore_write(gt->uncore, + GEN8_GTCR, GEN8_GTCR_INVALIDATE); + } } } @@ -1243,7 +1259,7 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.raw_insert_page = gen8_ggtt_insert_page; } - if (intel_uc_wants_guc(&ggtt->vm.gt->uc)) + if (intel_uc_wants_guc_submission(&ggtt->vm.gt->uc)) ggtt->invalidate = guc_ggtt_invalidate; else ggtt->invalidate = gen8_ggtt_invalidate; diff --git a/drivers/gpu/drm/i915/gt/intel_tlb.c b/drivers/gpu/drm/i915/gt/intel_tlb.c index 139608c30d978..a84563c178bc6 100644 --- a/drivers/gpu/drm/i915/gt/intel_tlb.c +++ b/drivers/gpu/drm/i915/gt/intel_tlb.c @@ -12,6 +12,7 @@ #include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_tlb.h" +#include "uc/intel_guc.h" /* * HW architecture suggest typical invalidation time at 40us, @@ -131,11 +132,22 @@ void intel_gt_invalidate_tlb_full(struct intel_gt *gt, u32 seqno) return; with_intel_gt_pm_if_awake(gt, wakeref) { + struct intel_guc *guc = >->uc.guc; + mutex_lock(>->tlb.invalidate_lock); if (tlb_seqno_passed(gt, seqno)) goto unlock; - mmio_invalidate_full(gt); + if (HAS_GUC_TLB_INVALIDATION(gt->i915)) { + /* + * Only perform GuC TLB invalidation if GuC is ready. + * Otherwise, skip invalidation altogeter. + */ + if (intel_guc_is_ready(guc)) + intel_guc_invalidate_tlb_full(guc); + } else { + mmio_invalidate_full(gt); + } write_seqcount_invalidate(>->tlb.seqno); unlock: diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h index f359bef046e0b..9dff8012d5e76 100644 --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +++ b/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h @@ -138,6 +138,8 @@ enum intel_guc_action { INTEL_GUC_ACTION_REGISTER_CONTEXT_MULTI_LRC = 0x4601, INTEL_GUC_ACTION_CLIENT_SOFT_RESET = 0x5507, INTEL_GUC_ACTION_SET_ENG_UTIL_BUFF = 0x550A, + INTEL_GUC_ACTION_TLB_INVALIDATION = 0x7000, + INTEL_GUC_ACTION_TLB_INVALIDATION_DONE = 0x7001, INTEL_GUC_ACTION_STATE_CAPTURE_NOTIFICATION = 0x8002, INTEL_GUC_ACTION_NOTIFY_FLUSH_LOG_BUFFER_TO_FILE = 0x8003, INTEL_GUC_ACTION_NOTIFY_CRASH_DUMP_POSTED = 0x8004, @@ -181,4 +183,35 @@ enum intel_guc_state_capture_event_status { #define INTEL_GUC_STATE_CAPTURE_EVENT_STATUS_MASK 0x000000FF +#define INTEL_GUC_TLB_INVAL_TYPE_MASK REG_GENMASK(7, 0) +#define INTEL_GUC_TLB_INVAL_MODE_MASK REG_GENMASK(11, 8) +#define INTEL_GUC_TLB_INVAL_FLUSH_CACHE REG_BIT(31) + +enum intel_guc_tlb_invalidation_type { + INTEL_GUC_TLB_INVAL_FULL = 0x0, + INTEL_GUC_TLB_INVAL_GUC = 0x3, +}; + +/* + * 0: Heavy mode of Invalidation: + * The pipeline of the engine(s) for which the invalidation is targeted to is + * blocked, and all the in-flight transactions are guaranteed to be Globally + * Observed before completing the TLB invalidation + * 1: Lite mode of Invalidation: + * TLBs of the targeted engine(s) are immediately invalidated. + * In-flight transactions are NOT guaranteed to be Globally Observed before + * completing TLB invalidation. + * Light Invalidation Mode is to be used only when + * it can be guaranteed (by SW) that the address translations remain invariant + * for the in-flight transactions across the TLB invalidation. In other words, + * this mode can be used when the TLB invalidation is intended to clear out the + * stale cached translations that are no longer in use. Light Invalidation Mode + * is much faster than the Heavy Invalidation Mode, as it does not wait for the + * in-flight transactions to be GOd. + */ +enum intel_guc_tlb_inval_mode { + INTEL_GUC_TLB_INVAL_MODE_HEAVY = 0x0, + INTEL_GUC_TLB_INVAL_MODE_LITE = 0x1, +}; + #endif /* _ABI_GUC_ACTIONS_ABI_H */ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index 6c392bad29c19..d7203ba88b0c0 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -79,6 +79,18 @@ struct intel_guc { */ atomic_t outstanding_submission_g2h; + /** @tlb_lookup: xarray to store all pending TLB invalidation requests */ + struct xarray tlb_lookup; + + /** + * @serial_slot: id to the initial waiter created in tlb_lookup, + * which is used only when failed to allocate new waiter. + */ + u32 serial_slot; + + /** @next_seqno: the next id (sequence no.) to allocate. */ + u32 next_seqno; + /** @interrupts: pointers to GuC interrupt-managing functions. */ struct { bool enabled; @@ -296,6 +308,11 @@ struct intel_guc { #define MAKE_GUC_VER_STRUCT(ver) MAKE_GUC_VER((ver).major, (ver).minor, (ver).patch) #define GUC_SUBMIT_VER(guc) MAKE_GUC_VER_STRUCT((guc)->submission_version) +struct intel_guc_tlb_wait { + struct wait_queue_head wq; + bool busy; +}; + static inline struct intel_guc *log_to_guc(struct intel_guc_log *log) { return container_of(log, struct intel_guc, log); @@ -418,6 +435,11 @@ static inline bool intel_guc_is_supported(struct intel_guc *guc) return intel_uc_fw_is_supported(&guc->fw); } +int intel_guc_invalidate_tlb_full(struct intel_guc *guc); +int intel_guc_invalidate_tlb(struct intel_guc *guc); +int intel_guc_tlb_invalidation_done(struct intel_guc *guc, const u32 *hxg, + u32 size); + static inline bool intel_guc_is_wanted(struct intel_guc *guc) { return intel_uc_fw_is_enabled(&guc->fw); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c index 6e22af31513a5..1ee4d4a988398 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -1115,6 +1115,11 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r case INTEL_GUC_ACTION_NOTIFY_EXCEPTION: ret = intel_guc_crash_process_msg(guc, action); break; + case INTEL_GUC_ACTION_TLB_INVALIDATION_DONE: + ret = intel_guc_tlb_invalidation_done(ct_to_guc(ct), hxg, request->size); + if (unlikely(ret)) + ct_free_msg(request); + break; default: ret = -EOPNOTSUPP; break; @@ -1186,6 +1191,7 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ switch (action) { case INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_DONE: case INTEL_GUC_ACTION_DEREGISTER_CONTEXT_DONE: + case INTEL_GUC_ACTION_TLB_INVALIDATION_DONE: g2h_release_space(ct, request->size); } diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h index b4d56eccfb1f0..a7c9874e122a3 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h @@ -22,6 +22,7 @@ /* Payload length only i.e. don't include G2H header length */ #define G2H_LEN_DW_SCHED_CONTEXT_MODE_SET 2 #define G2H_LEN_DW_DEREGISTER_CONTEXT 1 +#define G2H_LEN_DW_INVALIDATE_TLB 1 #define GUC_CONTEXT_DISABLE 0 #define GUC_CONTEXT_ENABLE 1 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 2cce5ec1ff00d..7b484d1573f16 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1798,9 +1798,11 @@ static void __guc_reset_context(struct intel_context *ce, intel_engine_mask_t st void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stalled) { + struct intel_guc_tlb_wait *wait; struct intel_context *ce; unsigned long index; unsigned long flags; + unsigned long i; if (unlikely(!guc_submission_initialized(guc))) { /* Reset called during driver load? GuC not yet initialised! */ @@ -1826,6 +1828,14 @@ void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stall /* GuC is blown away, drop all references to contexts */ xa_destroy(&guc->context_lookup); + + /* + * The full GT reset will have cleared the TLB caches and flushed the + * G2H message queue; we can release all the blocked waiters. + */ + xa_for_each(&guc->tlb_lookup, i, wait) { + wake_up(&wait->wq); + } } static void guc_cancel_context_requests(struct intel_context *ce) @@ -1948,6 +1958,49 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) static void destroyed_worker_func(struct work_struct *w); static void reset_fail_worker_func(struct work_struct *w); +static int init_tlb_lookup(struct intel_guc *guc) +{ + struct intel_guc_tlb_wait *wait; + int err; + + if (!HAS_GUC_TLB_INVALIDATION(guc_to_gt(guc)->i915)) + return 0; + + xa_init_flags(&guc->tlb_lookup, XA_FLAGS_ALLOC); + + wait = kzalloc(sizeof(*wait), GFP_KERNEL); + if (!wait) + return -ENOMEM; + + init_waitqueue_head(&wait->wq); + + /* Preallocate a shared id for use under memory pressure. */ + err = xa_alloc_cyclic_irq(&guc->tlb_lookup, &guc->serial_slot, wait, + xa_limit_32b, &guc->next_seqno, GFP_KERNEL); + if (err == -ENOMEM) { + kfree(wait); + return err; + } + + return 0; +} + +static void fini_tlb_lookup(struct intel_guc *guc) +{ + struct intel_guc_tlb_wait *wait; + + if (!HAS_GUC_TLB_INVALIDATION(guc_to_gt(guc)->i915)) + return; + + wait = xa_load(&guc->tlb_lookup, guc->serial_slot); + if (wait) { + GEM_BUG_ON(wait->busy); + kfree(wait); + } + + xa_destroy(&guc->tlb_lookup); +} + /* * Set up the memory resources to be shared with the GuC (via the GGTT) * at firmware loading time. @@ -1966,11 +2019,15 @@ int intel_guc_submission_init(struct intel_guc *guc) return ret; } + ret = init_tlb_lookup(guc); + if (ret) + goto destroy_pool; + guc->submission_state.guc_ids_bitmap = bitmap_zalloc(NUMBER_MULTI_LRC_GUC_ID(guc), GFP_KERNEL); if (!guc->submission_state.guc_ids_bitmap) { ret = -ENOMEM; - goto destroy_pool; + goto destroy_tlb; } guc->timestamp.ping_delay = (POLL_TIME_CLKS / gt->clock_frequency + 1) * HZ; @@ -1979,9 +2036,10 @@ int intel_guc_submission_init(struct intel_guc *guc) return 0; +destroy_tlb: + fini_tlb_lookup(guc); destroy_pool: guc_lrc_desc_pool_destroy_v69(guc); - return ret; } @@ -1994,6 +2052,7 @@ void intel_guc_submission_fini(struct intel_guc *guc) guc_lrc_desc_pool_destroy_v69(guc); i915_sched_engine_put(guc->sched_engine); bitmap_free(guc->submission_state.guc_ids_bitmap); + fini_tlb_lookup(guc); guc->submission_initialized = false; } @@ -4624,6 +4683,154 @@ g2h_context_lookup(struct intel_guc *guc, u32 ctx_id) return ce; } +static void wait_wake_outstanding_tlb_g2h(struct intel_guc *guc, u32 seqno) +{ + struct intel_guc_tlb_wait *wait; + unsigned long flags; + + xa_lock_irqsave(&guc->tlb_lookup, flags); + wait = xa_load(&guc->tlb_lookup, seqno); + + /* We received a response after the waiting task did exit with a timeout */ + if (wait) + wake_up(&wait->wq); + else + drm_dbg(&guc_to_gt(guc)->i915->drm, + "Stale TLB invalidation response with seqno %d\n", seqno); + + xa_unlock_irqrestore(&guc->tlb_lookup, flags); +} + +int intel_guc_tlb_invalidation_done(struct intel_guc *guc, const u32 *hxg, u32 size) +{ + u32 seqno, hxg_len, len; + + hxg_len = size - GUC_CTB_MSG_MIN_LEN; + len = hxg_len - GUC_HXG_MSG_MIN_LEN; + + /* Check for underflow */ + if (unlikely(len < 1 || len > size)) + return -EPROTO; + + seqno = hxg[GUC_HXG_MSG_MIN_LEN]; + wait_wake_outstanding_tlb_g2h(guc, seqno); + return 0; +} + +static long must_wait_woken(struct wait_queue_entry *wq_entry, long timeout) +{ + /* + * This is equivalent to wait_woken() with the exception that + * we do not wake up early if the kthread task has been completed. + * As we are called from page reclaim in any task context, + * we may be invoked from stopped kthreads, but we *must* + * complete the wait from the HW . + * + * A second problem is that since we are called under reclaim + * and wait_woken() inspected the thread state, it makes an invalid + * assumption that all PF_KTHREAD tasks have set_kthread_struct() + * called upon them, and will trigger a GPF in is_kthread_should_stop(). + */ + do { + set_current_state(TASK_UNINTERRUPTIBLE); + if (wq_entry->flags & WQ_FLAG_WOKEN) + break; + + timeout = schedule_timeout(timeout); + } while (timeout); + __set_current_state(TASK_RUNNING); + + /* See wait_woken() and woken_wake_function() */ + smp_store_mb(wq_entry->flags, wq_entry->flags & ~WQ_FLAG_WOKEN); + + return timeout; +} + +static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 type) +{ + struct intel_guc_tlb_wait _wq, *wq = &_wq; + DEFINE_WAIT_FUNC(wait, woken_wake_function); + struct intel_gt *gt = guc_to_gt(guc); + int err; + u32 seqno; + u32 action[] = { + INTEL_GUC_ACTION_TLB_INVALIDATION, + 0, + REG_FIELD_PREP(INTEL_GUC_TLB_INVAL_TYPE_MASK, type) | + REG_FIELD_PREP(INTEL_GUC_TLB_INVAL_MODE_MASK, + INTEL_GUC_TLB_INVAL_MODE_HEAVY) | + INTEL_GUC_TLB_INVAL_FLUSH_CACHE, + }; + u32 size = ARRAY_SIZE(action); + + if (!intel_guc_ct_enabled(&guc->ct)) + return -EINVAL; + + init_waitqueue_head(&_wq.wq); + + if (xa_alloc_cyclic_irq(&guc->tlb_lookup, &seqno, wq, + xa_limit_32b, &guc->next_seqno, + GFP_ATOMIC | __GFP_NOWARN) < 0) { + /* Under severe memory pressure? Serialise TLB allocations */ + xa_lock_irq(&guc->tlb_lookup); + wq = xa_load(&guc->tlb_lookup, guc->serial_slot); + wait_event_lock_irq(wq->wq, + !READ_ONCE(wq->busy), + guc->tlb_lookup.xa_lock); + /* + * Update wq->busy under lock to ensure only one waiter can + * issue the TLB invalidation command using the serial slot at a + * time. The condition is set to true before releasing the lock + * so that other caller continue to wait until woken up again. + */ + wq->busy = true; + xa_unlock_irq(&guc->tlb_lookup); + + seqno = guc->serial_slot; + } + + action[1] = seqno; + + add_wait_queue(&wq->wq, &wait); + + err = intel_guc_send_busy_loop(guc, action, size, G2H_LEN_DW_INVALIDATE_TLB, true); + if (err) + goto out; + + /* + * GuC has a timeout of 1ms for a TLB invalidation response from GAM. On a + * timeout GuC drops the request and has no mechanism to notify the host about + * the timeout. There is also no mechanism for determining the number of + * outstanding requests in the CT buffer. Ergo, keep a larger timeout that accounts + * for this individual timeout and the max number of outstanding requests that + * can be queued in CT buffer. + */ +#define OUTSTANDING_GUC_TIMEOUT_PERIOD (HZ * 2) + if (!must_wait_woken(&wait, OUTSTANDING_GUC_TIMEOUT_PERIOD)) { + gt_err(gt, + "TLB invalidation response timed out for seqno %u\n", seqno); + err = -ETIME; + } +out: + remove_wait_queue(&wq->wq, &wait); + if (seqno != guc->serial_slot) + xa_erase_irq(&guc->tlb_lookup, seqno); + + return err; +} + +/* Full TLB invalidation */ +int intel_guc_invalidate_tlb_full(struct intel_guc *guc) +{ + return guc_send_invalidate_tlb(guc, INTEL_GUC_TLB_INVAL_FULL); +} + +/* GuC TLB Invalidation: Invalidate the TLB's of GuC itself. */ +int intel_guc_invalidate_tlb(struct intel_guc *guc) +{ + return guc_send_invalidate_tlb(guc, INTEL_GUC_TLB_INVAL_GUC); +} + int intel_guc_deregister_done_process_msg(struct intel_guc *guc, const u32 *msg, u32 len) -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt @ 2023-10-04 22:48 ` Michal Wajdeczko 2023-10-05 13:58 ` Andi Shyti 1 sibling, 0 replies; 16+ messages in thread From: Michal Wajdeczko @ 2023-10-04 22:48 UTC (permalink / raw) To: Jonathan Cavitt, intel-gfx Cc: matthew.d.roper, janusz.krzysztofik, nirmoy.das, andi.shyti, chris.p.wilson On 05.10.2023 00:07, Jonathan Cavitt wrote: > From: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com> > snip > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > index 6e22af31513a5..1ee4d4a988398 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > @@ -1115,6 +1115,11 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r > case INTEL_GUC_ACTION_NOTIFY_EXCEPTION: > ret = intel_guc_crash_process_msg(guc, action); > break; > + case INTEL_GUC_ACTION_TLB_INVALIDATION_DONE: > + ret = intel_guc_tlb_invalidation_done(ct_to_guc(ct), hxg, request->size); > + if (unlikely(ret)) > + ct_free_msg(request); why this request message is released here ? for other actions this is done in unified way either later in this function (for success case) or in the caller (error case) so this will cause double free for (unlikely) error case, no ? > + break; > default: > ret = -EOPNOTSUPP; > break; > @@ -1186,6 +1191,7 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ > switch (action) { > case INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_DONE: > case INTEL_GUC_ACTION_DEREGISTER_CONTEXT_DONE: > + case INTEL_GUC_ACTION_TLB_INVALIDATION_DONE: > g2h_release_space(ct, request->size); > } > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt 2023-10-04 22:48 ` Michal Wajdeczko @ 2023-10-05 13:58 ` Andi Shyti 1 sibling, 0 replies; 16+ messages in thread From: Andi Shyti @ 2023-10-05 13:58 UTC (permalink / raw) To: Jonathan Cavitt Cc: chris.p.wilson, intel-gfx, matthew.d.roper, janusz.krzysztofik, nirmoy.das Hi Jonathan, > - if (intel_uc_wants_guc(&ggtt->vm.gt->uc)) > + if (intel_uc_wants_guc_submission(&ggtt->vm.gt->uc)) I think the failures we see in CI come from here. I think you had it right the first time, this should have both the checks: if (intel_uc_wants_guc(&ggtt->vm.gt->uc) && intel_uc_wants_guc_submission(&ggtt->vm.gt->uc)) The first is checking whether GuC is enabled, the second is checking if the submission is enabled. AFAU, running through the net of is_supported/wanted/enabled/disabled/gone/awol/onholiday/chillingout/.../ there is a distinction between supported and enabled. The condition for GuC submission to be enabled is to have GuC supported, but not necessarily enabled. So answering Tvrtko's question: No, intel_uc_wants_guc_submission() does not imply intel_uc_wants_guc(). Question to GuC experts... should it be? Andi ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH dii-client v6 3/5] drm/i915: No TLB invalidation on wedged or suspended GT 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (2 preceding siblings ...) 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 4/5] drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck Jonathan Cavitt ` (4 subsequent siblings) 8 siblings, 0 replies; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das In case of GT is suspended or wedged, don't allow submission of new TLB invalidation request and cancel all pending requests. The TLB entries will be invalidated either during GuC reload or on system resume. Signed-off-by: Fei Yang <fei.yang@intel.com> Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> CC: John Harrison <john.c.harrison@intel.com> --- drivers/gpu/drm/i915/gt/intel_gt.h | 1 + drivers/gpu/drm/i915/gt/intel_tlb.c | 25 ++++++++++++ drivers/gpu/drm/i915/gt/intel_tlb.h | 3 ++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 39 +++++++++++++++---- drivers/gpu/drm/i915/i915_driver.c | 6 +++ 6 files changed, 68 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h index 970bedf6b78a7..4e3bb221d2f4d 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.h +++ b/drivers/gpu/drm/i915/gt/intel_gt.h @@ -179,4 +179,5 @@ enum i915_map_type intel_gt_coherent_map_type(struct intel_gt *gt, void intel_gt_bind_context_set_ready(struct intel_gt *gt); void intel_gt_bind_context_set_unready(struct intel_gt *gt); bool intel_gt_is_bind_context_ready(struct intel_gt *gt); + #endif /* __INTEL_GT_H__ */ diff --git a/drivers/gpu/drm/i915/gt/intel_tlb.c b/drivers/gpu/drm/i915/gt/intel_tlb.c index a84563c178bc6..c6bb1b34abdaa 100644 --- a/drivers/gpu/drm/i915/gt/intel_tlb.c +++ b/drivers/gpu/drm/i915/gt/intel_tlb.c @@ -166,6 +166,31 @@ void intel_gt_fini_tlb(struct intel_gt *gt) mutex_destroy(>->tlb.invalidate_lock); } +void intel_gt_tlb_suspend_all(struct drm_i915_private *i915) +{ + struct intel_gt *gt; + int i; + + if (!HAS_GUC_TLB_INVALIDATION(i915)) + return; + for_each_gt(gt, i915, i) + wake_up_all_tlb_invalidate(>->uc.guc); +} + +void intel_gt_tlb_resume_all(struct drm_i915_private *i915) +{ + struct intel_gt *gt; + int i; + + if (!HAS_GUC_TLB_INVALIDATION(i915)) + return; + for_each_gt(gt, i915, i) { + /* Perform tlb invalidation on both GT and GuC, in that order. */ + intel_guc_invalidate_tlb_full(>->uc.guc); + intel_guc_invalidate_tlb(>->uc.guc); + } +} + #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftest_tlb.c" #endif diff --git a/drivers/gpu/drm/i915/gt/intel_tlb.h b/drivers/gpu/drm/i915/gt/intel_tlb.h index 337327af92ac4..1a34ec0c447f2 100644 --- a/drivers/gpu/drm/i915/gt/intel_tlb.h +++ b/drivers/gpu/drm/i915/gt/intel_tlb.h @@ -26,4 +26,7 @@ static inline u32 intel_gt_next_invalidate_tlb_full(const struct intel_gt *gt) return intel_gt_tlb_seqno(gt) | 1; } +void intel_gt_tlb_suspend_all(struct drm_i915_private *i915); +void intel_gt_tlb_resume_all(struct drm_i915_private *i915); + #endif /* INTEL_TLB_H */ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index d7203ba88b0c0..e76b26095eef2 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -536,4 +536,5 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p); int intel_guc_sched_disable_gucid_threshold_max(struct intel_guc *guc); +void wake_up_all_tlb_invalidate(struct intel_guc *guc); #endif diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 7b484d1573f16..7172335199c76 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -32,6 +32,7 @@ #include "i915_drv.h" #include "i915_reg.h" +#include "i915_irq.h" #include "i915_trace.h" /** @@ -1796,13 +1797,23 @@ static void __guc_reset_context(struct intel_context *ce, intel_engine_mask_t st intel_context_put(parent); } -void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stalled) +void wake_up_all_tlb_invalidate(struct intel_guc *guc) { struct intel_guc_tlb_wait *wait; + unsigned long i; + + if (!HAS_GUC_TLB_INVALIDATION(guc_to_gt(guc)->i915)) + return; + xa_for_each(&guc->tlb_lookup, i, wait) { + wake_up(&wait->wq); + } +} + +void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stalled) +{ struct intel_context *ce; unsigned long index; unsigned long flags; - unsigned long i; if (unlikely(!guc_submission_initialized(guc))) { /* Reset called during driver load? GuC not yet initialised! */ @@ -1833,9 +1844,7 @@ void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stall * The full GT reset will have cleared the TLB caches and flushed the * G2H message queue; we can release all the blocked waiters. */ - xa_for_each(&guc->tlb_lookup, i, wait) { - wake_up(&wait->wq); - } + wake_up_all_tlb_invalidate(guc); } static void guc_cancel_context_requests(struct intel_context *ce) @@ -1931,6 +1940,12 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc) /* GuC is blown away, drop all references to contexts */ xa_destroy(&guc->context_lookup); + + /* + * Wedged GT won't respond to any TLB invalidation request. Simply + * release all the blocked waiters. + */ + wake_up_all_tlb_invalidate(guc); } void intel_guc_submission_reset_finish(struct intel_guc *guc) @@ -4746,6 +4761,14 @@ static long must_wait_woken(struct wait_queue_entry *wq_entry, long timeout) return timeout; } +static bool intel_gt_is_enabled(const struct intel_gt *gt) +{ + /* Check if GT is wedged or suspended */ + if (intel_gt_is_wedged(gt) || !intel_irqs_enabled(gt->i915)) + return false; + return true; +} + static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 type) { struct intel_guc_tlb_wait _wq, *wq = &_wq; @@ -4763,7 +4786,8 @@ static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 type) }; u32 size = ARRAY_SIZE(action); - if (!intel_guc_ct_enabled(&guc->ct)) + if (!intel_gt_is_enabled(gt) || + !intel_guc_ct_enabled(&guc->ct)) return -EINVAL; init_waitqueue_head(&_wq.wq); @@ -4806,7 +4830,8 @@ static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 type) * can be queued in CT buffer. */ #define OUTSTANDING_GUC_TIMEOUT_PERIOD (HZ * 2) - if (!must_wait_woken(&wait, OUTSTANDING_GUC_TIMEOUT_PERIOD)) { + if (intel_gt_is_enabled(gt) && + !must_wait_woken(&wait, OUTSTANDING_GUC_TIMEOUT_PERIOD)) { gt_err(gt, "TLB invalidation response timed out for seqno %u\n", seqno); err = -ETIME; diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index ccbb2834cde07..0c9d9826d2f41 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -72,6 +72,7 @@ #include "gt/intel_gt.h" #include "gt/intel_gt_pm.h" #include "gt/intel_rc6.h" +#include "gt/intel_tlb.h" #include "pxp/intel_pxp.h" #include "pxp/intel_pxp_debugfs.h" @@ -1093,6 +1094,9 @@ static int i915_drm_suspend(struct drm_device *dev) intel_dp_mst_suspend(dev_priv); intel_runtime_pm_disable_interrupts(dev_priv); + + intel_gt_tlb_suspend_all(dev_priv); + intel_hpd_cancel_work(dev_priv); intel_suspend_encoders(dev_priv); @@ -1264,6 +1268,8 @@ static int i915_drm_resume(struct drm_device *dev) intel_gvt_resume(dev_priv); + intel_gt_tlb_resume_all(dev_priv); + enable_rpm_wakeref_asserts(&dev_priv->runtime_pm); return 0; -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH dii-client v6 4/5] drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (3 preceding siblings ...) 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 3/5] drm/i915: No TLB invalidation on wedged or suspended GT Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 5/5] drm/i915: Enable GuC TLB invalidations for MTL Jonathan Cavitt ` (3 subsequent siblings) 8 siblings, 0 replies; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das For the gt_tlb live selftest, increase the timeout from 10 ms to 200 ms. 200 ms should be more than enough time, and 10 ms was too aggressive. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/gt/selftest_tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/selftest_tlb.c b/drivers/gpu/drm/i915/gt/selftest_tlb.c index 7e41f69fc818f..46e0a1dbecc8d 100644 --- a/drivers/gpu/drm/i915/gt/selftest_tlb.c +++ b/drivers/gpu/drm/i915/gt/selftest_tlb.c @@ -137,7 +137,7 @@ pte_tlbinv(struct intel_context *ce, i915_request_add(rq); /* Short sleep to sanitycheck the batch is spinning before we begin */ - msleep(10); + msleep(200); if (va == vb) { if (!i915_request_completed(rq)) { pr_err("%s(%s): Semaphore sanitycheck failed %llx, with alignment %llx, using PTE size %x (phys %x, sg %x)\n", -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH dii-client v6 5/5] drm/i915: Enable GuC TLB invalidations for MTL 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (4 preceding siblings ...) 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 4/5] drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck Jonathan Cavitt @ 2023-10-04 22:07 ` Jonathan Cavitt 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Patchwork ` (2 subsequent siblings) 8 siblings, 0 replies; 16+ messages in thread From: Jonathan Cavitt @ 2023-10-04 22:07 UTC (permalink / raw) To: intel-gfx Cc: janusz.krzysztofik, andi.shyti, matthew.d.roper, jonathan.cavitt, chris.p.wilson, nirmoy.das Enable GuC TLB invalidations for MTL. Though more platforms than just MTL support GuC TLB invalidations, MTL is presently the only platform that requires it for any purpose, so only enable it there for now to minimize cross-platform impact. Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index df7c261410f79..c3a5d5efb45d1 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -837,6 +837,7 @@ static const struct intel_device_info mtl_info = { .memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0), .require_force_probe = 1, + .has_guc_tlb_invalidation = 1, MTL_CACHELEVEL, }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (5 preceding siblings ...) 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 5/5] drm/i915: Enable GuC TLB invalidations for MTL Jonathan Cavitt @ 2023-10-05 2:53 ` Patchwork 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2023-10-05 3:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 8 siblings, 0 replies; 16+ messages in thread From: Patchwork @ 2023-10-05 2:53 UTC (permalink / raw) To: Jonathan Cavitt; +Cc: intel-gfx == Series Details == Series: Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines URL : https://patchwork.freedesktop.org/series/124641/ State : warning == Summary == Error: dim checkpatch failed 1653f6156104 drm/i915: Add GuC TLB Invalidation pci flags 9597e085aec0 drm/i915: Define and use GuC and CTB TLB invalidation routines -:342: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants #342: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:1997: + GEM_BUG_ON(wait->busy); total: 0 errors, 1 warnings, 0 checks, 458 lines checked f9dd0c4123db drm/i915: No TLB invalidation on wedged or suspended GT c4e731137767 drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck bb52b3184a9e drm/i915: Enable GuC TLB invalidations for MTL ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (6 preceding siblings ...) 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Patchwork @ 2023-10-05 2:53 ` Patchwork 2023-10-05 3:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 8 siblings, 0 replies; 16+ messages in thread From: Patchwork @ 2023-10-05 2:53 UTC (permalink / raw) To: Jonathan Cavitt; +Cc: intel-gfx == Series Details == Series: Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines URL : https://patchwork.freedesktop.org/series/124641/ State : warning == Summary == Error: dim sparse failed Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt ` (7 preceding siblings ...) 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork @ 2023-10-05 3:16 ` Patchwork 2023-10-05 13:00 ` Andi Shyti 8 siblings, 1 reply; 16+ messages in thread From: Patchwork @ 2023-10-05 3:16 UTC (permalink / raw) To: Jonathan Cavitt; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 10356 bytes --] == Series Details == Series: Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines URL : https://patchwork.freedesktop.org/series/124641/ State : failure == Summary == CI Bug Log - changes from CI_DRM_13713 -> Patchwork_124641v1 ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_124641v1 absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_124641v1, please notify your bug team (lgci.bug.filing@intel.com) 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_124641v1/index.html Participating hosts (40 -> 38) ------------------------------ Additional (1): fi-kbl-soraka Missing (3): fi-hsw-4770 bat-dg2-11 fi-snb-2520m Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_124641v1: ### CI changes ### #### Possible regressions #### * boot: - bat-dg1-5: [PASS][1] -> [FAIL][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-dg1-5/boot.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-dg1-5/boot.html ### IGT changes ### #### Possible regressions #### * igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling: - bat-adlm-1: [PASS][3] -> [INCOMPLETE][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-adlm-1/igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlm-1/igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling.html * igt@kms_busy@basic@flip: - bat-adlp-11: [PASS][5] -> [ABORT][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-adlp-11/igt@kms_busy@basic@flip.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlp-11/igt@kms_busy@basic@flip.html - bat-adlp-6: [PASS][7] -> [INCOMPLETE][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-adlp-6/igt@kms_busy@basic@flip.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlp-6/igt@kms_busy@basic@flip.html * igt@kms_busy@basic@modeset: - bat-adlp-11: [PASS][9] -> [DMESG-WARN][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-adlp-11/igt@kms_busy@basic@modeset.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlp-11/igt@kms_busy@basic@modeset.html * igt@kms_force_connector_basic@force-connector-state: - bat-rpls-1: [PASS][11] -> [INCOMPLETE][12] [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-rpls-1/igt@kms_force_connector_basic@force-connector-state.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-rpls-1/igt@kms_force_connector_basic@force-connector-state.html Known issues ------------ Here are the changes found in Patchwork_124641v1 that come from known issues: ### CI changes ### #### Possible fixes #### * boot: - fi-bsw-n3050: [FAIL][13] ([i915#8293]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/fi-bsw-n3050/boot.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-bsw-n3050/boot.html ### IGT changes ### #### Issues hit #### * igt@gem_exec_suspend@basic-s3@lmem0: - bat-atsm-1: NOTRUN -> [DMESG-WARN][15] ([i915#8841]) +4 other tests dmesg-warn [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-atsm-1/igt@gem_exec_suspend@basic-s3@lmem0.html * igt@gem_huc_copy@huc-copy: - fi-kbl-soraka: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#2190]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@basic: - fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#4613]) +3 other tests skip [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html * igt@gem_lmem_swapping@random-engines: - fi-bsw-n3050: NOTRUN -> [SKIP][18] ([fdo#109271]) +18 other tests skip [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-bsw-n3050/igt@gem_lmem_swapping@random-engines.html * igt@i915_selftest@live@gt_pm: - fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][19] ([i915#1886] / [i915#7913]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html * igt@i915_selftest@live@gtt: - bat-adlp-9: [PASS][20] -> [INCOMPLETE][21] ([i915#7913]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-adlp-9/igt@i915_selftest@live@gtt.html [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlp-9/igt@i915_selftest@live@gtt.html * igt@i915_suspend@basic-s3-without-i915: - bat-atsm-1: NOTRUN -> [SKIP][22] ([i915#6645]) [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html - bat-mtlp-8: NOTRUN -> [SKIP][23] ([i915#6645]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-mtlp-8/igt@i915_suspend@basic-s3-without-i915.html * igt@kms_dsc@dsc-basic: - fi-kbl-soraka: NOTRUN -> [SKIP][24] ([fdo#109271]) +9 other tests skip [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-kbl-soraka/igt@kms_dsc@dsc-basic.html * igt@kms_hdmi_inject@inject-audio: - fi-bsw-n3050: NOTRUN -> [FAIL][25] ([IGT#3]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-bsw-n3050/igt@kms_hdmi_inject@inject-audio.html * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence: - bat-adlp-9: NOTRUN -> [SKIP][26] ([i915#3546]) +3 other tests skip [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-adlp-9/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html * igt@kms_pipe_crc_basic@suspend-read-crc: - bat-atsm-1: NOTRUN -> [SKIP][27] ([i915#1836]) [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-atsm-1/igt@kms_pipe_crc_basic@suspend-read-crc.html #### Possible fixes #### * igt@i915_selftest@live@execlists: - fi-bsw-nick: [ABORT][28] ([i915#7911] / [i915#7913]) -> [PASS][29] [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/fi-bsw-nick/igt@i915_selftest@live@execlists.html [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-bsw-nick/igt@i915_selftest@live@execlists.html * igt@i915_selftest@live@gt_heartbeat: - fi-apl-guc: [DMESG-FAIL][30] ([i915#5334]) -> [PASS][31] [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html * igt@i915_selftest@live@requests: - bat-mtlp-8: [ABORT][32] ([i915#9414]) -> [PASS][33] [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/bat-mtlp-8/igt@i915_selftest@live@requests.html [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/bat-mtlp-8/igt@i915_selftest@live@requests.html * igt@kms_hdmi_inject@inject-audio: - fi-kbl-guc: [FAIL][34] ([IGT#3]) -> [PASS][35] [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html #### Warnings #### * igt@i915_suspend@basic-s2idle-without-i915: - fi-ivb-3770: [DMESG-WARN][36] ([i915#1982] / [i915#8841]) -> [DMESG-WARN][37] ([i915#8841]) [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13713/fi-ivb-3770/igt@i915_suspend@basic-s2idle-without-i915.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/fi-ivb-3770/igt@i915_suspend@basic-s2idle-without-i915.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [IGT#3]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/3 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836 [i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886 [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334 [i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645 [i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911 [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913 [i915#7952]: https://gitlab.freedesktop.org/drm/intel/issues/7952 [i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293 [i915#8841]: https://gitlab.freedesktop.org/drm/intel/issues/8841 [i915#9414]: https://gitlab.freedesktop.org/drm/intel/issues/9414 Build changes ------------- * Linux: CI_DRM_13713 -> Patchwork_124641v1 CI-20190529: 20190529 CI_DRM_13713: 4540606b1e3d945191858f82b07576e12feb7f26 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7512: 2eb58faf82d3cd5e2e74154a7319cff56eb40762 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_124641v1: 4540606b1e3d945191858f82b07576e12feb7f26 @ git://anongit.freedesktop.org/gfx-ci/linux ### Linux commits 7de49a4dd341 drm/i915: Enable GuC TLB invalidations for MTL f93bbcc1b3ff drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck 43d14c80d008 drm/i915: No TLB invalidation on wedged or suspended GT 29cb8062a692 drm/i915: Define and use GuC and CTB TLB invalidation routines eb6fcbde7a3d drm/i915: Add GuC TLB Invalidation pci flags == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_124641v1/index.html [-- Attachment #2: Type: text/html, Size: 12150 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-05 3:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork @ 2023-10-05 13:00 ` Andi Shyti 2023-10-05 13:03 ` Andi Shyti 0 siblings, 1 reply; 16+ messages in thread From: Andi Shyti @ 2023-10-05 13:00 UTC (permalink / raw) To: intel-gfx; +Cc: Jonathan Cavitt Hi Jonathan, > CI changes > > Possible regressions > > • boot: > □ bat-dg1-5: PASS -> FAIL > > IGT changes > > Possible regressions > > • igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling: > > □ bat-adlm-1: PASS -> INCOMPLETE > • igt@kms_busy@basic@flip: > > □ bat-adlp-11: PASS -> ABORT > > □ bat-adlp-6: PASS -> INCOMPLETE > > • igt@kms_busy@basic@modeset: > > □ bat-adlp-11: PASS -> DMESG-WARN > • igt@kms_force_connector_basic@force-connector-state: > > □ bat-rpls-1: PASS -> INCOMPLETE Although these failures appear very consistently, they don't look related to your patch. But still I wonder why they show up so consistently. Is anyone from the list able to provide some thoughts? Andi ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines 2023-10-05 13:00 ` Andi Shyti @ 2023-10-05 13:03 ` Andi Shyti 0 siblings, 0 replies; 16+ messages in thread From: Andi Shyti @ 2023-10-05 13:03 UTC (permalink / raw) To: Andi Shyti; +Cc: intel-gfx, Jonathan Cavitt Hi, > > CI changes > > > > Possible regressions > > > > • boot: > > □ bat-dg1-5: PASS -> FAIL > > > > IGT changes > > > > Possible regressions > > > > • igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling: > > > > □ bat-adlm-1: PASS -> INCOMPLETE > > • igt@kms_busy@basic@flip: > > > > □ bat-adlp-11: PASS -> ABORT > > > > □ bat-adlp-6: PASS -> INCOMPLETE > > > > • igt@kms_busy@basic@modeset: > > > > □ bat-adlp-11: PASS -> DMESG-WARN > > • igt@kms_force_connector_basic@force-connector-state: > > > > □ bat-rpls-1: PASS -> INCOMPLETE > > Although these failures appear very consistently, they don't look > related to your patch. But still I wonder why they show up so > consistently. > > Is anyone from the list able to provide some thoughts? Please, ignore, they go through guc_ggtt_invalidate... the log was hidden :-) Andi ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-10-05 13:58 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-10-04 22:07 [Intel-gfx] [PATCH dii-client v6 0/5] Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/5] drm/i915: Add GuC TLB Invalidation pci flags Jonathan Cavitt 2023-10-04 22:27 ` Michal Wajdeczko 2023-10-05 13:15 ` Jani Nikula 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 1/4] drm/i915: Add GuC TLB Invalidation pci tags Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 2/5] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt 2023-10-04 22:48 ` Michal Wajdeczko 2023-10-05 13:58 ` Andi Shyti 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 3/5] drm/i915: No TLB invalidation on wedged or suspended GT Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 4/5] drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck Jonathan Cavitt 2023-10-04 22:07 ` [Intel-gfx] [PATCH dii-client v6 5/5] drm/i915: Enable GuC TLB invalidations for MTL Jonathan Cavitt 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Subject: [PATCH dii-client v6 0/4] drm/i915: Define and use GuC and CTB TLB invalidation routines Patchwork 2023-10-05 2:53 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2023-10-05 3:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2023-10-05 13:00 ` Andi Shyti 2023-10-05 13:03 ` Andi Shyti
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox