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

perf tools: Fallback to reading sysfs to get cacheline size

On systems where sysconf(_SC_LEVEL1_DCACHE_LINESIZE) is not available,
such as musl LIBC and Android's bionic libc.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Chris Phlipot <cphlipot0@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-772obxzby758g7m2wmzcejxz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+11 -1
+11 -1
tools/perf/perf.c
··· 497 497 pthread_sigmask(SIG_UNBLOCK, &set, NULL); 498 498 } 499 499 500 + #ifdef _SC_LEVEL1_DCACHE_LINESIZE 501 + #define cache_line_size(cacheline_sizep) *cacheline_sizep = sysconf(_SC_LEVEL1_DCACHE_LINESIZE) 502 + #else 503 + static void cache_line_size(int *cacheline_sizep) 504 + { 505 + if (sysfs__read_int("devices/system/cpu/cpu0/cache/index0/coherency_line_size", cacheline_sizep)) 506 + perror("cannot determine cache line size"); 507 + } 508 + #endif 509 + 500 510 int main(int argc, const char **argv) 501 511 { 502 512 const char *cmd; ··· 519 509 520 510 /* The page_size is placed in util object. */ 521 511 page_size = sysconf(_SC_PAGE_SIZE); 522 - cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); 512 + cache_line_size(&cacheline_size); 523 513 524 514 if (sysctl__read_int("kernel/perf_event_max_stack", &value) == 0) 525 515 sysctl_perf_event_max_stack = value;