From patchwork Wed Apr 9 08:26:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 14044287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57DDDC36002 for ; Wed, 9 Apr 2025 08:08:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2QSu-0005Sw-Fj; Wed, 09 Apr 2025 04:07:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2QSO-00058o-Tg; Wed, 09 Apr 2025 04:06:59 -0400 Received: from mgamail.intel.com ([192.198.163.14]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2QSL-0000UX-NG; Wed, 09 Apr 2025 04:06:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744186005; x=1775722005; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y/Ah2gIgHbe+sK/IOChNaZznI5EZIF+55b+SG00yUgU=; b=Oe7J8JWg9VXJ56ghC2qNc1crUmOT2HlGCP+KLAoDHOdG6eJQA1Ett2xB 9wR1uzTbUkaDYs7PANfrzQ4b6iLiXl4mI78Z5FxIZbQ+1C4vA/EsmTRUT njID0BNBGd8u28fSwR0f78Vaised9E/YtqsoDzGBFRgw28ykzDDylMr+9 VcsIaznsNeI55XqI5PISL89rph8rdKquRKiDeYRecFzb1c4xXMt7E6aPn 2nHLFD46NChrD8yGovunJfrT6TqUf2BPLkV5enIGxX7C3sHAuMYDKoOnj 5AjzKDsHg3W6lCDWQ/uKSai5V8keV3jiBQj+RCOmbM5/idnEg16yAZY5u g==; X-CSE-ConnectionGUID: tf98bI3qQZyXY3cDGsGFLg== X-CSE-MsgGUID: IT9daTE7Reml79q5bOBkcA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="45810065" X-IronPort-AV: E=Sophos;i="6.15,200,1739865600"; d="scan'208";a="45810065" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2025 01:06:43 -0700 X-CSE-ConnectionGUID: I97O+6i8RBm4yuoI5EFM2Q== X-CSE-MsgGUID: eesw//O1SlG3FcXwB6y7cg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,200,1739865600"; d="scan'208";a="151702674" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by fmviesa002.fm.intel.com with ESMTP; 09 Apr 2025 01:06:38 -0700 From: Zhao Liu To: Paolo Bonzini , Eric Blake , Markus Armbruster , Michael Roth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Eduardo Habkost , Marcelo Tosatti , Shaoqin Huang , Eric Auger , Peter Maydell , Laurent Vivier , Thomas Huth , Sebastian Ott , Gavin Shan Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, qemu-arm@nongnu.org, Dapeng Mi , Yi Lai , Zhao Liu Subject: [PATCH 5/5] i386/kvm: Support fixed counter in KVM PMU filter Date: Wed, 9 Apr 2025 16:26:49 +0800 Message-Id: <20250409082649.14733-6-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250409082649.14733-1-zhao1.liu@intel.com> References: <20250409082649.14733-1-zhao1.liu@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.198.163.14; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -51 X-Spam_score: -5.2 X-Spam_bar: ----- X-Spam_report: (-5.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.845, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 Tested-by: Yi Lai --- Changes since RFC v2: * Drop KVMPMUX86FixedCounter structure and use uint32_t to represent bitmap in QAPI directly. * Add Tested-by from Yi. * Add documentation in qemu-options.hx. * Bump up the supported QAPI version to v10.1. 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 v10.0. --- accel/kvm/kvm-pmu.c | 31 +++++++++++++++++++++++++++++++ include/system/kvm-pmu.h | 5 ++++- qapi/kvm.json | 6 +++++- qemu-options.hx | 6 +++++- target/i386/kvm/kvm.c | 39 ++++++++++++++++++++++++--------------- 5 files changed, 69 insertions(+), 18 deletions(-) diff --git a/accel/kvm/kvm-pmu.c b/accel/kvm/kvm-pmu.c index 9205907d1779..509d69d9c515 100644 --- a/accel/kvm/kvm-pmu.c +++ b/accel/kvm/kvm-pmu.c @@ -101,6 +101,29 @@ 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); + + visit_type_uint32(v, name, &filter->x86_fixed_counter, errp); +} + +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); + uint32_t counter; + + if (!visit_type_uint32(v, name, &counter, errp)) { + return; + } + + filter->x86_fixed_counter = counter; +} + static void kvm_pmu_filter_class_init(ObjectClass *oc, void *data) { object_class_property_add_enum(oc, "action", "KvmPmuFilterAction", @@ -116,6 +139,14 @@ 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", "uint32_t", + 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 6abc0d037aee..5238b2b4dcc7 100644 --- a/include/system/kvm-pmu.h +++ b/include/system/kvm-pmu.h @@ -19,10 +19,12 @@ OBJECT_DECLARE_SIMPLE_TYPE(KVMPMUFilter, KVM_PMU_FILTER) /** * KVMPMUFilter: - * @action: action that KVM PMU filter will take for selected PMU events. + * @action: action that KVM PMU filter will take for selected PMU events + * and counters. * @nevents: number of PMU event entries listed in @events * @events: list of PMU event entries. A PMU event entry may represent one * event or multiple events due to its format. + * @x86_fixed_counter: bitmap of x86 fixed counter. */ struct KVMPMUFilter { Object parent_obj; @@ -30,6 +32,7 @@ struct KVMPMUFilter { KvmPmuFilterAction action; uint32_t nevents; KvmPmuFilterEventList *events; + uint32_t x86_fixed_counter; }; /* diff --git a/qapi/kvm.json b/qapi/kvm.json index 1b523e058731..5374c8340e5a 100644 --- a/qapi/kvm.json +++ b/qapi/kvm.json @@ -115,7 +115,10 @@ # # Properties of KVM PMU Filter. # -# @action: action that KVM PMU filter will take for selected PMU events. +# @action: action that KVM PMU filter will take for selected PMU events +# and counters. +# +# @x86-fixed-counter: enablement bitmap of x86 fixed counters. # # @events: list of selected PMU events. # @@ -123,4 +126,5 @@ ## { 'struct': 'KvmPmuFilterProperties', 'data': { 'action': 'KvmPmuFilterAction', + '*x86-fixed-counter': 'uint32', '*events': ['KvmPmuFilterEvent'] } } diff --git a/qemu-options.hx b/qemu-options.hx index bb89198971e0..eadfb69c8876 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -6150,7 +6150,7 @@ SRST (qemu) qom-set /objects/iothread1 poll-max-ns 100000 - ``-object '{"qom-type":"kvm-pmu-filter","id":id,"action":action,"events":[entry_list]}'`` + ``-object '{"qom-type":"kvm-pmu-filter","id":id,"x86-fixed-counter":bitmap,"action":action,"events":[entry_list]}'`` Create a kvm-pmu-filter object that configures KVM to filter selected PMU events for Guest. @@ -6165,6 +6165,10 @@ SRST will be denied, while all other events can be accessed normally in the Guest. + The ``x86-fixed-counter`` parameter sets a bitmap of x86 fixed + counters, and ``action`` will also take effect on the selected + fixed counters. + The ``events`` parameter accepts a list of PMU event entries in JSON format. Event entries, based on different encoding formats, have the following types: diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 8786501e9c7e..8b916dbb5d6f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -6016,19 +6016,25 @@ static int kvm_install_pmu_event_filter(KVMState *s) g_assert_not_reached(); } - kvm_filter->flags = filter->events->value->format == - KVM_PMU_EVENT_FORMAT_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; } - if (!kvm_config_pmu_event(filter, kvm_filter)) { - goto fail; + if (filter->nevents) { + kvm_filter->flags = filter->events->value->format == + KVM_PMU_EVENT_FORMAT_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_FORMAT_X86_MASKED_ENTRY ? - KVM_PMU_EVENT_FLAG_MASKED_EVENTS : 0; + base_flag = 0; + if (filter->nevents && + events->value->format == KVM_PMU_EVENT_FORMAT_X86_MASKED_ENTRY) { + base_flag = KVM_PMU_EVENT_FLAG_MASKED_EVENTS; + } + while (events) { KvmPmuFilterEvent *event = events->value; uint32_t flag;