Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

coresight: tmc-etr: Fix barrier packet insertion for perf buffer

When the ETR is used in perf mode with a larger buffer (configured
via sysfs or the default size of 1M) than the perf aux buffer size,
we end up inserting the barrier packet at the wrong offset, while
moving the offset forward. i.e, instead of the "new moved offset",
we insert it at the current hardware buffer offset. These packets
will not be visible as they are never copied and could lead to
corruption in the trace decoding side, as the decoder is not aware
that it needs to reset the decoding.

Fixes: ec13c78d7b45 ("coresight: tmc-etr: Add barrier packets when moving offset forward")
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: stable@vger.kernel.org
Reported-by: Al Grant <al.grant@arm.com>
Tested-by: Mike Leach <mike.leach@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20201208182651.1597945-2-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Suzuki K Poulose and committed by
Greg Kroah-Hartman
83be0b84 ee64ed81

+1 -1
+1 -1
drivers/hwtracing/coresight/coresight-tmc-etr.c
··· 1552 1552 1553 1553 /* Insert barrier packets at the beginning, if there was an overflow */ 1554 1554 if (lost) 1555 - tmc_etr_buf_insert_barrier_packet(etr_buf, etr_buf->offset); 1555 + tmc_etr_buf_insert_barrier_packet(etr_buf, offset); 1556 1556 tmc_etr_sync_perf_buffer(etr_perf, offset, size); 1557 1557 1558 1558 /*