Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp267018pxv; Wed, 21 Jul 2021 22:45:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjFe44iV7okY56suk48HhjZmMxtB+bfJFIqCAi5ra9nj1OjRM4ERHBSmRNOSZVRcxseogR X-Received: by 2002:a92:3f08:: with SMTP id m8mr25861251ila.104.1626932742180; Wed, 21 Jul 2021 22:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626932742; cv=none; d=google.com; s=arc-20160816; b=k9T8MKGyXBE/JeBoqS9LQbZmIjOTFisH9AvGQHUKVNwUvnhI6H8XVelvV5Ms1/hXxL 4yev6uVZVN53XDXdKOmperc3+35BTGY9NYAXGSheYTpsEsAnWylgPcxmIyaxjQWbTJKZ MXd2RBYhrmQjR9l7hqmHVWOftwN8RT8cnedUCi9k1f7ssnssG2P6lLrUqsmvl6ypaxFp hp3xmchlhQ/S6Jy8ZP9Yr/3EMqQwWAXjB28+/TFsqB2BNBcoNM1BV+cqN42daa9koLhf L/Hp/lGCLAk30/FVBw8ES2MzrlS/d9IPIqrnUUtGQH+VAp7+J5AuZDwCqTaUc7Vbc8Du Cllw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uFz7cdNCk5ePX5DX7N0V0N9caJnCqQ7XCYY6/KCd/fc=; b=PGhgYlZwbOBj0/8G9xgVsg/kbO6xdzvAGZKkgV1uzPFkgHGH36VcUqnrziwQlk8eCt gShge+UKgJNCg2C7D6apt6qHJeNKqnO/KfN66ttVnoUwmWGymygw0aM6x1xrlTtrxyu2 ncNqUNJew6HYQSTbsRVmjcuDfJTvFIEdiZEvhP8GOtZU9/oyLNI5EVoiIS75Icl+L7/H jEnpNnKTyYkkZX/+1dSfz7nS+m2K4zoI67Q0C1NRDRh0UFsm6JHegkR5TYdmPvDIYRFd 1tFBS1X0QuX8H4BrlM7uQGPcz/kRubnulSucvutyCMxAQ2C09AmIjRxCIbzCFxUbeqUB 5tJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l2si28840143jak.30.2021.07.21.22.45.31; Wed, 21 Jul 2021 22:45:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231288AbhGVFDm (ORCPT + 99 others); Thu, 22 Jul 2021 01:03:42 -0400 Received: from mga06.intel.com ([134.134.136.31]:24019 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230517AbhGVFD3 (ORCPT ); Thu, 22 Jul 2021 01:03:29 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="272686993" X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="272686993" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 22:43:24 -0700 X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="512372590" Received: from vmm_a4_icx.sh.intel.com (HELO localhost.localdomain) ([10.239.53.245]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 22:43:20 -0700 From: Zhu Lingshan To: peterz@infradead.org, pbonzini@redhat.com Cc: bp@alien8.de, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, kan.liang@linux.intel.com, ak@linux.intel.com, wei.w.wang@intel.com, eranian@google.com, liuxiangdong5@huawei.com, linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org, like.xu.linux@gmail.com, boris.ostrvsky@oracle.com, Like Xu , Zhu Lingshan Subject: [PATCH V9 14/18] KVM: x86/pmu: Move pmc_speculative_in_use() to arch/x86/kvm/pmu.h Date: Thu, 22 Jul 2021 13:41:55 +0800 Message-Id: <20210722054159.4459-15-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210722054159.4459-1-lingshan.zhu@intel.com> References: <20210722054159.4459-1-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Like Xu It allows this inline function to be reused by more callers in more files, such as pmu_intel.c. Signed-off-by: Like Xu Signed-off-by: Zhu Lingshan --- arch/x86/kvm/pmu.c | 11 ----------- arch/x86/kvm/pmu.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index b907aba35ff3..d957c1e83ec9 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -481,17 +481,6 @@ void kvm_pmu_init(struct kvm_vcpu *vcpu) kvm_pmu_refresh(vcpu); } -static inline bool pmc_speculative_in_use(struct kvm_pmc *pmc) -{ - struct kvm_pmu *pmu = pmc_to_pmu(pmc); - - if (pmc_is_fixed(pmc)) - return fixed_ctrl_field(pmu->fixed_ctr_ctrl, - pmc->idx - INTEL_PMC_IDX_FIXED) & 0x3; - - return pmc->eventsel & ARCH_PERFMON_EVENTSEL_ENABLE; -} - /* Release perf_events for vPMCs that have been unused for a full time slice. */ void kvm_pmu_cleanup(struct kvm_vcpu *vcpu) { diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h index 1af86ae1d3f2..5795bb113e76 100644 --- a/arch/x86/kvm/pmu.h +++ b/arch/x86/kvm/pmu.h @@ -149,6 +149,17 @@ static inline u64 get_sample_period(struct kvm_pmc *pmc, u64 counter_value) return sample_period; } +static inline bool pmc_speculative_in_use(struct kvm_pmc *pmc) +{ + struct kvm_pmu *pmu = pmc_to_pmu(pmc); + + if (pmc_is_fixed(pmc)) + return fixed_ctrl_field(pmu->fixed_ctr_ctrl, + pmc->idx - INTEL_PMC_IDX_FIXED) & 0x3; + + return pmc->eventsel & ARCH_PERFMON_EVENTSEL_ENABLE; +} + void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel); void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int fixed_idx); void reprogram_counter(struct kvm_pmu *pmu, int pmc_idx); -- 2.27.0