From patchwork Wed Jun 7 01:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 104167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3771631vqr; Tue, 6 Jun 2023 18:04:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5VGE8JXAHDnsv/qcUamYPJUoxKwOqw9yJoFXUfGZDj55MtefZm1JIsQy5PTIz+J249iacf X-Received: by 2002:a17:902:c411:b0:1ac:5717:fd5 with SMTP id k17-20020a170902c41100b001ac57170fd5mr5398759plk.60.1686099859835; Tue, 06 Jun 2023 18:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686099859; cv=none; d=google.com; s=arc-20160816; b=XHJwdShI+4Pio4qKYiZd/PFRQmX9kpi+MyV7AmC6MrfnyXpcbMfgDS3rPScQyIZy+r VS9I7NIynlyfjLQhPhf2hSGFB36ccLklPTUfERb5Z1uaAfgltGf5lWY/TRhSBjyZke/B WIVEJ27AGByX8mbnkYGxpaxVwEwOZ2Q5o7YXirBSDcf0NwYgBGSgRmKu/A+pKj1vWhli MkVnDfrU1z0Q1DEfuj/IPAUJAyLk6SOU+gR6jOUV0bcTdJ0pUwmXP4wpRKN7fAISL6I8 374ow0wDh4cxtoiaWVhJwOLHKNnstFYqJ9qUxJ73R5oQpHBFIkwkPJetTmMpKsKMec2S e3+Q== 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=GdxTpX9Spmnpfwqe75ekBKH+Ldw87KCa0RRFcAselmo=; b=fjJXXANPUeC/ETmz3JBxeOspUeDD7YsSMqzsLW5VFC8Fb++gobeERsIblZ7fGBJpvE 3uvjHc2r17Z8lHMrBNsjPlFKmrDVLazcrkzG7O/5c5Y98UIKMfdI1+sJsyr41s63L+9l m8qwTbTGvUj0KX+HKZkSX5+vmDHCdMImyyvniNSLpRgA6ilBwxf0D6dOlAkDO1Rltu/6 1lkjUs/CqFx2Z70ypzyNo2sfOM3otyOOqW5GPdow9TpKdPLNoGxNWGRZuwC/31U9+eJI k3xjDqynMR4lSXcX7yrkqhbrRv/oTtpn3C8pfCDrXhgzOsjMlXWH8LvcCJUntk8IF4Cj R6bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=f3El6h4m; 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 l8-20020a170902f68800b001ae5fe35b6dsi8434676plg.177.2023.06.06.18.04.04; Tue, 06 Jun 2023 18:04:19 -0700 (PDT) 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=20221208 header.b=f3El6h4m; 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 S240424AbjFGBCY (ORCPT + 99 others); Tue, 6 Jun 2023 21:02:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240387AbjFGBCO (ORCPT ); Tue, 6 Jun 2023 21:02:14 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53ABC10D5 for ; Tue, 6 Jun 2023 18:02:13 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-5343c1d114cso6231461a12.0 for ; Tue, 06 Jun 2023 18:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686099733; x=1688691733; 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=GdxTpX9Spmnpfwqe75ekBKH+Ldw87KCa0RRFcAselmo=; b=f3El6h4m5J8UNxRj4A3Eoe7PFYBiRVvCRS7XcW3t5c08Z3ub3hWjb5iqnmgk+kAqJ6 OCB9HveaWmu7txC0/3bapAUlHQAV7dnXwgqCC6ZTEpyPZEgS9yryjImgtqwNOYzHb++Q 2eX5upC9ARA+s2JKqAvyakW6S48rXgVswrhpWugfB3KHwjchSpZ4e+oKV3L1WDhfuEpn F9W82WDmGKAZg7LF1qNA2aH2i59k7UmicNdZATpGNgij8p6+t9m65K+wsLWJyveegdYP IlrmJGwMoGVPukj6ZMn9+cml7v6SBNm+ZnJ31oEyJMCF2dZHJCncUB4CpFo7Skez72MP MrQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686099733; x=1688691733; 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=GdxTpX9Spmnpfwqe75ekBKH+Ldw87KCa0RRFcAselmo=; b=aECPSGy08uS5UBjEKy0HCH6xkn4mII6U90iQCDTEetqVx8qD88caBWbIBU5ATQCQCD wThneuSC0NjqrzAes671WVEvpPzhMmQLYmggboQYti/fx8rBDZh8XN9bM1XIplV1AfAS 7xFnAe9rjxEkTKd+hNuI80Pf6XxW1xD2k8dvjfauQlv5JDby9egMXRmyci0DBinRioGV PRrqD4LEolVNspC2u4zh9RTQfH3j1qAAVLoNYQrWGvLsOsN4E3hGZrI1sBrrF+spbBB6 iSwWox0AcLOawVofv1Xeb9ihmNN8kLANaLWHR++wpHrTj4Yj32FBQvTg1lk5sFaH5PbR wfNQ== X-Gm-Message-State: AC+VfDxCgX8rJYFJoiJqiqQ6AemJM7wJ+LLYIXw7ik2X9zXJ3azxTPgq JD5mwRBML0slUwdLJPtaVp4/Z+sqjsg= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a65:68c6:0:b0:528:c2cd:9b42 with SMTP id k6-20020a6568c6000000b00528c2cd9b42mr761868pgt.3.1686099732871; Tue, 06 Jun 2023 18:02:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 6 Jun 2023 18:02:04 -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-3-seanjc@google.com> Subject: [PATCH 2/4] KVM: x86/pmu: Simplify intel_hw_event_available() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Lewis , 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,T_SCC_BODY_TEXT_LINE,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?1768003846704482145?= X-GMAIL-MSGID: =?utf-8?q?1768003846704482145?= Walk only the "real", i.e. non-pseudo, architectural events when checking if a hardware event is available, i.e. isn't disabled by guest CPUID. Skipping pseudo-arch events in the loop body is unnecessarily convoluted, especially now that KVM has enums that delineate between real and pseudo events. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/pmu_intel.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 0050d71c9c01..f281e634af3c 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -122,17 +122,16 @@ static bool intel_hw_event_available(struct kvm_pmc *pmc) BUILD_BUG_ON(ARRAY_SIZE(intel_arch_events) != NR_INTEL_ARCH_EVENTS); - for (i = 0; i < NR_INTEL_ARCH_EVENTS; i++) { + /* + * Disallow events reported as unavailable in guest CPUID. Note, this + * doesn't apply to pseudo-architectural events. + */ + for (i = 0; i < NR_REAL_INTEL_ARCH_EVENTS; i++) { if (intel_arch_events[i].eventsel != event_select || intel_arch_events[i].unit_mask != unit_mask) continue; - /* disable event that reported as not present by cpuid */ - if ((i < PSEUDO_ARCH_REFERENCE_CYCLES) && - !(pmu->available_event_types & (1 << i))) - return false; - - break; + return pmu->available_event_types & BIT(i); } return true;