Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp714351rdh; Thu, 26 Oct 2023 13:39:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLH9LP5A/LQsYHpAkLddZ3PpQrsn17qmsf11FAxjKSZgp4Sc8cMFMzFzAWT19OVyXLUQbf X-Received: by 2002:a25:cf51:0:b0:d9a:f7dc:d8c3 with SMTP id f78-20020a25cf51000000b00d9af7dcd8c3mr459928ybg.15.1698352778924; Thu, 26 Oct 2023 13:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698352778; cv=none; d=google.com; s=arc-20160816; b=c5/Putnjor4HCAG8VxwNL42hc2FbrvWMZgtciHoTPvaIcq5y6NjXBcG6Ntm7p658VN ZVTEja4DG7N8b8FSIS/D0inCP0JyTEuYoKJEwY1ackeq1Ajq1xrWOrM+7bI3h9vcO6uX hVsfOiNH4n0U8IzqouaOpFBU247vnxrCcSKx/WXtKbx6DWzOEGZzHjHJUEcL+3OcPfJY ttaRDal/6imH0n7RqS8pJ5VfGGpfi7su9X93z/UrRB9bt0rU08GadD+GOQTa+j5JPmNg 5nxWTAgXT9iW2dhPohW5q+pCrwu+P/vCHBxN4F4hILg8lznkZFJEzBKhAhO+jsFJaQqR bTZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=jWfxmYPISTWv/m0+qLcYuup4KIcKEYDUaiihDfB8dmA=; fh=d4onqTLeUdlbGgMWgT20KxFGDWfOWTtbwh2XDNyDOw0=; b=MIEhlxj2IPzx+MzPeN+x5QYDBwKwlluGXNpjPk4+arQq/M9r2Uh1xPSDGbCQRDFaC3 AksGSdk0lJqGPOZZ+5etVCFC6fQNBHI/TWF8Ydt5br/iJriYDThHZjSeFh3vsVhAPUt4 yUghOcEiL9HcHzCAYxoGK/pt/3Lj3QNiyumHxdoS5E6iCQmLAJg+ORUCMD9mjPKIlucv V4BIw5171ulpxOWsqcy04f66llJHa9tlDx0eSRpepw8Ws6VTnxi+MAgAGGsAKWFO6G9W Y+GNj7VpNDr/Ov538N/USUM4EhSLHcE3k2bVErYXfc7DUP31SNG7Ads3HHkdmKAFnMzc dm4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=snMV+O71; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id 191-20020a250cc8000000b00da03c34c384si299265ybm.24.2023.10.26.13.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 13:39:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=snMV+O71; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9DF77825F10E; Thu, 26 Oct 2023 13:39:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231921AbjJZUjI (ORCPT + 99 others); Thu, 26 Oct 2023 16:39:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbjJZUjG (ORCPT ); Thu, 26 Oct 2023 16:39:06 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EA651A7 for ; Thu, 26 Oct 2023 13:39:04 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6bb4abb8100so1335290b3a.2 for ; Thu, 26 Oct 2023 13:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698352743; x=1698957543; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=jWfxmYPISTWv/m0+qLcYuup4KIcKEYDUaiihDfB8dmA=; b=snMV+O71zErV79g2oz8hjGhqi7TJr4s/gzn3kcp4cWASWG4Sy2SylxNBwPsUL6sTcF w3PFFqZi7WuxXNcGmheWFYBjuGAn58xvj+/DbAwKYY0x7nj11iPP78TkAq+gxc40mf7U y8rCWRbbjozPRpu8ZBPl3XdwJ+cIKVcmcrSGQMdfEFA8SIy3Gcj/NvscqiVNoxnU+SUJ BcmdFDzR/ha0CSabV2agKyzPGAz0BZPqJqf7lI1n/4hX5k/R9q6tdENAGQtJRS6Ygd/C I79l960GeSfbad8oFqrLzaSsZi+oo/H5Mq6KB25aeCYgkaJ7OHagQ2cbs0IegQhcZA/j l6nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698352743; x=1698957543; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jWfxmYPISTWv/m0+qLcYuup4KIcKEYDUaiihDfB8dmA=; b=OZqaScH5W/uxLEoODxSE+fNG0lOh+dAAVSBarurctGCJ2CkydIqU7dQC/qehJzC5sd TYLqFvkMhNyWGVncHYgVS//Xt1oZDo/zYxcsnGz+wF7dOPfvC5Osl3E2WDJxgiNQSQw/ MYX88E6wLn8hr9PtB5IX1wzFkxnDSatOW7L7t7c1CeIJ+tCpMBY/69rlGMsKUcabjE4y vhKFJs8g++lJx8B6d87oFTcNYef8SK+YWKUp5PTxQzChLfrk7wRSqQmlo4yBqtNBmXSc iQwV/RZWOZi0jhBeU2YoUgaSFSY0EYl1g8znfJ/goVVho8Z5Q1JTAluCB/dbQdJIH3Le b/2Q== X-Gm-Message-State: AOJu0YxbYkJx3hkAv+vKtt8b2A3jUQ+u5d2PpDwyVOhRvrCMVvQCnvsA eAFABj+0X9D3aZrVAfzGK4AKtQ== X-Received: by 2002:a05:6a20:1447:b0:17b:2b7e:923c with SMTP id a7-20020a056a20144700b0017b2b7e923cmr1144985pzi.16.1698352743191; Thu, 26 Oct 2023 13:39:03 -0700 (PDT) Received: from google.com (176.13.105.34.bc.googleusercontent.com. [34.105.13.176]) by smtp.gmail.com with ESMTPSA id g18-20020a62e312000000b0068feb378b89sm6151pfh.171.2023.10.26.13.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 13:39:02 -0700 (PDT) Date: Thu, 26 Oct 2023 20:38:59 +0000 From: Mingwei Zhang To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jinrong Liang , Like Xu Subject: Re: [PATCH v5 08/13] KVM: selftests: Test Intel PMU architectural events on gp counters Message-ID: References: <20231024002633.2540714-1-seanjc@google.com> <20231024002633.2540714-9-seanjc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231024002633.2540714-9-seanjc@google.com> X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 26 Oct 2023 13:39:35 -0700 (PDT) On Mon, Oct 23, 2023, Sean Christopherson wrote: > From: Jinrong Liang > > Add test cases to check if different Architectural events are available > after it's marked as unavailable via CPUID. It covers vPMU event filtering > logic based on Intel CPUID, which is a complement to pmu_event_filter. > > According to Intel SDM, the number of architectural events is reported > through CPUID.0AH:EAX[31:24] and the architectural event x is supported > if EBX[x]=0 && EAX[31:24]>x. > > Co-developed-by: Like Xu > Signed-off-by: Like Xu > Signed-off-by: Jinrong Liang > Co-developed-by: Sean Christopherson > Signed-off-by: Sean Christopherson > --- > tools/testing/selftests/kvm/Makefile | 1 + > .../selftests/kvm/x86_64/pmu_counters_test.c | 189 ++++++++++++++++++ > 2 files changed, 190 insertions(+) > create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_counters_test.c > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > index ed1c17cabc07..4c024fb845b4 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -82,6 +82,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test > TEST_GEN_PROGS_x86_64 += x86_64/monitor_mwait_test > TEST_GEN_PROGS_x86_64 += x86_64/nested_exceptions_test > TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test > +TEST_GEN_PROGS_x86_64 += x86_64/pmu_counters_test > TEST_GEN_PROGS_x86_64 += x86_64/pmu_event_filter_test > TEST_GEN_PROGS_x86_64 += x86_64/set_boot_cpu_id > TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test > diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c > new file mode 100644 > index 000000000000..2a6336b994d5 > --- /dev/null > +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c > @@ -0,0 +1,189 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2023, Tencent, Inc. > + */ > + > +#define _GNU_SOURCE /* for program_invocation_short_name */ > +#include > + > +#include "pmu.h" > +#include "processor.h" > + > +/* Guest payload for any performance counter counting */ > +#define NUM_BRANCHES 10 > + > +static struct kvm_vm *pmu_vm_create_with_one_vcpu(struct kvm_vcpu **vcpu, > + void *guest_code) > +{ > + struct kvm_vm *vm; > + > + vm = vm_create_with_one_vcpu(vcpu, guest_code); > + vm_init_descriptor_tables(vm); > + vcpu_init_descriptor_tables(*vcpu); > + > + return vm; > +} > + > +static void run_vcpu(struct kvm_vcpu *vcpu) > +{ > + struct ucall uc; > + > + do { > + vcpu_run(vcpu); > + switch (get_ucall(vcpu, &uc)) { > + case UCALL_SYNC: > + break; > + case UCALL_ABORT: > + REPORT_GUEST_ASSERT(uc); > + break; > + case UCALL_DONE: > + break; > + default: > + TEST_FAIL("Unexpected ucall: %lu", uc.cmd); > + } > + } while (uc.cmd != UCALL_DONE); > +} > + > +static bool pmu_is_intel_event_stable(uint8_t idx) > +{ > + switch (idx) { > + case INTEL_ARCH_CPU_CYCLES: > + case INTEL_ARCH_INSTRUCTIONS_RETIRED: > + case INTEL_ARCH_REFERENCE_CYCLES: > + case INTEL_ARCH_BRANCHES_RETIRED: > + return true; > + default: > + return false; > + } > +} Brief explanation on why other events are not stable please. Since there are only a few architecture events, maybe listing all of them with explanation in comments would work better. Let out-of-bound return false on default. > + > +static void guest_measure_pmu_v1(struct kvm_x86_pmu_feature event, > + uint32_t counter_msr, uint32_t nr_gp_counters) > +{ > + uint8_t idx = event.f.bit; > + unsigned int i; > + > + for (i = 0; i < nr_gp_counters; i++) { > + wrmsr(counter_msr + i, 0); > + wrmsr(MSR_P6_EVNTSEL0 + i, ARCH_PERFMON_EVENTSEL_OS | > + ARCH_PERFMON_EVENTSEL_ENABLE | intel_pmu_arch_events[idx]); > + __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES})); Some comment might be needed for readability. Abuptly inserting inline assembly code in C destroys the readability. I wonder do we need add 'clobber' here for the above line, since it takes away ecx? Also, I wonder if we need to disable IRQ here? This code might be intercepted and resumed. If so, then the test will get a different number? > + > + if (pmu_is_intel_event_stable(idx)) > + GUEST_ASSERT_EQ(this_pmu_has(event), !!_rdpmc(i)); Okay, just the counter value is non-zero means we pass the test ?! hmm, I wonder other than IRQ stuff, what else may affect the result? NMI watchdog or what? > + > + wrmsr(MSR_P6_EVNTSEL0 + i, ARCH_PERFMON_EVENTSEL_OS | > + !ARCH_PERFMON_EVENTSEL_ENABLE | > + intel_pmu_arch_events[idx]); > + wrmsr(counter_msr + i, 0); > + __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES})); ditto for readability. Please consider using a macro to avoid repeated explanation. > + > + if (pmu_is_intel_event_stable(idx)) > + GUEST_ASSERT(!_rdpmc(i)); > + } > + > + GUEST_DONE(); > +} > + > +static void guest_measure_loop(uint8_t idx) > +{ > + const struct { > + struct kvm_x86_pmu_feature gp_event; > + } intel_event_to_feature[] = { > + [INTEL_ARCH_CPU_CYCLES] = { X86_PMU_FEATURE_CPU_CYCLES }, > + [INTEL_ARCH_INSTRUCTIONS_RETIRED] = { X86_PMU_FEATURE_INSNS_RETIRED }, > + [INTEL_ARCH_REFERENCE_CYCLES] = { X86_PMU_FEATURE_REFERENCE_CYCLES }, > + [INTEL_ARCH_LLC_REFERENCES] = { X86_PMU_FEATURE_LLC_REFERENCES }, > + [INTEL_ARCH_LLC_MISSES] = { X86_PMU_FEATURE_LLC_MISSES }, > + [INTEL_ARCH_BRANCHES_RETIRED] = { X86_PMU_FEATURE_BRANCH_INSNS_RETIRED }, > + [INTEL_ARCH_BRANCHES_MISPREDICTED] = { X86_PMU_FEATURE_BRANCHES_MISPREDICTED }, > + }; > + > + uint32_t nr_gp_counters = this_cpu_property(X86_PROPERTY_PMU_NR_GP_COUNTERS); > + uint32_t pmu_version = this_cpu_property(X86_PROPERTY_PMU_VERSION); > + struct kvm_x86_pmu_feature gp_event; > + uint32_t counter_msr; > + unsigned int i; > + > + if (rdmsr(MSR_IA32_PERF_CAPABILITIES) & PMU_CAP_FW_WRITES) > + counter_msr = MSR_IA32_PMC0; > + else > + counter_msr = MSR_IA32_PERFCTR0; > + > + gp_event = intel_event_to_feature[idx].gp_event; > + TEST_ASSERT_EQ(idx, gp_event.f.bit); > + > + if (pmu_version < 2) { > + guest_measure_pmu_v1(gp_event, counter_msr, nr_gp_counters); > + return; > + } > + > + for (i = 0; i < nr_gp_counters; i++) { > + wrmsr(counter_msr + i, 0); > + wrmsr(MSR_P6_EVNTSEL0 + i, ARCH_PERFMON_EVENTSEL_OS | > + ARCH_PERFMON_EVENTSEL_ENABLE | > + intel_pmu_arch_events[idx]); > + > + wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, BIT_ULL(i)); > + __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES})); > + wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, 0); > + > + if (pmu_is_intel_event_stable(idx)) > + GUEST_ASSERT_EQ(this_pmu_has(gp_event), !!_rdpmc(i)); > + } > + > + GUEST_DONE(); > +} > + > +static void test_arch_events_cpuid(uint8_t i, uint8_t j, uint8_t idx) > +{ > + uint8_t arch_events_unavailable_mask = BIT_ULL(j); > + uint8_t arch_events_bitmap_size = BIT_ULL(i); > + struct kvm_vcpu *vcpu; > + struct kvm_vm *vm; > + > + vm = pmu_vm_create_with_one_vcpu(&vcpu, guest_measure_loop); > + > + vcpu_set_cpuid_property(vcpu, X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH, > + arch_events_bitmap_size); > + vcpu_set_cpuid_property(vcpu, X86_PROPERTY_PMU_EVENTS_MASK, > + arch_events_unavailable_mask); > + > + vcpu_args_set(vcpu, 1, idx); > + > + run_vcpu(vcpu); > + > + kvm_vm_free(vm); > +} > + > +static void test_intel_arch_events(void) > +{ > + uint8_t idx, i, j; > + > + for (idx = 0; idx < NR_INTEL_ARCH_EVENTS; idx++) { > + /* > + * A brute force iteration of all combinations of values is > + * likely to exhaust the limit of the single-threaded thread > + * fd nums, so it's test by iterating through all valid > + * single-bit values. > + */ > + for (i = 0; i < NR_INTEL_ARCH_EVENTS; i++) { > + for (j = 0; j < NR_INTEL_ARCH_EVENTS; j++) > + test_arch_events_cpuid(i, j, idx); > + } > + } > +} > + > +int main(int argc, char *argv[]) > +{ > + TEST_REQUIRE(get_kvm_param_bool("enable_pmu")); > + > + TEST_REQUIRE(host_cpu_is_intel); > + TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION)); > + TEST_REQUIRE(kvm_cpu_property(X86_PROPERTY_PMU_VERSION) > 0); > + TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_PDCM)); hmm, this means we cannot run this in nested if X86_FEATURE_PDCM is missing. It only affects full-width counter, right? > + > + test_intel_arch_events(); > + > + return 0; > +} > -- > 2.42.0.758.gaed0368e0e-goog >