From patchwork Sat Jun 3 01:10:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 10249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1400558vqr; Fri, 2 Jun 2023 18:12:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7V3R76LYs9Lf7mE1PliFRs6/3uyQBSuWacd4rd7BBoei1QS0YRMRca7ACNXCR6UddyqZ0o X-Received: by 2002:a05:6e02:6cf:b0:33a:bb61:6f26 with SMTP id p15-20020a056e0206cf00b0033abb616f26mr9644263ils.31.1685754741291; 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=yCNgWfncUAJHwcFQRdMj6C6Jt8XMjoBPJaujhyqB5WFgKV7mmbcAwhak9rBpu9lwOG 6Ol26Ctkop7mgKGrtmcg5H5BOw1QZQwjY+A622JPeojlVmQZwqbHfzoEq+h5gME27hCe Fm0dPlouGRi1/YiNFrupldwlniTyWaoWecpaxwp5MSSxFUZp1e1jq+uCgk0EW301cqdy CKZJSgBTGLMctog4HtAF1i6yMCzHhekbpHSTw4NvGZEGH/Rf7ehSh7CVBDDLs0QRGOWU x0bTa2DB2Rv1zXeS7fEG3pGl9vIbhncigDWkhljIvurFBARaAAWoExlhDxgoADitID79 zAtw== 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:mime-version:date :reply-to:dkim-signature; bh=iiocMTv8yvIcNZ4J7lO1deo0WKpqj2KZDWeFfD5uk+8=; b=M2JL2BooiQvd87QQpHHrM2q/DM3uEQ5edJe2+7fQnYnEFX2zBaPNND3dAY8hJO0EIJ mwmOI4gRPrh1iLdCGACRCxoRq65nDCy22efRllswN3SwKi+ggi99cLjXawv/9WdDHv0T X+e5DCYdT6sA484L1CnnLbQmHLU5/udA2cHiYvSazV43Z8IGGOEZoMz8ZMj7xU5cdG5j 9fGhN0hjb3ZDOFcyFsyVYOpE/whX7OVS6SKmOXUSS+nXVJMW4/7tJhIpBSl+95Mz0cL7 2VP3F8RbZVv9SnDsAWMsiXXJugNDUoF2A4fOzQeoMRHegmujz1n/+E2nkJL9pJLCtS2c QwPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=uh5NKLv+; 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 s196-20020a632ccd000000b005360d7da569si1782459pgs.634.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=uh5NKLv+; 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 S237069AbjFCBLL (ORCPT + 99 others); Fri, 2 Jun 2023 21:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236806AbjFCBLG (ORCPT ); Fri, 2 Jun 2023 21:11:06 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B0CCE4D for ; Fri, 2 Jun 2023 18:11:02 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-53b9eb7bda0so1220945a12.0 for ; Fri, 02 Jun 2023 18:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685754661; x=1688346661; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=iiocMTv8yvIcNZ4J7lO1deo0WKpqj2KZDWeFfD5uk+8=; b=uh5NKLv+bZuTCk11HqiRwQOg778yWsyI3yFt3YitAlkENAx2vJ5WuMzpdkL6zjOxn+ 5jrMzK6rhYuXI3uGg6Mok4vo69qi6M0sZMtE9067mijE806NlkxuWac2x6hG9wZ3cxEq KVWv0Bh4MiANhbT4Ao6zpnlGL16f61sS/l7mZft76egdD4mvGN1wbAs7ukVMryoQ0WCI lGRLMNwAPyy+dYWPQzUCeO1t06npnxxHsEiQsZ4kT4pstJt1w1idoPzr9W+N0duRynY5 XT8O6mfhi6IVDg1qvZzlFqltbY2wylydAxwwXAzcVkAvI97lbEVo2SLoiBWZ0G4yduH9 H1uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685754661; x=1688346661; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iiocMTv8yvIcNZ4J7lO1deo0WKpqj2KZDWeFfD5uk+8=; b=hCQiuYtTynkhzgsO21yZvkaIt+dxnvy+m0s/0Wh7LDoLTY4hG8PtqKAqOW9qgXcnwE Kjxc/92x/LfkZI21vDqyQdQ5QWz0MCJOOgHJVdqp0K1KBVGHZf5vs04NsANUPcRLHw3g WA8Ix85NDDopA+46K9HYi8OI5FMMQq1aQz/FqT/AAMluVK/UW03dA7HixHOlP6OU7Ed0 GCc1KepUOxgeheOTvNnJseMb5hfqlQmFMRn7pePwXw9PL7KAz0o9gioEZULA9NlFRU1i 1EiJc8X4nmz1CBqBu8i7kQ1WPEkZ87hN6oKdcIb+E4l0/Zxdp+5mFv03UwuG7NSUvsmm jNkw== X-Gm-Message-State: AC+VfDxifsJAdNQOirLWoW/zMHHD9+Y/KjpS7YaG73EMUXrJGeYHR2Lo zc5vi/Q0xwvkIDHRofYMB4Wfbw5Juxs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:24a:b0:253:3e6b:f5ce with SMTP id fz10-20020a17090b024a00b002533e6bf5cemr321454pjb.8.1685754661705; Fri, 02 Jun 2023 18:11:01 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 2 Jun 2023 18:10:46 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.rc2.161.g9c6817b8e7-goog Message-ID: <20230603011058.1038821-1-seanjc@google.com> Subject: [PATCH v7 00/12] KVM: x86: Add AMD Guest PerfMonV2 PMU support 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?1767641963937986907?= X-GMAIL-MSGID: =?utf-8?q?1767641963937986907?= v7 of AMD PMU v2 support. This includes the global_ovf_ctrl_mask => global_status_mask rename that I *just* posted. I really wanted to apply v6 and be done with this series, and so sent it out separately, but the code movement from pmu_intel.c to common x86 was too buggy to do in fixup. Lightly tested (it's late, it's Friday). v7: - Massage/rewrite changelogs to use preferred style. - Actually move PERF_GLOBAL_CTRL and friends out of pmu_intel.c. - Move intel_pmu_has_perf_global_ctrl() to common code instead of open coding it. - Split moving pmc_is_enabled() out to a separate patch. - Rebase on the s/global_ovf_ctrl_mask/global_status_mask rename v6: https://lore.kernel.org/all/20230530060423.32361-1-likexu@tencent.com v5: https://lore.kernel.org/all/20230410105056.60973-1-likexu@tencent.com v4: https://lore.kernel.org/kvm/20230214050757.9623-1-likexu@tencent.com Like Xu (11): KVM: x86/pmu: Move reprogram_counters() to pmu.h KVM: x86/pmu: Reject userspace attempts to set reserved GLOBAL_STATUS bits KVM: x86/pmu: Move handling PERF_GLOBAL_CTRL and friends to common x86 KVM: x86/pmu: Provide Intel PMU's pmc_is_enabled() as generic x86 code KVM: x86: Explicitly zero cpuid "0xa" leaf when PMU is disabled KVM: x86/pmu: Disable vPMU if the minimum num of counters isn't met KVM: x86/pmu: Advertise PERFCTR_CORE iff the min nr of counters is met KVM: x86/pmu: Constrain the num of guest counters with kvm_pmu_cap KVM: x86/cpuid: Add a KVM-only leaf to redirect AMD PerfMonV2 flag KVM: x86/svm/pmu: Add AMD PerfMonV2 support KVM: x86/cpuid: Add AMD CPUID ExtPerfMonAndDbg leaf 0x80000022 Sean Christopherson (1): KVM: x86/pmu: Rename global_ovf_ctrl_mask to global_status_mask arch/x86/include/asm/kvm-x86-pmu-ops.h | 1 - arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/cpuid.c | 30 ++++++++- arch/x86/kvm/pmu.c | 92 +++++++++++++++++++++++--- arch/x86/kvm/pmu.h | 56 ++++++++++++++-- arch/x86/kvm/reverse_cpuid.h | 7 ++ arch/x86/kvm/svm/pmu.c | 68 +++++++++++++------ arch/x86/kvm/svm/svm.c | 19 +++++- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/vmx/pmu_intel.c | 77 ++++----------------- arch/x86/kvm/vmx/vmx.h | 12 ---- arch/x86/kvm/x86.c | 10 +++ 12 files changed, 260 insertions(+), 118 deletions(-) base-commit: b9846a698c9aff4eb2214a06ac83638ad098f33f