From patchwork Fri Nov 10 02:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 163735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp837253vqs; Thu, 9 Nov 2023 18:14:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHU6Snsn4+b/i5JNNubkSHjUPd6HHhO/6J0pY3xhb2fbK5yKebYHRiRD+XDrUri4D24DHQ7 X-Received: by 2002:a17:902:b701:b0:1c0:afda:7707 with SMTP id d1-20020a170902b70100b001c0afda7707mr1271629pls.34.1699582486157; Thu, 09 Nov 2023 18:14:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699582486; cv=none; d=google.com; s=arc-20160816; b=uGxGbgoptHw2HyJ5wr2Jk2Xa73/8LWz5P4b+6m4UVgY/O++xXO16hDtAhCWOF0jMrk gd9d5oEDVazULbN6sy7nhNUwkNZu9bUrYNvJZlYFKl8AZbG+2pqQDZ4QI2HaCJijFuFR 7lq3XxC6Fk+WAJjQakemJtJv0vShGVzCid2qjZvYOPZJ1zzQ2P2xkhTD7DZrSuTn+rPK NKrxOc9M768lSJwWM2x41FEQCNGYROCE3Do6ecjQ5OFMX5TNPcr4xifnJmtasNWwAXqT 5z7Qdoau2pQRPIxeOzwZkfFRQXEF/e5x1d2nwPVtgnELsRqaP2BXdGJKv36+mijdSm8M DRyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=xdhPs5aVdFI/e9nrcqDiSTbi8B7nmVhj1Q4Gjt3XJ7E=; fh=gm96CM+cG0KJxn7vnhn0c1c98ILNP1HHUrKfrGecw3M=; b=FmUpcCKpTscGlqJ9QZjzSBPa5d1lLbj9ZDg0W4KyOr1TkZDWB3YlJomZ0iux09IZVw MEu9UJ7p/uvcugiNyGmTZHeSumE2Cm86tktXDlsel9zLJI14BJiHaLZ1fjoVn2O8m6f1 FNToLQQDAZMxXLDLXz5tN5II5ViIUyqwcz042exB2ZQrYtvfn45z81b1eGFvCMpyHYZC Om6V7ga8Fox8riBeiayA1ihRj31GiRw9XYFKigK1UpmXZ+d0bAuwh7hC3AOOdWwfCEEp dsQ0zQ90o3PWSLzkcP06lRdmegqO2oKTeJIitujE5sUn5AaPsT23FH4mJbgn70eA4blu pDiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="s/iQfsB3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id y15-20020a17090322cf00b001c5f5153e41si7040454plg.535.2023.11.09.18.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 18:14:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="s/iQfsB3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 5E28683A7FD5; Thu, 9 Nov 2023 18:14:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345732AbjKJCOb (ORCPT + 30 others); Thu, 9 Nov 2023 21:14:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345662AbjKJCOB (ORCPT ); Thu, 9 Nov 2023 21:14:01 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C93F49FC for ; Thu, 9 Nov 2023 18:13:40 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-6c4d0b51c7fso535422b3a.2 for ; Thu, 09 Nov 2023 18:13:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699582420; x=1700187220; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=xdhPs5aVdFI/e9nrcqDiSTbi8B7nmVhj1Q4Gjt3XJ7E=; b=s/iQfsB33ffXyN+pUTqQdjuX2i44FUZJqIXqndbU1ZQRO49WPz4JwZBnx09JiW2BNi LC4H9D12SXAmJrwyzloj5crR709o5QjfRhV83zuEd4DPQNAV70OaQ5PH8J1BE5uidufV DaECxLQ7RnM87QVL0bKGRmoqAL882fkxbk6IBXfOFTKoQqHOPY5hkjioqCptOOBqM7lV cketwtmS62JzlHbmagdPN+gkz2CsW7AIYXgn1BaoI5UoVAdaHc89ooNKPkofkEHkuuIX SiLK6UJmJVD2G9kJ8FuuoqexrdwvsL03tP7zA8xMGsjujFkYXzTdwMWBzu3dfu1W7T10 jvgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699582420; x=1700187220; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xdhPs5aVdFI/e9nrcqDiSTbi8B7nmVhj1Q4Gjt3XJ7E=; b=hsQw3pUc62dcUniATedhEBla7hAVstKHliAZNn0HBdWNIonFAxHyV1qXk6oDrlPI/K 2GZCxvRMD7FczUZmDtTc6kw9U5ENd8YuVeMUYroh6q83PF8hBTODRnPgpQTeXRt5rKph 4XTT/hF4RdSFvwBYUxP466s+QTiOSRKw+Ui+d162LlqIba+eJe7SqfqXpVAJ31GV0l2z 5Tt3gGal/IOSvlbibmRoqYDOjhw/X6c1CBLLDWEqJK7nRJaG14F4Uu/CyMl6lQAmy+1O mUu8pAm8zgamI4p7OsQ4ygDgtRVzEEAPGzOqiGF5Opx6dziZ/xX0PsI9bAZ3f+CoBiWK bJFQ== X-Gm-Message-State: AOJu0YzCHaRx9Bo5036YJ+1Uqd/Oa0C7P8mdrn5XDZPtF7hFyQ4HMOWv 3mtGd16ySzbrrgjLcquKbG6UyqvYH9Y= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:b34:b0:6c3:3782:6bcd with SMTP id f52-20020a056a000b3400b006c337826bcdmr877544pfu.4.1699582419755; Thu, 09 Nov 2023 18:13:39 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 9 Nov 2023 18:12:54 -0800 In-Reply-To: <20231110021306.1269082-1-seanjc@google.com> Mime-Version: 1.0 References: <20231110021306.1269082-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231110021306.1269082-15-seanjc@google.com> Subject: [PATCH v8 14/26] KVM: selftests: Test Intel PMU architectural events on fixed counters From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kan Liang , Dapeng Mi , Jim Mattson , Jinrong Liang , Aaron Lewis , Like Xu 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 (snail.vger.email [0.0.0.0]); Thu, 09 Nov 2023 18:14:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782141404989527967 X-GMAIL-MSGID: 1782141404989527967 From: Jinrong Liang Extend the PMU counters test to validate architectural events using fixed counters. The core logic is largely the same, the biggest difference being that if a fixed counter exists, its associated event is available (the SDM doesn't explicitly state this to be true, but it's KVM's ABI and letting software program a fixed counter that doesn't actually count would be quite bizarre). Note, fixed counters rely on PERF_GLOBAL_CTRL. Reviewed-by: Jim Mattson Reviewed-by: Dapeng Mi 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 --- .../selftests/kvm/x86_64/pmu_counters_test.c | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c index 5b8687bb4639..663e8fbe7ff8 100644 --- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c @@ -150,26 +150,46 @@ static void __guest_test_arch_event(uint8_t idx, struct kvm_x86_pmu_feature even guest_assert_event_count(idx, event, pmc, pmc_msr); } +#define X86_PMU_FEATURE_NULL \ +({ \ + struct kvm_x86_pmu_feature feature = {}; \ + \ + feature; \ +}) + +static bool pmu_is_null_feature(struct kvm_x86_pmu_feature event) +{ + return !(*(u64 *)&event); +} + static void guest_test_arch_event(uint8_t idx) { const struct { struct kvm_x86_pmu_feature gp_event; + struct kvm_x86_pmu_feature fixed_event; } intel_event_to_feature[] = { - [INTEL_ARCH_CPU_CYCLES_INDEX] = { X86_PMU_FEATURE_CPU_CYCLES }, - [INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX] = { X86_PMU_FEATURE_INSNS_RETIRED }, - [INTEL_ARCH_REFERENCE_CYCLES_INDEX] = { X86_PMU_FEATURE_REFERENCE_CYCLES }, - [INTEL_ARCH_LLC_REFERENCES_INDEX] = { X86_PMU_FEATURE_LLC_REFERENCES }, - [INTEL_ARCH_LLC_MISSES_INDEX] = { X86_PMU_FEATURE_LLC_MISSES }, - [INTEL_ARCH_BRANCHES_RETIRED_INDEX] = { X86_PMU_FEATURE_BRANCH_INSNS_RETIRED }, - [INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX] = { X86_PMU_FEATURE_BRANCHES_MISPREDICTED }, - [INTEL_ARCH_TOPDOWN_SLOTS_INDEX] = { X86_PMU_FEATURE_TOPDOWN_SLOTS }, + [INTEL_ARCH_CPU_CYCLES_INDEX] = { X86_PMU_FEATURE_CPU_CYCLES, X86_PMU_FEATURE_CPU_CYCLES_FIXED }, + [INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX] = { X86_PMU_FEATURE_INSNS_RETIRED, X86_PMU_FEATURE_INSNS_RETIRED_FIXED }, + /* + * Note, the fixed counter for reference cycles is NOT the same + * as the general purpose architectural event. The fixed counter + * explicitly counts at the same frequency as the TSC, whereas + * the GP event counts at a fixed, but uarch specific, frequency. + * Bundle them here for simplicity. + */ + [INTEL_ARCH_REFERENCE_CYCLES_INDEX] = { X86_PMU_FEATURE_REFERENCE_CYCLES, X86_PMU_FEATURE_REFERENCE_TSC_CYCLES_FIXED }, + [INTEL_ARCH_LLC_REFERENCES_INDEX] = { X86_PMU_FEATURE_LLC_REFERENCES, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_LLC_MISSES_INDEX] = { X86_PMU_FEATURE_LLC_MISSES, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_BRANCHES_RETIRED_INDEX] = { X86_PMU_FEATURE_BRANCH_INSNS_RETIRED, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX] = { X86_PMU_FEATURE_BRANCHES_MISPREDICTED, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_TOPDOWN_SLOTS_INDEX] = { X86_PMU_FEATURE_TOPDOWN_SLOTS, X86_PMU_FEATURE_TOPDOWN_SLOTS_FIXED }, }; uint32_t nr_gp_counters = this_cpu_property(X86_PROPERTY_PMU_NR_GP_COUNTERS); uint32_t pmu_version = guest_get_pmu_version(); /* PERF_GLOBAL_CTRL exists only for Architectural PMU Version 2+. */ bool guest_has_perf_global_ctrl = pmu_version >= 2; - struct kvm_x86_pmu_feature gp_event; + struct kvm_x86_pmu_feature gp_event, fixed_event; uint32_t base_pmc_msr; unsigned int i; @@ -199,6 +219,22 @@ static void guest_test_arch_event(uint8_t idx) __guest_test_arch_event(idx, gp_event, i, base_pmc_msr + i, MSR_P6_EVNTSEL0 + i, eventsel); } + + if (!guest_has_perf_global_ctrl) + return; + + fixed_event = intel_event_to_feature[idx].fixed_event; + if (pmu_is_null_feature(fixed_event) || !this_pmu_has(fixed_event)) + return; + + i = fixed_event.f.bit; + + wrmsr(MSR_CORE_PERF_FIXED_CTR_CTRL, FIXED_PMC_CTRL(i, FIXED_PMC_KERNEL)); + + __guest_test_arch_event(idx, fixed_event, i | INTEL_RDPMC_FIXED, + MSR_CORE_PERF_FIXED_CTR0 + i, + MSR_CORE_PERF_GLOBAL_CTRL, + FIXED_PMC_GLOBAL_CTRL_ENABLE(i)); } static void guest_test_arch_events(void)