drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
Subsystems (2)
PATCH v3 1/2 drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
SAMPLE_OA_REPORT enables sampling of OA reports from the OA buffer. Since reports from OA buffer had system wide visibility, collecting samples from the OA buffer was a privileged operation on previous platforms. Prior to TGL, it was also necessary to sample the OA buffer to normalize reports from MI REPORT PERF COUNT.
TGL has a dedicated OAR unit to sample perf reports for a specific render context. This removes the necessity to sample OA buffer.
- If not sampling the OA buffer, allow non-privileged access. An earlier patch allows the non-privilege access:
https://patchwork.freedesktop.org/patch/337716/?series=68582&rev=1
- Clear up the path for non-privileged access in this patch
--- drivers/gpu/drm/i915/i915_perf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +3 -2
@@ -2722,7 +2722,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,return -EINVAL ; } -if (!(props->sample_flags &SAMPLE_OA_REPORT )) { +if (!(props->sample_flags &SAMPLE_OA_REPORT ) && + (INTEL_GEN (perf->i915) <12 || !stream->ctx)) {DRM_DEBUG ("Only OA report sampling supported\n" );return -EINVAL ; }
@@ -2754,7 +2755,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, format_size = perf->oa_formats[props->oa_format].size; - stream->sample_flags |=SAMPLE_OA_REPORT ; + stream->sample_flags = props->sample_flags; stream->sample_size += format_size; stream->oa_buffer.format_size = format_size;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/2 drm/i915/perf: Configure OAR for specific context
Gen12 supports saving/restoring render counters per context. Apply OAR configuration only for the context that is passed in to perf.
v2:
- Fix OACTXCONTROL value to only stop/resume counters.
- Remove gen12_update_reg_state_unlocked as power state is already applied by the caller.
v3: (Lionel)
- Move register initialization into the array
- Assume a valid oa_config in enable_metric_set
--- drivers/gpu/drm/i915/i915_perf.c | 199 +++++++++++++++++-------------- 1 file changed, 112 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +112 -87
@@ -2082,20 +2082,12 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,u32 *reg_state = ce->lrc_reg_state;int i; -if (IS_GEN (stream->perf->i915,12 )) { -u32 format = stream->oa_buffer.format; + reg_state[ctx_oactxctrl +1 ] = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; - reg_state[ctx_oactxctrl +1 ] = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (stream->oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - reg_state[ctx_oactxctrl +1 ] = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =0 ; !!ctx_flexeu0 && i <ARRAY_SIZE (flex_regs); i++) +for (i =0 ; i <ARRAY_SIZE (flex_regs); i++) reg_state[ctx_flexeu0 + i *2 +1 ] =oa_config_flex_reg (stream->oa_config, flex_regs[i]);
@@ -2228,34 +2220,51 @@ static int gen8_configure_context(struct i915_gem_context *ctx,return err; } -static int gen12_emit_oar_config (struct intel_context *ce,bool enable) +static int gen12_configure_oar_context (struct i915_perf_stream *stream,bool enable) { -struct i915_request *rq; -u32 *cs; -int err =0 ; - - rq =i915_request_create (ce); -if (IS_ERR (rq)) -return PTR_ERR (rq); - - cs =intel_ring_begin (rq,4 ); -if (IS_ERR (cs)) { - err =PTR_ERR (cs); - goto out; - } - - *cs++ =MI_LOAD_REGISTER_IMM (1 ); - *cs++ =i915_mmio_reg_offset (RING_CONTEXT_CONTROL (ce->engine->mmio_base)); - *cs++ =_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , - enable ?GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE :0 ); - *cs++ =MI_NOOP ; +int err; +struct intel_context *ce = stream->pinned_ctx; +u32 format = stream->oa_buffer.format; +struct flex regs_context[] = { + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + enable ?GEN8_OA_COUNTER_RESUME :0 , + }, + }; +/* Offsets in regs_lri are not used since this configuration is only +* applied using LRI. Initialize the correct offsets for posterity. +*/ +#define GEN12_OAR_OACONTROL_OFFSET 0x5B0 +struct flex regs_lri[] = { + { +GEN12_OAR_OACONTROL , +GEN12_OAR_OACONTROL_OFFSET +1 , + (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | + (enable ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ) + }, + { +RING_CONTEXT_CONTROL (ce->engine->mmio_base), +CTX_CONTEXT_CONTROL , +_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , + enable ? +GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE : +0 ) + }, + }; -intel_ring_advance (rq, cs); +/* Modify the context image of pinned context with regs_context*/ + err =intel_context_lock_pinned (ce); +if (err) +return err; -out: -i915_request_add (rq); + err =gen8_modify_context (ce, regs_context,ARRAY_SIZE (regs_context)); +intel_context_unlock_pinned (ce); +if (err) +return err; -return err; +/* Apply regs_lri using LRI with pinned context */ +return gen8_modify_self (ce, regs_lri,ARRAY_SIZE (regs_lri)); }/*
@@ -2281,53 +2290,16 @@ static int gen12_emit_oar_config(struct intel_context *ce, bool enable)* per-context OA state. * * Note: it's only the RCS/Render context that has any OA state. +* Note: the first flex register passed must always be R_PWR_CLK_STATE */ -static int lrc_configure_all_contexts (struct i915_perf_stream *stream, -const struct i915_oa_config *oa_config) +static int oa_configure_all_contexts (struct i915_perf_stream *stream, +struct flex *regs, +size_t num_regs) {struct drm_i915_private *i915 = stream->perf->i915; -/* The MMIO offsets for Flex EU registers aren't contiguous */ -const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; -#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) -struct flex regs[] = { - { -GEN8_R_PWR_CLK_STATE , -CTX_R_PWR_CLK_STATE , - }, - { -IS_GEN (i915,12 ) ? -GEN12_OAR_OACONTROL :GEN8_OACTXCONTROL , - stream->perf->ctx_oactxctrl_offset +1 , - }, - {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, - {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, - {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, - {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, - {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, - {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, - {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, - }; -#undef ctx_flexeuNstruct intel_engine_cs *engine;struct i915_gem_context *ctx, *cn; -size_t array_size =IS_GEN (i915,12 ) ?2 :ARRAY_SIZE (regs); -int i, err; - -if (IS_GEN (i915,12 )) { -u32 format = stream->oa_buffer.format; - - regs[1 ].value = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - regs[1 ].value = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =2 ; !!ctx_flexeu0 && i < array_size; i++) - regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); +int err;lockdep_assert_held (&stream->perf->lock);
@@ -2357,7 +2329,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,spin_unlock (&i915->gem.contexts.lock); - err =gen8_configure_context (ctx, regs, array_size); + err =gen8_configure_context (ctx, regs, num_regs);if (err) {i915_gem_context_put (ctx);return err;
@@ -2382,7 +2354,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream, regs[0 ].value =intel_sseu_make_rpcs (i915, &ce->sseu); - err =gen8_modify_self (ce, regs, array_size); + err =gen8_modify_self (ce, regs, num_regs);if (err)return err; }
@@ -2390,6 +2362,56 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,return 0 ; } +static int gen12_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + }; + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} + +static int lrc_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +/* The MMIO offsets for Flex EU registers aren't contiguous */ +const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; +#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + }, + {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, + {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, + {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, + {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, + {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, + {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, + {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, + }; +#undef ctx_flexeuN +int i; + + regs[1 ].value = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; + +for (i =2 ; i <ARRAY_SIZE (regs); i++) + regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} +static int gen8_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;
@@ -2473,7 +2495,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* to make sure all slices/subslices are ON before writing to NOA * registers. */ - ret =lrc_configure_all_contexts (stream, oa_config); + ret =gen12_configure_all_contexts (stream, oa_config);if (ret)return ret;
@@ -2483,8 +2505,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* requested this. */ if (stream->ctx) { - ret =gen12_emit_oar_config (stream->pinned_ctx, - oa_config !=NULL ); + ret =gen12_configure_oar_context (stream, true);if (ret)return ret; }
@@ -2518,11 +2539,11 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)struct intel_uncore *uncore = stream->uncore;/* Reset all contexts' slices/subslices configurations. */ -lrc_configure_all_contexts (stream,NULL ); +gen12_configure_all_contexts (stream,NULL );/* disable the context save/restore or OAR counters */ if (stream->ctx) -gen12_emit_oar_config (stream->pinned_ctx, false); +gen12_configure_oar_context (stream, false);/* Make sure we disable noa to save power. */ intel_uncore_rmw (uncore,RPM_CONFIG1 ,GEN10_GT_NOA_ENABLE ,0 );
@@ -2864,7 +2885,11 @@ void i915_oa_init_reg_state(const struct intel_context *ce,return ; stream = engine->i915->perf.exclusive_stream; -if (stream) +/* +* For gen12, only CTX_R_PWR_CLK_STATE needs update, but the caller +* is already doing that, so nothing to be done for gen12 here. +*/ +if (stream &&INTEL_GEN (stream->perf->i915) <12 )gen8_update_reg_state_unlocked (ce, stream); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
URL : https://patchwork.freedesktop.org/series/70573/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7503 -> Patchwork_15633
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15633 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15633, 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_15633/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15633:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_gt_pm:
- fi-kbl-guc: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-kbl-guc/igt@i915_selftest@live_gt_pm.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-kbl-guc/igt@i915_selftest@live_gt_pm.html
Known issues
------------
Here are the changes found in Patchwork_15633 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][3] -> [DMESG-FAIL][4] ([i915#725])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-hsw-4770r/igt@i915_selftest@live_blt.html
- fi-bsw-n3050: [PASS][5] -> [DMESG-FAIL][6] ([i915#723])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-bsw-n3050/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-bsw-n3050/igt@i915_selftest@live_blt.html
- fi-ivb-3770: [PASS][7] -> [DMESG-FAIL][8] ([i915#563])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-ivb-3770/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-ivb-3770/igt@i915_selftest@live_blt.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][9] -> [DMESG-WARN][10] ([i915#44])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-hsw-peppy/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-hsw-peppy/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- {fi-tgl-u}: [INCOMPLETE][11] ([fdo#111593]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-tgl-u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-tgl-u/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- fi-hsw-peppy: [INCOMPLETE][13] ([i915#694]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
#### Warnings ####
* igt@i915_selftest@live_gt_pm:
- fi-icl-guc: [INCOMPLETE][15] ([i915#140]) -> [DMESG-FAIL][16] ([i915#571])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7503/fi-icl-guc/igt@i915_selftest@live_gt_pm.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/fi-icl-guc/igt@i915_selftest@live_gt_pm.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#111593]: https://bugs.freedesktop.org/show_bug.cgi?id=111593
[i915#140]: https://gitlab.freedesktop.org/drm/intel/issues/140
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#571]: https://gitlab.freedesktop.org/drm/intel/issues/571
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
Participating hosts (40 -> 34)
------------------------------
Additional (1): fi-apl-guc
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7503 -> Patchwork_15633
CI-20190529: 20190529
CI_DRM_7503: f475d85ea67eb3fe205a836461096fc082db01bf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5335: 06aa2c377ed40df1e246fca009c441fa18e53825 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15633: d20d4291d1d3e1baf151747e2bcc034abcaab69c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d20d4291d1d3 drm/i915/perf: Configure OAR for specific context f1335cc52e6a drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15633/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx