Received: by 2002:a05:7412:e794:b0:fa:551:50a7 with SMTP id o20csp631631rdd; Tue, 9 Jan 2024 15:03:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFCHu/TJGOSON1RQr0XqkfitAvS3XftlLrAGVSFwE/hm8q8vOQQkH6/6z+OudVl7Lm9X+Ck X-Received: by 2002:a05:6102:6cb:b0:467:f1ba:d8c5 with SMTP id m11-20020a05610206cb00b00467f1bad8c5mr219936vsg.6.1704841384173; Tue, 09 Jan 2024 15:03:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704841384; cv=none; d=google.com; s=arc-20160816; b=QCPsIrQBQzJN/EH1kcjH8ofVoE0V+K1ddkUPIoanZDV49RllBXFEQQRPdjHyHlA320 21KvJf5NnxgaDEjCXGpPA8JnSuoYtYFkcW5BdMdqwBbOtMpmJ+eCJl6I6VfXJKE6FgIg VPYn5+U3RQo0QzUMAaKw8tkfNOEE4hL5rq1yvESWW3WWHmu50Fgzb9Y3b7OIYgQbfum/ a2b/asmTLmy1rqJCYWGwKpfxEERRdNDqa+Y3cbgYStJPB/VV9a6foGyR3CKNbKetTzeq FpP1+DRjfR8ukutDcx+Jw+NAC6vtx3Gm1hQTemmq3MH5tR7J+x5kBg9y5T7HnhLlfvdH 75YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:reply-to:dkim-signature; bh=+/WTC5urPvjKbLxaXGg2R7t+1+DYebe0qdlFCKKJSgE=; fh=gm96CM+cG0KJxn7vnhn0c1c98ILNP1HHUrKfrGecw3M=; b=qDVWO7zbzGfyohLCubfmdC7XHaNdczJMmqmhVAHYc2XvJs+ZiCJGWXKLHcKlAdtLxw XjrJsGaIpQG7iAMNDZ0Uj0kAoPYmrpNJyDXiXMUQxszIbFHeM3zrIaTi3Qa4PbksAAt7 ct6OYV1MYRhfZcMa1SWewe2NJnQZQg4hiPEP84F6uW8dMTezWna5qGdAHss58ivx9n94 dmNh4PsbLJ11ulJfHh+5FDnx1Sg3lH5cKLgiH/O9JyD8wCAfb3ZqIsqLslbXhK6dCsr8 0J0ZRiaDfGK1rdQ1nUcvV5rnYiP46dfPQ7mR2F3Mse5lqqMozuPO+t0a8YHeuAmIL2Si u6iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WaCeRluF; spf=pass (google.com: domain of linux-kernel+bounces-21489-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-21489-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j6-20020a67e306000000b00466dfa76cacsi476429vsf.91.2024.01.09.15.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 15:03:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-21489-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WaCeRluF; spf=pass (google.com: domain of linux-kernel+bounces-21489-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-21489-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id D4D691C24C30 for ; Tue, 9 Jan 2024 23:03:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D1083E46B; Tue, 9 Jan 2024 23:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WaCeRluF" Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (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 DE3CC3E469 for ; Tue, 9 Jan 2024 23:02:53 +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-yb1-f202.google.com with SMTP id 3f1490d57ef6-db402e6f61dso4483627276.3 for ; Tue, 09 Jan 2024 15:02:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1704841373; x=1705446173; 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=+/WTC5urPvjKbLxaXGg2R7t+1+DYebe0qdlFCKKJSgE=; b=WaCeRluFbpL/0ux/AR9r8PSuCGI0X59auNyPOJEtMmImz6mmZPhcKxMDSs3XploSIB 6WhgAJjaqj95nv89urXhPp9x98MBo5jR5MO4QMVfAMS+JsH72ZFdeJqxtxOFxaXIdpP5 m33j1heZbuWih6PQTHNMUgzG0Gy2V598Rd/HvagPklA88ojkAD7yvBFA6vNYN2lumL8d ZQk58uaj9E+IIxC1D7O4IquzlYh+HADpKEaC5OCyL0+XGyZo3BsTTtGARGMeC0pXukgN /5o9aGWZBFguOIkoE+8FuKRBSse2tsXYEKNkB0VzxS1c3IZUWONg05B0Lu1iEfoknPvn MMgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704841373; x=1705446173; 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=+/WTC5urPvjKbLxaXGg2R7t+1+DYebe0qdlFCKKJSgE=; b=ZiEh5PzZD+kywbGpf2z77dKV8J+0neyVoLpbPt3edm0cg8ACbCkEtFDTtXuU/vaH8C wZYuGIBYMHBzAPtMCAapm9phG0NRqeuh21s6jgZtRY0WSh7WYqRU2yWa8DX02rch7QP/ 0YiSXPp8E5iJe0El06LpxSI8vA9PuWmnRHQo5FrP9LVdN5YV6nimGKqAtxoc6QvEhVpW ZJR5J1/g8R2xQw+dyQgeXiRjgYGWO1xtXAOGpZX3oKRKhVGnVYkbMJE5wvoOzYIW7/9a dUMZoDdBhxBNohc0cKNFKs04o86OgwI1tT8CM2e56hIsyKIrMpN0nEi8bSYsprEAojzH MvDw== X-Gm-Message-State: AOJu0Yx+qckdY6RvHm9PPCOP/74r8T+wzdZMCwX+iJQMSnFFZI2MUnvj XLubE8HHb7fb6xEveEwjocEjL3NQc95NGooWHw== X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:565:b0:dbd:99af:daba with SMTP id a5-20020a056902056500b00dbd99afdabamr34474ybt.5.1704841372925; Tue, 09 Jan 2024 15:02:52 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 9 Jan 2024 15:02:20 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20240109230250.424295-1-seanjc@google.com> Subject: [PATCH v10 00/29] 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" Knock wood, _this_ is the final of fixes and tests for PMU counters. New in v10 is a small refactor to treat FIXED as a value, not a flag, when emulating RDPMC. Everything else is the same as v9 (although rebased, but there were no conflicts). v10: - Collect review. [Dapeng] - Treat the FIXED type in RDPMC's ECX as a value, not a flag. [Jim] v9: - https://lore.kernel.org/all/20231202000417.922113-1-seanjc@google.com - Collect reviews. [Dapeng, Kan] - Fix a 63:31 => 63:32 typo in a changelog. [Dapeng] - Actually check that forced emulation is enabled before trying to force emulation on RDPMC. [Jinrong] - Fix the aformentioned priority inversion issue. - Completely drop "support" for fast RDPMC, in quotes because KVM doesn't actually support RDPMC for non-architectural PMUs. I had left the code in v8 because I didn't fully grok what the early emulator check was doing, i.e. wasn't 100% confident it was dead code. v8: - https://lore.kernel.org/all/20231110021306.1269082-1-seanjc@google.com - 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 (22): 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: Prioritize VMX interception over #GP on RDPMC due to bad index KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUs KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not flag KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC types 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 | 3 +- arch/x86/kvm/emulate.c | 2 +- arch/x86/kvm/kvm_emulate.h | 2 +- arch/x86/kvm/pmu.c | 20 +- arch/x86/kvm/pmu.h | 5 +- arch/x86/kvm/svm/pmu.c | 17 +- arch/x86/kvm/vmx/pmu_intel.c | 178 +++-- arch/x86/kvm/x86.c | 9 +- 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 | 617 ++++++++++++++++++ .../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 +- 20 files changed, 1097 insertions(+), 291 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: 1c6d984f523f67ecfad1083bb04c55d91977bb15 -- 2.43.0.472.g3155946c3a-goog