i915/perf: add tests for triggered OA reports
PATCH 1/2 i915/perf: add tests for triggered OA reports
From: Lionel G Landwerlin <[email protected]>
By whitelisting a couple of registers we can allow an application batch to trigger OA reports in the OA buffer by switching back & forth an inverter on the condition logic.
v2: Wait before sampling the timestamp used to end the OA buffer search v3:
- Ensure OA regs are whitelisted and reports are triggered only when perf_stream_paranoid is set to 0.
- Drop root to trigger reports.
--- tests/i915/perf.c | 449 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 430 insertions(+), 19 deletions(-)
tests/i915/perf.c +430 -19
@@ -53,6 +53,8 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");#define OAREPORT_REASON_SHIFT 19#define OAREPORT_REASON_TIMER (1<<0)#define OAREPORT_REASON_INTERNAL (3<<1) +#define OAREPORT_REASON_TRIGGER1 (1<<1) +#define OAREPORT_REASON_TRIGGER2 (1<<2)#define OAREPORT_REASON_CTX_SWITCH (1<<3)#define OAREPORT_REASON_GO (1<<4)#define OAREPORT_REASON_CLK_RATIO (1<<5)
@@ -204,6 +206,7 @@ static struct intel_perf *intel_perf = NULL;static struct intel_perf_metric_set *test_set =NULL ;static bool *undefined_a_counters;static uint64_t oa_exp_1_millisec; +struct intel_mmio_data mmio_data;static igt_render_copyfunc_t render_copy =NULL ; static uint32_t (*read_report_ticks)(uint32_t *report,
@@ -293,6 +296,23 @@ __perf_open(int fd, struct drm_i915_perf_open_param *param, bool prevent_pm)return ret; } +static int i915_perf_revision (int fd) +{ +drm_i915_getparam_t gp; +int value =1 , ret; + + gp.param =I915_PARAM_PERF_REVISION ; + gp.value = &value; + ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret ==-1 ) { +/* If the param is missing, consider version 1. */ +igt_assert_eq (errno,EINVAL ); +return 1 ; + } + +return value; +} +static int lookup_format (int i915_perf_fmt_id) {
@@ -383,11 +403,17 @@ gen8_read_report_clock_ratios(uint32_t *report, *unslice_freq_mhz = (unslice_freq *16666 ) /1000 ; } +static uint32_t +gen8_report_reason (const uint32_t *report) +{ +return ((report[0 ] >>OAREPORT_REASON_SHIFT ) & +OAREPORT_REASON_MASK ); +} +static const char *gen8_read_report_reason (const uint32_t *report) { -uint32_t reason = ((report[0 ] >>OAREPORT_REASON_SHIFT ) & -OAREPORT_REASON_MASK ); +uint32_t reason =gen8_report_reason (report);if (reason & (1 <<0 ))return "timer" ;
@@ -3118,6 +3144,268 @@ emit_stall_timestamp_and_rpc(struct intel_batchbuffer *batch,emit_report_perf_count (batch, dst, report_dst_offset, report_id); } +/* The following register all have the same layout. */ +#define OAREPORTTRIG2 (0x2744) +#define OAREPORTTRIG2_INVERT_A_0 (1 << 0) +#define OAREPORTTRIG2_INVERT_A_1 (1 << 1) +#define OAREPORTTRIG2_INVERT_A_2 (1 << 2) +#define OAREPORTTRIG2_INVERT_A_3 (1 << 3) +#define OAREPORTTRIG2_INVERT_A_4 (1 << 4) +#define OAREPORTTRIG2_INVERT_A_5 (1 << 5) +#define OAREPORTTRIG2_INVERT_A_6 (1 << 6) +#define OAREPORTTRIG2_INVERT_A_7 (1 << 7) +#define OAREPORTTRIG2_INVERT_A_8 (1 << 8) +#define OAREPORTTRIG2_INVERT_A_9 (1 << 9) +#define OAREPORTTRIG2_INVERT_A_10 (1 << 10) +#define OAREPORTTRIG2_INVERT_A_11 (1 << 11) +#define OAREPORTTRIG2_INVERT_A_12 (1 << 12) +#define OAREPORTTRIG2_INVERT_A_13 (1 << 13) +#define OAREPORTTRIG2_INVERT_A_14 (1 << 14) +#define OAREPORTTRIG2_INVERT_A_15 (1 << 15) +#define OAREPORTTRIG2_INVERT_B_0 (1 << 16) +#define OAREPORTTRIG2_INVERT_B_1 (1 << 17) +#define OAREPORTTRIG2_INVERT_B_2 (1 << 18) +#define OAREPORTTRIG2_INVERT_B_3 (1 << 19) +#define OAREPORTTRIG2_INVERT_C_0 (1 << 20) +#define OAREPORTTRIG2_INVERT_C_1 (1 << 21) +#define OAREPORTTRIG2_INVERT_D_0 (1 << 22) +#define OAREPORTTRIG2_THRESHOLD_ENABLE (1 << 23) +#define OAREPORTTRIG2_REPORT_TRIGGER_ENABLE (1 << 31) +#define OAREPORTTRIG6 (0x2754) +#define OA_PERF_COUNTER_A (idx) (0x2800 + 8 * (idx)) +#define GEN8_OASTATUS (0x2b08) + +#define GEN12_OAREPORTTRIG2 (0xd924) +#define GEN12_OAREPORTTRIG6 (0xd934) +#define GEN12_OAG_PERF_COUNTER_A (idx) (0xD980 + 8 * (idx)) +#define GEN12_OAG_OASTATUS (0xdafc) + +/* +* We have 2 trigger registers that each generate a different +* report reason. +*/ +static const uint32_t gen8_oa_wl[] = { +OAREPORTTRIG2 , +OAREPORTTRIG6 , +OA_PERF_COUNTER_A (18 ), +GEN8_OASTATUS , +}; +static const uint32_t gen12_oa_wl[] = { +GEN12_OAREPORTTRIG2 , +GEN12_OAREPORTTRIG6 , +GEN12_OAG_PERF_COUNTER_A (18 ), +GEN12_OAG_OASTATUS , +}; + +static void +emit_triggered_oa_report (struct intel_batchbuffer *batch, +uint32_t trigger) +{ +const uint32_t *triggers =intel_gen (devid) >=12 ? gen12_oa_wl: gen8_oa_wl; + +assert (trigger <=1 ); + +BEGIN_BATCH (6 ,0 ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (triggers[trigger]); +OUT_BATCH (OAREPORTTRIG2_INVERT_C_1 | +OAREPORTTRIG2_REPORT_TRIGGER_ENABLE ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (triggers[trigger]); +OUT_BATCH (OAREPORTTRIG2_INVERT_C_1 | +OAREPORTTRIG2_INVERT_D_0 | +OAREPORTTRIG2_REPORT_TRIGGER_ENABLE ); +ADVANCE_BATCH (); +} + +static uint64_t +rcs_timestmap_reg_read (int fd) +{ +struct drm_i915_reg_read rr = { + .offset =0x2358 |I915_REG_READ_8B_WA ,/* render ring timestamp */ + }; + +do_ioctl (fd,DRM_IOCTL_I915_REG_READ , &rr); + +return rr.val; +} + +/* +* Verify that we can trigger OA reports into the OA buffer using +* MI_LRI. +*/ +static void +test_triggered_oa_reports (int paranoid) +{ +int oa_exponent =max_oa_exponent_for_period_lte (1000000 ); +uint64_t properties[] = { +DRM_I915_PERF_PROP_CTX_HANDLE ,UINT64_MAX ,/* updated below */ + +/* Note: we have to specify at least one sample property even +* though we aren't interested in samples in this case +*/ +DRM_I915_PERF_PROP_SAMPLE_OA , true, + +/* OA unit configuration */ +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exponent, + +/* Note: no OA exponent specified in this case */ + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =ARRAY_SIZE (properties) /2 , + .properties_ptr =to_user_pointer (properties), + }; +struct drm_i915_perf_record_header *header; +drm_intel_bufmgr *bufmgr; +drm_intel_context *context; +struct igt_helper_process child = {}; +struct intel_batchbuffer *batch; +struct igt_buf src[2 ], dst[2 ]; +uint64_t timestamp32_mask = (1ull <<32 ) -1 ; +uint64_t timestamps[2 ]; +uint32_t buf_size =16 *1024 *1024 ; +uint8_t *buf =malloc (buf_size); +uint32_t ctx_id; +int width =800 ; +int height =600 ; +uint32_t trigger_counts[2 ] = {0 , }; +int ret; + +write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" , paranoid); + +do { + igt_fork_helper(&child) { +if (!paranoid) +igt_drop_root (); + + bufmgr =drm_intel_bufmgr_gem_init (drm_fd,4096 ); +drm_intel_bufmgr_gem_enable_reuse (bufmgr); + +scratch_buf_init (bufmgr, &src[0 ], width, height,0xff0000ff ); +scratch_buf_init (bufmgr, &dst[0 ], width, height,0x00ff00ff ); +scratch_buf_init (bufmgr, &src[1 ],2 * width, height,0xff0000ff ); +scratch_buf_init (bufmgr, &dst[1 ],2 * width, height,0x00ff00ff ); + + batch =intel_batchbuffer_alloc (bufmgr, devid); + + context =drm_intel_gem_context_create (bufmgr); +igt_assert (context); + + ret =drm_intel_gem_context_get_id (context, &ctx_id); + properties[1 ] = ctx_id; + + + timestamps[0 ] =rcs_timestmap_reg_read (drm_fd); + + stream_fd =__perf_open (drm_fd, ¶m, false); + +emit_triggered_oa_report (batch,0 ); + +render_copy (batch, + context, + &src[0 ],0 ,0 , width, height, + &dst[0 ],0 ,0 ); + +emit_triggered_oa_report (batch,0 ); + +emit_triggered_oa_report (batch,1 ); + +render_copy (batch, + context, + &src[1 ],0 ,0 ,2 * width, height, + &dst[1 ],0 ,0 ); + +emit_triggered_oa_report (batch,1 ); + +intel_batchbuffer_flush_with_context (batch, context); + +/* On some failures, this timestamp is too early as in +* we bail out before seeing the triggered report. Wait +* a little more and then check. +*/ +usleep (50000 ); + + timestamps[1 ] =rcs_timestmap_reg_read (drm_fd); + +if (timestamps[1 ] < timestamps[0 ] || + (timestamps[1 ] & timestamp32_mask) < (timestamps[1 ] & timestamp32_mask)) { +igt_debug ("Timestamp rollover, trying again\n" ); +exit (EAGAIN ); + } + + ret =i915_read_reports_until_timestamp (test_set->perf_oa_format, + buf, buf_size, + timestamps[0 ] & timestamp32_mask, + timestamps[1 ] & timestamp32_mask); + +for (size_t offset =0 ; offset < ret; offset += header->size) { +uint32_t *report; + + header = (void *)(buf + offset); + +igt_assert_eq (header->pad,0 );/* Reserved */ + +igt_assert_neq (header->type,DRM_I915_PERF_RECORD_OA_BUFFER_LOST ); + +if (header->type ==DRM_I915_PERF_RECORD_OA_REPORT_LOST ) +continue ; + +/* Currently the only other record type expected is a +* _SAMPLE. Notably this test will need updating if +* i915-perf is extended in the future with additional +* record types. +*/ +igt_assert_eq (header->type,DRM_I915_PERF_RECORD_SAMPLE ); + + report = (void *)(header +1 ); + +igt_debug ("report ts=0x%08x hw_id=0x%08x reason=%s\n" , + report[1 ], report[2 ], +gen8_read_report_reason (report)); + +if (gen8_report_reason (report) &OAREPORT_REASON_TRIGGER1 ) { +igt_assert_eq (trigger_counts[1 ],0 ); + trigger_counts[0 ]++; + } +if (gen8_report_reason (report) &OAREPORT_REASON_TRIGGER2 ) { +igt_assert_eq (trigger_counts[0 ],2 ); + trigger_counts[1 ]++; + } + } + +if (paranoid) { +igt_assert_eq (trigger_counts[0 ],0 ); +igt_assert_eq (trigger_counts[1 ],0 ); + }else { +igt_assert_eq (trigger_counts[0 ],2 ); +igt_assert_eq (trigger_counts[1 ],2 ); + } + +for (int i =0 ; i <ARRAY_SIZE (src); i++) { +drm_intel_bo_unreference (src[i].bo); +drm_intel_bo_unreference (dst[i].bo); + } + +intel_batchbuffer_free (batch); +drm_intel_gem_context_destroy (context); +drm_intel_bufmgr_destroy (bufmgr); +__perf_close (stream_fd); + } + + + ret =igt_wait_helper (&child); + +igt_assert (WEXITSTATUS (ret) ==EAGAIN || +WEXITSTATUS (ret) ==0 ); + + }while (WEXITSTATUS (ret) ==EAGAIN ); + +free (buf); +} +/* Tests the INTEL_performance_query use case where an unprivileged process * should be able to configure the OA unit for per-context metrics (for a * context associated with that process' drm file descriptor) and the counters
@@ -4768,6 +5056,122 @@ test_whitelisted_registers_userspace_config(void)i915_perf_remove_config (drm_fd, config_id); } +#define RING_FORCE_TO_NONPRIV_ADDRESS_MASK 0x03fffffc + +static uint32_t gen12_wl_slots[] = { +0x24d0 ,0x24d4 ,0x24d8 ,0x24dc ,0x24e0 ,0x24e4 ,0x24e8 ,0x24ec , +0x24f0 ,0x24f4 ,0x24f8 ,0x24fc ,0x2010 ,0x2014 ,0x2018 ,0x201c , +0x21e0 ,0x21e4 ,0x21e8 ,0x21ec , +}; + +static uint32_t gen9_wl_slots[] = { +0x24d0 ,0x24d4 ,0x24d8 ,0x24dc ,0x24e0 ,0x24e4 ,0x24e8 ,0x24ec , +0x24f0 ,0x24f4 ,0x24f8 ,0x24fc , +}; + +static void dump_wl (uint32_t *slots,uint32_t count) +{ +int i; + +for (i =0 ; i < count; i++) +igt_debug ("LOCAL: FORCE_TO_NON_PRIV_%02d = %08x\n" , + i,intel_register_read (&mmio_data, slots[i])); +} + +static void dump_whitelist (const char *msg) +{ +igt_debug ("%s\n" , msg); + +if (intel_gen (devid) >=12 ) +dump_wl (gen12_wl_slots,ARRAY_SIZE (gen12_wl_slots)); +else if (intel_gen (devid) >8 ) +dump_wl (gen9_wl_slots,ARRAY_SIZE (gen9_wl_slots)); +else +return ; +} + +static bool in_whitelist (uint32_t reg) +{ +uint32_t *slots, count; +int i; + +if (intel_gen (devid) >=12 ) { + slots = gen12_wl_slots; + count =ARRAY_SIZE (gen12_wl_slots); + }else { + slots = gen9_wl_slots; + count =ARRAY_SIZE (gen9_wl_slots); + } + +for (i =0 ; i < count; i++) { +uint32_t fpriv =intel_register_read (&mmio_data, slots[i]); + +if ((fpriv &RING_FORCE_TO_NONPRIV_ADDRESS_MASK ) == reg) +return true; + } + +return false; +} + +static void oa_regs_in_whitelist (bool are_present) +{ +const uint32_t *regs; +uint32_t count; +int i; + +if (intel_gen (devid) >=12 ) { + regs = gen12_oa_wl; + count =i915_perf_revision (drm_fd) >=7 ? +ARRAY_SIZE (gen12_oa_wl) :2 ; + }else { + regs = gen8_oa_wl; + count =i915_perf_revision (drm_fd) >=7 ? +ARRAY_SIZE (gen8_oa_wl) :2 ; + } + +for (i =0 ; i < count; i++) +if (are_present) +igt_assert (in_whitelist (regs[i])); +else +igt_assert (!in_whitelist (regs[i])); +} + +static void test_oa_regs_whitelist (int paranoid) +{ +uint64_t properties[] = { +DRM_I915_PERF_PROP_SAMPLE_OA , true, +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exp_1_millisec, + + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =sizeof (properties) /16 , + .properties_ptr =to_user_pointer (properties), + }; +write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" , paranoid); +intel_register_access_init (&mmio_data,intel_get_pci_device (), +0 , drm_fd); + stream_fd =__perf_open (drm_fd, ¶m, false); + +dump_whitelist ("oa whitelisted" ); + +if (paranoid) +oa_regs_in_whitelist (false); +else +oa_regs_in_whitelist (true); + +__perf_close (stream_fd); + +dump_whitelist ("oa remove whitelist" ); + +/* after perf close, whitelist should be removed */ +oa_regs_in_whitelist (false); + +intel_register_access_fini (&mmio_data); +} +static unsigned read_i915_module_ref (void ) {
@@ -4880,23 +5284,6 @@ test_sysctl_defaults(void)igt_assert_eq (max_freq,100000 ); } -static int i915_perf_revision (int fd) -{ -drm_i915_getparam_t gp; -int value =1 , ret; - - gp.param =I915_PARAM_PERF_REVISION ; - gp.value = &value; - ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); -if (ret ==-1 ) { -/* If the param is missing, consider version 1. */ -igt_assert_eq (errno,EINVAL ); -return 1 ; - } - -return value; -} -igt_main { igt_fixture {
@@ -5096,6 +5483,30 @@ igt_main igt_subtest("whitelisted-registers-userspace-config")test_whitelisted_registers_userspace_config (); + + igt_subtest_group { + igt_fixture { +igt_require (intel_gen (devid) >8 ); +igt_require (i915_perf_revision (drm_fd) >=6 ); + } + +igt_describe ("Verify that OA registers are whitelisted for paranoid 0" ); + igt_subtest("oa-regs-whitelisted") +test_oa_regs_whitelist (0 ); + +igt_describe ("Verify that OA registers are not whitelisted for paranoid 1" ); + igt_subtest("oa-regs-not-whitelisted") +test_oa_regs_whitelist (1 ); + +igt_describe ("Verify reports triggered when perf_stream_paranoid is 0" ); + igt_subtest("triggered-oa-reports-paranoid-0") +test_triggered_oa_reports (0 ); + +igt_describe ("Verify reports not triggered when perf_stream_paranoid is 1" ); + igt_subtest("triggered-oa-reports-paranoid-1") +test_triggered_oa_reports (1 ); + } + igt_fixture {/* leave sysctl options in their default state... */ write_u64_file ("/proc/sys/dev/i915/oa_max_sample_rate" ,100000 );
Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 2/2 i915/perf: Add tests for mapped OA buffer
For applications that need a faster way to access reports in the OA buffer, i915 now provides a way to map the OA buffer to privileged user space. Validate the mapped OA buffer.
v2: Fail on forked-privileged access to mapped oa buffer (Chris)
--- include/drm-uapi/i915_drm.h | 18 +++ tests/i915/perf.c | 295 ++++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+)
include/drm-uapi/i915_drm.h +18 -0
@@ -2101,6 +2101,24 @@ struct drm_i915_perf_open_param {*/ #define I915_PERF_IOCTL_CONFIG _IO('i', 0x2) +/** +* Returns OA buffer properties to be used with mmap. +* +* This ioctl is available in perf revision 8. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_INFO _IOWR('i', 0x3, struct drm_i915_perf_oa_buffer_info) + +/** +* OA buffer size and offset. +*/ +struct drm_i915_perf_oa_buffer_info { +__u32 type;/* in */ +__u32 flags;/* in */ +__u64 size;/* out */ +__u64 offset;/* out */ +__u64 rsvd;/* mbz */ +}; +/** * Common to all i915 perf records */
tests/i915/perf.c +295 -0
307 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Re: [igt-dev] [PATCH 2/2] i915/perf: Add tests for mapped OA buffer
Following up, any reviewers?
Thanks,
Umesh
Quoted 361 lines · Umesh Nerlige Ramappa
For applications that need a faster way to access reports in the OA buffer, i915 now provides a way to map the OA buffer to privileged user space. Validate the mapped OA buffer.
v2: Fail on forked-privileged access to mapped oa buffer (Chris)
Signed-off-by Umesh Nerlige Ramappa <[email protected]>---
include/drm-uapi/i915_drm.h| 18 +++tests/i915/perf.c| 295 ++++++++++++++++++++++++++++++++++++2 files changed, 313 insertions(+)include/drm-uapi/i915_drm.h +18
-0@@ -2101,6 +2101,24 @@ struct drm_i915_perf_open_param {*/ #define I915_PERF_IOCTL_CONFIG _IO('i', 0x2) +/** +* Returns OA buffer properties to be used with mmap. +* +* This ioctl is available in perf revision 8. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_INFO _IOWR('i', 0x3, struct drm_i915_perf_oa_buffer_info) + +/** +* OA buffer size and offset. +*/ +struct drm_i915_perf_oa_buffer_info { +__u32 type;/* in */ +__u32 flags;/* in */ +__u64 size;/* out */ +__u64 offset;/* out */ +__u64 rsvd;/* mbz */ +}; +/** * Common to all i915 perf records */ tests/i915/perf.c +265
-0@@ -5172,6 +5172,271 @@ static void test_oa_regs_whitelist(int paranoid)intel_register_access_fini (&mmio_data); } +#define OA_BUFFER_DATA (tail, head, oa_buffer_size) \ + (((tail) - (head)) & ((oa_buffer_size) - 1)) + +#ifndef MAP_FAILED +#define MAP_FAILED ((void *)-1) +#endif + +static uint32_t oa_status_reg (void ) +{ +uint32_t status; + +intel_register_access_init (&mmio_data,intel_get_pci_device (), +0 , drm_fd); +if (IS_HASWELL (devid)) + status =intel_register_read (&mmio_data,0x2346 ) &0x7 ; +else if (IS_GEN12 (devid)) + status =intel_register_read (&mmio_data,0xdafc ) &0x7 ; +else + status =intel_register_read (&mmio_data,0x2b08 ) &0xf ; + +intel_register_access_fini (&mmio_data); + +return status; +} + +static jmp_buf jmp; +static void __attribute__((noreturn))sigtrap (int sig) +{ +siglongjmp (jmp, sig); +} + +static void try_invalid_access (void *vaddr) +{ +sighandler_t old_sigsegv; +uint32_t dummy; + + old_sigsegv =signal (SIGSEGV , sigtrap); +switch (sigsetjmp (jmp,SIGSEGV )) { +case SIGSEGV : +break ; +case 0 : + dummy =READ_ONCE (*((uint32_t *)vaddr +1 )); + (void ) dummy; +default : +igt_assert (!"reached" ); +break ; + } +signal (SIGSEGV , old_sigsegv); +} + +static void invalid_param_map_oa_buffer (void ) +{ +struct drm_i915_perf_oa_buffer_info oa_buffer = {0 }; +void *oa_vaddr =NULL ; + +do_ioctl (stream_fd,I915_PERF_IOCTL_GET_OA_BUFFER_INFO , &oa_buffer); + +igt_debug ("size = %llu\n" , oa_buffer.size); +igt_debug ("offset = %llx\n" , oa_buffer.offset); + +igt_assert_eq (oa_buffer.size & (oa_buffer.size -1 ),0 ); + +/* try a couple invalid mmaps */ +/* bad prots */ + oa_vaddr =mmap (0 , oa_buffer.size,PROT_WRITE ,MAP_PRIVATE , stream_fd, oa_buffer.offset); +igt_assert (oa_vaddr ==MAP_FAILED ); + + oa_vaddr =mmap (0 , oa_buffer.size,PROT_EXEC ,MAP_PRIVATE , stream_fd, oa_buffer.offset); +igt_assert (oa_vaddr ==MAP_FAILED ); + +/* bad MAPs */ + oa_vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_SHARED , stream_fd, oa_buffer.offset); +igt_assert (oa_vaddr ==MAP_FAILED ); + +/* bad offsets */ + oa_vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_PRIVATE , stream_fd,0 ); +igt_assert (oa_vaddr ==MAP_FAILED ); + + oa_vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_PRIVATE , stream_fd,8192 ); +igt_assert (oa_vaddr ==MAP_FAILED ); + + oa_vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_PRIVATE , stream_fd,11 ); +igt_assert (oa_vaddr ==MAP_FAILED ); + +/* bad size */ + oa_vaddr =mmap (0 , oa_buffer.size +1 ,PROT_READ ,MAP_PRIVATE , stream_fd, oa_buffer.offset); +igt_assert (oa_vaddr ==MAP_FAILED ); + +/* do the right thing */ + oa_vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_PRIVATE , stream_fd, oa_buffer.offset); +igt_assert (oa_vaddr !=MAP_FAILED && oa_vaddr !=NULL ); + +munmap (oa_vaddr, oa_buffer.size); +} + +static void *map_oa_buffer (uint32_t *size) +{ +struct drm_i915_perf_oa_buffer_info oa_buffer = {0 }; +void *vaddr; + +do_ioctl (stream_fd,I915_PERF_IOCTL_GET_OA_BUFFER_INFO , &oa_buffer); + +igt_debug ("size = %llu\n" , oa_buffer.size); +igt_debug ("offset = %llx\n" , oa_buffer.offset); + +igt_assert_eq (oa_buffer.size & (oa_buffer.size -1 ),0 ); +igt_assert_eq (oa_status_reg (),0 ); + + vaddr =mmap (0 , oa_buffer.size,PROT_READ ,MAP_PRIVATE , stream_fd, oa_buffer.offset); +igt_assert (vaddr !=NULL ); + + *size = oa_buffer.size; + +return vaddr; +} + +static void unmap_oa_buffer (void *addr,uint32_t size) +{ +munmap (addr, size); +} + +static void check_reports (void *oa_vaddr,uint32_t oa_size) +{ +struct oa_format format =get_oa_format (test_set->perf_oa_format); +size_t report_words = format.size >>2 ; +uint32_t *reports; +uint32_t timer_reports =0 ; + +for (reports = (uint32_t *)oa_vaddr; + timer_reports <20 && reports[0 ] && reports[1 ]; + reports += report_words) { +if (!oa_report_is_periodic (oa_exp_1_millisec, reports)) +continue ; + + timer_reports++; +if (timer_reports >=3 ) +sanity_check_reports (reports -2 * report_words, + reports - report_words, + test_set->perf_oa_format); + } + +igt_assert (timer_reports >=3 ); +} + +static void check_reports_from_mapped_buffer (void ) +{ +void *vaddr; +uint32_t size; +uint32_t period_us =oa_exponent_to_ns (oa_exp_1_millisec) /1000 ; + + vaddr =map_oa_buffer (&size); + +/* wait for approx 100 reports */ +usleep (100 * period_us); +check_reports (vaddr, size); + +unmap_oa_buffer (vaddr, size); +} + +static void unprivileged_try_to_map_oa_buffer (void ) +{ +struct drm_i915_perf_oa_buffer_info oa_buffer = {0 }; +void *oa_vaddr; + +do_ioctl_err (stream_fd,I915_PERF_IOCTL_GET_OA_BUFFER_INFO , + &oa_buffer,EACCES ); + + oa_vaddr =mmap (0 ,4096 ,PROT_READ ,MAP_PRIVATE , stream_fd,4096 ); +igt_assert (oa_vaddr ==MAP_FAILED ); +igt_assert_eq (errno,EACCES ); +} + +static void unprivileged_map_oa_buffer (void ) +{ + igt_fork(child, 1) { +igt_drop_root (); +unprivileged_try_to_map_oa_buffer (); + } +igt_waitchildren (); +} + +static void map_oa_buffer_unprivilege_access (void ) +{ +void *vaddr; +uint32_t size; + + vaddr =map_oa_buffer (&size); + + igt_fork(child, 1) { +igt_drop_root (); +try_invalid_access (vaddr); + } +igt_waitchildren (); + +unmap_oa_buffer (vaddr, size); +} + +static void map_oa_buffer_forked_access (void ) +{ +void *vaddr; +uint32_t size; + + vaddr =map_oa_buffer (&size); + + igt_fork(child, 1) { +try_invalid_access (vaddr); + } +igt_waitchildren (); + +unmap_oa_buffer (vaddr, size); +} + +static void test_mapped_oa_buffer (void (*test_with_fd_open)(void )) +{ +uint64_t properties[] = { +DRM_I915_PERF_PROP_SAMPLE_OA , true, +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exp_1_millisec, + + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =sizeof (properties) /16 , + .properties_ptr =to_user_pointer (properties), + }; + + stream_fd =__perf_open (drm_fd, ¶m, false); + +igt_assert (test_with_fd_open); +test_with_fd_open (); + +__perf_close (stream_fd); +} + +static void closed_fd_and_unmapped_access (void ) +{ +uint64_t properties[] = { +DRM_I915_PERF_PROP_SAMPLE_OA , true, +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exp_1_millisec, + + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =sizeof (properties) /16 , + .properties_ptr =to_user_pointer (properties), + }; +void *vaddr; +uint32_t size; +uint32_t period_us =oa_exponent_to_ns (oa_exp_1_millisec) /1000 ; + + stream_fd =__perf_open (drm_fd, ¶m, false); + vaddr =map_oa_buffer (&size); + +usleep (100 * period_us); +check_reports (vaddr, size); + +unmap_oa_buffer (vaddr, size); +__perf_close (stream_fd); + +try_invalid_access (vaddr); +} +static unsigned
read_i915_module_ref(void)
{tests/i915/perf.c +30
-0@@ -5507,6 +5772,36 @@ igt_maintest_triggered_oa_reports (1 ); } + igt_subtest_group { + igt_fixture { +igt_require (i915_perf_revision (drm_fd) >=8 ); + } + +igt_describe ("Verify mapping of oa buffer" ); + igt_subtest("map-oa-buffer") +test_mapped_oa_buffer (check_reports_from_mapped_buffer); + +igt_describe ("Verify invalid mappings of oa buffer" ); + igt_subtest("invalid-map-oa-buffer") +test_mapped_oa_buffer (invalid_param_map_oa_buffer); + +igt_describe ("Verify if non-privileged user can map oa buffer" ); + igt_subtest("non-privileged-map-oa-buffer") +test_mapped_oa_buffer (unprivileged_map_oa_buffer); + +igt_describe ("Verify if non-privileged user can map oa buffer" ); + igt_subtest("non-privileged-access-vaddr") +test_mapped_oa_buffer (map_oa_buffer_unprivilege_access); + +igt_describe ("Verify that forked access to mapped buffer fails" ); + igt_subtest("privileged-forked-access-vaddr") +test_mapped_oa_buffer (map_oa_buffer_forked_access); + +igt_describe ("Unmap buffer, close fd and try to access" ); + igt_subtest("closed-fd-and-unmapped-access") +closed_fd_and_unmapped_access (); + } + igt_fixture {/* leave sysctl options in their default state... */ write_u64_file ("/proc/sys/dev/i915/oa_max_sample_rate" ,100000 );Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] i915/perf: add tests for triggered OA reports
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [1/2] i915/perf: add tests for triggered OA reports
URL : https://patchwork.freedesktop.org/series/80761/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8901 -> IGTPW_4889
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
Known issues
------------
Here are the changes found in IGTPW_4889 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-apl-guc: [PASS][1] -> [DMESG-WARN][2] ([i915#1635] / [i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/fi-apl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/fi-apl-guc/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_lrc:
- fi-tgl-u2: [DMESG-FAIL][3] ([i915#1233]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/fi-tgl-u2/igt@i915_selftest@live@gt_lrc.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/fi-tgl-u2/igt@i915_selftest@live@gt_lrc.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][5] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][6] ([i915#62] / [i915#92]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/fi-kbl-x1275/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/fi-kbl-x1275/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][7] ([fdo#109271]) -> [DMESG-FAIL][8] ([i915#62] / [i915#95])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/fi-kbl-x1275/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/fi-kbl-x1275/igt@[email protected]
* igt@kms_force_connector_basic@force-connector-state:
- fi-kbl-x1275: [DMESG-WARN][9] ([i915#62] / [i915#92]) -> [DMESG-WARN][10] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/fi-kbl-x1275/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/fi-kbl-x1275/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (39 -> 34)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5769 -> IGTPW_4889
CI-20190529: 20190529
CI_DRM_8901: 39e63f96cd9438015d6204a3ca33819447e4c066 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4889: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
IGT_5769: 4e5f76be680b65780204668e302026cf638decc9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Testlist changes ==
+igt@perf@closed-fd-and-unmapped-access
+igt@perf@invalid-map-oa-buffer
+igt@perf@map-oa-buffer
+igt@perf@non-privileged-access-vaddr
+igt@perf@non-privileged-map-oa-buffer
+igt@perf@oa-regs-not-whitelisted
+igt@perf@oa-regs-whitelisted
+igt@perf@privileged-forked-access-vaddr
+igt@perf@triggered-oa-reports-paranoid-0
+igt@perf@triggered-oa-reports-paranoid-1
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for series starting with [1/2] i915/perf: add tests for triggered OA reports
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [1/2] i915/perf: add tests for triggered OA reports
URL : https://patchwork.freedesktop.org/series/80761/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8901_full -> IGTPW_4889_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4889_full:
### IGT changes ###
#### Possible regressions ####
* {igt@perf@non-privileged-access-vaddr} (NEW):
- shard-iclb: NOTRUN -> [SKIP][1] +9 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb7/igt@[email protected]
* {igt@perf@non-privileged-map-oa-buffer} (NEW):
- shard-tglb: NOTRUN -> [SKIP][2] +9 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-tglb8/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_8901_full and IGTPW_4889_full:
### New IGT tests (10) ###
* igt@perf@closed-fd-and-unmapped-access:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@invalid-map-oa-buffer:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@map-oa-buffer:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@non-privileged-access-vaddr:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@non-privileged-map-oa-buffer:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@oa-regs-not-whitelisted:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@oa-regs-whitelisted:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@privileged-forked-access-vaddr:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@triggered-oa-reports-paranoid-0:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
* igt@perf@triggered-oa-reports-paranoid-1:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in IGTPW_4889_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@legacy-engines-mixed-process@render:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#1528])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk4/igt@gem_ctx_persistence@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk6/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_whisper@basic-queues-all:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([i915#118] / [i915#95]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk9/igt@[email protected]
* igt@gem_ppgtt@blt-vs-render-ctx0:
- shard-snb: [PASS][7] -> [TIMEOUT][8] ([i915#1958]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-snb2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-snb5/igt@[email protected]
- shard-hsw: [PASS][9] -> [TIMEOUT][10] ([i915#1958]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw4/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw8/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [PASS][11] -> [WARN][12] ([i915#1515])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-iclb4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb2/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-c-256x256-left-edge:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#1982])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk8/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-tglb: [PASS][15] -> [DMESG-WARN][16] ([i915#1982]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-tglb8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-tglb1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([i915#180]) +10 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl1/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-iclb2/igt@kms_psr@psr2_suspend.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb4/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][21] -> [FAIL][22] ([i915#1635] / [i915#31])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-apl1/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-apl3/igt@[email protected]
* igt@kms_vblank@pipe-c-wait-forked-busy:
- shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([i915#1982])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl4/igt@[email protected]
* igt@prime_busy@before@vecs0:
- shard-hsw: [PASS][25] -> [FAIL][26] ([i915#2258]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw2/igt@prime_busy@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw7/igt@prime_busy@[email protected]
#### Possible fixes ####
* igt@gem_exec_gttfill@all:
- shard-glk: [DMESG-WARN][27] ([i915#118] / [i915#95]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk9/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk6/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- shard-snb: [TIMEOUT][29] ([i915#1958]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-snb4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-snb5/igt@[email protected]
* igt@gem_mmap_gtt@fault-concurrent:
- shard-snb: [DMESG-WARN][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-snb4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-snb2/igt@[email protected]
* igt@i915_selftest@mock@contexts:
- shard-apl: [INCOMPLETE][33] ([i915#1635] / [i915#2278]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-apl6/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-apl4/igt@i915_selftest@[email protected]
* igt@kms_big_fb@linear-64bpp-rotate-180:
- shard-glk: [DMESG-FAIL][35] ([i915#118] / [i915#95]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk8/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk1/igt@[email protected]
* igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [DMESG-WARN][37] ([i915#1982]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-glk1/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-glk1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-tglb: [FAIL][39] ([i915#79]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-tglb1/igt@kms_flip@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-tglb7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][41] ([i915#180]) -> [PASS][42] +7 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl2/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-blt:
- shard-kbl: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [INCOMPLETE][45] ([i915#155]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-cpu:
- shard-tglb: [DMESG-WARN][47] ([i915#1982]) -> [PASS][48] +6 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-tglb5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-tglb1/igt@[email protected]
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-iclb6/igt@kms_psr@psr2_cursor_plane_move.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
* igt@kms_vblank@pipe-c-wait-idle-hang:
- shard-apl: [DMESG-WARN][51] ([i915#1635] / [i915#1982]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-apl8/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-apl2/igt@[email protected]
* igt@perf@blocking-parameterized:
- shard-iclb: [FAIL][53] ([i915#1542]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-iclb5/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb5/igt@[email protected]
* igt@perf@oa-exponents:
- shard-hsw: [INCOMPLETE][55] ([i915#1958]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw4/igt@[email protected]
* igt@prime_busy@before-wait@vecs0:
- shard-hsw: [FAIL][57] ([i915#2258]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw4/igt@prime_busy@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw1/igt@prime_busy@[email protected]
#### Warnings ####
* igt@gem_exec_schedule@preemptive-hang:
- shard-snb: [TIMEOUT][59] ([i915#1958]) -> [SKIP][60] ([fdo#109271]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-snb4/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-snb4/igt@[email protected]
* igt@kms_content_protection@lic:
- shard-kbl: [TIMEOUT][61] ([i915#1319]) -> [TIMEOUT][62] ([i915#1319] / [i915#1958])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-kbl1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-kbl2/igt@[email protected]
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][63] ([i915#1226]) -> [SKIP][64] ([fdo#109349])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-iclb2/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-iclb5/igt@[email protected]
* igt@kms_plane_scaling@pipe-d-scaler-with-pixel-format:
- shard-snb: [SKIP][65] ([fdo#109271]) -> [TIMEOUT][66] ([i915#1958])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-snb5/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-snb5/igt@[email protected]
- shard-hsw: [SKIP][67] ([fdo#109271]) -> [TIMEOUT][68] ([i915#1958])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw8/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw8/igt@[email protected]
* igt@runner@aborted:
- shard-hsw: ([FAIL][69], [FAIL][70]) ([i915#1958] / [i915#2283]) -> [FAIL][71] ([i915#2283])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw6/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8901/shard-hsw7/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/shard-hsw4/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1515]: https://gitlab.freedesktop.org/drm/intel/issues/1515
[i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2258]: https://gitlab.freedesktop.org/drm/intel/issues/2258
[i915#2278]: https://gitlab.freedesktop.org/drm/intel/issues/2278
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 8)
------------------------------
Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5769 -> IGTPW_4889
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_8901: 39e63f96cd9438015d6204a3ca33819447e4c066 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4889: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
IGT_5769: 4e5f76be680b65780204668e302026cf638decc9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4889/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 6 lines · Umesh Nerlige Ramappa
From: Lionel G Landwerlin <[email protected]>
By whitelisting a couple of registers we can allow an application batch to trigger OA reports in the OA buffer by switching back & forth an inverter on the condition logic.
Quoted 7 lines
v2: Wait before sampling the timestamp used to end the OA buffer search v3:
- Ensure OA regs are whitelisted and reports are triggered only whenperf_stream_paranoidis set to 0.
- Drop root to trigger reports.Signed-off-by Lionel Landwerlin <[email protected]>
Thanks,
Umesh
Quoted 523 lines
---
tests/i915/perf.c| 449 ++++++++++++++++++++++++++++++++++++++++++++--1 file changed, 430 insertions(+), 19 deletions(-)tests/i915/perf.c +20
-0@@ -53,6 +53,8 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");#define OAREPORT_REASON_SHIFT 19#define OAREPORT_REASON_TIMER (1<<0)#define OAREPORT_REASON_INTERNAL (3<<1) +#define OAREPORT_REASON_TRIGGER1 (1<<1) +#define OAREPORT_REASON_TRIGGER2 (1<<2)#define OAREPORT_REASON_CTX_SWITCH (1<<3)#define OAREPORT_REASON_GO (1<<4)#define OAREPORT_REASON_CLK_RATIO (1<<5)@@ -204,6 +206,7 @@ static struct intel_perf *intel_perf = NULL;static struct intel_perf_metric_set *test_set =NULL ;static bool *undefined_a_counters;static uint64_t oa_exp_1_millisec; +struct intel_mmio_data mmio_data;static igt_render_copyfunc_t render_copy =NULL ; static uint32_t (*read_report_ticks)(uint32_t *report,@@ -293,6 +296,23 @@ __perf_open(int fd, struct drm_i915_perf_open_param *param, bool prevent_pm)return ret; } +static int i915_perf_revision (int fd) +{ +drm_i915_getparam_t gp; +int value =1 , ret; + + gp.param =I915_PARAM_PERF_REVISION ; + gp.value = &value; + ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret ==-1 ) { +/* If the param is missing, consider version 1. */ +igt_assert_eq (errno,EINVAL ); +return 1 ; + } + +return value; +} +static int
lookup_format(int i915_perf_fmt_id)
{tests/i915/perf.c +7
-0@@ -383,11 +403,17 @@ gen8_read_report_clock_ratios(uint32_t *report, *unslice_freq_mhz = (unslice_freq *16666 ) /1000 ; } +static uint32_t +gen8_report_reason (const uint32_t *report) +{ +return ((report[0 ] >>OAREPORT_REASON_SHIFT ) & +OAREPORT_REASON_MASK ); +} +static const char *
gen8_read_report_reason(const uint32_t *report)
{tests/i915/perf.c +1
-2-uint32_t reason = ((report[0 ] >>OAREPORT_REASON_SHIFT ) & -OAREPORT_REASON_MASK ); +uint32_t reason =gen8_report_reason (report);if (reason & (1<<0)) return "timer";tests/i915/perf.c +378
-0@@ -3118,6 +3144,268 @@ emit_stall_timestamp_and_rpc(struct intel_batchbuffer *batch,emit_report_perf_count (batch, dst, report_dst_offset, report_id); } +/* The following register all have the same layout. */ +#define OAREPORTTRIG2 (0x2744) +#define OAREPORTTRIG2_INVERT_A_0 (1 << 0) +#define OAREPORTTRIG2_INVERT_A_1 (1 << 1) +#define OAREPORTTRIG2_INVERT_A_2 (1 << 2) +#define OAREPORTTRIG2_INVERT_A_3 (1 << 3) +#define OAREPORTTRIG2_INVERT_A_4 (1 << 4) +#define OAREPORTTRIG2_INVERT_A_5 (1 << 5) +#define OAREPORTTRIG2_INVERT_A_6 (1 << 6) +#define OAREPORTTRIG2_INVERT_A_7 (1 << 7) +#define OAREPORTTRIG2_INVERT_A_8 (1 << 8) +#define OAREPORTTRIG2_INVERT_A_9 (1 << 9) +#define OAREPORTTRIG2_INVERT_A_10 (1 << 10) +#define OAREPORTTRIG2_INVERT_A_11 (1 << 11) +#define OAREPORTTRIG2_INVERT_A_12 (1 << 12) +#define OAREPORTTRIG2_INVERT_A_13 (1 << 13) +#define OAREPORTTRIG2_INVERT_A_14 (1 << 14) +#define OAREPORTTRIG2_INVERT_A_15 (1 << 15) +#define OAREPORTTRIG2_INVERT_B_0 (1 << 16) +#define OAREPORTTRIG2_INVERT_B_1 (1 << 17) +#define OAREPORTTRIG2_INVERT_B_2 (1 << 18) +#define OAREPORTTRIG2_INVERT_B_3 (1 << 19) +#define OAREPORTTRIG2_INVERT_C_0 (1 << 20) +#define OAREPORTTRIG2_INVERT_C_1 (1 << 21) +#define OAREPORTTRIG2_INVERT_D_0 (1 << 22) +#define OAREPORTTRIG2_THRESHOLD_ENABLE (1 << 23) +#define OAREPORTTRIG2_REPORT_TRIGGER_ENABLE (1 << 31) +#define OAREPORTTRIG6 (0x2754) +#define OA_PERF_COUNTER_A (idx) (0x2800 + 8 * (idx)) +#define GEN8_OASTATUS (0x2b08) + +#define GEN12_OAREPORTTRIG2 (0xd924) +#define GEN12_OAREPORTTRIG6 (0xd934) +#define GEN12_OAG_PERF_COUNTER_A (idx) (0xD980 + 8 * (idx)) +#define GEN12_OAG_OASTATUS (0xdafc) + +/* +* We have 2 trigger registers that each generate a different +* report reason. +*/ +static const uint32_t gen8_oa_wl[] = { +OAREPORTTRIG2 , +OAREPORTTRIG6 , +OA_PERF_COUNTER_A (18 ), +GEN8_OASTATUS , +}; +static const uint32_t gen12_oa_wl[] = { +GEN12_OAREPORTTRIG2 , +GEN12_OAREPORTTRIG6 , +GEN12_OAG_PERF_COUNTER_A (18 ), +GEN12_OAG_OASTATUS , +}; + +static void +emit_triggered_oa_report (struct intel_batchbuffer *batch, +uint32_t trigger) +{ +const uint32_t *triggers =intel_gen (devid) >=12 ? gen12_oa_wl: gen8_oa_wl; + +assert (trigger <=1 ); + +BEGIN_BATCH (6 ,0 ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (triggers[trigger]); +OUT_BATCH (OAREPORTTRIG2_INVERT_C_1 | +OAREPORTTRIG2_REPORT_TRIGGER_ENABLE ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (triggers[trigger]); +OUT_BATCH (OAREPORTTRIG2_INVERT_C_1 | +OAREPORTTRIG2_INVERT_D_0 | +OAREPORTTRIG2_REPORT_TRIGGER_ENABLE ); +ADVANCE_BATCH (); +} + +static uint64_t +rcs_timestmap_reg_read (int fd) +{ +struct drm_i915_reg_read rr = { + .offset =0x2358 |I915_REG_READ_8B_WA ,/* render ring timestamp */ + }; + +do_ioctl (fd,DRM_IOCTL_I915_REG_READ , &rr); + +return rr.val; +} + +/* +* Verify that we can trigger OA reports into the OA buffer using +* MI_LRI. +*/ +static void +test_triggered_oa_reports (int paranoid) +{ +int oa_exponent =max_oa_exponent_for_period_lte (1000000 ); +uint64_t properties[] = { +DRM_I915_PERF_PROP_CTX_HANDLE ,UINT64_MAX ,/* updated below */ + +/* Note: we have to specify at least one sample property even +* though we aren't interested in samples in this case +*/ +DRM_I915_PERF_PROP_SAMPLE_OA , true, + +/* OA unit configuration */ +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exponent, + +/* Note: no OA exponent specified in this case */ + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =ARRAY_SIZE (properties) /2 , + .properties_ptr =to_user_pointer (properties), + }; +struct drm_i915_perf_record_header *header; +drm_intel_bufmgr *bufmgr; +drm_intel_context *context; +struct igt_helper_process child = {}; +struct intel_batchbuffer *batch; +struct igt_buf src[2 ], dst[2 ]; +uint64_t timestamp32_mask = (1ull <<32 ) -1 ; +uint64_t timestamps[2 ]; +uint32_t buf_size =16 *1024 *1024 ; +uint8_t *buf =malloc (buf_size); +uint32_t ctx_id; +int width =800 ; +int height =600 ; +uint32_t trigger_counts[2 ] = {0 , }; +int ret; + +write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" , paranoid); + +do { + igt_fork_helper(&child) { +if (!paranoid) +igt_drop_root (); + + bufmgr =drm_intel_bufmgr_gem_init (drm_fd,4096 ); +drm_intel_bufmgr_gem_enable_reuse (bufmgr); + +scratch_buf_init (bufmgr, &src[0 ], width, height,0xff0000ff ); +scratch_buf_init (bufmgr, &dst[0 ], width, height,0x00ff00ff ); +scratch_buf_init (bufmgr, &src[1 ],2 * width, height,0xff0000ff ); +scratch_buf_init (bufmgr, &dst[1 ],2 * width, height,0x00ff00ff ); + + batch =intel_batchbuffer_alloc (bufmgr, devid); + + context =drm_intel_gem_context_create (bufmgr); +igt_assert (context); + + ret =drm_intel_gem_context_get_id (context, &ctx_id); + properties[1 ] = ctx_id; + + + timestamps[0 ] =rcs_timestmap_reg_read (drm_fd); + + stream_fd =__perf_open (drm_fd, ¶m, false); + +emit_triggered_oa_report (batch,0 ); + +render_copy (batch, + context, + &src[0 ],0 ,0 , width, height, + &dst[0 ],0 ,0 ); + +emit_triggered_oa_report (batch,0 ); + +emit_triggered_oa_report (batch,1 ); + +render_copy (batch, + context, + &src[1 ],0 ,0 ,2 * width, height, + &dst[1 ],0 ,0 ); + +emit_triggered_oa_report (batch,1 ); + +intel_batchbuffer_flush_with_context (batch, context); + +/* On some failures, this timestamp is too early as in +* we bail out before seeing the triggered report. Wait +* a little more and then check. +*/ +usleep (50000 ); + + timestamps[1 ] =rcs_timestmap_reg_read (drm_fd); + +if (timestamps[1 ] < timestamps[0 ] || + (timestamps[1 ] & timestamp32_mask) < (timestamps[1 ] & timestamp32_mask)) { +igt_debug ("Timestamp rollover, trying again\n" ); +exit (EAGAIN ); + } + + ret =i915_read_reports_until_timestamp (test_set->perf_oa_format, + buf, buf_size, + timestamps[0 ] & timestamp32_mask, + timestamps[1 ] & timestamp32_mask); + +for (size_t offset =0 ; offset < ret; offset += header->size) { +uint32_t *report; + + header = (void *)(buf + offset); + +igt_assert_eq (header->pad,0 );/* Reserved */ + +igt_assert_neq (header->type,DRM_I915_PERF_RECORD_OA_BUFFER_LOST ); + +if (header->type ==DRM_I915_PERF_RECORD_OA_REPORT_LOST ) +continue ; + +/* Currently the only other record type expected is a +* _SAMPLE. Notably this test will need updating if +* i915-perf is extended in the future with additional +* record types. +*/ +igt_assert_eq (header->type,DRM_I915_PERF_RECORD_SAMPLE ); + + report = (void *)(header +1 ); + +igt_debug ("report ts=0x%08x hw_id=0x%08x reason=%s\n" , + report[1 ], report[2 ], +gen8_read_report_reason (report)); + +if (gen8_report_reason (report) &OAREPORT_REASON_TRIGGER1 ) { +igt_assert_eq (trigger_counts[1 ],0 ); + trigger_counts[0 ]++; + } +if (gen8_report_reason (report) &OAREPORT_REASON_TRIGGER2 ) { +igt_assert_eq (trigger_counts[0 ],2 ); + trigger_counts[1 ]++; + } + } + +if (paranoid) { +igt_assert_eq (trigger_counts[0 ],0 ); +igt_assert_eq (trigger_counts[1 ],0 ); + }else { +igt_assert_eq (trigger_counts[0 ],2 ); +igt_assert_eq (trigger_counts[1 ],2 ); + } + +for (int i =0 ; i <ARRAY_SIZE (src); i++) { +drm_intel_bo_unreference (src[i].bo); +drm_intel_bo_unreference (dst[i].bo); + } + +intel_batchbuffer_free (batch); +drm_intel_gem_context_destroy (context); +drm_intel_bufmgr_destroy (bufmgr); +__perf_close (stream_fd); + } + + + ret =igt_wait_helper (&child); + +igt_assert (WEXITSTATUS (ret) ==EAGAIN || +WEXITSTATUS (ret) ==0 ); + + }while (WEXITSTATUS (ret) ==EAGAIN ); + +free (buf); +} +/* Tests the INTEL_performance_query use case where an unprivileged process * should be able to configure the OA unit for per-context metrics (for a * context associated with that process' drm file descriptor) and the counters @@ -4768,6 +5056,122 @@ test_whitelisted_registers_userspace_config(void)i915_perf_remove_config (drm_fd, config_id); } +#define RING_FORCE_TO_NONPRIV_ADDRESS_MASK 0x03fffffc + +static uint32_t gen12_wl_slots[] = { +0x24d0 ,0x24d4 ,0x24d8 ,0x24dc ,0x24e0 ,0x24e4 ,0x24e8 ,0x24ec , +0x24f0 ,0x24f4 ,0x24f8 ,0x24fc ,0x2010 ,0x2014 ,0x2018 ,0x201c , +0x21e0 ,0x21e4 ,0x21e8 ,0x21ec , +}; + +static uint32_t gen9_wl_slots[] = { +0x24d0 ,0x24d4 ,0x24d8 ,0x24dc ,0x24e0 ,0x24e4 ,0x24e8 ,0x24ec , +0x24f0 ,0x24f4 ,0x24f8 ,0x24fc , +}; + +static void dump_wl (uint32_t *slots,uint32_t count) +{ +int i; + +for (i =0 ; i < count; i++) +igt_debug ("LOCAL: FORCE_TO_NON_PRIV_%02d = %08x\n" , + i,intel_register_read (&mmio_data, slots[i])); +} + +static void dump_whitelist (const char *msg) +{ +igt_debug ("%s\n" , msg); + +if (intel_gen (devid) >=12 ) +dump_wl (gen12_wl_slots,ARRAY_SIZE (gen12_wl_slots)); +else if (intel_gen (devid) >8 ) +dump_wl (gen9_wl_slots,ARRAY_SIZE (gen9_wl_slots)); +else +return ; +} + +static bool in_whitelist (uint32_t reg) +{ +uint32_t *slots, count; +int i; + +if (intel_gen (devid) >=12 ) { + slots = gen12_wl_slots; + count =ARRAY_SIZE (gen12_wl_slots); + }else { + slots = gen9_wl_slots; + count =ARRAY_SIZE (gen9_wl_slots); + } + +for (i =0 ; i < count; i++) { +uint32_t fpriv =intel_register_read (&mmio_data, slots[i]); + +if ((fpriv &RING_FORCE_TO_NONPRIV_ADDRESS_MASK ) == reg) +return true; + } + +return false; +} + +static void oa_regs_in_whitelist (bool are_present) +{ +const uint32_t *regs; +uint32_t count; +int i; + +if (intel_gen (devid) >=12 ) { + regs = gen12_oa_wl; + count =i915_perf_revision (drm_fd) >=7 ? +ARRAY_SIZE (gen12_oa_wl) :2 ; + }else { + regs = gen8_oa_wl; + count =i915_perf_revision (drm_fd) >=7 ? +ARRAY_SIZE (gen8_oa_wl) :2 ; + } + +for (i =0 ; i < count; i++) +if (are_present) +igt_assert (in_whitelist (regs[i])); +else +igt_assert (!in_whitelist (regs[i])); +} + +static void test_oa_regs_whitelist (int paranoid) +{ +uint64_t properties[] = { +DRM_I915_PERF_PROP_SAMPLE_OA , true, +DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , test_set->perf_oa_format, +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exp_1_millisec, + + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , + .num_properties =sizeof (properties) /16 , + .properties_ptr =to_user_pointer (properties), + }; +write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" , paranoid); +intel_register_access_init (&mmio_data,intel_get_pci_device (), +0 , drm_fd); + stream_fd =__perf_open (drm_fd, ¶m, false); + +dump_whitelist ("oa whitelisted" ); + +if (paranoid) +oa_regs_in_whitelist (false); +else +oa_regs_in_whitelist (true); + +__perf_close (stream_fd); + +dump_whitelist ("oa remove whitelist" ); + +/* after perf close, whitelist should be removed */ +oa_regs_in_whitelist (false); + +intel_register_access_fini (&mmio_data); +} +static unsigned
read_i915_module_ref(void)
{tests/i915/perf.c +0
-17@@ -4880,23 +5284,6 @@ test_sysctl_defaults(void)igt_assert_eq (max_freq,100000 ); } -static int i915_perf_revision (int fd) -{ -drm_i915_getparam_t gp; -int value =1 , ret; - - gp.param =I915_PARAM_PERF_REVISION ; - gp.value = &value; - ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); -if (ret ==-1 ) { -/* If the param is missing, consider version 1. */ -igt_assert_eq (errno,EINVAL ); -return 1 ; - } - -return value; -} -
igt_main{ igt_fixture {tests/i915/perf.c +24
-0@@ -5096,6 +5483,30 @@ igt_main igt_subtest("whitelisted-registers-userspace-config")test_whitelisted_registers_userspace_config (); + + igt_subtest_group { + igt_fixture { +igt_require (intel_gen (devid) >8 ); +igt_require (i915_perf_revision (drm_fd) >=6 ); + } + +igt_describe ("Verify that OA registers are whitelisted for paranoid 0" ); + igt_subtest("oa-regs-whitelisted") +test_oa_regs_whitelist (0 ); + +igt_describe ("Verify that OA registers are not whitelisted for paranoid 1" ); + igt_subtest("oa-regs-not-whitelisted") +test_oa_regs_whitelist (1 ); + +igt_describe ("Verify reports triggered when perf_stream_paranoid is 0" ); + igt_subtest("triggered-oa-reports-paranoid-0") +test_triggered_oa_reports (0 ); + +igt_describe ("Verify reports not triggered when perf_stream_paranoid is 1" ); + igt_subtest("triggered-oa-reports-paranoid-1") +test_triggered_oa_reports (1 ); + } + igt_fixture {/* leave sysctl options in their default state... */ write_u64_file ("/proc/sys/dev/i915/oa_max_sample_rate" ,100000 );Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev