From patchwork Sat Mar 11 00:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp52581wrd; Fri, 10 Mar 2023 16:54:11 -0800 (PST) X-Google-Smtp-Source: AK7set/PNyCLZ48/52BEbDhkZ2ihX7NvjDIxsdwanHVoc7goS7aKg5IdSvNy8rvIr9RxJZc0tYKb X-Received: by 2002:a17:90a:184:b0:234:118d:b1b1 with SMTP id 4-20020a17090a018400b00234118db1b1mr27971023pjc.48.1678496050763; Fri, 10 Mar 2023 16:54:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678496050; cv=none; d=google.com; s=arc-20160816; b=Su/twwzjlucCQU24oAFHmcwy+h3Byy7ie1fm9vJFz+SMJ8n+rgIshNxHgWJxUzMcx8 F8za7d8lA8DGo2VLUyOd3tWP50NbnqxGb4i5Q4glAC8OuEVT8JbE3W9bW1KB6xNuVT8T hLNH2wSYbMPPwMXGyTrajdgS+q6vKxtF9g6P7L2OHJ+pU1OvoYWCt7IaGs1VWtHYdwCn WGphVPd/hBO9KxPDC71cf+C60A7ugjG2ESG/9mQtSrXTbZKgiN+86z1L82cPoJ12yi/y ny9++s5NXVqdZzo13er0jAa8Rz6CpNVNrMF0vsQHcyugFan6cGOK2RT87gq66ecVoGDb SY8w== 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=fG/gctdmsHG4KFmH0rDrimK5SXVIN8L7Kh/kR2GvG5A=; b=KwnrfGFhBGY3ggWxVDkLCeApYhpQjWzGvK7TaJJ8Us5KFfUaGjggA9KmRChVTNozFy ZU48Ah3r4NipmdvslN+evEq/BQWYfMesFXLo1xMtXpuI1q44VJYSrUqzoY7GrbFybUNr 5YeX8B8gJHjMqpLnNWrSkTU9bk87Kz3xEAtoEBbjxyNrooxVLGa2V0oIlIJMjGpLSkwG gZSpjeM0yLWCiNdTimcRY5rYi+nEuthIHrC6Y0wdjajdfKQagvOdfTkn00XoACRrbf8c L/XwJknYNQx9C0LCxNu9e1W7uKfX/c+b0T8zhVbN/IUmBf+OxZ4ly/X+2bC1/dBDCyoK CSCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=BCXSRihX; 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 ob11-20020a17090b390b00b00230c8e3ed4bsi1116604pjb.24.2023.03.10.16.53.55; Fri, 10 Mar 2023 16:54:10 -0800 (PST) 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=20210112 header.b=BCXSRihX; 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 S230204AbjCKArN (ORCPT + 99 others); Fri, 10 Mar 2023 19:47:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjCKAqz (ORCPT ); Fri, 10 Mar 2023 19:46:55 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3807713D1F0 for ; Fri, 10 Mar 2023 16:46:36 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id x137-20020a62868f000000b0060017d68643so3624784pfd.18 for ; Fri, 10 Mar 2023 16:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678495595; 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=fG/gctdmsHG4KFmH0rDrimK5SXVIN8L7Kh/kR2GvG5A=; b=BCXSRihXjCF5gcpGEqZASI3X2u2m382eLGuNLXdp9s9FXaM2NnxlLaov/07yvpjiZI d5dc57wxslbohOAxK7jf/NKVwHIt6oyCqizaYjDuIEe518RQDeiCwgkRz6SEh1xibxxX ySlMYp/aC6gazQyrjwOT5yeD6v4xmZdy3az3oJlb3y4CK8bpbPOhydZ7ceuCu9o9Huz+ WtTW8lcLsuNoak4HCLCQKkZsigrLQu+oQDdqSWBVFk+7C+frapYtH+PegbRXJIXk+q4c D7YI+dZaAvhESpu2jak5vyM8eTXpPHNXsdv1vtNYC6FHKPnU6WPGLLsvDasDULfj7KX9 wtlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678495595; 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=fG/gctdmsHG4KFmH0rDrimK5SXVIN8L7Kh/kR2GvG5A=; b=ypxt8vDbAbbbnPNH7LGcw4aZGxU3k+bam/vLaZ/u84UoKKdOd1JtHYohqYjS20+QiK a+y8LVDNc1YWXq1DJ5eJztYHT2JQKSigfJl/pyJvOgWy20CoTw5CVxlRfPG3Uh6Wmpps OhYlngdE9czCss9F2nGHLGuYE0mNzCv4NCj1kKYAFJTIrA/m0UENccs/JE/GC31Hwybi UkYvuu4AABg4gPJuE7nzEV586paDRAsgrQ1zmtoGYfuV1acAcLS/TtO37i4Rx5StSf6h I9jw7/duWm2n1KWCR8MM4W7TK1pXcRSRmTH/m+o4kUKmXEmDo9JJFxmrfeJeAgeMb6MT DCAg== X-Gm-Message-State: AO0yUKUnhVnV7DlIacxxDUR6rgh04CY1IG5v7bZE3gkbWt+qqXE2AHos d9r24MxhUo+Uu6BQubfpF3GtRp1u1Qo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:8247:0:b0:5a8:bdd2:f99c with SMTP id w68-20020a628247000000b005a8bdd2f99cmr11215844pfd.1.1678495595379; Fri, 10 Mar 2023 16:46:35 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:46:04 -0800 In-Reply-To: <20230311004618.920745-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311004618.920745-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311004618.920745-8-seanjc@google.com> Subject: [PATCH v3 07/21] KVM: x86/pmu: WARN and bug the VM if PMU is refreshed after vCPU has run From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Like Xu , Yu Zhang 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,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?1760030675134241188?= X-GMAIL-MSGID: =?utf-8?q?1760030675134241188?= Now that KVM disallows changing feature MSRs, i.e. PERF_CAPABILITIES, after running a vCPU, WARN and bug the VM if the PMU is refreshed after the vCPU has run. Note, KVM has disallowed CPUID updates after running a vCPU since commit feb627e8d6f6 ("KVM: x86: Forbid KVM_SET_CPUID{,2} after KVM_RUN"), i.e. PERF_CAPABILITIES was the only remaining way to trigger a PMU refresh after KVM_RUN. Cc: Like Xu Signed-off-by: Sean Christopherson --- arch/x86/kvm/pmu.c | 3 +++ arch/x86/kvm/x86.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index 612e6c70ce2e..7e974c4e61b0 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -589,6 +589,9 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) */ void kvm_pmu_refresh(struct kvm_vcpu *vcpu) { + if (KVM_BUG_ON(kvm_vcpu_has_run(vcpu), vcpu->kvm)) + return; + static_call(kvm_x86_pmu_refresh)(vcpu); } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 219492cd887e..93a7302e4fc3 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3625,9 +3625,17 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) if (data & ~kvm_caps.supported_perf_cap) return 1; + /* + * Note, this is not just a performance optimization! KVM + * disallows changing feature MSRs after the vCPU has run; PMU + * refresh will bug the VM if called after the vCPU has run. + */ + if (vcpu->arch.perf_capabilities == data) + break; + vcpu->arch.perf_capabilities = data; kvm_pmu_refresh(vcpu); - return 0; + break; case MSR_EFER: return set_efer(vcpu, msr_info); case MSR_K7_HWCR: