From nobody Mon Feb 9 23:15:49 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 7AE781F0E5C for ; Fri, 4 Apr 2025 21:15:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743801315; cv=none; b=lvH9AwWm7yPqVqlagWq1iLG+2gQradPCDkgRbaJAlboRQdmVoTnYJb/j6Oj8ZsuZ95bE998leQjURCrD38+06dUGnSgmLobRxM17SF/trHXvRGyiea/ddzN93ndPiI5raT58moVZN9cPEO9dDgCst5D9B3wrmXKUhJb3Guuc5nY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743801315; c=relaxed/simple; bh=R8NuUhmI02N5n1m2zQQJmYcq/tgo+PabOiQg+/IuxGk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AsZ2HjXfm1mDhDmnqLglOeyyciuuxlJ0em13K1UbonN8M49u/hC7lno/MKAMaSiMuToIF1yCyvIij0o0j3GaKDm1ANrvh94W3vhf9nRMsNyBCvGCS6ZG5Y2AsncdKH5nNxaLId3pYM6CKj7qrHP/dPu7OuWBGeppU3pDZdwXXLo= 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=RyGi+dNm; arc=none smtp.client-ip=209.85.210.201 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="RyGi+dNm" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-739071bdf2eso1856253b3a.2 for ; Fri, 04 Apr 2025 14:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743801313; x=1744406113; 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=+c3CamxlMu4cATASgv0Iy6Lf5d+wt8ucP9dRv+3+Crg=; b=RyGi+dNmo0BgsZBqodEkGGcqn0l+ZJrVdlX7al2r9GPIi19p6iyazBVfXdySUcHaEl zOEoHdJpGRcaJTnYuAN5JmIiHHJz7M2q48GfsBGM9IOqtNWW74TxTXydWrQ3nAK5L8gq cAUsWSrFsiVwL1U/ucLoqqoftVTzb//eb3UuZPJP2uj7zkYFxV2g/6zHBTIT8Zy/+t2v Pq/ltO/mVHbKWO1zBGF7cl9KmqurvTNyjin4K0lhN2WBifk4qY2FSBNQSMWiuFvcM/nV VHZBXV3EqBtZ0LrluCHA61GI38r2D4MHjzVc2PGZrNzmoiop9U4vTS1V7N3L5QAP4VH2 u5PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743801313; x=1744406113; 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=+c3CamxlMu4cATASgv0Iy6Lf5d+wt8ucP9dRv+3+Crg=; b=CASXbXbBbu/yTJ7w4ILw4jqzZLcGfR8TV/IFk1z2OaW+su6B1jIdU5lvPgU0TOBdcU fvNXKWPPYaF+v1IfV23ReEh98kM5Qh4OYJKNP7gCk7SgZbI6du+qWFN5nQkDQVYpc9QG CZst45pgLVPzwaOy8aSZvi+JMl3kiXUmuSPzzzHKioNTYe7v/f0S8mwUDtuO6dMpZ4cu 0OFV/1jXMtbOyRLv+OXe8cxPTmOdzh3MM5HpGAZnZl44umH6t1pFAOJB0ABMp80HwNTy K2e5R6/lOvSg/axLmyShx2YWsxCn8Yg7WrNKWf/unqjqYgyzwuSYAdNic3icqphrEduy S4yg== X-Forwarded-Encrypted: i=1; AJvYcCXnbUpRK/6wJBmxeaJ/44a/05wMWti2mfFCU6FazO4Ai/0Vi4GVB3QaVvJG8hX5SzhW6ixEDxapN9vQB1Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8+nyQ1hea5blJUoTKbu7K3AVnZrhrbHAFZPkpEhwRyHlR/okF Dr4Zbrc5Gpw1VqiZ502norpgmmZiDRbOySzfZn0ozOylajiDt9xvpYl1G0n1tqHJOh8xaP+XDBU cLw== X-Google-Smtp-Source: AGHT+IF1tacFrLaohc7CkMS1gtWVWkDqbIHHrrY0gCvWvfr9O5duisiiz3XdJWCovxvuLreYisa8S4H6eT8= X-Received: from pfbhg1.prod.google.com ([2002:a05:6a00:8601:b0:736:3d80:706e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:32a2:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-20113c57dfcmr1150484637.13.1743801312641; Fri, 04 Apr 2025 14:15:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 4 Apr 2025 14:14:47 -0700 In-Reply-To: <20250404211449.1443336-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: <20250404211449.1443336-1-seanjc@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250404211449.1443336-6-seanjc@google.com> Subject: [PATCH 5/7] irqbypass: Use paired consumer/producer to disconnect during unregister From: Sean Christopherson To: "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Alex Williamson Cc: kvm@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Christopherson , Oliver Upton , David Matlack , Like Xu , Yong He Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the paired consumer/producer information to disconnect IRQ bypass producers/consumers in O(1) time (ignoring the cost of __disconnect()). Signed-off-by: Sean Christopherson Reviewed-by: Kevin Tian --- virt/lib/irqbypass.c | 50 +++++++------------------------------------- 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/virt/lib/irqbypass.c b/virt/lib/irqbypass.c index 4c912c30b7e6..6d68a0f71dd9 100644 --- a/virt/lib/irqbypass.c +++ b/virt/lib/irqbypass.c @@ -138,32 +138,16 @@ EXPORT_SYMBOL_GPL(irq_bypass_register_producer); */ void irq_bypass_unregister_producer(struct irq_bypass_producer *producer) { - struct irq_bypass_producer *tmp; - struct irq_bypass_consumer *consumer; - if (!producer->token) return; =20 mutex_lock(&lock); =20 - list_for_each_entry(tmp, &producers, node) { - if (tmp->token !=3D producer->token) - continue; + if (producer->consumer) + __disconnect(producer, producer->consumer); =20 - list_for_each_entry(consumer, &consumers, node) { - if (consumer->token =3D=3D producer->token) { - WARN_ON_ONCE(producer->consumer !=3D consumer); - __disconnect(producer, consumer); - break; - } - } - - producer->token =3D NULL; - list_del(&producer->node); - break; - } - - WARN_ON_ONCE(producer->token); + producer->token =3D NULL; + list_del(&producer->node); mutex_unlock(&lock); } EXPORT_SYMBOL_GPL(irq_bypass_unregister_producer); @@ -173,8 +157,6 @@ EXPORT_SYMBOL_GPL(irq_bypass_unregister_producer); * @consumer: pointer to consumer structure * @eventfd: pointer to the eventfd context associated with the consumer * - * Add the provided IRQ consumer to the list of consumers and connect - * with any matching token found on the IRQ producer list. */ int irq_bypass_register_consumer(struct irq_bypass_consumer *consumer, struct eventfd_ctx *eventfd) @@ -228,32 +210,16 @@ EXPORT_SYMBOL_GPL(irq_bypass_register_consumer); */ void irq_bypass_unregister_consumer(struct irq_bypass_consumer *consumer) { - struct irq_bypass_consumer *tmp; - struct irq_bypass_producer *producer; - if (!consumer->token) return; =20 mutex_lock(&lock); =20 - list_for_each_entry(tmp, &consumers, node) { - if (tmp !=3D consumer) - continue; + if (consumer->producer) + __disconnect(consumer->producer, consumer); =20 - list_for_each_entry(producer, &producers, node) { - if (producer->token =3D=3D consumer->token) { - WARN_ON_ONCE(consumer->producer !=3D producer); - __disconnect(producer, consumer); - break; - } - } - - consumer->token =3D NULL; - list_del(&consumer->node); - break; - } - - WARN_ON_ONCE(consumer->token); + consumer->token =3D NULL; + list_del(&consumer->node); mutex_unlock(&lock); } EXPORT_SYMBOL_GPL(irq_bypass_unregister_consumer); --=20 2.49.0.504.g3bcea36a83-goog