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

perf mmap: Discard head in overwrite_rb_find_range()

In overwrite mode, start will be set to head in perf_mmap__read_init().
Therefore, there is no need to set the start one more time in
overwrite_rb_find_range() and *start can be used as head instead of
passing head to overwrite_rb_find_range().

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1520944274-37001-1-git-send-email-xieyisheng1@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Yisheng Xie and committed by
Arnaldo Carvalho de Melo
699db111 9749adc3

+7 -8
+7 -8
tools/perf/util/mmap.c
··· 199 199 return 0; 200 200 } 201 201 202 - static int overwrite_rb_find_range(void *buf, int mask, u64 head, u64 *start, u64 *end) 202 + static int overwrite_rb_find_range(void *buf, int mask, u64 *start, u64 *end) 203 203 { 204 204 struct perf_event_header *pheader; 205 - u64 evt_head = head; 205 + u64 evt_head = *start; 206 206 int size = mask + 1; 207 207 208 - pr_debug2("overwrite_rb_find_range: buf=%p, head=%"PRIx64"\n", buf, head); 209 - pheader = (struct perf_event_header *)(buf + (head & mask)); 210 - *start = head; 208 + pr_debug2("%s: buf=%p, start=%"PRIx64"\n", __func__, buf, *start); 209 + pheader = (struct perf_event_header *)(buf + (*start & mask)); 211 210 while (true) { 212 - if (evt_head - head >= (unsigned int)size) { 211 + if (evt_head - *start >= (unsigned int)size) { 213 212 pr_debug("Finished reading overwrite ring buffer: rewind\n"); 214 - if (evt_head - head > (unsigned int)size) 213 + if (evt_head - *start > (unsigned int)size) 215 214 evt_head -= pheader->size; 216 215 *end = evt_head; 217 216 return 0; ··· 261 262 * Backward ring buffer is full. We still have a chance to read 262 263 * most of data from it. 263 264 */ 264 - if (overwrite_rb_find_range(data, md->mask, head, &md->start, &md->end)) 265 + if (overwrite_rb_find_range(data, md->mask, &md->start, &md->end)) 265 266 return -EINVAL; 266 267 } 267 268