From patchwork Fri Nov 10 02:12:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 163750 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp838053vqs; Thu, 9 Nov 2023 18:16:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/ezmG5SA/kVqFTjN2OOm1iGLKWNGRRLzeGN0cAQi+AANpK46gTSGVcwjELRULa1bKiUyX X-Received: by 2002:a05:6a21:3b45:b0:180:edee:1530 with SMTP id zy5-20020a056a213b4500b00180edee1530mr7432100pzb.37.1699582619573; Thu, 09 Nov 2023 18:16:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699582619; cv=none; d=google.com; s=arc-20160816; b=CO2wINn3XkP+zLjCi6hkTIpot7DjcN7c/482aHXmfu8m4r8PW8OL6kTp+kvM/djeke cluOVgWai424GHXHdnzY5SRsLEMQZ0PXBMYUZJNxBKcmGAKbKC83+B2CfJ6R3XiwBx5v dzmfhXSfWB57LLtoXmdHZLgYtjqUbSeNqHbgAZLNtkg7M1t0yIUsv1jC1sDQxmqPAZ3s /EAvuzEhf9Pr8crdHt6KZ5padN22ssNptA3R3ZBCrKj5gQnNZjOZzgAbCcq/1n6oGsvN b7XY7dkZ7OtOzaoS9BFG94DKOeuXH9xUTBNnhQvVc0R0r7tGNZhu6sj2yIm5PahUMzmq vdSw== 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=u1oA1WU+H0wBHafKtshVkBCE9ktzVNyHnD3r1OYhd/M=; fh=gm96CM+cG0KJxn7vnhn0c1c98ILNP1HHUrKfrGecw3M=; b=HGioG3fFWuiU9wCDsl0y/LXTO3uiTwgJ/Mps7PhmHsmRHIIDKkOELs2j/0IZCoMBL8 ky3+z55dZpesRlz1wrMIEsFbW13gwinOiTv4HAUThrjo0zUzIB7j0sWE3Q7gQ1NKGMrW jMjgUZndNRIPCaK3hx7DE5E4W2a6JMCO44czBBvIhiBAWBXkvXB56LgWQN9y2bha1ayF zjaqddSawzyDyoaVPG8WPQwL9VnnNY6qWyIioBwRzKnHqfalqPMrCRLhk7kzTaNnAbJ0 9engZDM7zLEM5vJwiOXTehWceckxB4KQdmg95SgPmhiYX5bHCQVOWYxqiAP6PTz13dPV 9M+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=YMNKbB+a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id b13-20020a63d80d000000b005be2508cde6si679749pgh.593.2023.11.09.18.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 18:16:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=YMNKbB+a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 9674180944DD; Thu, 9 Nov 2023 18:16:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345833AbjKJCPI (ORCPT + 30 others); Thu, 9 Nov 2023 21:15:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345725AbjKJCOa (ORCPT ); Thu, 9 Nov 2023 21:14:30 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CDED4EE3 for ; Thu, 9 Nov 2023 18:13:50 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7b9e83b70so12014497b3.0 for ; Thu, 09 Nov 2023 18:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699582429; x=1700187229; 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=u1oA1WU+H0wBHafKtshVkBCE9ktzVNyHnD3r1OYhd/M=; b=YMNKbB+aduxL5RO9h0qwYDk1RhnweXTBQqQfmrJv3trZGcKf4NVABeKCWWrFCw+41/ kakpYXk8XQderU71w5kw+UuEOSbcMyzWyG5yIb/Uz8ivq/kzS5s4y1i65L8bG4RFrQss DcNlqW2DQ23jYGgiq5qB6tbYtFnN78H1hpP1K7RBIKMeyYNwjiMmFHEAOvLrczxjB+sQ sSnK5ek99h1uQ/TMnDfKwK1JF0voGCptIk43OHwYF0XSgMkpy22t2iDayi1i6aph4RSj 4hra2o7tfvAuMxHQNxVi3tn2rD4PkWvZgrp/gkA9bT8Jgaic73vsL0/cPhropa+wATt/ C9sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699582429; x=1700187229; 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=u1oA1WU+H0wBHafKtshVkBCE9ktzVNyHnD3r1OYhd/M=; b=PcH6/jq9voBRhJ+f+tt2XcUtl+sq6p8ml3y6fUJi5rFBX5fS4bdkpQP3AfasXX/LCa B7op1gCwr9WjOIa90elqVUfVUplv+XittxcGNlV1VvdnuUwyDrdTXWtiCHidu4Zv4s7N IxkejJqphLLLp4Un353qRG8yhOSFJ3DiN0bFTnuBamLiz04pSJcU9WS3qBXvnMFct/cn SvzHavTVQmvQvWNoQlu1FV2AbUd2SdboWgzwTcSM5TCducUfPX3OZv05S9X7CsHNk12w Px5OK6RSHo+0uh7GFuZ7RzQi1LkYNXrhmyKGDR6zEJNlBMTPywVbTr6E9NmjtkdJjv5Z MP1g== X-Gm-Message-State: AOJu0Yx4IMTigzmUqAyGaX9xu+IwpH9WcSBvoiEiS04lsWsLmjV/9WYZ A1eHeINsVaKWJtF/kO0wmpZcNyMj3ZE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:250a:b0:5a8:207a:143a with SMTP id dt10-20020a05690c250a00b005a8207a143amr39667ywb.0.1699582429656; Thu, 09 Nov 2023 18:13:49 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 9 Nov 2023 18:12:59 -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-20-seanjc@google.com> Subject: [PATCH v8 19/26] KVM: selftests: Add a helper to query if the PMU module param is enabled 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 (agentk.vger.email [0.0.0.0]); Thu, 09 Nov 2023 18:16:53 -0800 (PST) X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782141544862665026 X-GMAIL-MSGID: 1782141544862665026 Add a helper to probe KVM's "enable_pmu" param, open coding strings in multiple places is just asking for false negatives and/or runtime errors due to typos. Reviewed-by: Dapeng Mi Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86_64/processor.h | 5 +++++ tools/testing/selftests/kvm/x86_64/pmu_counters_test.c | 2 +- tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 2 +- tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index 64aecb3dcf60..c261e0941dfe 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -1216,6 +1216,11 @@ static inline uint8_t xsetbv_safe(uint32_t index, uint64_t value) bool kvm_is_tdp_enabled(void); +static inline bool kvm_is_pmu_enabled(void) +{ + return get_kvm_param_bool("enable_pmu"); +} + uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr, int *level); uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr); 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 4c7133ddcda8..9e9dc4084c0d 100644 --- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c @@ -545,7 +545,7 @@ static void test_intel_counters(void) int main(int argc, char *argv[]) { - TEST_REQUIRE(get_kvm_param_bool("enable_pmu")); + TEST_REQUIRE(kvm_is_pmu_enabled()); TEST_REQUIRE(host_cpu_is_intel); TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION)); diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c index 7ec9fbed92e0..fa407e2ccb2f 100644 --- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c @@ -867,7 +867,7 @@ int main(int argc, char *argv[]) struct kvm_vcpu *vcpu, *vcpu2 = NULL; struct kvm_vm *vm; - TEST_REQUIRE(get_kvm_param_bool("enable_pmu")); + TEST_REQUIRE(kvm_is_pmu_enabled()); TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_FILTER)); TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_MASKED_EVENTS)); 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 ebbcb0a3f743..562b0152a122 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 @@ -237,7 +237,7 @@ int main(int argc, char *argv[]) { union perf_capabilities host_cap; - TEST_REQUIRE(get_kvm_param_bool("enable_pmu")); + TEST_REQUIRE(kvm_is_pmu_enabled()); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_PDCM)); TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION));