From patchwork Mon Oct 23 23:39: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: 15784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1615569vqx; Mon, 23 Oct 2023 16:40:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExJ2R6pRmThMEoq/PbdikHX5ltYoAziNW4ysRyx/1vzYCiUS6KBgshn7XS/8frOdGQDL7v X-Received: by 2002:a05:6a20:734d:b0:16b:f586:3c4 with SMTP id v13-20020a056a20734d00b0016bf58603c4mr1114966pzc.58.1698104418704; Mon, 23 Oct 2023 16:40:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698104418; cv=none; d=google.com; s=arc-20160816; b=OtwJEljbeJm7kLeuU4FJMMUnXitB3OI7n2CWZK+1dnwInhXXQW23KhhRpaUkLPeBh7 sXzLqyKmvmOLoHxwwLg5AjMB3Lw7oMYehVCdh2CVC++yh2t0qY+Mr1xWLXyUf3VBBh/7 UHYc3+M1t4AB3993qOcm2xQhXeJFC+t5QiZgcDEwPLOJeeZ4WiXGFq5C7jXcwsXSbgT2 +Nc1oCUdWHz2iBjPQAMDmrQ2mEzxSBy8aj1YBKxevxqCM5FGdS+3a55DrRzrHp09uxLH LxTyGU077L2K2tuSPdTzu0U+eoqFV/dR93zynKFHQnjSaIbXpGe15vaASA4V2CN+SvbD qZvA== 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=6neP5ivK010SBRb0ibXYexUf8ZRbqIGhikwLVX47+yQ=; fh=t7gFcWLRyAqmyldGbr6d3KgIXGxOYU/i61iCoIU6S88=; b=09pvniu/ijxEbNUFNl0SEph+MfTvE1OJoRpUm6p4sOGoKsu607mrseG4MX/jOhvBnC mI1/TFYZhASdSUruog4TaWkMxPTpkzWkkTWGGRn5J8carMk5w+2q+NaGzxn9xWciRf0O KPytVpWKPL3KvEpdmJjGhc0YZzOKYGPAB/MWvHDOYeVwOy5MBPQ5QDxBgJYmrelqHIWb dF9r+YqslB3dyaPgSjLLJ9ndT/QuvO2v2O+pKYnsoHW+17M6gxc8dBTc/FY+542VYif7 /Kw6XYfKAodsbd/0WKCNPTLKSpdjCddq4oR+egvOCSRZYPBS7SGOdyrsBsxYVuP6u47N tsaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xbElmHYF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id q11-20020a632a0b000000b005859c874eb5si7118451pgq.275.2023.10.23.16.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 16:40:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xbElmHYF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id C102380A432C; Mon, 23 Oct 2023 16:40:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231492AbjJWXkI (ORCPT + 27 others); Mon, 23 Oct 2023 19:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229829AbjJWXkG (ORCPT ); Mon, 23 Oct 2023 19:40:06 -0400 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 7797DDE for ; Mon, 23 Oct 2023 16:40:04 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7ac9c1522so55065837b3.0 for ; Mon, 23 Oct 2023 16:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698104403; x=1698709203; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=6neP5ivK010SBRb0ibXYexUf8ZRbqIGhikwLVX47+yQ=; b=xbElmHYFUhnIKBFb6so2aaj7in7ozZtHvbYUpgx1aq3YoHjpTd8sG3hqvzY+bwCcNC 4zRIToRxvLzRG0ZRm6wTGa2fN9onLLWvJQOq12rq30fLGyulz46Lff4YJPLQ597aGPVP IrV9BY0JrNe0CPMTMTFkLtB1impi99Xz7gZRQSWTgNKRPEDUQUL9dCaA6zrWzrqrIC4A 2mYNECP2cXguTNKmCde19jxMVo96p7CY5mbjxlgq3Oyan3zUduTUH85NxJCJMQqUhAQ+ 0mBE98r2YCX61pK9Y1LIHj2TaNadJ5rnL15/Fdy/0YfIbuQ2TLfHyekF0W7gdcCj+z+P eB1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698104403; x=1698709203; 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=6neP5ivK010SBRb0ibXYexUf8ZRbqIGhikwLVX47+yQ=; b=aCT2gRjRzTjFy+Gb7nfqANdG0hPmzudRkgUUccf+Oc3xJLb2kh4WkcqN9HlmVi1/6g 2xeZVxFq1v9Ty8NM9Kg8zy8DuuSz+5resCUMZp0ablmafMrSgNIBBqKbQwPxgUdcpLZZ dcP/eK2SPhceDhTiKaRBx3TQ6pcPsUbLXU/+CpNpa4CAbb9tZopctOYQlMXoN9C6vQsj E0PGVFVTS0W9dbvV2vnXBcPvlUvA81UBn0ireftk6JNbwip4sK/WloI+ITadETC0Mjjx RF1S5/Y/j6HN1FOXBxldmNn88dPh4grxvN6GR42clznlfb/Z+9uGJyyOUm7t4Wc0MFpM HJAQ== X-Gm-Message-State: AOJu0YxOS9RtBrpsXmK2iV1whZuTDZd/0SrO8Nfm6y/MHnN+BtdltADg +cJTR+4v2QEijIx39OlrBrCQwkb/pBc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a0d:d50f:0:b0:59b:c811:a702 with SMTP id x15-20020a0dd50f000000b0059bc811a702mr237963ywd.6.1698104403721; Mon, 23 Oct 2023 16:40:03 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 23 Oct 2023 16:39:54 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog Message-ID: <20231023234000.2499267-1-seanjc@google.com> Subject: [PATCH 0/6] KVM: x86/pmu: Clean up emulated PMC event handling From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , Roman Kagan , Jim Mattson , Dapeng Mi , Like Xu X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 23 Oct 2023 16:40:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780591538959754497 X-GMAIL-MSGID: 1780591538959754497 The ultimate goal of this series is to track emulated counter events using a dedicated variable instead of trying to track the previous counter value. Tracking the previous counter value is flawed as it takes a snapshot at every emulated event, but only checks for overflow prior to VM-Enter, i.e. KVM could miss an overflow if KVM ever supports emulating event types that can occur multiple times in a single VM-Exit. Patches 1-5 are (some loosely, some tightly) related fixes and cleanups to simplify the emulated counter approach implementation. The fixes are tagged for stable as usersepace could cause some weirdness around perf events, but I doubt any real world VMM is actually affected. Sean Christopherson (6): KVM: x86/pmu: Move PMU reset logic to common x86 code KVM: x86/pmu: Reset the PMU, i.e. stop counters, before refreshing KVM: x86/pmu: Stop calling kvm_pmu_reset() at RESET (it's redundant) KVM: x86/pmu: Remove manual clearing of fields in kvm_pmu_init() KVM: x86/pmu: Update sample period in pmc_write_counter() KVM: x86/pmu: Track emulated counter events instead of previous counter arch/x86/include/asm/kvm-x86-pmu-ops.h | 2 +- arch/x86/include/asm/kvm_host.h | 17 +++- arch/x86/kvm/pmu.c | 128 +++++++++++++++++++++---- arch/x86/kvm/pmu.h | 47 +-------- arch/x86/kvm/svm/pmu.c | 17 ---- arch/x86/kvm/vmx/pmu_intel.c | 22 ----- arch/x86/kvm/x86.c | 1 - 7 files changed, 127 insertions(+), 107 deletions(-) base-commit: ec2f1daad460c6201338dae606466220ccaa96d5 Reviewed-by: Dapeng Mi