drm/i915: Sanitize engine context sizes
Joonas Lahtinen
maintainerPATCH v3 1/1 drm/i915: Sanitize engine context sizes
Pre-calculate engine context size based on engine class and device generation and store it in the engine instance.
v2:
- Squash and get rid of hw_context_size (Chris)
v3:
- Move after MMIO init for probing on Gen7 and 8 (Chris)
- Retained rounding (Tvrtko)
--- drivers/gpu/drm/i915/gvt/scheduler.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 15 +++-- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_context.c | 61 +++----------------- drivers/gpu/drm/i915/i915_guc_submission.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 10 ---- drivers/gpu/drm/i915/intel_engine_cs.c | 90 +++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_lrc.c | 54 +----------------- drivers/gpu/drm/i915/intel_lrc.h | 2 - drivers/gpu/drm/i915/intel_ringbuffer.h | 7 ++- 10 files changed, 113 insertions(+), 138 deletions(-)
drivers/gpu/drm/i915/gvt/scheduler.c +2 -4
@@ -69,8 +69,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)gvt_dbg_sched ("ring id %d workload lrca %x" , ring_id, workload->ctx_desc.lrca); - context_page_num =intel_lr_context_size ( - gvt->dev_priv->engine[ring_id]); + context_page_num = gvt->dev_priv->engine[ring_id]->context_size; context_page_num = context_page_num >>PAGE_SHIFT ;
@@ -330,8 +329,7 @@ static void update_guest_context(struct intel_vgpu_workload *workload)gvt_dbg_sched ("ring id %d workload lrca %x\n" , ring_id, workload->ctx_desc.lrca); - context_page_num =intel_lr_context_size ( - gvt->dev_priv->engine[ring_id]); + context_page_num = gvt->dev_priv->engine[ring_id]->context_size; context_page_num = context_page_num >>PAGE_SHIFT ;
drivers/gpu/drm/i915/i915_drv.c +9 -6
@@ -835,10 +835,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv); - ret =intel_engines_init_early (dev_priv); -if (ret) -return ret; - ret =i915_workqueues_init (dev_priv);if (ret <0 ) goto err_engines;
@@ -948,14 +944,21 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) ret =i915_mmio_setup (dev_priv);if (ret <0 ) - goto put_bridge; + goto err_bridge;intel_uncore_init (dev_priv); + + ret =intel_engines_init_mmio (dev_priv); +if (ret) + goto err_uncore; +i915_gem_init_mmio (dev_priv);return 0 ; -put_bridge: +err_uncore: +intel_uncore_fini (dev_priv); +err_bridge:pci_dev_put (dev_priv->bridge_dev);return ret;
drivers/gpu/drm/i915/i915_drv.h +1 -2
@@ -2359,7 +2359,6 @@ struct drm_i915_private {*/ struct mutex av_mutex; -uint32_t hw_context_size;struct list_head context_list;u32 fdi_rx_config;
@@ -3023,7 +3022,7 @@ extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);extern void i915_update_gfx_val (struct drm_i915_private *dev_priv);int vlv_force_gfx_clock (struct drm_i915_private *dev_priv,bool on); -int intel_engines_init_early (struct drm_i915_private *dev_priv); +int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv);/* intel_hotplug.c */
drivers/gpu/drm/i915/i915_gem_context.c +8 -53
111 lines not on this page · raw message
drivers/gpu/drm/i915/i915_guc_submission.c +1 -2
@@ -1051,8 +1051,7 @@ static int guc_ads_create(struct intel_guc *guc) dev_priv->engine[RCS ]->status_page.ggtt_offset;for_each_engine (engine, dev_priv, id) - blob->ads.eng_state_size[engine->guc_id] = -intel_lr_context_size (engine); + blob->ads.eng_state_size[engine->guc_id] = engine->context_size; base =guc_ggtt_offset (vma); blob->ads.scheduler_policies = base +ptr_offset (blob, policies);
drivers/gpu/drm/i915/i915_reg.h +0 -10
@@ -3370,16 +3370,6 @@ enum skl_disp_power_wells {#define GEN7_CXT_VFSTATE_SIZE (ctx_reg) (((ctx_reg) >> 0) & 0x3f)#define GEN7_CXT_TOTAL_SIZE (ctx_reg) (GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \ GEN7_CXT_VFSTATE_SIZE(ctx_reg)) -/* Haswell does have the CXT_SIZE register however it does not appear to be -* valid. Now, docs explain in dwords what is in the context object. The full -* size is 70720 bytes, however, the power context and execlist context will -* never be saved (power context is stored elsewhere, and execlists don't work -* on HSW) - so the final size, including the extra state required for the -* Resource Streamer, is 66944 bytes, which rounds to 17 pages. -*/ -#define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE) -/* Same as Haswell, but 72064 bytes now. */ -#define GEN8_CXT_TOTAL_SIZE (18 * PAGE_SIZE)enum {INTEL_ADVANCED_CONTEXT =0 ,
drivers/gpu/drm/i915/intel_engine_cs.c +87 -3
124 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +1 -53
72 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +0 -2
@@ -78,8 +78,6 @@ int logical_xcs_ring_init(struct intel_engine_cs *engine);struct drm_i915_private ;struct i915_gem_context ; -uint32_t intel_lr_context_size (struct intel_engine_cs *engine); -void intel_lr_context_resume (struct drm_i915_private *dev_priv);uint64_t intel_lr_context_descriptor (struct i915_gem_context *ctx,struct intel_engine_cs *engine);
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -3
@@ -196,13 +196,14 @@ struct intel_engine_cs {enum intel_engine_id id;unsigned int uabi_id;unsigned int hw_id; +unsigned int guc_id;u8 class;u8 instance; - -unsigned int guc_id; -u32 mmio_base; +u32 context_size; +u32 mmio_base;unsigned int irq_shift; +struct intel_ring *buffer;struct intel_timeline *timeline;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Joonas Lahtinen
Pre-calculate engine context size based on engine class and device generation and store it in the engine instance.
v2:
- Squash and get rid ofhw_context_size(Chris)v3:
- Move after MMIO init for probing on Gen7 and 8 (Chris)
- Retained rounding (Tvrtko)
Quoted 11 lines
Signed-off-by Joonas Lahtinen <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Chris Wilson <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Oscar Mateo <[email protected]>Cc Zhenyu Wang <[email protected]>Acked-by Tvrtko Ursulin <[email protected]>Cc Tvrtko Ursulin <[email protected]>
Lgtm, though I did wish you would kill HAS_HW_CONTEXT after all that. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Sanitize engine context sizes (rev2)
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: drm/i915: Sanitize engine context sizes (rev2)
URL : https://patchwork.freedesktop.org/series/23567/
State : failure
== Summary ==
Series 23567v2 drm/i915: Sanitize engine context sizes
https://patchwork.freedesktop.org/api/1.0/series/23567/revisions/2/mbox/
Test core_auth:
Subgroup basic-auth:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test core_prop_blob:
Subgroup basic:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test drv_getparams_basic:
Subgroup basic-eu-total:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Subgroup basic-subslice-total:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test drv_hangman:
Subgroup error-state-basic:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test drv_module_reload:
Subgroup basic-no-display:
pass -> FAIL (fi-bxt-t5700)
pass -> FAIL (fi-bdw-gvtdvm)
pass -> FAIL (fi-skl-gvtdvm)
Subgroup basic-reload:
dmesg-warn -> FAIL (fi-bdw-gvtdvm) fdo#99938
pass -> FAIL (fi-bxt-t5700)
pass -> INCOMPLETE (fi-bsw-n3050)
pass -> INCOMPLETE (fi-kbl-7500u)
pass -> INCOMPLETE (fi-skl-6700hq)
pass -> FAIL (fi-skl-gvtdvm)
Subgroup basic-reload-final:
pass -> FAIL (fi-bxt-t5700)
dmesg-warn -> FAIL (fi-bdw-gvtdvm) fdo#99938
pass -> FAIL (fi-skl-gvtdvm)
Subgroup basic-reload-inject:
dmesg-warn -> PASS (fi-bdw-gvtdvm) fdo#99938
Test gem_basic:
Subgroup bad-close:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Subgroup create-close:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Subgroup create-fd-close:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test gem_busy:
Subgroup basic-busy-default:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Subgroup basic-hang-default:
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bxt-t5700)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-gvtdvm)
Test gem_close_race:
Subgroup basic-process:
pass -> SKIP (fi-bdw-gvtdvm)WARNING: Long output truncated
fi-skl-6700k failed to connect after reboot
a0363fea4a56eef81e8cda759a24d8951dd7ac73 drm-tip: 2017y-04m-27d-08h-13m-25s UTC integration manifest 3f6d25f drm/i915: Sanitize engine context sizes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4563/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
drivers/gpu/drm/i915/i915_gem_context.c __create_hw_context(struct drm_i915_private *dev_priv, · line 242
Quoted 6 lines · Joonas Lahtinen
drivers/gpu/drm/i915/i915_gem_context.c +1
-1@@ -266,11 +239,12 @@ __create_hw_context(struct drm_i915_private *dev_priv,list_add_tail (&ctx->link, &dev_priv->context_list); ctx->i915 = dev_priv; -if (dev_priv->hw_context_size) { +if (dev_priv->engine[RCS ]->context_size) {
Totally missed this. This is for legacy only. Long term fix is to do deferred allocation for legacy context objects (i.e. just move this chunk to intel_ring_context_pin under a if (!ce->state) guard).
Quick and dirty fix is if(!execlists && RCS->context_size). -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx