KVM_SET_PMU_EVENT_FILTER of x86 KVM allows user to configure x86 fixed
function counters by a bitmap.
Add the support of x86-fixed-counter in kvm-pmu-filter object and handle
this in i386 kvm codes.
Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx>
---
Changes since RFC v1:
* Make "action" as a global (per filter object) item, not a per-counter
parameter. (Dapeng)
* Bump up the supported QAPI version to 10.0.
---
accel/kvm/kvm-pmu.c | 69 ++++++++++++++++++++++++++++++++++++++++
include/system/kvm-pmu.h | 1 +
qapi/kvm.json | 30 ++++++++++++++++-
target/i386/kvm/kvm.c | 47 ++++++++++++++++-----------
4 files changed, 127 insertions(+), 20 deletions(-)
diff --git a/accel/kvm/kvm-pmu.c b/accel/kvm/kvm-pmu.c
index 9d68cd15e477..b5e6f430632f 100644
--- a/accel/kvm/kvm-pmu.c
+++ b/accel/kvm/kvm-pmu.c
@@ -271,6 +271,66 @@ fail:
qapi_free_KVMPMUFilterEventList(head);
}
+static void kvm_pmu_filter_get_fixed_counter(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ KVMPMUFilter *filter = KVM_PMU_FILTER(obj);
+ KVMPMUX86FixedCounterVariant *str_counter;
+
+ str_counter = g_new(KVMPMUX86FixedCounterVariant, 1);
+ str_counter->bitmap = g_strdup_printf("0x%x",
+ filter->x86_fixed_counter->bitmap);
+
+ visit_type_KVMPMUX86FixedCounterVariant(v, name, &str_counter, errp);
+ qapi_free_KVMPMUX86FixedCounterVariant(str_counter);
+}
+
+static void kvm_pmu_filter_set_fixed_counter(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ KVMPMUFilter *filter = KVM_PMU_FILTER(obj);
+ KVMPMUX86FixedCounterVariant *str_counter;
+ KVMPMUX86FixedCounter *new_counter, *old_counter;
+ uint64_t bitmap;
+ int ret;
+
+ old_counter = filter->x86_fixed_counter;
+ if (!visit_type_KVMPMUX86FixedCounterVariant(v, name,
+ &str_counter, errp)) {
+ return;
+ }
+
+ new_counter = g_new(KVMPMUX86FixedCounter, 1);
+
+ ret = qemu_strtou64(str_counter->bitmap, NULL,
+ 0, &bitmap);
+ if (ret < 0) {
+ error_setg(errp,
+ "Invalid x86 fixed counter (bitmap: %s): %s. "
+ "The bitmap must be a uint32 string.",
+ str_counter->bitmap, strerror(-ret));
+ g_free(new_counter);
+ goto fail;
+ }
+ if (bitmap > UINT32_MAX) {
+ error_setg(errp,
+ "Invalid x86 fixed counter (bitmap: %s): "
+ "Numerical result out of range. "
+ "The bitmap must be a uint32 string.",
+ str_counter->bitmap);
+ g_free(new_counter);
+ goto fail;
+ }
+ new_counter->bitmap = bitmap;
+ filter->x86_fixed_counter = new_counter;
+ qapi_free_KVMPMUX86FixedCounter(old_counter);
+
+fail:
+ qapi_free_KVMPMUX86FixedCounterVariant(str_counter);
+}
+
static void kvm_pmu_filter_class_init(ObjectClass *oc, void *data)
{
object_class_property_add_enum(oc, "action", "KVMPMUFilterAction",
@@ -286,6 +346,15 @@ static void kvm_pmu_filter_class_init(ObjectClass *oc, void *data)
NULL, NULL);
object_class_property_set_description(oc, "events",
"KVM PMU event list");
+
+ object_class_property_add(oc, "x86-fixed-counter",
+ "KVMPMUX86FixedCounter",
+ kvm_pmu_filter_get_fixed_counter,
+ kvm_pmu_filter_set_fixed_counter,
+ NULL, NULL);
+ object_class_property_set_description(oc, "x86-fixed-counter",
+ "Enablement bitmap of "
+ "x86 PMU fixed counter");
}
static void kvm_pmu_filter_instance_init(Object *obj)
diff --git a/include/system/kvm-pmu.h b/include/system/kvm-pmu.h
index 63402f75cfdc..1a1da37b6304 100644
--- a/include/system/kvm-pmu.h
+++ b/include/system/kvm-pmu.h
@@ -25,6 +25,7 @@ struct KVMPMUFilter {
KVMPMUFilterAction action;
uint32_t nevents;
KVMPMUFilterEventList *events;
+ KVMPMUX86FixedCounter *x86_fixed_counter;
};
/*
diff --git a/qapi/kvm.json b/qapi/kvm.json
index a673e499e7ea..31447dfeffb0 100644
--- a/qapi/kvm.json
+++ b/qapi/kvm.json
@@ -120,6 +120,18 @@
'x86-default': 'KVMPMUX86DefalutEvent',
'x86-masked-entry': 'KVMPMUX86MaskedEntry' } }
+##
+# @KVMPMUX86FixedCounter:
+#
+# x86 fixed counter that KVM PMU filter supports.
+#
+# @bitmap: x86 fixed counter bitmap.
+#
+# Since 10.0
+##
+{ 'struct': 'KVMPMUX86FixedCounter',
+ 'data': { 'bitmap': 'uint32' } }
+
##
# @KVMPMUFilterProperty:
#
@@ -202,6 +214,19 @@
'x86-default': 'KVMPMUX86DefalutEventVariant',
'x86-masked-entry': 'KVMPMUX86MaskedEntryVariant' } }
+##
+# @KVMPMUX86FixedCounterVariant:
+#
+# The variant of KVMPMUX86FixedCounter with the string, rather than
+# the numeric value.
+#
+# @bitmap: x86 fixed counter bitmap. This field is a uint32 string.
+#
+# Since 10.0
+##
+{ 'struct': 'KVMPMUX86FixedCounterVariant',
+ 'data': { 'bitmap': 'str' } }
+
##
# @KVMPMUFilterPropertyVariant:
#
@@ -211,8 +236,11 @@
#
# @events: the KVMPMUFilterEventVariant list.
#
+# @x86-fixed-counter: enablement bitmap of x86 fixed counters.
+#
# Since 10.0
##
{ 'struct': 'KVMPMUFilterPropertyVariant',
'data': { 'action': 'KVMPMUFilterAction',
- '*events': ['KVMPMUFilterEventVariant'] } }
+ '*events': ['KVMPMUFilterEventVariant'],
+ '*x86-fixed-counter': 'KVMPMUX86FixedCounterVariant' } }
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 97b94c331271..56094361cb8f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -6012,23 +6012,29 @@ static int kvm_install_pmu_event_filter(KVMState *s)
g_assert_not_reached();
}
- /*
- * The check in kvm_arch_check_pmu_filter() ensures masked entry
- * format won't be mixed with other formats.
- */
- kvm_filter->flags = filter->events->value->format ==
- KVM_PMU_EVENT_FMT_X86_MASKED_ENTRY ?
- KVM_PMU_EVENT_FLAG_MASKED_EVENTS : 0;
-
- if (kvm_filter->flags == KVM_PMU_EVENT_FLAG_MASKED_EVENTS &&
- !kvm_vm_check_extension(s, KVM_CAP_PMU_EVENT_MASKED_EVENTS)) {
- error_report("Masked entry format of PMU event "
- "is not supported by Host.");
- goto fail;
+ if (filter->x86_fixed_counter) {
+ kvm_filter->fixed_counter_bitmap = filter->x86_fixed_counter->bitmap;
}
- if (!kvm_config_pmu_event(filter, kvm_filter)) {
- goto fail;
+ if (filter->nevents) {
+ /*
+ * The check in kvm_arch_check_pmu_filter() ensures masked entry
+ * format won't be mixed with other formats.
+ */
+ kvm_filter->flags = filter->events->value->format ==
+ KVM_PMU_EVENT_FMT_X86_MASKED_ENTRY ?
+ KVM_PMU_EVENT_FLAG_MASKED_EVENTS : 0;
+
+ if (kvm_filter->flags == KVM_PMU_EVENT_FLAG_MASKED_EVENTS &&
+ !kvm_vm_check_extension(s, KVM_CAP_PMU_EVENT_MASKED_EVENTS)) {
+ error_report("Masked entry format of PMU event "
+ "is not supported by Host.");
+ goto fail;
+ }
+
+ if (!kvm_config_pmu_event(filter, kvm_filter)) {
+ goto fail;
+ }
}
ret = kvm_vm_ioctl(s, KVM_SET_PMU_EVENT_FILTER, kvm_filter);
@@ -6656,16 +6662,19 @@ static void kvm_arch_check_pmu_filter(const Object *obj, const char *name,
KVMPMUFilterEventList *events = filter->events;
uint32_t base_flag;
- if (!filter->nevents) {
+ if (!filter->x86_fixed_counter && !filter->nevents) {
error_setg(errp,
"Empty KVM PMU filter.");
return;
}
/* Pick the first event's flag as the base one. */
- base_flag = events->value->format ==
- KVM_PMU_EVENT_FMT_X86_MASKED_ENTRY ?
- KVM_PMU_EVENT_FLAG_MASKED_EVENTS : 0;
+ base_flag = 0;
+ if (filter->nevents &&
+ events->value->format == KVM_PMU_EVENT_FMT_X86_MASKED_ENTRY) {
+ base_flag = KVM_PMU_EVENT_FLAG_MASKED_EVENTS;
+ }
+
while (events) {
KVMPMUFilterEvent *event = events->value;
uint32_t flag;
--
2.34.1
