tjh.dev / kernel
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 tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm fix from Paolo Bonzini:

- Fix boolean logic in intel_guest_get_msrs

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86/pmu: fix masking logic for MSR_CORE_PERF_GLOBAL_CTRL

Linus Torvalds 7987b8b7 7131c2e9

+6 -1
+6 -1
arch/x86/events/intel/core.c
··· 4051 4051 u64 pebs_mask = cpuc->pebs_enabled & x86_pmu.pebs_capable; 4052 4052 int global_ctrl, pebs_enable; 4053 4053 4054 + /* 4055 + * In addition to obeying exclude_guest/exclude_host, remove bits being 4056 + * used for PEBS when running a guest, because PEBS writes to virtual 4057 + * addresses (not physical addresses). 4058 + */ 4054 4059 *nr = 0; 4055 4060 global_ctrl = (*nr)++; 4056 4061 arr[global_ctrl] = (struct perf_guest_switch_msr){ 4057 4062 .msr = MSR_CORE_PERF_GLOBAL_CTRL, 4058 4063 .host = intel_ctrl & ~cpuc->intel_ctrl_guest_mask, 4059 - .guest = intel_ctrl & (~cpuc->intel_ctrl_host_mask | ~pebs_mask), 4064 + .guest = intel_ctrl & ~cpuc->intel_ctrl_host_mask & ~pebs_mask, 4060 4065 }; 4061 4066 4062 4067 if (!x86_pmu.pebs)