From patchwork Sat Jun 3 01:10:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 102737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1412906vqr; Fri, 2 Jun 2023 18:52:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71d74qzD0RCpBGw93PsLM7rqxCUZSSgS8luQFKf2Rbzkl4lBYrSPmv6FWp+3z8ZCu9niAF X-Received: by 2002:a25:680a:0:b0:ba8:87f0:8861 with SMTP id d10-20020a25680a000000b00ba887f08861mr5295384ybc.21.1685757126374; Fri, 02 Jun 2023 18:52:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685757126; cv=none; d=google.com; s=arc-20160816; b=ylstfu8W9s8UuGnPjjUuLo65sc6A1Bf2f2bgrL8FxbmG4UI8hKQczR6+bndDh22USm +xq/9GmTmIGltZ1NER3phVObG3bv+wxGfo0cvdXwTGYcCvfO7ji6dq/KYUKMeiyK9biu WO3C/SgoKkBYiBC0XQAu8nlBdymdsJwEJ5jVH2Ua0c9xPxpZikLGR1z7R5zFexUsS6Ud aMXz1hXZ9Y0XdBWcXMYOufCg9R85ab7MCoCNSPs9vWg3gAIL9YBMTHNAa1qDd90/Etps JfLMuLiFFX6eCtkO+oyZy5eHBL1GxVTffY8ZP0bukwKlK9Q+fLRaHkbFBgefuH4fmb5K e4YQ== 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=9mEKg+5dKinZ3o/gKM2CFOEFc6et6wjklTlAkP2Ylko=; b=yybfSuw28H4Etx4sV3XKsQSahuK++vcsMgq2rGJ/ueutUatg58Le9Sn+fJj5XFoPjP A3/Cg4/+MZTr0iiUk1CFRVbMYIn1XjaEe3iY6SpiqRizRyBuxj0yL6c4nMgt/DeFaLQs fr+Q8Q3QRsCjCyz6vPGQOYDym11oyln6G5avRI7DmDuIjTPzI/n/ZAUggOBXHDX2xVv7 V/6GrYP+w07PfiiYNsOFIWDZm3ifwK2KY1QgeWUsbJXebpMmPouHSyBGe93NWY4DSOOJ DzHRrB34peh+w3CNgYc8ZwTvg/mFOsnVKWLR7a94coAu8y8fqtmVf33V+gr59323g6LQ vpTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=q6p+9D8q; 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 q4-20020a170902bd8400b001ae788e1660si1674054pls.441.2023.06.02.18.51.52; Fri, 02 Jun 2023 18:52:06 -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=q6p+9D8q; 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 S237187AbjFCBLh (ORCPT + 99 others); Fri, 2 Jun 2023 21:11:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237071AbjFCBL2 (ORCPT ); Fri, 2 Jun 2023 21:11:28 -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 CFC3DE6E for ; Fri, 2 Jun 2023 18:11:16 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bacfa4eefcbso6145739276.1 for ; Fri, 02 Jun 2023 18:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685754676; x=1688346676; 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=9mEKg+5dKinZ3o/gKM2CFOEFc6et6wjklTlAkP2Ylko=; b=q6p+9D8qbbuObxrHFz+nYKPtoZwhdWYziXBWxqr37YSs6to0F7StpHNbvtTfIWq0Sw lBR26pE0sYw6CXLdXhJHydn11m66uJ4O1XHwgnYOyebl03LpxV6tFqOb0Gl13HfZHZA2 V2lfNXHNbh0lHwcbvkE7GMb1EA/EyRgDUzJ8GXp4UpoFxcjkihJm19pzeeeoy2ApqcFq owrzIU6aIVCvXuxeJnGf2CVjh0Z7LP+BQSLa5+8otX7ul9UvzUA3AVJzndHLva9e6kRr pkzIgbnSD8GJ94RDO0EXbm10j3jsdpWcWz6ebGFS3BVJTxsu1wAi8nGtuimZ1iZ0pF20 g5Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685754676; x=1688346676; 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=9mEKg+5dKinZ3o/gKM2CFOEFc6et6wjklTlAkP2Ylko=; b=A44mEmszh4ZhJMGsWggWBnlqoUwSZreLQ/Gs5NmB5gUryqd6vp7kDGlHEks9EAo9DS 4hiicpXHmMftAMklAU0wglkdK1h0oJLfNpXEUXgLtJLF0NXcBo0J4xcny9vyCq+Jsuuv Y2/2dPGvmJ7rr7vx4VKyM4euFrGURc6ijrrG7sQaW3u+i3rf5QXEs/Dr6qQlJAav28I9 feSMA6lPcZAHlEL4V1Ht/Vv1FL4dX/iPxZCOIXBE9FLTW5HBuxU7PZeC4sJ53d2hLsgj QkL0yuhkG5HIcq8+IbWUKYn3k79OZHgL8JNxIZNLwWY2zo+2EwnVgswXW5mWEpi7wLqj XNLw== X-Gm-Message-State: AC+VfDwUteqYGyBmEVJG3OyIbqJxSLjN6cEWHHAflrYkzLrMvyQUwKI8 PFlphmC4f7Kza8yXVSxsKRC/e83gWb4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:6d56:0:b0:bb1:d903:eae9 with SMTP id i83-20020a256d56000000b00bb1d903eae9mr2423730ybc.2.1685754676575; Fri, 02 Jun 2023 18:11:16 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 2 Jun 2023 18:10:54 -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-9-seanjc@google.com> Subject: [PATCH v7 08/12] KVM: x86/pmu: Advertise PERFCTR_CORE iff the min nr of counters is met 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=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?1767644464811281249?= X-GMAIL-MSGID: =?utf-8?q?1767644464811281249?= From: Like Xu Enable and advertise PERFCTR_CORE if and only if the minimum number of required counters are available, i.e. if perf says there are less than six general purpose counters. Opportunistically, use kvm_cpu_cap_check_and_set() instead of open coding the check for host support. Suggested-by: Sean Christopherson Signed-off-by: Like Xu [sean: massage shortlog and changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ca32389f3c36..d9669e3cc00a 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5025,9 +5025,18 @@ static __init void svm_set_cpu_caps(void) boot_cpu_has(X86_FEATURE_AMD_SSBD)) kvm_cpu_cap_set(X86_FEATURE_VIRT_SSBD); - /* AMD PMU PERFCTR_CORE CPUID */ - if (enable_pmu && boot_cpu_has(X86_FEATURE_PERFCTR_CORE)) - kvm_cpu_cap_set(X86_FEATURE_PERFCTR_CORE); + if (enable_pmu) { + /* + * Enumerate support for PERFCTR_CORE if and only if KVM has + * access to enough counters to virtualize "core" support, + * otherwise limit vPMU support to the legacy number of counters. + */ + if (kvm_pmu_cap.num_counters_gp < AMD64_NUM_COUNTERS_CORE) + kvm_pmu_cap.num_counters_gp = min(AMD64_NUM_COUNTERS, + kvm_pmu_cap.num_counters_gp); + else + kvm_cpu_cap_check_and_set(X86_FEATURE_PERFCTR_CORE); + } /* CPUID 0x8000001F (SME/SEV features) */ sev_set_cpu_caps();