From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B9F7606A329 for ; Wed, 28 Oct 2026 19:03:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NCRdevPS Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jFGwK46jwz30hr; Thu, 29 Oct 2026 06:03:13 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:20::1048" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793214193; cv=none; b=U2gs4WlNIF4Mzd+feI9QLgebsvGC5H7YCtLay8KDEPk+PQSe+0oZKtWUl7pkyf46/xu9Z3/JWjVq7sTn7trU/RU9s58hmQ+DnOSp/x2hC9JfPMXg917WXBshwPrd8O8BxgIiFS0zCTey8qbVADp3/q4COhhQzVXsKhpiQJzZBX68FOXLU7VpEtMbq8q6GCvHDckIJ0SjE1H5/vQED5qfnS1FQmqM6FE2w4LsM1KYV5pA1qTTutPgCAf7UoBdAXFwWTdVPFpkLazBUy9VYkXHqEffRgVLA8g6573n0vyuSNh1sLeFx7q3Tv0XyhnLhIhYhFXS9PZf1+dPeuv6Eu9ASg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793214193; c=relaxed/relaxed; bh=jCCEmu80ia44kI2vyDb6i59VDXRIs93I0WproZ1Xw/A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RB17uqX0V9NcHj4ZnbCkKRMOy9CR8kDTcaWjryL8lw7d/H1bApYWpKKhMDESSabcVEq4aK3KKpLUHBp6y/ePJ2xbOXVApi3dc6spEPwW9wkiR98DAoVdvfU6/OyZk74jqytD8f+7EfJBtFLzmPteylizZVXJ+0ztv7uqWk+q2YqzUzKW8aoHE2VH0H/7Vr+dx9f7lVL11zmN2kG8ts389/82KN/0UjE0nAbA2eV09zhOnseaj9vnWYjV40QCnlMwyrf+/HFdZs6jzQRxEd4OWvIYVO9zlWoBwqXsysxa5iZjPBOtVJnxBut+5mEntP7z+mnVFRFzE1mFaROYR/qJiQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NCRdevPS; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:20::1048; helo=mail-pj1-x1048.google.com; envelope-from=37kbiagykdgmtfbokdhpphmf.dpnmjovyqqd-efwmjtut.pambct.psh@flex--seanjc.bounces.google.com; receiver=lists.ozlabs.org) smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NCRdevPS; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--seanjc.bounces.google.com (client-ip=2607:f8b0:4864:20::1048; helo=mail-pj1-x1048.google.com; envelope-from=37kbiagykdgmtfbokdhpphmf.dpnmjovyqqd-efwmjtut.pambct.psh@flex--seanjc.bounces.google.com; receiver=lists.ozlabs.org) Received: from mail-pj1-x1048.google.com (mail-pj1-x1048.google.com [IPv6:2607:f8b0:4864:20::1048]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jFGwJ5gWMz30dn for ; Thu, 29 Oct 2026 06:03:12 +1100 (AEDT) Received: by mail-pj1-x1048.google.com with SMTP id 98e67ed59e1d1-3abb4c24125so1234682a91.3 for ; Wed, 28 Oct 2026 12:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793214191; x=1793818991; darn=lists.ozlabs.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=jCCEmu80ia44kI2vyDb6i59VDXRIs93I0WproZ1Xw/A=; b=NCRdevPSIBT1pcquPfCCtrDrmzX4JRUlvOaocA8Mb+IWnBonAjOtmbJyJEPOj6VvgT Kd3WR0Tf/ftoWNSj3HS1dri2pOCCrgZxV86fMAt6udIGIZjVW1lDJwtewOy68eai5vjI J8eEDrY5h8RN2AzbOeMroTl2Fltu5Ac7EuU8xfBZAQoa2DFTIOv/mkfJe//NW41kg4dT JZKjFrjBTq8NC0ssBv98mSGtUCYFbN/d0vKRQFO5nXKwTr9YH2mUwi7xhr7qbZu91P0W jMEsVHHOCg+QFNf1QSkbzDBde41BypWbR9W4LvqWlOp5M9AE6JYwu7sUUzEZB9VIETOz I9GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793214191; x=1793818991; h=content-type: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:content-type; bh=jCCEmu80ia44kI2vyDb6i59VDXRIs93I0WproZ1Xw/A=; b=gQBFNm/ywWd9wc7SJahtwvm3LvQHjkcH7/zLDsqgCTAtnkaCzG6IcUDRTIbsvIH+3U pMplxOOUrjXd4MUq97juxSHngmZlgtekgnwz57r0PPZCfKUjfz46ENgFLd9za239dcmv w/dxQak82pxbCVJNTaJcPiR5OkwzI3GtyQJpAA+a8IBvtlRPwaxBEUwP2NxrvO41OhTW aM1a5JmXGKYgSgSU0fBIEk4+xA65D8g57f5FwjS80T98dfN7szO70T42wJfNYwKRSElu bkBPGqwbHDKRE1BKwqJWtX1Zjp8IQl+vRLTQhU8foBeiwri6Z03AN1L37IHaRp/1IBee AOaA== X-Forwarded-Encrypted: i=1; AKwUvBxKuuQ1Ofo8IB5pnMcJ1qYYLMAmEbsJdPDQu7vcxL42a2D10GX9zPe9OFsP9aHHMs+yHTSX7OkrOj3jmDU=@lists.ozlabs.org X-Gm-Message-State: AFq9FYJj38ZzhhXksTH0CyJ8HuxjVeNQL6yhVV9Tk7JmTNUg114Lq3bT mzmPwwFAX6s1Qt/Al1QpOxMBqLtml4Kc9kLTi1/DIxI5AA56N6Stu8jvMgpqHu7nmxEtS0PhIei BUd2RWA== X-Received: from pghv3.prod.google.com ([2002:a63:f203:0:b0:cd6:b233:e4aa]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4b06:b0:3ab:b64:5893 with SMTP id 98e67ed59e1d1-3ae581bc654mr2418362a91.53.1793214190430; Wed, 28 Oct 2026 12:03:10 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 28 Oct 2026 12:02:59 -0700 In-Reply-To: <20261028190259.1819571-1-seanjc@google.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: Mime-Version: 1.0 References: <20261028190259.1819571-1-seanjc@google.com> X-Mailer: git-send-email 2.56.0.313.g2479322e68-goog Message-ID: <20261028190259.1819571-8-seanjc@google.com> Subject: [PATCH 7/7] KVM: Drop kvm_vcpu_should_kick() and use kvm_request_needs_ipi() From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini Cc: Fuad Tabba , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Nicholas Piggin , Atish Patra , Alexandre Ghiti , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Teodorescu Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Drop kvm_vcpu_should_kick() in favor of kvm_request_needs_ipi() to fix a bug where KVM will fail to wait for a vCPU to exit guest mode if the vCPU was already marked as EXITING_GUEST_MODE by a concurrent non-waiting kick. Because kvm_vcpu_should_kick() (was kvm_arch_vcpu_should_kick()) only waits (and sends an IPI to do so) if the target vCPU is fully IN_GUEST_MODE, the sending task will proceed even though it hasn't actually guaranteed the vCPU as fully exited the guest. The flaw is most problematic for SNP VMSA invalidation with in-place gmem conversion, as KVM invokes kvm_gmem_invalidate_start() => rmp_make_shared() (via kvm_gmem_make_shared() in quick succession when in-place conversion is enabled. I.e. if the target has been marked as EXITING_GUEST_MODE but has not yet received the other kicker's IPI, then updating the RMP will fail as the VMSA is still in-use and subsequent accesses to the page will encounter unexpected RMP #PFs. Note, the bug exists and affects VMSA invalidation even without in-place conversion, but is significantly more difficult to hit as PUNCH_HOLE and .release() have to wade through a lot more code and several locks to get from invalidation to kvm_gmem_free_folio(). Note #2, currently only x86 uses kvm_make_request_and_kick(), i.e. this is a glorified nop for all other architectures as the KVM_REQUEST_WAIT path is never taken. Fixes: 309d28576f0a ("KVM: SVM: Fix SNP AP destroy race with VMRUN") Fixes: d1a3c2162334 ("KVM: SEV: Forcefully invalidate SNP VMSA if its backing gmem page is zapped") Reported-by: Stefan Teodorescu Signed-off-by: Sean Christopherson --- virt/kvm/kvm_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f1792256576b..f99a714698e3 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -191,7 +191,6 @@ void vcpu_put(struct kvm_vcpu *vcpu) } EXPORT_SYMBOL_FOR_KVM_INTERNAL(vcpu_put); -/* TODO: merge with kvm_vcpu_should_kick */ static bool kvm_request_needs_ipi(struct kvm_vcpu *vcpu, unsigned req) { int mode = kvm_vcpu_exiting_guest_mode(vcpu); @@ -209,11 +208,6 @@ static bool kvm_request_needs_ipi(struct kvm_vcpu *vcpu, unsigned req) return mode == IN_GUEST_MODE; } -static int kvm_vcpu_should_kick(struct kvm_vcpu *vcpu) -{ - return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE; -} - static void ack_kick(void *_completed) { } @@ -3935,7 +3929,7 @@ void __kvm_vcpu_kick(struct kvm_vcpu *vcpu, int req, bool force) /* * Note, the vCPU could get migrated to a different pCPU at any point - * after kvm_vcpu_should_kick(), which could result in sending an + * after kvm_request_needs_ipi(), which could result in sending an * IPI to the previous pCPU. But, that's ok because the purpose of the * IPI is to force the vCPU to leave IN_GUEST_MODE, and migrating the * vCPU also requires it to leave IN_GUEST_MODE @@ -3944,7 +3938,7 @@ void __kvm_vcpu_kick(struct kvm_vcpu *vcpu, int req, bool force) * check also modifies vcpu->mode and KVM PPC needs to avoid that side * effect for unknown historical reasons. */ - if (force || kvm_vcpu_should_kick(vcpu)) { + if (force || kvm_request_needs_ipi(vcpu, req)) { cpu = READ_ONCE(vcpu->cpu); if (cpu != me && (unsigned int)cpu < nr_cpu_ids && cpu_online(cpu)) { /* -- 2.56.0.313.g2479322e68-goog