drm/i915/perf: Whitelist OA report trigger registers
Subsystems (3)
PATCH 1/3 drm/i915/perf: Whitelist OA report trigger registers
From: Piotr Maciejewski <[email protected]>
OA reports can be triggered into the OA buffer by writing into the OAREPORTTRIG registers. Whitelist the registers to allow user to trigger reports.
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/i915/gt/intel_workarounds.c +26 -0
@@ -1365,6 +1365,20 @@ whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg)whitelist_reg_ext (wal, reg,RING_FORCE_TO_NONPRIV_ACCESS_RW ); } +static void gen9_whitelist_build_performance_counters (struct i915_wa_list *w) +{ +/* OA buffer trigger report 2/6 used by performance query */ +whitelist_reg (w,OAREPORTTRIG2 ); +whitelist_reg (w,OAREPORTTRIG6 ); +} + +static void gen12_whitelist_build_performance_counters (struct i915_wa_list *w) +{ +/* OA buffer trigger report 2/6 used by performance query */ +whitelist_reg (w,GEN12_OAG_OAREPORTTRIG2 ); +whitelist_reg (w,GEN12_OAG_OAREPORTTRIG6 ); +} +static void gen9_whitelist_build (struct i915_wa_list *w) {/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */
@@ -1378,6 +1392,9 @@ static void gen9_whitelist_build(struct i915_wa_list *w)/* WaSendPushConstantsFromMMIO:skl,bxt */ whitelist_reg (w,COMMON_SLICE_CHICKEN2 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w); }static void skl_whitelist_build (struct intel_engine_cs *engine)
@@ -1471,6 +1488,9 @@ static void cnl_whitelist_build(struct intel_engine_cs *engine)/* WaEnablePreemptionGranularityControlByUMD:cnl */ whitelist_reg (w,GEN8_CS_CHICKEN1 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w); }static void icl_whitelist_build (struct intel_engine_cs *engine)
@@ -1500,6 +1520,9 @@ static void icl_whitelist_build(struct intel_engine_cs *engine)whitelist_reg_ext (w,PS_INVOCATION_COUNT ,RING_FORCE_TO_NONPRIV_ACCESS_RD |RING_FORCE_TO_NONPRIV_RANGE_4 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w);break ;case VIDEO_DECODE_CLASS :
@@ -1550,6 +1573,9 @@ static void tgl_whitelist_build(struct intel_engine_cs *engine)/* Wa_1806527549:tgl */ whitelist_reg (w,HIZ_CHICKEN ); + +/* Performance counters support */ +gen12_whitelist_build_performance_counters (w);break ;default : whitelist_reg_ext(w,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/perf: Whitelist OA counter and buffer registers
From: Piotr Maciejewski <[email protected]>
It is useful to have markers in the OA reports to identify triggered reports. Whitelist some OA counters that can be used as markers.
A triggered report can be found faster if we can sample the HW tail and head registers when the report was triggered. Whitelist OA buffer specific registers.
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 34 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 +++++++++ 2 files changed, 49 insertions(+)
drivers/gpu/drm/i915/gt/intel_workarounds.c +34 -0
@@ -1370,6 +1370,23 @@ static void gen9_whitelist_build_performance_counters(struct i915_wa_list *w)/* OA buffer trigger report 2/6 used by performance query */ whitelist_reg (w,OAREPORTTRIG2 );whitelist_reg (w,OAREPORTTRIG6 ); + +/* Performance counters A18-20 used by tbs marker query */ +whitelist_reg_ext (w,OA_PERF_COUNTER_A18 , +RING_FORCE_TO_NONPRIV_ACCESS_RW | +RING_FORCE_TO_NONPRIV_RANGE_4 ); + +whitelist_reg (w,OA_PERF_COUNTER_A20 ); +whitelist_reg (w,OA_PERF_COUNTER_A20_UPPER ); + +/* Read access to gpu ticks */ +whitelist_reg_ext (w,GEN8_GPU_TICKS , +RING_FORCE_TO_NONPRIV_ACCESS_RD ); + +/* Read access to: oa status, head, tail, buffer settings */ +whitelist_reg_ext (w,GEN8_OASTATUS , +RING_FORCE_TO_NONPRIV_ACCESS_RD | +RING_FORCE_TO_NONPRIV_RANGE_4 ); }static void gen12_whitelist_build_performance_counters (struct i915_wa_list *w)
@@ -1377,6 +1394,23 @@ static void gen12_whitelist_build_performance_counters(struct i915_wa_list *w)/* OA buffer trigger report 2/6 used by performance query */ whitelist_reg (w,GEN12_OAG_OAREPORTTRIG2 );whitelist_reg (w,GEN12_OAG_OAREPORTTRIG6 ); + +/* Performance counters A18-20 used by tbs marker query */ +whitelist_reg_ext (w,GEN12_OAG_PERF_COUNTER_A18 , +RING_FORCE_TO_NONPRIV_ACCESS_RW | +RING_FORCE_TO_NONPRIV_RANGE_4 ); + +whitelist_reg (w,GEN12_OAG_PERF_COUNTER_A20 ); +whitelist_reg (w,GEN12_OAG_PERF_COUNTER_A20_UPPER ); + +/* Read access to gpu ticks */ +whitelist_reg_ext (w,GEN12_OAG_GPU_TICKS , +RING_FORCE_TO_NONPRIV_ACCESS_RD ); + +/* Read access to: oa status, head, tail, buffer settings */ +whitelist_reg_ext (w,GEN12_OAG_OASTATUS , +RING_FORCE_TO_NONPRIV_ACCESS_RD | +RING_FORCE_TO_NONPRIV_RANGE_4 ); }static void gen9_whitelist_build (struct i915_wa_list *w)
drivers/gpu/drm/i915/i915_reg.h +15 -0
@@ -675,6 +675,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_OASTATUS2_HEAD_MASK 0xffffffc0#define GEN7_OASTATUS2_MEM_SELECT_GGTT (1 << 0)/* 0: PPGTT, 1: GGTT */ +#define GEN8_GPU_TICKS _MMIO(0x2910)#define GEN8_OASTATUS _MMIO(0x2b08)#define GEN8_OASTATUS_OVERRUN_STATUS (1 << 3)#define GEN8_OASTATUS_COUNTER_OVERFLOW (1 << 2)
@@ -731,6 +732,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_OAG_OA_DEBUG_DISABLE_GO_1_0_REPORTS (1 << 2)#define GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS (1 << 1) +#define GEN12_OAG_GPU_TICKS _MMIO(0xda90)#define GEN12_OAG_OASTATUS _MMIO(0xdafc)#define GEN12_OAG_OASTATUS_COUNTER_OVERFLOW (1 << 2)#define GEN12_OAG_OASTATUS_BUFFER_OVERFLOW (1 << 1)
@@ -972,6 +974,19 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OAREPORTTRIG8_NOA_SELECT_6_SHIFT 24#define OAREPORTTRIG8_NOA_SELECT_7_SHIFT 28 +/* Performance counters registers */ +#define OA_PERF_COUNTER_A18 _MMIO(0x2890) +#define OA_PERF_COUNTER_A19 _MMIO(0x2898) +#define OA_PERF_COUNTER_A20 _MMIO(0x28A0) +#define OA_PERF_COUNTER_A20_UPPER _MMIO(0x28A4) + +/* Gen12 Performance counters registers */ +#define GEN12_OAG_PERF_COUNTER_A16 _MMIO(0xDA00) +#define GEN12_OAG_PERF_COUNTER_A18 _MMIO(0xDA10) +#define GEN12_OAG_PERF_COUNTER_A19 _MMIO(0xDA18) +#define GEN12_OAG_PERF_COUNTER_A20 _MMIO(0xDA20) +#define GEN12_OAG_PERF_COUNTER_A20_UPPER _MMIO(0xDA24) +/* Same layout as OASTARTTRIGX */ #define GEN12_OAG_OASTARTTRIG1 _MMIO(0xd900)#define GEN12_OAG_OASTARTTRIG2 _MMIO(0xd904)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/3] drm/i915/perf: Whitelist OA counter and buffer registers
Quoted 89 lines · Umesh Nerlige Ramappa
From: Piotr Maciejewski <[email protected]>
It is useful to have markers in the OA reports to identify triggered reports. Whitelist some OA counters that can be used as markers.
A triggered report can be found faster if we can sample the HW tail and head registers when the report was triggered. Whitelist OA buffer specific registers.
Signed-off-by Piotr Maciejewski <[email protected]>Signed-off-by Umesh Nerlige Ramappa <[email protected]>--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 34 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 +++++++++ 2 files changed, 49 insertions(+)drivers/gpu/drm/i915/gt/intel_workarounds.c +34
-0@@ -1370,6 +1370,23 @@ static void gen9_whitelist_build_performance_counters(struct i915_wa_list *w)/* OA buffer trigger report 2/6 used by performance query */ whitelist_reg (w,OAREPORTTRIG2 );whitelist_reg (w,OAREPORTTRIG6 ); + +/* Performance counters A18-20 used by tbs marker query */ +whitelist_reg_ext (w,OA_PERF_COUNTER_A18 , +RING_FORCE_TO_NONPRIV_ACCESS_RW | +RING_FORCE_TO_NONPRIV_RANGE_4 ); + +whitelist_reg (w,OA_PERF_COUNTER_A20 ); +whitelist_reg (w,OA_PERF_COUNTER_A20_UPPER ); + +/* Read access to gpu ticks */ +whitelist_reg_ext (w,GEN8_GPU_TICKS , +RING_FORCE_TO_NONPRIV_ACCESS_RD ); + +/* Read access to: oa status, head, tail, buffer settings */ +whitelist_reg_ext (w,GEN8_OASTATUS , +RING_FORCE_TO_NONPRIV_ACCESS_RD | +RING_FORCE_TO_NONPRIV_RANGE_4 ); }static void gen12_whitelist_build_performance_counters (struct i915_wa_list *w)@@ -1377,6 +1394,23 @@ static void gen12_whitelist_build_performance_counters(struct i915_wa_list *w)/* OA buffer trigger report 2/6 used by performance query */ whitelist_reg (w,GEN12_OAG_OAREPORTTRIG2 );whitelist_reg (w,GEN12_OAG_OAREPORTTRIG6 ); + +/* Performance counters A18-20 used by tbs marker query */ +whitelist_reg_ext (w,GEN12_OAG_PERF_COUNTER_A18 , +RING_FORCE_TO_NONPRIV_ACCESS_RW | +RING_FORCE_TO_NONPRIV_RANGE_4 ); + +whitelist_reg (w,GEN12_OAG_PERF_COUNTER_A20 ); +whitelist_reg (w,GEN12_OAG_PERF_COUNTER_A20_UPPER ); + +/* Read access to gpu ticks */ +whitelist_reg_ext (w,GEN12_OAG_GPU_TICKS , +RING_FORCE_TO_NONPRIV_ACCESS_RD ); + +/* Read access to: oa status, head, tail, buffer settings */ +whitelist_reg_ext (w,GEN12_OAG_OASTATUS , +RING_FORCE_TO_NONPRIV_ACCESS_RD | +RING_FORCE_TO_NONPRIV_RANGE_4 ); }static void gen9_whitelist_build (struct i915_wa_list *w)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -675,6 +675,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_OASTATUS2_HEAD_MASK 0xffffffc0#define GEN7_OASTATUS2_MEM_SELECT_GGTT (1 << 0)/* 0: PPGTT, 1: GGTT */ +#define GEN8_GPU_TICKS _MMIO(0x2910)#define GEN8_OASTATUS _MMIO(0x2b08)#define GEN8_OASTATUS_OVERRUN_STATUS (1 << 3)#define GEN8_OASTATUS_COUNTER_OVERFLOW (1 << 2)@@ -731,6 +732,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_OAG_OA_DEBUG_DISABLE_GO_1_0_REPORTS (1 << 2)#define GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS (1 << 1) +#define GEN12_OAG_GPU_TICKS _MMIO(0xda90)#define GEN12_OAG_OASTATUS _MMIO(0xdafc)#define GEN12_OAG_OASTATUS_COUNTER_OVERFLOW (1 << 2)#define GEN12_OAG_OASTATUS_BUFFER_OVERFLOW (1 << 1)
drivers/gpu/drm/i915/i915_reg.h static inline bool i915_mmio_reg_valid(i915_reg_t reg) · line 981
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -972,6 +974,19 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OAREPORTTRIG8_NOA_SELECT_6_SHIFT 24#define OAREPORTTRIG8_NOA_SELECT_7_SHIFT 28 +/* Performance counters registers */ +#define OA_PERF_COUNTER_A18 _MMIO(0x2890) +#define OA_PERF_COUNTER_A19 _MMIO(0x2898) +#define OA_PERF_COUNTER_A20 _MMIO(0x28A0) +#define OA_PERF_COUNTER_A20_UPPER _MMIO(0x28A4)
#define OA_PERF_COUNTER_A(idx) _MMIO(0x2800 + 8 * (idx))
drivers/gpu/drm/i915/i915_reg.h static inline bool i915_mmio_reg_valid(i915_reg_t reg) · line 988
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +7
-0+ +/* Gen12 Performance counters registers */ +#define GEN12_OAG_PERF_COUNTER_A16 _MMIO(0xDA00) +#define GEN12_OAG_PERF_COUNTER_A18 _MMIO(0xDA10) +#define GEN12_OAG_PERF_COUNTER_A19 _MMIO(0xDA18) +#define GEN12_OAG_PERF_COUNTER_A20 _MMIO(0xDA20) +#define GEN12_OAG_PERF_COUNTER_A20_UPPER _MMIO(0xDA24)
#define GEN12_OA_PERF_COUNTER_A(idx) _MMIO(0xD980 + 8 * (idx)
drivers/gpu/drm/i915/i915_reg.h static inline bool i915_mmio_reg_valid(i915_reg_t reg) · line 992
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+/* Same layout as OASTARTTRIGX */ #define GEN12_OAG_OASTARTTRIG1 _MMIO(0xd900)#define GEN12_OAG_OASTARTTRIG2 _MMIO(0xd904)
I think this deserves its own i915-perf revision bump.
Thanks,
-Lionel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/perf: Map OA buffer to user space for gen12 performance query
In reply to Umesh Nerlige RamappaFrom: Piotr Maciejewski <[email protected]>
i915 used to support time based sampling mode which is good for overall system monitoring, but is not enough for query mode used to measure a single draw call or dispatch. Gen9-Gen11 are using current i915 perf implementation for query, but Gen12+ requires a new approach for query based on triggered reports within oa buffer.
Triggering reports into the OA buffer is achieved by writing into a a trigger register. Optionally an unused counter/register is set with a marker value such that a triggered report can be identified in the OA buffer. Reports are usually triggered at the start and end of work that is measured.
Since OA buffer is large and queries can be frequent, an efficient way to look for triggered reports is required. By knowing the current head and tail offsets into the OA buffer, it is easier to determine the locality of the reports of interest.
Current perf OA interface does not expose head/tail information to the user and it filters out invalid reports before sending data to user. Also considering limited size of user buffer used during a query, creating a 1:1 copy of the OA buffer at the user space added undesired complexity.
The solution was to map the OA buffer to user space provided
(1) that it is accessed from a privileged user.
(2) OA report filtering is not used.
These 2 conditions would satisfy the safety criteria that the current perf interface addresses.
To enable the query:
- Add an ioctl to expose head and tail to the user
- Add an ioctl to return size and offset of the OA buffer
- Map the OA buffer to the user space
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 156 ++++++++++++++++++++++- drivers/gpu/drm/i915/i915_perf_types.h | 5 + drivers/gpu/drm/i915/i915_reg.h | 1 + include/uapi/drm/i915_drm.h | 32 +++++ 6 files changed, 194 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -1
@@ -204,7 +204,7 @@ compute_partial_view(const struct drm_i915_gem_object *obj,return view; } -static vm_fault_t i915_error_to_vmf_fault (int err) +vm_fault_t i915_error_to_vmf_fault (int err) {switch (err) {default :
drivers/gpu/drm/i915/gem/i915_gem_mman.h +2 -0
@@ -29,4 +29,6 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj);void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj); +vm_fault_t i915_error_to_vmf_fault (int err); +#endif
drivers/gpu/drm/i915/i915_perf.c +153 -3
245 lines not on this page · raw message
drivers/gpu/drm/i915/i915_perf_types.h +5 -0
@@ -377,6 +377,11 @@ struct i915_oa_ops {* generations. */ u32 (*oa_hw_tail_read)(struct i915_perf_stream *stream); + +/** +* @oa_hw_head_read: read the OA head pointer register +*/ +u32 (*oa_hw_head_read)(struct i915_perf_stream *stream); };struct i915_perf {
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -697,6 +697,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OABUFFER_SIZE_16M (7 << 3)#define GEN12_OA_TLB_INV_CR _MMIO(0xceec) +#define GEN12_SQCNT1 _MMIO(0x8718)/* Gen12 OAR unit */ #define GEN12_OAR_OACONTROL _MMIO(0x2960)
include/uapi/drm/i915_drm.h +32 -0
@@ -2048,6 +2048,38 @@ 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 6. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_INFO _IO('i', 0x3) + +/** +* OA buffer size and offset. +*/ +struct drm_i915_perf_oa_buffer_info { +__u32 size; +__u32 offset; +__u64 reserved[4 ]; +}; + +/** +* Returns current position of OA buffer head and tail. +* +* This ioctl is available in perf revision 6. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_HEAD_TAIL _IO('i', 0x4) + +/** +* OA buffer head and tail. +*/ +struct drm_i915_perf_oa_buffer_head_tail { +__u32 head; +__u32 tail; +__u64 reserved[4 ]; +}; +/** * Common to all i915 perf records */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kernel test robot
build botRe: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Map OA buffer to user space for gen12 performance query
Thank you for the patch! Perhaps something to improve:
Hi Umesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip v5.8-rc5 next-20200716] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Umesh-Nerlige-Ramappa/drm-i915-perf-Whitelist-OA-report-trigger-registers/20200717-095850 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/i915_perf.c:1642:5: warning: no previous prototype for 'i915_perf_mmap' [-Wmissing-prototypes]
1642 | int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
| ^~~~~~~~~~~~~~
vim +/i915_perf_mmap +1642 drivers/gpu/drm/i915/i915_perf.c
1641
> 1642 int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
1643 {
1644 struct i915_perf_stream *stream = file->private_data;
1645
1646 if (vma->vm_end < vma->vm_start)
1647 return -EINVAL;
1648
1649 if ((vma->vm_end - vma->vm_start) > OA_BUFFER_SIZE)
1650 return -EINVAL;
1651
1652 if (vma->vm_flags & VM_WRITE)
1653 return -EINVAL;
1654
1655 if (vma->vm_pgoff != I915_PERF_OA_BUFFER_MMAP_OFFSET)
1656 return -EINVAL;
1657
1658 vma->vm_flags &= ~(VM_MAYWRITE | VM_MAYEXEC | VM_MAYSHARE);
1659 vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
1660 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1661 vma->vm_private_data = stream;
1662 vma->vm_ops = &vm_ops_oa;
1663
1664 return 0;
1665 }
1666
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Map OA buffer to user space for gen12 performance query
In reply to Umesh Nerlige RamappaQuoted 132 lines · Umesh Nerlige Ramappa
From: Piotr Maciejewski <[email protected]>
i915 used to support time based sampling mode which is good for overall system monitoring, but is not enough for query mode used to measure a single draw call or dispatch. Gen9-Gen11 are using current i915 perf implementation for query, but Gen12+ requires a new approach for query based on triggered reports within oa buffer.
Triggering reports into the OA buffer is achieved by writing into a a trigger register. Optionally an unused counter/register is set with a marker value such that a triggered report can be identified in the OA buffer. Reports are usually triggered at the start and end of work that is measured.
Since OA buffer is large and queries can be frequent, an efficient way to look for triggered reports is required. By knowing the current head and tail offsets into the OA buffer, it is easier to determine the locality of the reports of interest.
Current perf OA interface does not expose head/tail information to the user and it filters out invalid reports before sending data to user. Also considering limited size of user buffer used during a query, creating a 1:1 copy of the OA buffer at the user space added undesired complexity.
The solution was to map the OA buffer to user space provided
(1) that it is accessed from a privileged user.
(2) OA report filtering is not used.These 2 conditions would satisfy the safety criteria that the current perf interface addresses.
To enable the query:
- Add an ioctl to expose head and tail to the user
- Add an ioctl to return size and offset of the OA buffer
- Map the OA buffer to the user spaceSigned-off-by Piotr Maciejewski <[email protected]>Signed-off-by Umesh Nerlige Ramappa <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 156 ++++++++++++++++++++++- drivers/gpu/drm/i915/i915_perf_types.h | 5 + drivers/gpu/drm/i915/i915_reg.h | 1 + include/uapi/drm/i915_drm.h | 32 +++++ 6 files changed, 194 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_mman.c +1
-1@@ -204,7 +204,7 @@ compute_partial_view(const struct drm_i915_gem_object *obj,return view; } -static vm_fault_t i915_error_to_vmf_fault (int err) +vm_fault_t i915_error_to_vmf_fault (int err) {switch (err) {default :drivers/gpu/drm/i915/gem/i915_gem_mman.h +2
-0@@ -29,4 +29,6 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj);void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj); +vm_fault_t i915_error_to_vmf_fault (int err); +#endif drivers/gpu/drm/i915/i915_perf.c +28
-1@@ -192,10 +192,12 @@*/ #include <linux/anon_inodes.h> +#include <linux/mman.h> #include <linux/sizes.h> #include <linux/uuid.h> #include "gem/i915_gem_context.h" +#include "gem/i915_gem_mman.h" #include "gt/intel_engine_pm.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h" @@ -434,6 +436,30 @@ static u32 gen7_oa_hw_tail_read(struct i915_perf_stream *stream)return oastatus1 &GEN7_OASTATUS1_TAIL_MASK ; } +static u32 gen12_oa_hw_head_read (struct i915_perf_stream *stream) +{ +struct intel_uncore *uncore = stream->uncore; + +return intel_uncore_read (uncore,GEN12_OAG_OAHEADPTR ) & +GEN12_OAG_OAHEADPTR_MASK ; +} + +static u32 gen8_oa_hw_head_read (struct i915_perf_stream *stream) +{ +struct intel_uncore *uncore = stream->uncore; + +return intel_uncore_read (uncore,GEN8_OAHEADPTR ) & +GEN8_OAHEADPTR_MASK ; +} + +static u32 gen7_oa_hw_head_read (struct i915_perf_stream *stream) +{ +struct intel_uncore *uncore = stream->uncore; +u32 oastatus2 =intel_uncore_read (uncore,GEN7_OASTATUS2 ); + +return oastatus2 &GEN7_OASTATUS2_HEAD_MASK ; +} +/** * oa_buffer_check_unlocked - check for data and update tail ptr state * @stream: i915 stream instance @@ -1448,7 +1474,8 @@ static void gen8_init_oa_buffer(struct i915_perf_stream *stream)* bit." */ intel_uncore_write (uncore,GEN8_OABUFFER , gtt_offset | -OABUFFER_SIZE_16M |GEN8_OABUFFER_MEM_SELECT_GGTT ); +OABUFFER_SIZE_16M |GEN8_OABUFFER_MEM_SELECT_GGTT | +GEN7_OABUFFER_EDGE_TRIGGER );intel_uncore_write (uncore,GEN8_OATAILPTR , gtt_offset &GEN8_OATAILPTR_MASK );/* Mark that we need updated tail pointers to read from... */
drivers/gpu/drm/i915/i915_perf.c static void gen12_init_oa_buffer(struct i915_perf_stream *stream) · line 1532
Quoted 6 lines
drivers/gpu/drm/i915/i915_perf.c +2
-1@@ -1501,7 +1528,8 @@ static void gen12_init_oa_buffer(struct i915_perf_stream *stream)* bit." */ intel_uncore_write (uncore,GEN12_OAG_OABUFFER , gtt_offset | -OABUFFER_SIZE_16M |GEN8_OABUFFER_MEM_SELECT_GGTT ); +OABUFFER_SIZE_16M |GEN8_OABUFFER_MEM_SELECT_GGTT | +GEN7_OABUFFER_EDGE_TRIGGER );
This belongs to the first patch to whitelist the OA trigger registers.
Quoted 33 lines
drivers/gpu/drm/i915/i915_perf.c +26
-0intel_uncore_write (uncore,GEN12_OAG_OATAILPTR , gtt_offset &GEN12_OAG_OATAILPTR_MASK );@@ -1584,6 +1612,58 @@ static int alloc_oa_buffer(struct i915_perf_stream *stream)return ret; } +static vm_fault_t vm_fault_oa (struct vm_fault *vmf) +{ +struct vm_area_struct *vma = vmf->vma; +struct i915_perf_stream *stream = vma->vm_private_data; +struct drm_i915_gem_object *obj = stream->oa_buffer.vma->obj; +int err; + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out; + + err =remap_io_sg (vma, + vma->vm_start, vma->vm_end - vma->vm_start, + obj->mm.pages->sgl,-1 ); + +i915_gem_object_unpin_pages (obj); + +out: +return i915_error_to_vmf_fault (err); +} + +static const struct vm_operations_struct vm_ops_oa = { + .fault = vm_fault_oa, +}; + +#define I915_PERF_OA_BUFFER_MMAP_OFFSET 1
drivers/gpu/drm/i915/i915_perf.c static int alloc_oa_buffer(struct i915_perf_stream *stream) · line 1650
Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +10
-0+ +int i915_perf_mmap (struct file *file,struct vm_area_struct *vma) +{ +struct i915_perf_stream *stream = file->private_data; + +if (vma->vm_end < vma->vm_start) +return -EINVAL ; + +if ((vma->vm_end - vma->vm_start) >OA_BUFFER_SIZE ) +return -EINVAL ;
I think you need to also verify that the start & range are aligned to a page.
Quoted 20 lines
drivers/gpu/drm/i915/i915_perf.c +16
-0+ +if (vma->vm_flags &VM_WRITE ) +return -EINVAL ; + +if (vma->vm_pgoff !=I915_PERF_OA_BUFFER_MMAP_OFFSET ) +return -EINVAL ; + + vma->vm_flags &= ~(VM_MAYWRITE |VM_MAYEXEC |VM_MAYSHARE ); + vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); + vma->vm_private_data = stream; + vma->vm_ops = &vm_ops_oa; + +return 0 ; +} +static u32 *save_restore_register (struct i915_perf_stream *stream,u32 *cs,bool save,i915_reg_t reg,u32 offset,u32 dword_count)
drivers/gpu/drm/i915/i915_perf.c gen12_enable_metric_set(struct i915_perf_stream *stream, · line 2581
Quoted 9 lines
drivers/gpu/drm/i915/i915_perf.c +6
-0@@ -2493,6 +2573,13 @@ gen12_enable_metric_set(struct i915_perf_stream *stream, (period_exponent << GEN12_OAG_OAGLBCTXCTRL_TIMER_PERIOD_SHIFT)) : 0); +/* +* Initialize Super Queue Internal Cnt Register +* BIT(30) - PMON Enable - set in order to collect valid metrics. +*/ +intel_uncore_write (uncore,GEN12_SQCNT1 , +intel_uncore_read (uncore,GEN12_SQCNT1 ) |BIT (30 ));
This sounds like a fix that should go separately with a Fixes tag. Am I wrong?
The convention seems to have the registers bits defined in i915_reg.h as GEN12_SQCNT1_PMON_ENABLE for example.
Quoted 187 lines
drivers/gpu/drm/i915/i915_perf.c +65
-1+/* * Update all contexts prior writing the mux configurations as we need * to make sure all slices/subslices are ON before writing to NOA @@ -3199,6 +3286,57 @@ static long i915_perf_config_locked(struct i915_perf_stream *stream,return ret; } +/** +* i915_perf_oa_buffer_head_tail_locked - head and tail of the OA buffer +* @stream: i915 perf stream +* @arg: pointer to oa buffer head and tail filled by this function. +*/ +static int i915_perf_oa_buffer_head_tail_locked (struct i915_perf_stream *stream, +unsigned long arg) +{ +struct drm_i915_perf_oa_buffer_head_tail ht; +void __user *output = (void __user *) arg; +u32 gtt_offset =i915_ggtt_offset (stream->oa_buffer.vma); + +if (!output) +return -EINVAL ; + +memset (&ht,0 ,sizeof (ht)); + + ht.head = stream->perf->ops.oa_hw_head_read (stream) - gtt_offset; + ht.tail = stream->perf->ops.oa_hw_tail_read (stream) - gtt_offset; + +if (copy_to_user (output, &ht,sizeof (ht))) +return -EFAULT ; + +return 0 ; +} + +/** +* i915_perf_oa_buffer_info_locked - size and offset of the OA buffer +* @stream: i915 perf stream +* @arg: pointer to oa buffer info filled by this function. +*/ +static int i915_perf_oa_buffer_info_locked (struct i915_perf_stream *stream, +unsigned long arg) +{ +struct drm_i915_perf_oa_buffer_info info; +void __user *output = (void __user *) arg; + +if (!output) +return -EINVAL ; + +memset (&info,0 ,sizeof (info)); + + info.size = stream->oa_buffer.vma->size; + info.offset =I915_PERF_OA_BUFFER_MMAP_OFFSET *PAGE_SIZE ; + +if (copy_to_user (output, &info,sizeof (info))) +return -EFAULT ; + +return 0 ; +} +/** * i915_perf_ioctl - support ioctl() usage with i915 perf stream FDs * @stream: An i915 perf stream @@ -3224,6 +3362,10 @@ static long i915_perf_ioctl_locked(struct i915_perf_stream *stream,return 0 ;case I915_PERF_IOCTL_CONFIG :return i915_perf_config_locked (stream, arg); +case I915_PERF_IOCTL_GET_OA_BUFFER_INFO : +return i915_perf_oa_buffer_info_locked (stream, arg); +case I915_PERF_IOCTL_GET_OA_BUFFER_HEAD_TAIL : +return i915_perf_oa_buffer_head_tail_locked (stream, arg); }return -EINVAL ;@@ -3317,6 +3459,7 @@ static const struct file_operations fops = {* to handle 32bits compatibility. */ .compat_ioctl = i915_perf_ioctl, + .mmap = i915_perf_mmap, };@@ -4245,6 +4388,7 @@ void i915_perf_init(struct drm_i915_private *i915) perf->ops.oa_disable = gen7_oa_disable; perf->ops.read = gen7_oa_read; perf->ops.oa_hw_tail_read = gen7_oa_hw_tail_read; + perf->ops.oa_hw_head_read = gen7_oa_hw_head_read; perf->oa_formats = hsw_oa_formats; }else if (HAS_LOGICAL_RING_CONTEXTS (i915)) {@@ -4276,6 +4420,7 @@ void i915_perf_init(struct drm_i915_private *i915) perf->ops.enable_metric_set = gen8_enable_metric_set; perf->ops.disable_metric_set = gen8_disable_metric_set; perf->ops.oa_hw_tail_read = gen8_oa_hw_tail_read; + perf->ops.oa_hw_head_read = gen8_oa_hw_head_read;if (IS_GEN (i915,8 )) { perf->ctx_oactxctrl_offset =0x120 ;@@ -4303,6 +4448,7 @@ void i915_perf_init(struct drm_i915_private *i915) perf->ops.enable_metric_set = gen8_enable_metric_set; perf->ops.disable_metric_set = gen10_disable_metric_set; perf->ops.oa_hw_tail_read = gen8_oa_hw_tail_read; + perf->ops.oa_hw_head_read = gen8_oa_hw_head_read;if (IS_GEN (i915,10 )) { perf->ctx_oactxctrl_offset =0x128 ;@@ -4327,6 +4473,7 @@ void i915_perf_init(struct drm_i915_private *i915) perf->ops.enable_metric_set = gen12_enable_metric_set; perf->ops.disable_metric_set = gen12_disable_metric_set; perf->ops.oa_hw_tail_read = gen12_oa_hw_tail_read; + perf->ops.oa_hw_head_read = gen12_oa_hw_head_read; perf->ctx_flexeu0_offset =0 ; perf->ctx_oactxctrl_offset =0x144 ;@@ -4432,8 +4579,11 @@ int i915_perf_ioctl_version(void)* * 5: Add DRM_I915_PERF_PROP_POLL_OA_PERIOD parameter that controls the * interval for the hrtimer used to check for OA data. +* +* 6: Added an option to map oa buffer at umd driver level and trigger +* oa reports within oa buffer from command buffer. */ -return 5 ; +return 6 ; }#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )drivers/gpu/drm/i915/i915_perf_types.h +5
-0@@ -377,6 +377,11 @@ struct i915_oa_ops {* generations. */ u32 (*oa_hw_tail_read)(struct i915_perf_stream *stream); + +/** +* @oa_hw_head_read: read the OA head pointer register +*/ +u32 (*oa_hw_head_read)(struct i915_perf_stream *stream); };struct i915_perf {drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -697,6 +697,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OABUFFER_SIZE_16M (7 << 3)#define GEN12_OA_TLB_INV_CR _MMIO(0xceec) +#define GEN12_SQCNT1 _MMIO(0x8718)/* Gen12 OAR unit */ #define GEN12_OAR_OACONTROL _MMIO(0x2960)include/uapi/drm/i915_drm.h +25
-0@@ -2048,6 +2048,38 @@ 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 6. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_INFO _IO('i', 0x3) + +/** +* OA buffer size and offset. +*/ +struct drm_i915_perf_oa_buffer_info { +__u32 size; +__u32 offset; +__u64 reserved[4 ]; +}; + +/** +* Returns current position of OA buffer head and tail. +* +* This ioctl is available in perf revision 6. +*/ +#define I915_PERF_IOCTL_GET_OA_BUFFER_HEAD_TAIL _IO('i', 0x4) + +/** +* OA buffer head and tail.
include/uapi/drm/i915_drm.h struct drm_i915_perf_open_param { · line 2085
Quoted 10 lines
include/uapi/drm/i915_drm.h +7
-0+*/ +struct drm_i915_perf_oa_buffer_head_tail { +__u32 head; +__u32 tail; +__u64 reserved[4 ]; +}; +/** * Common to all i915 perf records */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kernel test robot
build botRe: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Map OA buffer to user space for gen12 performance query
In reply to Umesh Nerlige RamappaThank you for the patch! Perhaps something to improve:
Hi Umesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip v5.8-rc5 next-20200716] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Umesh-Nerlige-Ramappa/drm-i915-perf-Whitelist-OA-report-trigger-registers/20200717-095850 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-allyesconfig (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project ed6b578040a85977026c93bf4188f996148f3218)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/i915_perf.c:1642:5: warning: no previous prototype for function 'i915_perf_mmap' [-Wmissing-prototypes]
int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
^ drivers/gpu/drm/i915/i915_perf.c:1642:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
^
static
1 warning generated.
vim +/i915_perf_mmap +1642 drivers/gpu/drm/i915/i915_perf.c
1641
> 1642 int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
1643 {
1644 struct i915_perf_stream *stream = file->private_data;
1645
1646 if (vma->vm_end < vma->vm_start)
1647 return -EINVAL;
1648
1649 if ((vma->vm_end - vma->vm_start) > OA_BUFFER_SIZE)
1650 return -EINVAL;
1651
1652 if (vma->vm_flags & VM_WRITE)
1653 return -EINVAL;
1654
1655 if (vma->vm_pgoff != I915_PERF_OA_BUFFER_MMAP_OFFSET)
1656 return -EINVAL;
1657
1658 vma->vm_flags &= ~(VM_MAYWRITE | VM_MAYEXEC | VM_MAYSHARE);
1659 vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
1660 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1661 vma->vm_private_data = stream;
1662 vma->vm_ops = &vm_ops_oa;
1663
1664 return 0;
1665 }
1666
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Map OA buffer to user space for gen12 performance query
In reply to Umesh Nerlige RamappaThank you for the patch! Yet something to improve:
Hi Umesh,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip v5.8-rc5 next-20200717] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Umesh-Nerlige-Ramappa/drm-i915-perf-Whitelist-OA-report-trigger-registers/20200717-095850 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-randconfig-r011-20200719 (attached as .config) compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/i915_perf.c:1642:5: error: no previous prototype for 'i915_perf_mmap' [-Werror=missing-prototypes]
1642 | int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
| ^~~~~~~~~~~~~~
cc1: all warnings being treated as errors
vim +/i915_perf_mmap +1642 drivers/gpu/drm/i915/i915_perf.c
1641
> 1642 int i915_perf_mmap(struct file *file, struct vm_area_struct *vma)
1643 {
1644 struct i915_perf_stream *stream = file->private_data;
1645
1646 if (vma->vm_end < vma->vm_start)
1647 return -EINVAL;
1648
1649 if ((vma->vm_end - vma->vm_start) > OA_BUFFER_SIZE)
1650 return -EINVAL;
1651
1652 if (vma->vm_flags & VM_WRITE)
1653 return -EINVAL;
1654
1655 if (vma->vm_pgoff != I915_PERF_OA_BUFFER_MMAP_OFFSET)
1656 return -EINVAL;
1657
1658 vma->vm_flags &= ~(VM_MAYWRITE | VM_MAYEXEC | VM_MAYSHARE);
1659 vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
1660 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1661 vma->vm_private_data = stream;
1662 vma->vm_ops = &vm_ops_oa;
1663
1664 return 0;
1665 }
1666
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] drm/i915/perf: Whitelist OA report trigger registers
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/perf: Whitelist OA report trigger registers
URL : https://patchwork.freedesktop.org/series/79571/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 451a46ae0075 drm/i915/perf: Whitelist OA report trigger registers 9c529f1bfafe drm/i915/perf: Whitelist OA counter and buffer registers 54031bcae51f drm/i915/perf: Map OA buffer to user space for gen12 performance query -:224: CHECK:SPACING: No space is necessary after a cast #224: FILE: drivers/gpu/drm/i915/i915_perf.c:3298: + void __user *output = (void __user *) arg;
-:250: CHECK:SPACING: No space is necessary after a cast #250: FILE: drivers/gpu/drm/i915/i915_perf.c:3324:
+ void __user *output = (void __user *) arg;
total: 0 errors, 0 warnings, 2 checks, 315 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915/perf: Whitelist OA report trigger registers
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/perf: Whitelist OA report trigger registers
URL : https://patchwork.freedesktop.org/series/79571/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.0 Fast mode used, each commit won't be checked separately.
_______________________________________________
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 [1/3] drm/i915/perf: Whitelist OA report trigger registers
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/perf: Whitelist OA report trigger registers
URL : https://patchwork.freedesktop.org/series/79571/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8759 -> Patchwork_18199
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18199 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18199, 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_18199/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18199:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@workarounds:
- fi-tgl-u2: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-u2/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-u2/igt@i915_selftest@[email protected]
- fi-skl-6700k2: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-skl-6700k2/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-skl-6700k2/igt@i915_selftest@[email protected]
- fi-cml-s: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-cml-s/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-cml-s/igt@i915_selftest@[email protected]
- fi-icl-y: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-y/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-icl-y/igt@i915_selftest@[email protected]
- fi-kbl-x1275: [PASS][9] -> [DMESG-FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-x1275/igt@i915_selftest@[email protected]
- fi-cfl-guc: [PASS][11] -> [DMESG-FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-cfl-guc/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-cfl-guc/igt@i915_selftest@[email protected]
- fi-tgl-y: [PASS][13] -> [DMESG-FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-y/igt@i915_selftest@[email protected]
- fi-skl-guc: [PASS][15] -> [DMESG-FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-skl-guc/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-skl-guc/igt@i915_selftest@[email protected]
- fi-skl-6600u: [PASS][17] -> [DMESG-FAIL][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-skl-6600u/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-skl-6600u/igt@i915_selftest@[email protected]
- fi-kbl-8809g: [PASS][19] -> [DMESG-FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-8809g/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-8809g/igt@i915_selftest@[email protected]
- fi-cfl-8700k: [PASS][21] -> [DMESG-FAIL][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-cfl-8700k/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-cfl-8700k/igt@i915_selftest@[email protected]
- fi-kbl-r: [PASS][23] -> [DMESG-FAIL][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-r/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-r/igt@i915_selftest@[email protected]
- fi-icl-u2: [PASS][25] -> [DMESG-FAIL][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@i915_selftest@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-icl-u2/igt@i915_selftest@[email protected]
- fi-cfl-8109u: [PASS][27] -> [DMESG-FAIL][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-cfl-8109u/igt@i915_selftest@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-cfl-8109u/igt@i915_selftest@[email protected]
- fi-skl-lmem: [PASS][29] -> [DMESG-FAIL][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-skl-lmem/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-skl-lmem/igt@i915_selftest@[email protected]
- fi-kbl-7500u: [PASS][31] -> [DMESG-FAIL][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-7500u/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-7500u/igt@i915_selftest@[email protected]
- fi-kbl-guc: [PASS][33] -> [DMESG-FAIL][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-guc/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-guc/igt@i915_selftest@[email protected]
- fi-kbl-soraka: [PASS][35] -> [DMESG-FAIL][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-soraka/igt@i915_selftest@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-soraka/igt@i915_selftest@[email protected]
- fi-whl-u: [PASS][37] -> [DMESG-FAIL][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-whl-u/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-whl-u/igt@i915_selftest@[email protected]
- fi-cml-u2: [PASS][39] -> [DMESG-FAIL][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-cml-u2/igt@i915_selftest@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-cml-u2/igt@i915_selftest@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@workarounds:
- {fi-tgl-dsi}: [PASS][41] -> [DMESG-FAIL][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-dsi/igt@i915_selftest@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-dsi/igt@i915_selftest@[email protected]
- {fi-ehl-1}: [PASS][43] -> [DMESG-FAIL][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-ehl-1/igt@i915_selftest@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-ehl-1/igt@i915_selftest@[email protected]
- {fi-kbl-7560u}: [PASS][45] -> [DMESG-FAIL][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-7560u/igt@i915_selftest@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-7560u/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18199 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@workarounds:
- fi-apl-guc: [PASS][47] -> [DMESG-FAIL][48] ([i915#1635])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-apl-guc/igt@i915_selftest@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-apl-guc/igt@i915_selftest@[email protected]
- fi-bxt-dsi: [PASS][49] -> [DMESG-FAIL][50] ([i915#1635])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-bxt-dsi/igt@i915_selftest@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-bxt-dsi/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-icl-u2: [PASS][51] -> [DMESG-WARN][52] ([i915#1982])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-icl-u2/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@b-vga1:
- fi-elk-e7500: [PASS][53] -> [FAIL][54] ([i915#2122])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-elk-e7500/igt@kms_flip@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-elk-e7500/igt@kms_flip@[email protected]
* igt@vgem_basic@setversion:
- fi-tgl-y: [PASS][55] -> [DMESG-WARN][56] ([i915#402]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [FAIL][57] ([i915#1888]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-u2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-u2/igt@[email protected]
* igt@kms_busy@basic@flip:
- fi-tgl-y: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@kms_busy@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-y/igt@kms_busy@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [DMESG-WARN][61] ([i915#1982]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@kms_flip@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-icl-u2/igt@kms_flip@[email protected]
* igt@prime_vgem@basic-write:
- fi-tgl-y: [DMESG-WARN][63] ([i915#402]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][65] ([i915#1982] / [i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][66] ([i915#62] / [i915#92])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-x1275/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-kbl-x1275: [DMESG-WARN][67] ([i915#62] / [i915#92]) -> [DMESG-WARN][68] ([i915#62] / [i915#92] / [i915#95]) +4 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-x1275/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-x1275: [DMESG-WARN][69] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][70] ([i915#62] / [i915#92]) +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[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 (45 -> 40)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_8759 -> Patchwork_18199
CI-20190529: 20190529
CI_DRM_8759: 9136d875406863759c4c7939f4b32edf7d76b007 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5738: bc8b56fe177af34fbde7b96f1f66614a0014c6ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18199: 54031bcae51f6d6403036e81ab52bdaa55d4cdf5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
54031bcae51f drm/i915/perf: Map OA buffer to user space for gen12 performance query 9c529f1bfafe drm/i915/perf: Whitelist OA counter and buffer registers 451a46ae0075 drm/i915/perf: Whitelist OA report trigger registers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18199/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 68 lines · Umesh Nerlige Ramappa
From: Piotr Maciejewski <[email protected]>
OA reports can be triggered into the OA buffer by writing into the OAREPORTTRIG registers. Whitelist the registers to allow user to trigger reports.
Signed-off-by Piotr Maciejewski <[email protected]>Signed-off-by Umesh Nerlige Ramappa <[email protected]>--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+)drivers/gpu/drm/i915/gt/intel_workarounds.c +23
-0@@ -1365,6 +1365,20 @@ whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg)whitelist_reg_ext (wal, reg,RING_FORCE_TO_NONPRIV_ACCESS_RW ); } +static void gen9_whitelist_build_performance_counters (struct i915_wa_list *w) +{ +/* OA buffer trigger report 2/6 used by performance query */ +whitelist_reg (w,OAREPORTTRIG2 ); +whitelist_reg (w,OAREPORTTRIG6 ); +} + +static void gen12_whitelist_build_performance_counters (struct i915_wa_list *w) +{ +/* OA buffer trigger report 2/6 used by performance query */ +whitelist_reg (w,GEN12_OAG_OAREPORTTRIG2 ); +whitelist_reg (w,GEN12_OAG_OAREPORTTRIG6 ); +} +static void gen9_whitelist_build (struct i915_wa_list *w) {/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ @@ -1378,6 +1392,9 @@ static void gen9_whitelist_build(struct i915_wa_list *w)/* WaSendPushConstantsFromMMIO:skl,bxt */ whitelist_reg (w,COMMON_SLICE_CHICKEN2 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w); }static void skl_whitelist_build (struct intel_engine_cs *engine)@@ -1471,6 +1488,9 @@ static void cnl_whitelist_build(struct intel_engine_cs *engine)/* WaEnablePreemptionGranularityControlByUMD:cnl */ whitelist_reg (w,GEN8_CS_CHICKEN1 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w); }static void icl_whitelist_build (struct intel_engine_cs *engine)@@ -1500,6 +1520,9 @@ static void icl_whitelist_build(struct intel_engine_cs *engine)whitelist_reg_ext (w,PS_INVOCATION_COUNT ,RING_FORCE_TO_NONPRIV_ACCESS_RD |RING_FORCE_TO_NONPRIV_RANGE_4 ); + +/* Performance counters support */ +gen9_whitelist_build_performance_counters (w);break ;case VIDEO_DECODE_CLASS :
drivers/gpu/drm/i915/gt/intel_workarounds.c static void tgl_whitelist_build(struct intel_engine_cs *engine) · line 1581
Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-0@@ -1550,6 +1573,9 @@ static void tgl_whitelist_build(struct intel_engine_cs *engine)/* Wa_1806527549:tgl */ whitelist_reg (w,HIZ_CHICKEN ); + +/* Performance counters support */ +gen12_whitelist_build_performance_counters (w);break ;default : whitelist_reg_ext(w,
Since this is a i915-perf feature, I think we should bump the i915-perf revision number.
This will allow the IGT test to properly check the availability of this feature and skip otherwise.
Otherwise looks sound to me.
-Lionel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx