Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011af857 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

perf, amd: Use GO/HO bits in perf-ctr 



The AMD perf-counters support counting in guest or host-mode
only. Make use of that feature when user-space specified
guest/host-mode only counting.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1317816084-18026-3-git-send-email-gleb@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a240f761

arch/x86/include/asm/perf_event.h

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define ARCH_PERFMON_EVENTSEL_INV			(1ULL << 23)

#define ARCH_PERFMON_EVENTSEL_CMASK			0xFF000000ULL



#define AMD_PERFMON_EVENTSEL_GUESTONLY			(1ULL << 40)

#define AMD_PERFMON_EVENTSEL_HOSTONLY			(1ULL << 41)



#define AMD64_EVENTSEL_EVENT	\

	(ARCH_PERFMON_EVENTSEL_EVENT | (0x0FULL << 32))

#define INTEL_ARCH_EVENT_MASK	\

arch/x86/kernel/cpu/perf_event_amd.c

+13 −0
Original line number Diff line number Diff line
@@ -138,6 +138,19 @@ static int amd_pmu_hw_config(struct perf_event *event) 
	if (ret)

		return ret;



	if (event->attr.exclude_host && event->attr.exclude_guest)

		/*

		 * When HO == GO == 1 the hardware treats that as GO == HO == 0

		 * and will count in both modes. We don't want to count in that

		 * case so we emulate no-counting by setting US = OS = 0.

		 */

		event->hw.config &= ~(ARCH_PERFMON_EVENTSEL_USR |

				      ARCH_PERFMON_EVENTSEL_OS);

	else if (event->attr.exclude_host)

		event->hw.config |= AMD_PERFMON_EVENTSEL_GUESTONLY;

	else if (event->attr.exclude_guest)

		event->hw.config |= AMD_PERFMON_EVENTSEL_HOSTONLY;



	if (event->attr.type != PERF_TYPE_RAW)

		return 0;