From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 963C2C4332F for ; Fri, 10 Nov 2023 02:13:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345696AbjKJCNR (ORCPT ); Thu, 9 Nov 2023 21:13:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229581AbjKJCNP (ORCPT ); Thu, 9 Nov 2023 21:13:15 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC3643AA3 for ; Thu, 9 Nov 2023 18:13:13 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-da04776a869so1964009276.0 for ; Thu, 09 Nov 2023 18:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699582393; x=1700187193; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=+fieQRgDj3lOBldorrKk0xxM9dxIlyktL3ce/ZyP+uk=; b=vRLLea/rURSg1c12rK0HA8Ar6UTiPnaRBaDkOV4feiy6z1dPnAHMGEZCC185mKUwjw USf2Rp8JIiN03RAtbrJ7GRmZm5vTJAxLkK27hj/ovJHVBF584K6p1K9240YO48ZxmcRV uf/1RIVBl5ckrZ81XvaABWQ22AiSxc4fqtx/u7H+Eu3xTJ+mKMQg7V+fg40fIyFy61K+ xqPBC4JaRo8f3hrJ3QzUeRE1X1Dsp7b/vW3VO0Ts3t8vkrMcsUxXO3lVw3CsTFjZrd/9 oG6op2mrTgG0yhVR7Jh0C3SmeSUHO/B1fqI8eUAH3utrKzgru/d4KAiPWTuFkC/Rhsik tEFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699582393; x=1700187193; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+fieQRgDj3lOBldorrKk0xxM9dxIlyktL3ce/ZyP+uk=; b=N2CdWxTsDND6/rzbN2jxxaO1man11qm8dxRqqXpKQc8ahnHOXGc0b3gn4x7NqogTAp acDEEgl5S+DPLJgkz7f/jnMESZ0nCM+XheiT0XlxmSusbuolFyXy0RY+5+gyp1KL/EGM 8dYklWtUATlIxlYnYUptSvACYR75ihAXSkxSGAGWyCyRG8CsXPrqDSgAgbIQj1zY3sNQ 5H/F9sRZMg0Pbit3HC9nwHW2M8zuBRbaCM7ckbFT+ZV/1bi1gdQUBu03TWFfeDnLiCdW 6VgWLlnSiq90UQsVfHXLXvDoqCqbTd+8G/dXPjih0Y662wLo5uheND4+PGCsZR3lJZFW 4i7g== X-Gm-Message-State: AOJu0YyPJGufvKhp+T20yvyvQqYP97TN2aEhLdP8bc+sumReDpMKFBPy yZrWX9MwZ0UJueRcO6cw3a+zUfdVWS8= X-Google-Smtp-Source: AGHT+IFV7CH/dCGUgods9ICtYXMvecn5bC5WpPOIUAgyUeAHi/Hs0TPU8YMvkGp7t90hneFQ08caiOqxT64= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:701:b0:d9a:6007:223a with SMTP id k1-20020a056902070100b00d9a6007223amr225799ybt.8.1699582392989; Thu, 09 Nov 2023 18:13:12 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 9 Nov 2023 18:12:40 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231110021306.1269082-1-seanjc@google.com> Subject: [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Another round, another new pile of fixes and tests. My apologies for sending so many versions of this thing, I thought v7 was going to be the last one. *sigh* Fix bugs where KVM incorrectly refuses to virtualize fixed counters and events whose encodings match unsupported arch events, and add a PMU counters selftest to verify the behavior. As an aside, my hope is that in the long term, we can build out the PMU selftests and deprecate the PMU tests in KUT so that we have everything in-kernel and in one spot. v8: - Collect reviews. [Jim, Dapeng, Kan] - Tweak names for the RDPMC flags in the selftests #defines. - Get the event selectors used to virtualize fixed straight from perf instead of hardcoding the (wrong) selectors in KVM. [Kan] - Rename an "eventsel" field to "event" for a patch that gets blasted away in the end anyways. [Jim] - Add patches to fix RDPMC emulation and to test the behavior on Intel. I spot tested on AMD and spent ~30 minutes trying to squeeze in the bare minimum AMD support, but the PMU implementations between Intel and AMD are juuuust different enough to make adding AMD support non- trivial, and this series is already way too big. v7: - https://lore.kernel.org/all/20231108003135.546002-1-seanjc@google.com - Drop patches that unnecessarily sanitized supported CPUID. [Jim] - Purge the array of architectural event encodings. [Jim, Dapeng] - Clean up pmu.h to remove useless macros, and make it easier to use the new macros. [Jim] - Port more of pmu_event_filter_test.c to pmu.h macros. [Jim, Jinrong] - Clean up test comments and error messages. [Jim] - Sanity check the value provided to vcpu_set_cpuid_property(). [Jim] v6: - https://lore.kernel.org/all/20231104000239.367005-1-seanjc@google.com - Test LLC references/misses with CFLUSH{OPT}. [Jim] - Make the tests play nice without PERF_CAPABILITIES. [Mingwei] - Don't squash eventsels that happen to match an unsupported arch event. [Kan] - Test PMC counters with forced emulation (don't ask how long it took me to figure out how to read integer module params). v5: https://lore.kernel.org/all/20231024002633.2540714-1-seanjc@google.com v4: https://lore.kernel.org/all/20230911114347.85882-1-cloudliang@tencent.com v3: https://lore.kernel.org/kvm/20230814115108.45741-1-cloudliang@tencent.com Jinrong Liang (7): KVM: selftests: Add vcpu_set_cpuid_property() to set properties KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets KVM: selftests: Test Intel PMU architectural events on gp counters KVM: selftests: Test Intel PMU architectural events on fixed counters KVM: selftests: Test consistency of CPUID with num of gp counters KVM: selftests: Test consistency of CPUID with num of fixed counters KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson (19): KVM: x86/pmu: Always treat Fixed counters as available when supported KVM: x86/pmu: Allow programming events that match unsupported arch events KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization KVM: x86/pmu: Get eventsel for fixed counters from perf KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUs KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters KVM: selftests: Expand PMU counters test to verify LLC events KVM: selftests: Add a helper to query if the PMU module param is enabled KVM: selftests: Add helpers to read integer module params KVM: selftests: Query module param to detect FEP in MSR filtering test KVM: selftests: Move KVM_FEP macro into common library header KVM: selftests: Test PMC virtualization with forced emulation KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR arch/x86/include/asm/kvm-x86-pmu-ops.h | 1 - arch/x86/kvm/pmu.c | 4 +- arch/x86/kvm/pmu.h | 1 - arch/x86/kvm/svm/pmu.c | 10 +- arch/x86/kvm/vmx/pmu_intel.c | 133 ++-- tools/testing/selftests/kvm/Makefile | 2 + .../selftests/kvm/include/kvm_util_base.h | 4 + tools/testing/selftests/kvm/include/pmu.h | 97 +++ .../selftests/kvm/include/x86_64/processor.h | 148 ++++- tools/testing/selftests/kvm/lib/kvm_util.c | 62 +- tools/testing/selftests/kvm/lib/pmu.c | 31 + .../selftests/kvm/lib/x86_64/processor.c | 15 +- .../selftests/kvm/x86_64/pmu_counters_test.c | 607 ++++++++++++++++++ .../kvm/x86_64/pmu_event_filter_test.c | 143 ++--- .../smaller_maxphyaddr_emulation_test.c | 2 +- .../kvm/x86_64/userspace_msr_exit_test.c | 29 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +- 17 files changed, 1035 insertions(+), 256 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/pmu.h create mode 100644 tools/testing/selftests/kvm/lib/pmu.c create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_counters_test.c base-commit: 45b890f7689eb0aba454fc5831d2d79763781677 -- 2.42.0.869.gea05f2083d-goog