From patchwork Fri Nov 3 23:05:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 16238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1359507vqu; Fri, 3 Nov 2023 16:06:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzOEYHNTvyqN9PYSyo1u57JjuDQ8qzR4LZKAdsxjLSvHAWr7nLsG+hnrZLxDuuMYkNJ+bf X-Received: by 2002:a05:687c:354c:b0:1e9:cddf:f825 with SMTP id li12-20020a05687c354c00b001e9cddff825mr16296792oac.15.1699052819688; Fri, 03 Nov 2023 16:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699052819; cv=none; d=google.com; s=arc-20160816; b=rBDdjkbrC+nvIxq9wKAaBvruaPEAufVNAmiqLU3kmiDHyHAgFP0ZbqpmBRfYqdIbsx JpmbIGhK/fn3+iqAOZmmxYnT3r0GaRUxuIBPWHpZbrPgVbgNstGYwJMUdzf4a/Hxo72c L1OX2NZYA/Yle9Tw7N6nbxQFzgHZWZOiGKWCHnkpFlP7/Y9mDnQhB7DRcayAhB3TLST4 ZwwVYJEoUp/or0sjA0tlMQAYWoiUq5Ta9WXRbvwvSL2nz81iI8xuWyiocUa0PiSrLdXL Vr522rfCTrnTw1RmJPu0I02KZeEjMW+nk4KvztHsjjN4eUKjMHBKfvexuH0Ecw5orkBT QthQ== 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=DEfjFh44NmfiqSsnTU+vPV5C1Ip8OtIT4vR69i+9ITE=; fh=GEJ0r4Uylk4yNLU+0Cus278tKN04SijuDr+21/yG6nk=; b=cGHo54zfQWVEkZJPWPZPg5F9/zCj95/O+Tur/lWCO/jEfiTuFmy89pIg7Al7bYRynN Rkemrex2U4hdJ0B8KgBoXDY+v+/B9TPKrzaq0bKizRlw+sS8O9CGntHuAWwr25cpFDO0 go4HHVdIh6v479nx3W0aoiUmvFarsomIPI4gkUmr2lNTSVnN340iju+QVr7bTOhOV2EZ IHBeb5lhnaFZnWoAWL3Mqog59CG3QBJkyBPrw6bWFaXgIdUsUMe9z3+Cu6fHX4ED2o/r 6j5XwU6d8bVbtVMVXFf1tlyi5ARG6IFUSD3FwnDfjAyqgAs/tBiCKn1yfFSELSsBgLKA NugQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=RKqc6eDX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id be2-20020a656e42000000b00578c64433d5si2501313pgb.877.2023.11.03.16.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 16:06:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=RKqc6eDX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id F3ECB806CF7B; Fri, 3 Nov 2023 16:05:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231266AbjKCXFu (ORCPT + 35 others); Fri, 3 Nov 2023 19:05:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230521AbjKCXFr (ORCPT ); Fri, 3 Nov 2023 19:05:47 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABFD5D50 for ; Fri, 3 Nov 2023 16:05:44 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5afe220cadeso34834427b3.3 for ; Fri, 03 Nov 2023 16:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699052744; x=1699657544; 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=DEfjFh44NmfiqSsnTU+vPV5C1Ip8OtIT4vR69i+9ITE=; b=RKqc6eDX2SdkS4IAXyxsVP5uyHSFrqCn504HqK2Q9x74/0/bq4uYAgZ1VTGPS+xCt5 okpVbhKtNCLyeaDsIiVQoQugYdYqEhZxTFN8sAS17f3KendUwVBx0uajTIGlqlMvsT9g xRvKdamt7Vu5uU2HjMEczbxWya8LWewblmvNdmmzcQ0VQMENf2BbfcB2fOmif/Bc5zix 4XL/Y82V1aydNOlG9lVATHcmxsln1Cgk/evPJKvzeOWe+ea7aXJJkvSuotgecVPRIYhB tZ/NtXB9AXVD1h9oylQrAvx3CFStuDMPty6piDVULoGvxShxYjkGO5Kx9OpzUY+BPvUu H5AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699052744; x=1699657544; 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=DEfjFh44NmfiqSsnTU+vPV5C1Ip8OtIT4vR69i+9ITE=; b=oVumXZ9Hyo6o9R7h5Wfqvlnnt0CIMEl9/fe23K24r7oxcZbEP7tJMaoMDT6aIbmKRj 9tDaO8bM56w7vfvwolcVdsgEDknIkWKOVM1OQW4047qA6at+EiSCm0pgpDhR3cLgb3hH S+kwZkcmWOMHZR5Mun6zj4DwCjeh+9Ijy7uSMhlMBklXt1+F/VpuwbSsENh7DpA08VDh W+OEeGbzlotTodsmwj3u34MM2XZ/llE4dg8FRF4VO9jA2/mN9K1elOqKqtmX41/CkwN6 zWuv3MSqw3b5F0766GXRFOdKY/pz4ZhRP5XqirATGCklAnAYaQ4dDQPrvvJ1c88XgSad AESw== X-Gm-Message-State: AOJu0YxjKhVcPYk/o9Gao9+r9aqLDhsGhf49Kw6NRlw1btPx2xN88CZJ hqhNCgeAHUU47m3UQYBgjH0v89znrjw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a0d:d785:0:b0:592:7a39:e4b4 with SMTP id z127-20020a0dd785000000b005927a39e4b4mr82946ywd.6.1699052743920; Fri, 03 Nov 2023 16:05:43 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 3 Nov 2023 16:05:35 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231103230541.352265-1-seanjc@google.com> Subject: [PATCH v2 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, Dapeng Mi , Mingwei Zhang , Roman Kagan , Jim Mattson , Like Xu 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_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 16:05:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781586009218334092 X-GMAIL-MSGID: 1781586009218334092 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. And as Mingwei root caused, emulating overflow while the perf event is running can result in duplicate overflow events, e.g. if the perf event overflows between taking and checking the snapshot. This bug is largely masked now that KVM correctly sets LVT_MASK when delivering PMIs, but it's still a bug, e.g. could cause problems if there are other side effects. 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. Dapeng, I intentionally omitted your Reviewed-by from the last patch as the change from v1 isn't trivial. v2: - Collect reviews. [Dapeng] - Emulate overflow *after* pausing perf event. [Mingwei] v1: https://lore.kernel.org/all/20231023234000.2499267-1-seanjc@google.com 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 | 140 +++++++++++++++++++++---- 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, 137 insertions(+), 109 deletions(-) base-commit: 45b890f7689eb0aba454fc5831d2d79763781677