From patchwork Sat Mar 11 00:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp62951wrd; Fri, 10 Mar 2023 17:23:05 -0800 (PST) X-Google-Smtp-Source: AK7set8crJiC6J1ElC2LsriObRWMvSOtTjVgP0pD+Rf6J5sQ+akz/MBM55Q6fanAUHnmkCJ52v7n X-Received: by 2002:a17:902:da8f:b0:19e:9807:de4a with SMTP id j15-20020a170902da8f00b0019e9807de4amr27809092plx.57.1678497784862; Fri, 10 Mar 2023 17:23:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678497784; cv=none; d=google.com; s=arc-20160816; b=JGqdsAU0Dgi7/PpZa3b576hj8u94Y05xWXNTdziOHC2wQ6LG/p6tFoHh5UN0LONd2B dA51sqIcgn3slGvP62K9Ra7DJd/rCXTg5MNh4SNsywMhi+9yYREnNqXv0bkoL2UzyryV 6AOFsxx5TrcUQND7uancD7RrZ9zkpx/NBFKoIVvJOxMf5lP4wH0S/8hcuYFl1kU8sF3y +onTeyc56n3/xEDJ8kfPLSmCXVPY4TTd/2GiBNYROuM/MspOVmtcmRPwg2W/nVRCNPq7 8nq5MYaKzGnYUvuzokWNcsa51GAAy2yhtBqnPdU+TgPSUUP3nCstGUSVW4C8GSfNKvv2 Pp1g== 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=PL46ZVFFY4W6THy18E6ByGyTQEOReUquwUIR0GdzpTw=; b=IeyzbhD95GcNzXfayJBqhR1F/Ar3EyulB+nVLKaCiKbFc1QwAdoNeayUdVIl/KVcqW 0VqXIbnbOPKxL6y7uIwOHSAzLNMKZyT/WesETYhTiW3pknUySDqnBqq9j5+cRG5/+mO3 +hw244dbCnFQu2KZ94UfqcTOnr9QqVkkQd3AXEMoMgLxJ44xvLumbL83/vhPm73DaE7U Dum5m5DlEHBVsM18Ik1ueeNatIJ5vqhntyvhDFUH9apmt6l4/+id3MchhsuZFUPlcpaJ B0YWCkAljI8RmL9RSwQat5URW0AyQOXMCGQ7opPQ09JCJhevTSiyssecpf9KjU+z2P02 73wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UqLaWbM1; 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 u30-20020a63471e000000b00503a3e606besi1102692pga.253.2023.03.10.17.22.51; Fri, 10 Mar 2023 17:23:04 -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=UqLaWbM1; 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 S231402AbjCKAtN (ORCPT + 99 others); Fri, 10 Mar 2023 19:49:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjCKAsN (ORCPT ); Fri, 10 Mar 2023 19:48:13 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18C9113F55E for ; Fri, 10 Mar 2023 16:47:25 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id i15-20020aa78d8f000000b005edc307b103so3627151pfr.17 for ; Fri, 10 Mar 2023 16:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678495617; 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=PL46ZVFFY4W6THy18E6ByGyTQEOReUquwUIR0GdzpTw=; b=UqLaWbM1URFaqajdFYpP3qWI1GLaFwLH3UIQad3gxXdNnR1HssacIG0e3wji4Ozdtd IEBfvROKjN8oIX1O4Ul4D2qwqpHTLH9/lqh4xWW2SSMSrxIZeWH0RCMdX7n4O02NM/3p 4qVVv6rBds34QA6rHcUxGX7oOPvXMqfIG6ImBaYN/SclYX6ddXVFvHePPAY/J2nlqBNI yk27LLdv2THmLKQdIC1pviVhi2NqGZsw+1Vjr/uwqIqAJqF89zvGLLkN9sLoYKJLAmmu EEKx7yRv7Q65JJnBwtpoe+0V5j7yssZ6d3zuNkSllf8hv/AkmuD//pZLv2tauiB5tpTj QRoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678495617; 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=PL46ZVFFY4W6THy18E6ByGyTQEOReUquwUIR0GdzpTw=; b=U+QUcQyh/z68zDfz3gURkTmZqotaSHOO6POOD69HeR90wfh6hgOMIeYgQONyQQN2Hs dhGIRK+QEjmoXIp3OZ0ozWpLtCc/hIif39eaSwBxy6/niKw+KdGQarJhqerPeNXhhvgQ kgr/fGvrpgZo3eDlX4zGRV0AUaMx05ouoxkwOeFjSxnGQTlgWKNQaUwZwl8mkGGiFahs 9WCmx/JsSrg6q+wR68bnZrCiBWrjFJ4G2jm/D9/k8SjU+CIkS3UQBRZA41JlzIZsn9UU I4xC7MTeuO5fhpCiwPDACUU1pgfreFYCfAs3D5jqVdwMGLZm/sL/m25aYbSSUKrq5iBu sh4A== X-Gm-Message-State: AO0yUKX1q16eBqkOFbiUd3I3Lo+ucoqQnSPSEgdSKYH2K86c0ywZAX2F 6CGLlngVxslzShtFKH5te/7NpjLOikU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:ce43:0:b0:593:dc61:2161 with SMTP id y64-20020a62ce43000000b00593dc612161mr11028772pfg.2.1678495617175; Fri, 10 Mar 2023 16:46:57 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:46:16 -0800 In-Reply-To: <20230311004618.920745-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311004618.920745-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311004618.920745-20-seanjc@google.com> Subject: [PATCH v3 19/21] KVM: selftests: Refactor LBR_FMT test to avoid use of separate macro From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Like Xu , Yu Zhang 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?1760032493493036211?= X-GMAIL-MSGID: =?utf-8?q?1760032493493036211?= Rework the LBR format test to use the bitfield instead of a separate mask macro, mainly so that adding a nearly-identical PEBS format test doesn't have to copy-paste-tweak the macro too. No functional change intended. Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 6733d879a00b..38aec88d733b 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 @@ -19,8 +19,6 @@ #include "kvm_util.h" #include "vmx.h" -#define PMU_CAP_LBR_FMT 0x3f - union perf_capabilities { struct { u64 lbr_format:6; @@ -169,7 +167,7 @@ static void test_immutable_perf_capabilities(union perf_capabilities host_cap) struct kvm_vcpu *vcpu; struct kvm_vm *vm = vm_create_with_one_vcpu(&vcpu, NULL); - uint64_t val; + union perf_capabilities val = host_cap; int r, bit; for_each_set_bit(bit, &reserved_caps, 64) { @@ -184,12 +182,13 @@ static void test_immutable_perf_capabilities(union perf_capabilities host_cap) * KVM only supports the host's native LBR format, as well as '0' (to * disable LBR support). Verify KVM rejects all other LBR formats. */ - for (val = 1; val <= PMU_CAP_LBR_FMT; val++) { - if (val == (host_cap.capabilities & PMU_CAP_LBR_FMT)) + for (val.lbr_format = 1; val.lbr_format; val.lbr_format++) { + if (val.lbr_format == host_cap.lbr_format) continue; - r = _vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, val); - TEST_ASSERT(!r, "Bad LBR FMT = 0x%lx didn't fail", val); + r = _vcpu_set_msr(vcpu, MSR_IA32_PERF_CAPABILITIES, val.capabilities); + TEST_ASSERT(!r, "Bad LBR FMT = 0x%x didn't fail, host = 0x%x", + val.lbr_format, host_cap.lbr_format); } kvm_vm_free(vm);