From patchwork Sat Jun 3 01:10:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 102728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1400556vqr; Fri, 2 Jun 2023 18:12:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UHPanHDnR+uli9kKYZAHtYEmXgCKjzFwv9jlqhJ/3v+cmgmNDJ6wFZ4bVcaKgBObkzX1S X-Received: by 2002:a0d:e88d:0:b0:567:7db6:3d48 with SMTP id r135-20020a0de88d000000b005677db63d48mr2163440ywe.12.1685754741202; Fri, 02 Jun 2023 18:12:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685754741; cv=none; d=google.com; s=arc-20160816; b=Ka4RREJEyMOOv1HmS8bT5h2tKL0QBYEJS8aK74Al9C4OWUJ+ANN8I5/UwUvRat32wZ pQMsioJx8RKMjLFALTidIpw2yhaSUr56hCMMKwKq7xC4G4TEUwgeP2UQIgFUiWvzi9Ob SHYp5zgRDUoEWw3eLDcT8A1I7lbtMe1oA6KnlsAqwrw6HhXQcORt2zXnA7DKdHWRUamr FbUN3kBZVaeMOKTPizg8R4Qb0Sz4AxEf32a9vQ/9qMv327j44/PBF5xqD0jSvBslwbG6 wb1ltY5LQPWcPCO389bsMidZ6kzdOoJeoaIxBCAMzukFsmng02F5KggfMCacwm51Do5h NiaQ== 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=zNS+2nUop8HSFhXhjGUsYHrKCz8noRLlXBPZS+z46QI=; b=RUWmForNW5VsJG+lEbd3tGUBDjFD7FwpU7ewJZAagdHlqK5FNEW/0KDLwrUgHSRuyd 8Mv+tr9F3z/udeZSiCZqrKQSBwhnjJKG+FhqNDQbLAyeZeSrPml6CwSqHbyynNq/EI79 KAhqhhCX+yOKWIQgjn4npDM70gwoaLmJA75h70WXcuxVTHTPjHOFsV/mEX96817N9kiX eHvT7+S99jIY9jyH8f9I9vQzZ3MM/ZYxZToPAjRiGuEUE3ueYFFGG9kjqCRdCc1iPaWH nwNpEP7r/8YFI4nTHPm8wgHlNUSFEYsFIc9Pn4gLqAcFq/uWJ7pPgC+mX5de2lrQHvnK WZoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=zD9YgFff; 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 a18-20020aa78e92000000b0064d2d6b6b87si1570339pfr.268.2023.06.02.18.12.09; Fri, 02 Jun 2023 18:12:21 -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=zD9YgFff; 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 S236806AbjFCBLP (ORCPT + 99 others); Fri, 2 Jun 2023 21:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237007AbjFCBLI (ORCPT ); Fri, 2 Jun 2023 21:11:08 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15E3DE43 for ; Fri, 2 Jun 2023 18:11:06 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-64d2a8896faso1297724b3a.1 for ; Fri, 02 Jun 2023 18:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685754665; x=1688346665; 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=zNS+2nUop8HSFhXhjGUsYHrKCz8noRLlXBPZS+z46QI=; b=zD9YgFffhnt58QHSD5hvMYuW98to2PwClt4O7Q5PboHoKYWMUYyrdJRIsO9wOabfrO wbIZ5xULWSadmjrlN0rX9UFk2OB96dKBbdLaudCvmoJUFEPojXphaikBq7HlrEo3Kc5B QUHmKGIPRHLHv+D2zzZVmj1V0GVVepFaZoJ1hUx+xFhXca0H1VaovUViPyU9u0WHtLnr TdbtyI2knorbbWKSj9JxzoWVtBh+3XM8xmV76f/l0Q6XIsMGRTSKTKF5r89qp9DiGQ4t q2hhevSK8TfoK8BDjKnq3gso1vshT8TMMUSvzYuPlEjNAJWuzxrT+i+LXQUOhHHhx5cP f8tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685754665; x=1688346665; 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=zNS+2nUop8HSFhXhjGUsYHrKCz8noRLlXBPZS+z46QI=; b=UzelzM0ZdLg+9SsRA2icFl1zlk80YGDS3RsUHCRiqTWJhoiKiNtSJc73nbP8tEWpFF Pr14/Pdg/AnXHIbkezGLqFIGnhZM65jY5JrCbhwwrleRmN+ErA6bxoOAghm2ozJ7NwaD NbpcjVEMTb9OwUCAYBoLMkJS59t5JGwJX1jIpFiTHbTG9RzANBsGWsQkJ27vmfOtzYIT wXoupcqVYp8N39wn1coPpy5Qebi/45kpVRAsKQhghYt/H4UTR+cZU9hzTSY9WXZqeOKu JXrml/Uvg/FiJ/gt1zAhyE1g40sSYxsYvCrBkACLiJZ+gLAvrlhkVHe3H0tOx3WXFEjV yzEw== X-Gm-Message-State: AC+VfDzZrli/OODzNXLvROZLc58zjO2gmW3MthAnV/F32duQPhPvD0ow o/trCtqUnX8slw/nQ0lyJY4IYYZ/4UQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:2e0e:b0:647:3f80:c607 with SMTP id fc14-20020a056a002e0e00b006473f80c607mr5051252pfb.4.1685754665454; Fri, 02 Jun 2023 18:11:05 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 2 Jun 2023 18:10:48 -0700 In-Reply-To: <20230603011058.1038821-1-seanjc@google.com> Mime-Version: 1.0 References: <20230603011058.1038821-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.rc2.161.g9c6817b8e7-goog Message-ID: <20230603011058.1038821-3-seanjc@google.com> Subject: [PATCH v7 02/12] KVM: x86/pmu: Move reprogram_counters() to pmu.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Like Xu , Like Xu , Jim Mattson , Sandipan Das 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=unavailable 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?1767641963191350425?= X-GMAIL-MSGID: =?utf-8?q?1767641963191350425?= From: Like Xu Move reprogram_counters() out of Intel specific PMU code and into pmu.h so that it can be used to implement AMD PMU v2 support. No functional change intended. Suggested-by: Sean Christopherson Signed-off-by: Like Xu [sean: rewrite changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/pmu.h | 12 ++++++++++++ arch/x86/kvm/vmx/pmu_intel.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h index 5c7bbf03b599..986563aeeef8 100644 --- a/arch/x86/kvm/pmu.h +++ b/arch/x86/kvm/pmu.h @@ -201,6 +201,18 @@ static inline void kvm_pmu_request_counter_reprogram(struct kvm_pmc *pmc) kvm_make_request(KVM_REQ_PMU, pmc->vcpu); } +static inline void reprogram_counters(struct kvm_pmu *pmu, u64 diff) +{ + int bit; + + if (!diff) + return; + + for_each_set_bit(bit, (unsigned long *)&diff, X86_PMC_IDX_MAX) + set_bit(bit, pmu->reprogram_pmi); + kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu)); +} + void kvm_pmu_deliver_pmi(struct kvm_vcpu *vcpu); void kvm_pmu_handle_event(struct kvm_vcpu *vcpu); int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data); diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index fb96cbfc9ae8..edcf8670eb4e 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -73,18 +73,6 @@ static struct kvm_pmc *intel_pmc_idx_to_pmc(struct kvm_pmu *pmu, int pmc_idx) } } -static void reprogram_counters(struct kvm_pmu *pmu, u64 diff) -{ - int bit; - - if (!diff) - return; - - for_each_set_bit(bit, (unsigned long *)&diff, X86_PMC_IDX_MAX) - set_bit(bit, pmu->reprogram_pmi); - kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu)); -} - static bool intel_hw_event_available(struct kvm_pmc *pmc) { struct kvm_pmu *pmu = pmc_to_pmu(pmc);