From nobody Sat Oct 4 16:10:46 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85E581514F7 for ; Fri, 15 Aug 2025 00:12:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755216743; cv=none; b=enxIAWgUEPjwBbKXc4w77qgL/W/rny+pTc1+LEsi7bxbAy92JtjeWu5HqUqQFz6E0rqweP4JGWQK+mjsR2Wwqcov5r5khY9aOpHN6ldRlGljGkseeLRZAljJObwzgAXDdKZOUPpWjzeCiX5kOKfQ8a8mJCD3ytuEt/5zfeDcdlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755216743; c=relaxed/simple; bh=VhV9EFrTudTyrNyi+hXz4xZPaoxl5bt2eNREG6X3+KU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hOgrm7oOHe3NxzL3T92pxKHQ8nlgKVkXyRLDW+qOq1amlBKUbKFeqR/Vx/1/GTPKWbk5GKNoVvbxZfBhgF+uKCu0NoPUHZ7BLo7ixUrQS/iK6h4kUnRwW8CKtS3SZ2NpMJK8D5D0b05l0JMV+PaqurvQamOG44oogVeWPFDukmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zP5yQsCc; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zP5yQsCc" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3232677ad11so1441683a91.1 for ; Thu, 14 Aug 2025 17:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755216741; x=1755821541; darn=vger.kernel.org; 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=IwosmCXhK1vj9BTxghsFWvBqb4znPc+loO6bF0vRg/w=; b=zP5yQsCcy5QpL2kFvKjhxF2peyA3+u4o0TlE6elSG9Ivsg3bBJdnvJ9Y6jBYpmSYgn mr/drTREDgzrzZ3k+moyZMe7c2lexPaQxVUSvXEbwJe9XBPa3D/PFDSlHpvRvhMvi+NJ 0oSws3wpOReY9JsC+BpAMDvbEeiHD21IPSAjhuPoH3nRBKvJi7jULHYsW3eHJHACdNd7 XyKki0La52diHF9vDvZBqWsCgSa70F7LBiMzei4bB9/4ygQXGWPJhlfkxjU8U2LwfxlM 7OGAYfBIPHkeG16T5e54deb6zbKWgakdMIcXHC2+2/05dCB1KfkXfVmZ1o0A4kO/9WSN wgsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755216741; x=1755821541; 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=IwosmCXhK1vj9BTxghsFWvBqb4znPc+loO6bF0vRg/w=; b=r3qyLjmD6e3kukwW3oGl4CT4YrU+R5tsmcbX8fnbTKwTK7eijPwkUSucHQBSnZPrZ8 2ymHmt09D2q6li8dhGvIdH/KNhbpl3QO3EmIoQv2ZpY7IjfHgDbDMqqHRnFj7N4aqHFk bDaI04tvVt2yqR9HUNZYvMqjIrAB5d0lwXtDAyH4rqVEUJsHPHSswV4zfEzorhSwZAfy l2XWeC0yn2bIBiMjirTJJ8vWGCVok2CUbJCKEvuL9rDNSz2TTE+sLJBf3E0HayVtAlUT Subb92R9aqxSvd1aURWs3OmlTCKncnjkqhSLIMFKHm0DJynOZVm0fwQj9sxiqx9pH6YT rWNA== X-Forwarded-Encrypted: i=1; AJvYcCXLrNxGiV9UV7liSOCHmBVAnREl3asbOSnC1wCDT0/2XV3UYWoUPyXlCZhwAWE82qLe+tuaKfQz88lzsEs=@vger.kernel.org X-Gm-Message-State: AOJu0YyNVSOCtX/EZ9DjmcUfj6CkewUN0Y8/YbODyRcr2b6AcoF2H2KC DTcJNFyOTTcfE7katt5WBcVd+HWNKLr1osG3icXndaxXYOR3I6p1xUSYJ6XeXuGumXqO8cgEYwX R2KV2sw== X-Google-Smtp-Source: AGHT+IGO/jPS6jdJmEtvnGY3PxwPeRyl+ObkL45xgwHrNfQdLHZ7iDlH5jvrHyrHHvz2++/SRO0Y4P+AtJ8= X-Received: from pjbpq1.prod.google.com ([2002:a17:90b:3d81:b0:31f:1ed:c76e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:dfcd:b0:312:1ae9:1525 with SMTP id 98e67ed59e1d1-32341e17c8cmr356019a91.8.1755216740828; Thu, 14 Aug 2025 17:12:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 14 Aug 2025 17:11:49 -0700 In-Reply-To: <20250815001205.2370711-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250815001205.2370711-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.rc1.163.g2494970778-goog Message-ID: <20250815001205.2370711-6-seanjc@google.com> Subject: [PATCH 6.1.y 05/21] KVM: x86: Take irqfds.lock when adding/deleting IRQ bypass producer From: Sean Christopherson To: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" [ Upstream commit f1fb088d9cecde5c3066d8ff8846789667519b7d ] Take irqfds.lock when adding/deleting an IRQ bypass producer to ensure irqfd->producer isn't modified while kvm_irq_routing_update() is running. The only lock held when a producer is added/removed is irqbypass's mutex. Fixes: 872768800652 ("KVM: x86: select IRQ_BYPASS_MANAGER") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Message-ID: <20250404193923.1413163-5-seanjc@google.com> Signed-off-by: Paolo Bonzini [sean: account for lack of kvm_x86_call()] Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a6dc8f662fa4..08c4ad276ccb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13385,16 +13385,22 @@ int kvm_arch_irq_bypass_add_producer(struct irq_b= ypass_consumer *cons, { struct kvm_kernel_irqfd *irqfd =3D container_of(cons, struct kvm_kernel_irqfd, consumer); + struct kvm *kvm =3D irqfd->kvm; int ret; =20 - irqfd->producer =3D prod; kvm_arch_start_assignment(irqfd->kvm); + + spin_lock_irq(&kvm->irqfds.lock); + irqfd->producer =3D prod; + ret =3D static_call(kvm_x86_pi_update_irte)(irqfd->kvm, prod->irq, irqfd->gsi, 1); - if (ret) kvm_arch_end_assignment(irqfd->kvm); =20 + spin_unlock_irq(&kvm->irqfds.lock); + + return ret; } =20 @@ -13404,9 +13410,9 @@ void kvm_arch_irq_bypass_del_producer(struct irq_by= pass_consumer *cons, int ret; struct kvm_kernel_irqfd *irqfd =3D container_of(cons, struct kvm_kernel_irqfd, consumer); + struct kvm *kvm =3D irqfd->kvm; =20 WARN_ON(irqfd->producer !=3D prod); - irqfd->producer =3D NULL; =20 /* * When producer of consumer is unregistered, we change back to @@ -13414,11 +13420,18 @@ void kvm_arch_irq_bypass_del_producer(struct irq_= bypass_consumer *cons, * when the irq is masked/disabled or the consumer side (KVM * int this case doesn't want to receive the interrupts. */ + spin_lock_irq(&kvm->irqfds.lock); + irqfd->producer =3D NULL; + + ret =3D static_call(kvm_x86_pi_update_irte)(irqfd->kvm, prod->irq, irqfd-= >gsi, 0); if (ret) printk(KERN_INFO "irq bypass consumer (token %p) unregistration" " fails: %d\n", irqfd->consumer.token, ret); =20 + spin_unlock_irq(&kvm->irqfds.lock); + + kvm_arch_end_assignment(irqfd->kvm); } =20 --=20 2.51.0.rc1.163.g2494970778-goog