Received: by 2002:a05:7412:e794:b0:fa:551:50a7 with SMTP id o20csp634800rdd; Tue, 9 Jan 2024 15:09:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFB29vZ88P8udzGWHnQ9tJGfBxgoQTBTx7nrk1/XXNJ3INNdQMImQHpzuxeuZSeNbwZaUbb X-Received: by 2002:a05:6a21:187:b0:199:7d51:a942 with SMTP id le7-20020a056a21018700b001997d51a942mr65298pzb.50.1704841761351; Tue, 09 Jan 2024 15:09:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704841761; cv=none; d=google.com; s=arc-20160816; b=IRqfbnPpzed9NQOpv4Yq2pY95hMifF6sBhWVSNpNfsZpHmJimESoVdYh7xqMFjytPk ZhxjHfEPWC8CghofrBMlrK0zuW556na7gyxEpS+kUASs+RPayOMm9G3IHZxUBUklMjb+ /N4xZo/+ys/yBmfbs6mJqiZYRHZbNqXeZTpnJ/rdg202Fxe0PRwntZ+DrHR39cH/YXL+ 5xHFnEtZcXvnLPgqt+1urNo8l8k+uKh8p+9A3u9oXAO+zv6KuF4i1IchM/qOeiqrly8D PEtgCk3lPNJjI0RdWE5I0zWG+T/Dk1AB2S/P1tk8NtG2NFbTHt9zBRPrgOMCLPWojX+I TEfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :reply-to:dkim-signature; bh=GD4EZFYi0i8CuDV5X7w+RXfnLUBQZe1U+Lgyy49HRZw=; fh=gm96CM+cG0KJxn7vnhn0c1c98ILNP1HHUrKfrGecw3M=; b=wj/FUH865Ul1G7ZpbvwsQQxedxsLMyMphnOrCa7aux32KGOCjqKlQVEVYCwu918uSa hTOtZobnQgT0sWUl25QbLuD38cnqLB7YSnOhsIt3YymuHV/5RZ553B9J2mWHRRHdZ9mo gOIHq399j9Km27tgmRemBa/SOtUFySdsEHCyA766X47NG3vahxMA0XOw2uDgBCdioMpU AHB9cypPYWuq2DyY/+SIKbj43UHxckak/U4a7Kq0tIr8PMFNcjvvszJ5DgjRSBxD0cOD 32w5DlAqkOKOIwcicpQn82NMtYvO8seAdq8OffWJvPZWrnbhv505ZEFlGCsifVaCltxx WPHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=XXcLU9dW; spf=pass (google.com: domain of linux-kernel+bounces-21506-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-21506-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id o9-20020a17090aac0900b0028d94180eecsi40389pjq.93.2024.01.09.15.09.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:09:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-21506-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=XXcLU9dW; spf=pass (google.com: domain of linux-kernel+bounces-21506-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-21506-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 05F3E286ECF for ; Tue, 9 Jan 2024 23:09:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D178948799; Tue, 9 Jan 2024 23:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XXcLU9dW" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 574A3482E3 for ; Tue, 9 Jan 2024 23:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5efe82b835fso62199317b3.0 for ; Tue, 09 Jan 2024 15:03:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1704841406; x=1705446206; 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=GD4EZFYi0i8CuDV5X7w+RXfnLUBQZe1U+Lgyy49HRZw=; b=XXcLU9dWue3DciT3rek1jKpZaoIQ/f53YXcYrlkzcSMJpTfv9AW9TRsglfMFiKY63/ zpXUgKEsl2P9v/VfSuJ6tdEkjW5ZPQ/IM1fYYwc3dnqGdxOs0vfglZLOCHrerYFyEoSp tgZm67siU53QDrvh9L6dQhzfIbpjcN9dvQ3i/qtSRCM3HxG965KtUR003t+tt1pAF7lK MLbRS1lDN7yOs7nxkkfb4GIeujvC6E4n41xPmVn+10AmTwNDfROdOtCBzlulafYqfOet rFd2kSpOZEn+8tOWwWX7L5aDJrd8ixiCeP/RPjkfDo+Yfzu9XEz6A+gbgtySa89jpgtz HpMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704841406; x=1705446206; 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=GD4EZFYi0i8CuDV5X7w+RXfnLUBQZe1U+Lgyy49HRZw=; b=Enia/68dYkN+LruFvTBFzjBFcmTKN51FQQ0G2Is2YC+HbLZA4NHe1WuzyLeNbNWUCL 5r+Wr2WlVz/ylFlT//1TU1DxGNqdy/NX0w+zyvGorhSFjL7kp8sq5wB1962KqrzHahqw MroHcOXe7RPb5k6GezRAZA9vYV+b5WnsKjz1P9xHkgLcEeyoqHLS6EPyWln7wDlagYjr vC3hnvLm5iEYhoytgFVuBeY8tUbGl1GdMLXRxf4cZo3l1KcLjJ5GQbImKlj46mYt4mZq Z6bUzIyeuL/NC+J5Y8ICiamE1Dxk7VOQWsLXBGhFEXK96rqNcFaQIJAdMdvj54DyeSs7 lA3g== X-Gm-Message-State: AOJu0Yy610zfl6LRpQDhiWd0A4H5hmucw+bfgUJWfQJHyPQZew0JSJ6y nytY60ThNdbcobJXo5GX/+MhVZiJMkNcjp6ywA== X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:c84:b0:5f6:ed3d:53f9 with SMTP id cm4-20020a05690c0c8400b005f6ed3d53f9mr114559ywb.10.1704841406473; Tue, 09 Jan 2024 15:03:26 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 9 Jan 2024 15:02:37 -0800 In-Reply-To: <20240109230250.424295-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240109230250.424295-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20240109230250.424295-18-seanjc@google.com> Subject: [PATCH v10 17/29] 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 Content-Type: text/plain; charset="UTF-8" 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) -- 2.43.0.472.g3155946c3a-goog