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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner:
"Three fixlets for perf:

- Return the proper error code if aux buffers for a event are not
supported.

- Calculate the probe offset for inlined functions correctly

- Update the Skylake DTLB load/store miss event so it can count 1G
TLB entries as well"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf probe: Fix probe definition for inlined functions
perf/x86/intel: Add 1G DTLB load/store miss support for SKL
perf/aux: Correct return code of rb_alloc_aux() if !has_aux(ev)

+4 -4
+2 -2
arch/x86/events/intel/core.c
··· 431 431 [ C(DTLB) ] = { 432 432 [ C(OP_READ) ] = { 433 433 [ C(RESULT_ACCESS) ] = 0x81d0, /* MEM_INST_RETIRED.ALL_LOADS */ 434 - [ C(RESULT_MISS) ] = 0x608, /* DTLB_LOAD_MISSES.WALK_COMPLETED */ 434 + [ C(RESULT_MISS) ] = 0xe08, /* DTLB_LOAD_MISSES.WALK_COMPLETED */ 435 435 }, 436 436 [ C(OP_WRITE) ] = { 437 437 [ C(RESULT_ACCESS) ] = 0x82d0, /* MEM_INST_RETIRED.ALL_STORES */ 438 - [ C(RESULT_MISS) ] = 0x649, /* DTLB_STORE_MISSES.WALK_COMPLETED */ 438 + [ C(RESULT_MISS) ] = 0xe49, /* DTLB_STORE_MISSES.WALK_COMPLETED */ 439 439 }, 440 440 [ C(OP_PREFETCH) ] = { 441 441 [ C(RESULT_ACCESS) ] = 0x0,
+1 -1
kernel/events/ring_buffer.c
··· 580 580 int ret = -ENOMEM, max_order = 0; 581 581 582 582 if (!has_aux(event)) 583 - return -ENOTSUPP; 583 + return -EOPNOTSUPP; 584 584 585 585 if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) { 586 586 /*
+1 -1
tools/perf/util/probe-event.c
··· 619 619 struct map *map, unsigned long offs) 620 620 { 621 621 struct symbol *sym; 622 - u64 addr = tp->address + tp->offset - offs; 622 + u64 addr = tp->address - offs; 623 623 624 624 sym = map__find_symbol(map, addr); 625 625 if (!sym)