From mboxrd@z Thu Jan 1 00:00:00 1970 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 ACF11C76196 for ; Fri, 7 Apr 2023 01:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239323AbjDGBjI (ORCPT ); Thu, 6 Apr 2023 21:39:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231322AbjDGBjG (ORCPT ); Thu, 6 Apr 2023 21:39:06 -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 C64956EB7 for ; Thu, 6 Apr 2023 18:39:04 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id w5-20020a253005000000b00aedd4305ff2so41047064ybw.13 for ; Thu, 06 Apr 2023 18:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680831544; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cnRzfyzI+UY6zqZu7950JAiupbhaGdQtV9MG+1slD40=; b=Y4524jRw3W+rLRsHRjuLlT9k7xi/MKQdxqdP39rTMH31JAwcXg/T7RAlYDa00xKnHM BLHHvnUSaElmfo4D1komDu4DICeBntRTZtnX6afs3vytQ787D0fF8ZUQCPGdDLJDK2FB wfdewcjzzxnF2vDrG4u5Bo1WpfbzYS55YfIOBuEQhaPQgB7eKCCY2s++K3wgUANmSN+L s5fitK3gubAuPeA2exKjwS/dNSbyyQ3jxhyp5ioa/txncG0CFd76sKBIWfHT0PihB/0u Agy+pVUqnF924Y150/8wDl/aVpDubX32ssRYcYX/19BUbu7LqeMhDbPc+FYpEMUxmQLe PjGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680831544; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cnRzfyzI+UY6zqZu7950JAiupbhaGdQtV9MG+1slD40=; b=wpt/8vPQlaq8COR6Wqa3HsX46W6K6NdZvKVQ+CWTNsDVV7bihZt7YMJfXg0cYU1beZ 933puZPlaFCSVRCDNkV1McpTAB80sQlRwO6yJ+fIpXLZnlgT7/lnWwSpp/zzMHVdXP4t NDToErvlSrKWVnOWwdsLGzTfr07jO67MVDUIwLAqYt0LT12g7CwTylZUbKNkZc3iMfGa kh3/c45iN/kuXJhmmk3XLS93cy8Qhn/LpVvJilO9/jO2t0NFkYx7OV+T/WfoukP/xDL1 HAVmrs6FuP9iFrK5ZEqlSD/qPF710yWG6KUX0XHN9iddITQfYigbGVbcrshlXv5+86jJ T+ZA== X-Gm-Message-State: AAQBX9e2vF/3b9mq1m/JVY+v0fQRa7Fv+7ZLDEbdzh/oBQuSvnoIBjDm dZkssRXPc0M/VzXgNzdMRocGSXP/x3A= X-Google-Smtp-Source: AKy350b5Vsgx2wZUSbTO2NknkQL1122pL6zWUjx9ESwdl2mDLmZED3lD3f2PMeKjFd1n69JEwkvaeA7sPds= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:431e:0:b0:545:883a:544d with SMTP id q30-20020a81431e000000b00545883a544dmr175931ywa.9.1680831544075; Thu, 06 Apr 2023 18:39:04 -0700 (PDT) Date: Thu, 6 Apr 2023 18:39:02 -0700 In-Reply-To: <20230214050757.9623-7-likexu@tencent.com> Mime-Version: 1.0 References: <20230214050757.9623-1-likexu@tencent.com> <20230214050757.9623-7-likexu@tencent.com> Message-ID: Subject: Re: [PATCH v4 06/12] KVM: x86/pmu: Make part of the Intel v2 PMU MSRs handling x86 generic From: Sean Christopherson To: Like Xu Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 14, 2023, Like Xu wrote: > @@ -574,11 +569,61 @@ static void kvm_pmu_mark_pmc_in_use(struct kvm_vcpu *vcpu, u32 msr) > > int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > { > + struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); > + u32 msr = msr_info->index; > + > + switch (msr) { > + case MSR_CORE_PERF_GLOBAL_STATUS: > + msr_info->data = pmu->global_status; > + return 0; > + case MSR_CORE_PERF_GLOBAL_CTRL: > + msr_info->data = pmu->global_ctrl; > + return 0; > + case MSR_CORE_PERF_GLOBAL_OVF_CTRL: > + msr_info->data = 0; > + return 0; > + default: > + break; > + } > + > return static_call(kvm_x86_pmu_get_msr)(vcpu, msr_info); > } > > int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > { > + struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); > + u32 msr = msr_info->index; > + u64 data = msr_info->data; > + u64 diff; > + > + switch (msr) { > + case MSR_CORE_PERF_GLOBAL_STATUS: > + if (!msr_info->host_initiated || (data & pmu->global_ovf_ctrl_mask)) > + return 1; /* RO MSR */ > + > + pmu->global_status = data; > + return 0; > + case MSR_CORE_PERF_GLOBAL_CTRL: > + if (!kvm_valid_perf_global_ctrl(pmu, data)) > + return 1; > + > + if (pmu->global_ctrl != data) { > + diff = pmu->global_ctrl ^ data; > + pmu->global_ctrl = data; > + reprogram_counters(pmu, diff); > + } > + return 0; > + case MSR_CORE_PERF_GLOBAL_OVF_CTRL: > + if (data & pmu->global_ovf_ctrl_mask) > + return 1; > + > + if (!msr_info->host_initiated) > + pmu->global_status &= ~data; > + return 0; > + default: > + break; > + } > + > kvm_pmu_mark_pmc_in_use(vcpu, msr_info->index); > return static_call(kvm_x86_pmu_set_msr)(vcpu, msr_info); > } Please tweak these to follow the patterns for other MSR helpers (see below). I don't actually mind the style, but people get used to the pattern and make mistakes when there are unexpected deviations. int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) { struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); u32 msr = msr_info->index; switch (msr) { case MSR_CORE_PERF_GLOBAL_STATUS: msr_info->data = pmu->global_status; break; case MSR_CORE_PERF_GLOBAL_CTRL: msr_info->data = pmu->global_ctrl; break; case MSR_CORE_PERF_GLOBAL_OVF_CTRL: msr_info->data = 0; break; default: return static_call(kvm_x86_pmu_get_msr)(vcpu, msr_info); } return 0; } int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) { struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); u32 msr = msr_info->index; u64 data = msr_info->data; u64 diff; switch (msr) { case MSR_CORE_PERF_GLOBAL_STATUS: if (!msr_info->host_initiated) return 1; /* RO MSR */ pmu->global_status = data; break; case MSR_CORE_PERF_GLOBAL_CTRL: if (!kvm_valid_perf_global_ctrl(pmu, data)) return 1; if (pmu->global_ctrl != data) { diff = pmu->global_ctrl ^ data; pmu->global_ctrl = data; reprogram_counters(pmu, diff); } break; case MSR_CORE_PERF_GLOBAL_OVF_CTRL: if (data & pmu->global_ovf_ctrl_mask) return 1; if (!msr_info->host_initiated) pmu->global_status &= ~data; break; default: kvm_pmu_mark_pmc_in_use(vcpu, msr_info->index); return static_call(kvm_x86_pmu_set_msr)(vcpu, msr_info); } return 0; }