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 6968BC4332F for ; Wed, 8 Nov 2023 19:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbjKHTfL (ORCPT ); Wed, 8 Nov 2023 14:35:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjKHTfJ (ORCPT ); Wed, 8 Nov 2023 14:35:09 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AA232110 for ; Wed, 8 Nov 2023 11:35:07 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a839b31a0dso1519077b3.0 for ; Wed, 08 Nov 2023 11:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699472106; x=1700076906; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BeJqDywIA9SJQWdHjdlzV7j446J+Wll1DVQbRo0AN2o=; b=jUxY2Rhlsfh5uuNXZV3R+rfBxqaVjmkdCNqwZYkSKFZBJQWKOmFeGfQYDGzP74ES3i P2/+v0gMz6I3AN6lhaP8rTI5FHHpz3xWZMTkif1xdaKmdXbQunKDrUG2H7pb73+Ux3Lc XTNWLvrfipqpYJKwbAcXVfyzZAs6qlcwjdxh2maZgLy9O8By94Oo70lxbkzqLvvnLix8 CB+amgoZsy5IEe/udFrJbkO8ggVBpNsxQpbQoVZ3RryuSxSp55ADUxvNyrzFKidJBR5M ricNZd/qo2IS7URXwaOPmd6iuShUNq7kHzEbYU63Opslgby+jc4h4tLza31BNqn/9uOq Z4aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699472106; x=1700076906; 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=BeJqDywIA9SJQWdHjdlzV7j446J+Wll1DVQbRo0AN2o=; b=wYgSNErHjJzIFuQZtVVmUsAGj6ir8s7hvXbplt+Z94M30Wl8pR/0Q9pSH0GYXUwUI3 3x2UVx7qW81owXBm3AoncfiRmKALyrT+vBlrwTkL+0Ub+k8cNE6dP54slxzoIHv1EkTi YT40CHRMqHccL0z37epaozCpx0m/vH2ynDCKWujvqh1LCm5ysSHYHruPe383x7flbAM1 IXD1kzcCy6uilA6c5NNuUdQdFKs9ppG9xHgOx+w9NstQq/eNphmaBTUJAiJ+I+Ql1EBC QFxTXoUaXyA1X5MduInQH810ej91S30qUtoTV8LINXNlSTHXjRGezRPLdk/Ev750PgQ0 qTig== X-Gm-Message-State: AOJu0Yy0W9VyNRDq8kxSLQtBkPbro4cHhMdy0C1XD4rQpMPS4vPXLYIe TSYmETZlL4C8wWldSrYThipP3jgBznc= X-Google-Smtp-Source: AGHT+IGLmkrTaPP6S11ajreCCXZPcmYitlsfG2AuK9TV6sy3ukACu8QSNGsAvSLFv8j5p2OKSEkqV8vgDOs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:4f8c:0:b0:5a7:bb7e:993e with SMTP id d134-20020a814f8c000000b005a7bb7e993emr53158ywb.9.1699472106512; Wed, 08 Nov 2023 11:35:06 -0800 (PST) Date: Wed, 8 Nov 2023 11:35:04 -0800 In-Reply-To: <4281eee7-6423-4ec8-bb18-c6aeee1faf2c@linux.intel.com> Mime-Version: 1.0 References: <20231108003135.546002-1-seanjc@google.com> <20231108003135.546002-4-seanjc@google.com> <4281eee7-6423-4ec8-bb18-c6aeee1faf2c@linux.intel.com> Message-ID: Subject: Re: [PATCH v7 03/19] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings From: Sean Christopherson To: Kan Liang Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Jim Mattson , Jinrong Liang , Aaron Lewis , Like Xu Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 08, 2023, Kan Liang wrote: > On 2023-11-07 7:31 p.m., Sean Christopherson wrote: > > @@ -442,8 +396,29 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > > return 0; > > } > > > > +/* > > + * Map fixed counter events to architectural general purpose event encodings. > > + * Perf doesn't provide APIs to allow KVM to directly program a fixed counter, > > + * and so KVM instead programs the architectural event to effectively request > > + * the fixed counter. Perf isn't guaranteed to use a fixed counter and may > > + * instead program the encoding into a general purpose counter, e.g. if a > > + * different perf_event is already utilizing the requested counter, but the end > > + * result is the same (ignoring the fact that using a general purpose counter > > + * will likely exacerbate counter contention). > > + * > > + * Note, reference cycles is counted using a perf-defined "psuedo-encoding", > > + * as there is no architectural general purpose encoding for reference cycles. > > It's not the case for the latest Intel platforms anymore. Please see > ffbe4ab0beda ("perf/x86/intel: Extend the ref-cycles event to GP counters"). Ugh, yeah. But that and should actually be easier to do on top. > Maybe perf should export .event_map to KVM somehow. Oh for ***** sake, perf already does export this for KVM. Untested, but the below should do the trick. If I need to spin another version of this series then I'll fold it in, otherwise I'll post it as something on top. There's also an optimization to be had for kvm_pmu_trigger_event(), which incurs an indirect branch not only every invocation, but on every iteration. I'll post this one separately. diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 5fc5a62af428..a02e13c2e5e6 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -405,25 +405,32 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) * different perf_event is already utilizing the requested counter, but the end * result is the same (ignoring the fact that using a general purpose counter * will likely exacerbate counter contention). - * - * Note, reference cycles is counted using a perf-defined "psuedo-encoding", - * as there is no architectural general purpose encoding for reference cycles. */ static u64 intel_get_fixed_pmc_eventsel(int index) { - const struct { - u8 eventsel; - u8 unit_mask; - } fixed_pmc_events[] = { - [0] = { 0xc0, 0x00 }, /* Instruction Retired / PERF_COUNT_HW_INSTRUCTIONS. */ - [1] = { 0x3c, 0x00 }, /* CPU Cycles/ PERF_COUNT_HW_CPU_CYCLES. */ - [2] = { 0x00, 0x03 }, /* Reference Cycles / PERF_COUNT_HW_REF_CPU_CYCLES*/ + enum perf_hw_id perf_id; + u64 eventsel; + + BUILD_BUG_ON(KVM_PMC_MAX_FIXED != 3); + + switch (index) { + case 0: + perf_id = PERF_COUNT_HW_INSTRUCTIONS; + break; + case 1: + perf_id = PERF_COUNT_HW_CPU_CYCLES; + break; + case 2: + perf_id = PERF_COUNT_HW_REF_CPU_CYCLES; + break; + default: + WARN_ON_ONCE(1); + return 0; }; - BUILD_BUG_ON(ARRAY_SIZE(fixed_pmc_events) != KVM_PMC_MAX_FIXED); - - return (fixed_pmc_events[index].unit_mask << 8) | - fixed_pmc_events[index].eventsel; + eventsel = perf_get_hw_event_config(perf_id); + WARN_ON_ONCE(!eventsel && index < kvm_pmu_cap.num_counters_fixed); + return eventsel; } static void intel_pmu_refresh(struct kvm_vcpu *vcpu)