From patchwork Fri Jun 2 22:12:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 102712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1335888vqr; Fri, 2 Jun 2023 15:23:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BguyR3frMInLYP1Xh+q4XND6wBxtwj05OCUdRJWvYhwdog8bFCwdRMtt+TefKXJJw5DcA X-Received: by 2002:a17:90a:498b:b0:258:c89e:b137 with SMTP id d11-20020a17090a498b00b00258c89eb137mr1063410pjh.14.1685744637106; Fri, 02 Jun 2023 15:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685744637; cv=none; d=google.com; s=arc-20160816; b=MpO0Kzi3iUoawWPRgyb3dohOqo2Zl12XKmr63e6hqQyY+0ZLLgD9IEoKS1k03311Bx lasUg1/b9b5wWYXlKjtbIP9+bSIMuDPUGfGB7A3X8Rmg7xkyZEGzFPgakOTS/upMf3zl +7gpr0BBuAsqlTj+mfoD7yhD/t2p6Bb2TgHKEputQM81KhdWby22VxAJjuJq+i22rxnf qZgsDf7Zhc1cKG9IEMkLNgAGiQv0M57syb7N40SSnuocb7kHhelSLM7EOS6B0SiPoJ9N H/I85cIlRREstX8JlG22av94S/rTg06jFWOvjwcAF1cIks5njoIOeB4P22jnDvm2WF8O TElA== 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:mime-version:date :reply-to:dkim-signature; bh=hZOQLIvJzczYTMAnaTGjzB0ofTaMaErv1XOCluG82ws=; b=u3l8DeDJuQUBPnyZNI85mTZM+fCt1yellP+cQOqq2TwFFWaySmD9Ep50tMHZ0PN348 oByYdPWQJRUBNE6XNDhCuSgLL5XtgmsujPhkrDojyyoMflrHpeDMUG/ne+bpn4Qv4uEF vBMb3fclEGY5OzSs3M7Ewr5fah3xiz/+/vX2pw0CUvBVGG6ipnh3RucO6W1pmUDR3dl6 5IBVvqWJ+v0S83upVAJZNjn9i4VQH5gVjmeBf47fQzmoJOC6WQTVAQfga86cygJdtsGs ovo12Q8V6sXsDgVn7td/a6O5tWEW3W+6+TTFKGtC7XHSDt09pELU8QCNxBcQkZjkZlCY jzuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=ztnEwzy3; 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 m23-20020a63ed57000000b005300dbf81d5si1625335pgk.496.2023.06.02.15.23.43; Fri, 02 Jun 2023 15:23:57 -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=ztnEwzy3; 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 S236800AbjFBWMo (ORCPT + 99 others); Fri, 2 Jun 2023 18:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236565AbjFBWMm (ORCPT ); Fri, 2 Jun 2023 18:12:42 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7792E1BC for ; Fri, 2 Jun 2023 15:12:39 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba8337ade1cso3507060276.2 for ; Fri, 02 Jun 2023 15:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685743958; x=1688335958; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=hZOQLIvJzczYTMAnaTGjzB0ofTaMaErv1XOCluG82ws=; b=ztnEwzy36DzIiYsf21ckOGWKoNk9x0+aF0krJRVhEGILD6FboIXDsRdHNE4nHzs8yQ D0nQnrSycvryY8KmsmF2B9P+c4iKhgxXfpMIAYDhOOw8Z3YfjvifOVAHHXtSc+VA4lcv vtJB58g21yx16+MjcUO0PWPLRYaen/R1GkwQ2R5DygvBCHRATnuSJUlx9qzrWJAfKbuJ PDq3fVh+dV2cn7B7iX8gv4dOVqZwH8Jk56seTtG571ZyY1FT4iGz8sB+Ge3BmXFEKay0 2jChpUvDjsXGJDyGTqf9E4tDl+OsuY07liagomRKpZ9cdyEwbNKENiZZMzwTBN9qtJQx Dnzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685743958; x=1688335958; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hZOQLIvJzczYTMAnaTGjzB0ofTaMaErv1XOCluG82ws=; b=Fto3IqZIGnuSZ5EuwUD/YOi+0gn2HboQXDN+phz2RgH+q2PcpSjmlA/UBRLkYXJ+FL /hzMFWFtqfFZ4CR9D2Qj8h4O9q2lbkIDtBHlGC3R8EvQ0xAVEvoh9JWsdrV/xDS3WDeZ H/v9RwPq9M2aQVevQVAu3n1R2tJ5Gcjx88CVwhpKeIiGVkpjAQNxpC4ah85sbIipMKEm YH1e1ZlHvilRxXYJju2SKxYQOY69HXYa4Sz89lXjLUVgo9RUQH4dInp9jO4qj3i19BdQ kZ7WeSuQOEqPJHdS+TANOuesZo2tYngideqvmJJPEcSg1NtX/H6fHhvWBKGc0pn+BsH2 +A7A== X-Gm-Message-State: AC+VfDydlph/mGYMeyFpJ+xkvXxYUCEkEor6W8cIyyqwjsgVjBlbNeC5 vPne6xg+U2BWSHPxN9LcV6W4vvxs46E= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:728:b0:ba1:d0:7f7c with SMTP id l8-20020a056902072800b00ba100d07f7cmr1667909ybt.2.1685743958805; Fri, 02 Jun 2023 15:12:38 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 2 Jun 2023 15:12:36 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.rc2.161.g9c6817b8e7-goog Message-ID: <20230602221236.952888-1-seanjc@google.com> Subject: [PATCH] KVM: x86/pmu: Rename global_ovf_ctrl_mask to global_status_mask From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, 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?1767631368656940519?= X-GMAIL-MSGID: =?utf-8?q?1767631368656940519?= Rename global_ovf_ctrl_mask to global_status_mask to avoid confusion now that Intel has renamed GLOBAL_OVF_CTRL to GLOBAL_STATUS_RESET in PMU v4. GLOBAL_OVF_CTRL and GLOBAL_STATUS_RESET are the same MSR index, i.e. are just different names for the same thing, but the SDM provides different entries in the IA-32 Architectural MSRs table, which gets really confusing when looking at PMU v4 definitions since it *looks* like GLOBAL_STATUS has bits that don't exist in GLOBAL_OVF_CTRL, but in reality the bits are simply defined in the GLOBAL_STATUS_RESET entry. No functional change intended. Cc: Like Xu Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx/pmu_intel.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) base-commit: b9846a698c9aff4eb2214a06ac83638ad098f33f diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index fb9d1f2d6136..28bd38303d70 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -523,7 +523,7 @@ struct kvm_pmu { u64 global_status; u64 counter_bitmask[2]; u64 global_ctrl_mask; - u64 global_ovf_ctrl_mask; + u64 global_status_mask; u64 reserved_bits; u64 raw_event_mask; struct kvm_pmc gp_counters[KVM_INTEL_PMC_MAX_GENERIC]; diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 741efe2c497b..fb96cbfc9ae8 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -427,7 +427,11 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) } break; case MSR_CORE_PERF_GLOBAL_OVF_CTRL: - if (data & pmu->global_ovf_ctrl_mask) + /* + * GLOBAL_OVF_CTRL, a.k.a. GLOBAL STATUS_RESET, clears bits in + * GLOBAL_STATUS, and so the set of reserved bits is the same. + */ + if (data & pmu->global_status_mask) return 1; if (!msr_info->host_initiated) @@ -531,7 +535,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->reserved_bits = 0xffffffff00200000ull; pmu->raw_event_mask = X86_RAW_EVENT_MASK; pmu->global_ctrl_mask = ~0ull; - pmu->global_ovf_ctrl_mask = ~0ull; + pmu->global_status_mask = ~0ull; pmu->fixed_ctr_ctrl_mask = ~0ull; pmu->pebs_enable_mask = ~0ull; pmu->pebs_data_cfg_mask = ~0ull; @@ -585,11 +589,17 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) counter_mask = ~(((1ull << pmu->nr_arch_gp_counters) - 1) | (((1ull << pmu->nr_arch_fixed_counters) - 1) << INTEL_PMC_IDX_FIXED)); pmu->global_ctrl_mask = counter_mask; - pmu->global_ovf_ctrl_mask = pmu->global_ctrl_mask + + /* + * GLOBAL_STATUS and GLOBAL_OVF_CONTROL (a.k.a. GLOBAL_STATUS_RESET) + * share reserved bit definitions. The kernel just happens to use + * OVF_CTRL for the names. + */ + pmu->global_status_mask = pmu->global_ctrl_mask & ~(MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF | MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD); if (vmx_pt_mode_is_host_guest()) - pmu->global_ovf_ctrl_mask &= + pmu->global_status_mask &= ~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI; entry = kvm_find_cpuid_entry_index(vcpu, 7, 0);