From patchwork Fri Feb 10 00:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 55161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp660991wrn; Thu, 9 Feb 2023 16:34:38 -0800 (PST) X-Google-Smtp-Source: AK7set/uAta2o7jHJl7WP2YYv4Ie/G8imlJDK3mkcYAo2NVj7oaQfnGJekBU7+GfUQY8tFxJZG9I X-Received: by 2002:a17:902:ce86:b0:199:1375:279c with SMTP id f6-20020a170902ce8600b001991375279cmr14253691plg.69.1675989278075; Thu, 09 Feb 2023 16:34:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675989278; cv=none; d=google.com; s=arc-20160816; b=XW+XvJ881Y1VVlleT77oTO1w8vyszvd+LYybem04jLxVPh5Q+nos8jevLG+fOgdaMI sZi9I7ngJ1YOQKa8kDqBIYKRLsZ73IjGw4337FA85ezKPl2GobEAZWYXfFVcqkIs1LMn Y7ysZ5fVQOH+g1wvzadVpLvWhDg19RQkARdYk1ufNNidP4cM00NHaYzT0MDd0BxO3EPT bl0vQ/+e6jXl/H8CKJbDvcTekkyyjVK79gIWdSnIpB9IxXmNKjZQMXfgKc5PtNO/zfOB IGKkW98InW+2Cayk7FiJgbPY0sUMHP3yd/JztQXqm8kQZf+K6PctPV/r2cyIbLI2ivDh ILCQ== 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=l7cJrzLZ8eAvu1dfgk3wdtw3/0KBtZxBV1s4qDZiZW0=; b=yIA9W+o+ggFb8GB4QGw86MeOB6fzngrLGZgzSHPcpAHJ+E70TCcm8UsSI2ORqFMGL8 N0wCy3sIh0MDvaUhkKnLCUAzPxDr0+Yw08hcc13nvyfxKSR/uRqnXKD3yNTs6/PyuIS9 q0ZRhUbOdS7F84XwLJwGNuRTru4ryx9oKrb1oowm2Z45PBOQ5trbkh9GTTTPe8hsP7Wy W1ahxNqRiwOnkwrEsafzznBfOa2/f5CzZog/FIRG0GD0SsC50EQxvsRCX1k5cdC08mQl 7i2S5+Hu7kvndGJ3tox9yF6weomPuKixkIUX2A1il1bUvxBkMg67DmhaWqsUN3Jr8Ie3 0F9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UHNNfqkD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i15-20020a63b30f000000b004fac849f880si3134911pgf.206.2023.02.09.16.34.24; Thu, 09 Feb 2023 16:34:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UHNNfqkD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231133AbjBJAdi (ORCPT + 99 others); Thu, 9 Feb 2023 19:33:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjBJAcz (ORCPT ); Thu, 9 Feb 2023 19:32:55 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01657206AD for ; Thu, 9 Feb 2023 16:32:22 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id jn16-20020a170903051000b00198f5741d23so2098666plb.18 for ; Thu, 09 Feb 2023 16:32:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=l7cJrzLZ8eAvu1dfgk3wdtw3/0KBtZxBV1s4qDZiZW0=; b=UHNNfqkDjSKVJdelnrCH+Ts0wZPROnz5hQmCtIskOZaoDuIeDGReWBlhjSmjHn386d As37kllaRCJpQwmTp+JiTHu0h75RCOEzBhNhkxMvOLLL+JARY52FQ5o7pvUuFzeag/Id DlrpIIEbKR8uW9YDcVqwyueK0O1OA5H9x2EM1Si1M9tLIcuBqHA8COd9SSqsh3CGg9LJ NJB6EZ7I2JfuIK+KVCbRkuWDOanOk7qFrk0l53wpoerKIlhtkwkK4CcNCVntPecs++Og mo4hQxcILy0wuU5tqOxJibz+KkqA4ORjnNlbNZaJrYSX0wJslvYDvSVPNPPpPTUgPyU4 C5sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=l7cJrzLZ8eAvu1dfgk3wdtw3/0KBtZxBV1s4qDZiZW0=; b=S5d6GvFvTTFE9yjx/tbsemxGlV/tGZk3d4DUc/LPygXjHlx7z3HU4ksU8nW7d+pV6Y PNbPnLkEpUeCawGJUTB6Z06BoZXQutXTQzb5nREVBgiIqJ9ScFRqyQ/j9UgR7M7UG0G5 AgRhOuc/J/Uxi4iHYtFIEov10Fk/TKvtXQDq2v3aiRfb+zsnSie7VZP5uOuT74cLAd07 HTRyEVoi6MNGXQvfahOq1yEJy9qsA/KchbYdQvFJx46q5//6Xxu4IGrqbThm//EIogC8 m1sOk71wV/invLowyL0MTPVRTN+y72eZ8hIkoF1rPVajOlleVXI/77zsjLmFM2FNbJ5l 5rCw== X-Gm-Message-State: AO0yUKVDhWiulG2wV7b7Y7A9AOUpAoz8EZys2LrtjsG3KogqcoUfeFaA TQrnOznz6Zylvw6l6jKyC0/XkcMBJxo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:1a8c:0:b0:592:557f:9f65 with SMTP id a134-20020a621a8c000000b00592557f9f65mr2914611pfa.8.1675989134617; Thu, 09 Feb 2023 16:32:14 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Feb 2023 00:31:41 +0000 In-Reply-To: <20230210003148.2646712-1-seanjc@google.com> Mime-Version: 1.0 References: <20230210003148.2646712-1-seanjc@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog Message-ID: <20230210003148.2646712-15-seanjc@google.com> Subject: [PATCH v2 14/21] KVM: selftests: Test all fungible features in PERF_CAPABILITIES From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Like Xu X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757402132962504126?= X-GMAIL-MSGID: =?utf-8?q?1757402132962504126?= Verify that userspace can set all fungible features in PERF_CAPABILITIES. Drop the now unused #define of the "full-width writes" flag. Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c index f7a27b5c949b..2647282ff380 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c @@ -14,10 +14,11 @@ #define _GNU_SOURCE /* for program_invocation_short_name */ #include +#include + #include "kvm_util.h" #include "vmx.h" -#define PMU_CAP_FW_WRITES (1ULL << 13) #define PMU_CAP_LBR_FMT 0x3f union perf_capabilities { @@ -36,6 +37,18 @@ union perf_capabilities { u64 capabilities; }; +/* + * The LBR format and most PEBS features are immutable, all other features are + * fungible (if supported by the host and KVM). + */ +static const union perf_capabilities immutable_caps = { + .lbr_format = -1, + .pebs_trap = 1, + .pebs_arch_reg = 1, + .pebs_format = -1, + .pebs_baseline = 1, +}; + static void guest_code(void) { wrmsr(MSR_IA32_PERF_CAPABILITIES, PMU_CAP_LBR_FMT); @@ -58,15 +71,22 @@ static void test_basic_perf_capabilities(union perf_capabilities host_cap) static void test_fungible_perf_capabilities(union perf_capabilities host_cap) { + const uint64_t fungible_caps = host_cap.capabilities & ~immutable_caps.capabilities; + struct kvm_vcpu *vcpu; struct kvm_vm *vm = vm_create_with_one_vcpu(&vcpu, guest_code); + int bit; - /* testcase 1, set capabilities when we have PDCM bit */ - vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, PMU_CAP_FW_WRITES); + for_each_set_bit(bit, &fungible_caps, 64) { + vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, BIT_ULL(bit)); + vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, + host_cap.capabilities & ~BIT_ULL(bit)); + } + vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, host_cap.capabilities); /* check whatever we write with KVM_SET_MSR is _not_ modified */ vcpu_run(vcpu); - ASSERT_EQ(vcpu_get_msr(vcpu, MSR_IA32_PERF_CAPABILITIES), PMU_CAP_FW_WRITES); + ASSERT_EQ(vcpu_get_msr(vcpu, MSR_IA32_PERF_CAPABILITIES), host_cap.capabilities); kvm_vm_free(vm); } @@ -102,7 +122,6 @@ int main(int argc, char *argv[]) TEST_REQUIRE(kvm_cpu_property(X86_PROPERTY_PMU_VERSION) > 0); host_cap.capabilities = kvm_get_feature_msr(MSR_IA32_PERF_CAPABILITIES); - host_cap.capabilities &= (PMU_CAP_FW_WRITES | PMU_CAP_LBR_FMT); TEST_ASSERT(host_cap.full_width_write, "Full-width writes should always be supported");