> > > > It is an error to have a bit set outside the valid bits for a masked > > event, and calls to KVM_SET_PMU_EVENT_FILTER will return -EINVAL in > > such cases, including the high bits of the event select (35:32) if > > called on Intel. > > Some users want to count Intel TSX events and their VM instances needs: > > #define HSW_IN_TX (1ULL << 32) > #define HSW_IN_TX_CHECKPOINTED (1ULL << 33) The purpose of the PMU event filter is to restrict events based solely on the event select + unit mask. What the guest decides to do with HSW_IN_TX and HSW_IN_TX_CHECKPOINTED is done at their discretion and the PMU event filter should not be involved. Patch 1/7 in this series fixes a bug to ensure that's true, then the next patch removes events from the PMU event filter that attempts to filter bits outside the event select + unit mask. Masked events take this one step farther by rejecting the entire filter and returning an error if there are invalid bits set in any of the events. Unfortunately legacy events weren't implemented that way so removing events is the best we can do. > > > > With these updates the filter matching code has been updated to match on > > a common event. Masked events were flexible enough to handle both event > > types, so they were used as the common event. This changes how guest > > events get filtered because regardless of the type of event used in the > > uAPI, they will be converted to masked events. Because of this there > > could be a slight performance hit because instead of matching the filter > > Bonus, if this performance loss is quantified, we could make a side-by-side > comparison of alternative solutions, considering wasting memory seems to > be a habit of many kernel developers. > > > event with a lookup on event select + unit mask, it does a lookup on event > > select then walks the unit masks to find the match. This shouldn't be a > > big problem because I would expect the set of common event selects to be > > A quick rough statistic about Intel PMU based on > https://github.com/intel/perfmon.git: > our filtering mechanism needs to consider 388 different EventCode and 183 different > UMask, prioritizing filtering event_select will instead bring more entries. I don't see how we could end up with more entries considering the pathological case would result in the same number of filter entries as before. How did you come up with 388 event selects and 183 different unit masks? Are those all from the same uarch? > > > small, and if they aren't the set can likely be reduced by using masked > > events to generalize the unit mask. Using one type of event when > > filtering guest events allows for a common code path to be used. > > > > Signed-off-by: Aaron Lewis <aaronlewis@xxxxxxxxxx> > > --- > > Documentation/virt/kvm/api.rst | 77 +++++++++++-- > > arch/x86/include/asm/kvm_host.h | 14 ++- > > arch/x86/include/uapi/asm/kvm.h | 29 +++++ > > arch/x86/kvm/pmu.c | 197 +++++++++++++++++++++++++++----- > > arch/x86/kvm/x86.c | 1 + > > include/uapi/linux/kvm.h | 1 + > > 6 files changed, 281 insertions(+), 38 deletions(-) > > > > ... > > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 312aea1854ae..d2023076f363 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -4401,6 +4401,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) > > case KVM_CAP_SPLIT_IRQCHIP: > > case KVM_CAP_IMMEDIATE_EXIT: > > case KVM_CAP_PMU_EVENT_FILTER: > > + case KVM_CAP_PMU_EVENT_MASKED_EVENTS: > > How about reusing KVM_CAP_PMU_CAPABILITY to advertise this new cap ? The purpose of KVM_CAP_PMU_CAPABILITY is to allow userspace to adjust the PMU virtualization capabilities on a VM. KVM_CAP_PMU_EVENT_MASKED_EVENTS isn't meant to be adjustable, but rather advertise that this feature exists. > > > case KVM_CAP_GET_MSR_FEATURES: > > case KVM_CAP_MSR_PLATFORM_INFO: > > case KVM_CAP_EXCEPTION_PAYLOAD: > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > > index 20522d4ba1e0..0b16b9ed3b23 100644 > > --- a/include/uapi/linux/kvm.h > > +++ b/include/uapi/linux/kvm.h > > @@ -1175,6 +1175,7 @@ struct kvm_ppc_resize_hpt { > > #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 > > #define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224 > > #define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225 > > +#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226 > > > > #ifdef KVM_CAP_IRQ_ROUTING > >
