From nobody Mon Feb 9 10:26:34 2026 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 BFD2EC7EE2F for ; Wed, 7 Jun 2023 01:02:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240440AbjFGBC3 (ORCPT ); Tue, 6 Jun 2023 21:02:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240401AbjFGBCR (ORCPT ); Tue, 6 Jun 2023 21:02:17 -0400 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 B824F1712 for ; Tue, 6 Jun 2023 18:02:15 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-bb2fae9b286so4669091276.3 for ; Tue, 06 Jun 2023 18:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686099735; x=1688691735; 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=/p3hE18mmnljLb7fbFnVkkn8QwKXTaT5e9jEQlBWXcU=; b=6UvT6b0pBC2I3ReD74BskUKqwcHxT2DPwtJz6h4dQIf0lHIvZSKhTS2z6XHo0m2YyQ dyyCZPMTIaqqpphsP6+05vRW/aDN6KreYQqGeaaZWyXjMzJUD60PPE0HtOuAuZjtOHMu Oz+BBNEuK99s7gfi6PJtXvYxpHyEpOiYFxX+/yJI+S3tLnIoesOR7gyw8m4ynEGveJzT SDnYH7M+8WW2xoCXwUP1RnvMVPRCKHzj1ZNFKfxS2wp2nz7Ui38bmNTLEX2S2iKr5L45 Wb2+GpSmRSs1WwOAyl3F0INfi5pydWmUHlJRxYt6nOm1gQqIOSFij9xPXiJ3UssrOsEz RiNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686099735; x=1688691735; 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=/p3hE18mmnljLb7fbFnVkkn8QwKXTaT5e9jEQlBWXcU=; b=TKmul+SGiTfMIUavBzh1Gw3oR5r5TehlRZcODkZf4IXQUNZ3eBecIc2n32HhBbhsKK op3+wggnvb6cuxS284euMF5cNIWiyOWm8aqWUT28AIO2o/RnvBSn+nrlRLdVzvaM3OMw dZuM8Y8Jq01JoLM2/is7W4g4Rfax2kZwlLW8cJn2XR5hn2EOIIF6WAmw0Z6q1LWWVX5I R/tNN21EbmQpAfJnAEwDV3LwuvsnP/YE33v+wa4agUyG1yJrXyt/DcLiZaDH72umCQsJ tyuSDcbHf7tomFSXqbvyV4cfoq+B6XyFpAfJXuJeht5fQVAVswZl3BUfkb4lWGXukLmA NCVg== X-Gm-Message-State: AC+VfDzRVMEXk6AuKL1Npc4R+SIYZ6MmA0PyEC602/pfSdiUO533Er1M oahioZVlsFVPUITeD2apOp1medE/5xg= X-Google-Smtp-Source: ACHHUZ66ZN18TSVUSFfTJ9KYMFh531G+fYQnxCFRROXfI3t6AlHX78mEuOWXgZ1KtH0TDjdOM2NxAZyogNQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:4117:0:b0:ba8:9653:c948 with SMTP id o23-20020a254117000000b00ba89653c948mr1341420yba.3.1686099734922; Tue, 06 Jun 2023 18:02:14 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 6 Jun 2023 18:02:05 -0700 In-Reply-To: <20230607010206.1425277-1-seanjc@google.com> Mime-Version: 1.0 References: <20230607010206.1425277-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230607010206.1425277-4-seanjc@google.com> Subject: [PATCH 3/4] KVM: x86/pmu: Require nr fixed_pmc_events to match nr max fixed counters From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Lewis , Like Xu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Assert that the number of known fixed_pmc_events matches the max number of fixed counters supported by KVM, and clean up related code. Opportunistically extend setup_fixed_pmc_eventsel()'s use of array_index_nospec() to cover fixed_counters, as nr_arch_fixed_counters is set based on userspace input (but capped using KVM-controlled values). Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/pmu_intel.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index f281e634af3c..c0b0a721b97f 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -527,16 +527,17 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, s= truct msr_data *msr_info) =20 static void setup_fixed_pmc_eventsel(struct kvm_pmu *pmu) { - size_t size =3D ARRAY_SIZE(fixed_pmc_events); - struct kvm_pmc *pmc; - u32 event; int i; =20 + BUILD_BUG_ON(ARRAY_SIZE(fixed_pmc_events) !=3D KVM_PMC_MAX_FIXED); + for (i =3D 0; i < pmu->nr_arch_fixed_counters; i++) { - pmc =3D &pmu->fixed_counters[i]; - event =3D fixed_pmc_events[array_index_nospec(i, size)]; + int index =3D array_index_nospec(i, KVM_PMC_MAX_FIXED); + struct kvm_pmc *pmc =3D &pmu->fixed_counters[index]; + u32 event =3D fixed_pmc_events[index]; + pmc->eventsel =3D (intel_arch_events[event].unit_mask << 8) | - intel_arch_events[event].eventsel; + intel_arch_events[event].eventsel; } } =20 @@ -597,10 +598,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) if (pmu->version =3D=3D 1) { pmu->nr_arch_fixed_counters =3D 0; } else { - pmu->nr_arch_fixed_counters =3D - min3(ARRAY_SIZE(fixed_pmc_events), - (size_t) edx.split.num_counters_fixed, - (size_t)kvm_pmu_cap.num_counters_fixed); + pmu->nr_arch_fixed_counters =3D min_t(int, edx.split.num_counters_fixed, + kvm_pmu_cap.num_counters_fixed); edx.split.bit_width_fixed =3D min_t(int, edx.split.bit_width_fixed, kvm_pmu_cap.bit_width_fixed); pmu->counter_bitmask[KVM_PMC_FIXED] =3D --=20 2.41.0.162.gfafddb0af9-goog