Currently, pt_buffer_reset_offsets() calculates the current ToPA entry by
casting pointers to addresses and performing ungainly subtractions and
divisions instead of a simpler pointer arithmetic, which would be perfectly
applicable in that case. Fix that.

Signed-off-by: Alexander Shishkin <alexander.shish...@linux.intel.com>
---
 arch/x86/events/intel/pt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index 831163a1b41a..15e7c11e3460 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -1030,8 +1030,7 @@ static void pt_buffer_reset_offsets(struct pt_buffer 
*buf, unsigned long head)
        pg = pt_topa_next_entry(buf, pg);
 
        buf->cur = (struct topa *)((unsigned long)buf->topa_index[pg] & 
PAGE_MASK);
-       buf->cur_idx = ((unsigned long)buf->topa_index[pg] -
-                       (unsigned long)buf->cur) / sizeof(struct topa_entry);
+       buf->cur_idx = buf->topa_index[pg] - TOPA_ENTRY(buf->cur, 0);
        buf->output_off = head & (pt_buffer_region_size(buf) - 1);
 
        local64_set(&buf->head, head);
-- 
2.23.0.rc1

Reply via email to