irqbypass: Explicitly track producer and consumer bindings

Explicitly track IRQ bypass producer:consumer bindings.  This will allow
making removal an O(1) operation; searching through the list to find
information that is trivially tracked (and useful for debug) is wasteful.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Link: https://lore.kernel.org/r/20250516230734.2564775-5-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
pull/1309/head
Sean Christopherson 2025-05-16 16:07:30 -07:00
parent 2b521d86ee
commit add57f493e
2 changed files with 16 additions and 0 deletions

View File

@ -29,10 +29,13 @@ struct irq_bypass_consumer;
* pairings are not supported. * pairings are not supported.
*/ */
struct irq_bypass_consumer;
/** /**
* struct irq_bypass_producer - IRQ bypass producer definition * struct irq_bypass_producer - IRQ bypass producer definition
* @node: IRQ bypass manager private list management * @node: IRQ bypass manager private list management
* @eventfd: eventfd context used to match producers and consumers * @eventfd: eventfd context used to match producers and consumers
* @consumer: The connected consumer (NULL if no connection)
* @irq: Linux IRQ number for the producer device * @irq: Linux IRQ number for the producer device
* @add_consumer: Connect the IRQ producer to an IRQ consumer (optional) * @add_consumer: Connect the IRQ producer to an IRQ consumer (optional)
* @del_consumer: Disconnect the IRQ producer from an IRQ consumer (optional) * @del_consumer: Disconnect the IRQ producer from an IRQ consumer (optional)
@ -46,6 +49,7 @@ struct irq_bypass_consumer;
struct irq_bypass_producer { struct irq_bypass_producer {
struct list_head node; struct list_head node;
struct eventfd_ctx *eventfd; struct eventfd_ctx *eventfd;
struct irq_bypass_consumer *consumer;
int irq; int irq;
int (*add_consumer)(struct irq_bypass_producer *, int (*add_consumer)(struct irq_bypass_producer *,
struct irq_bypass_consumer *); struct irq_bypass_consumer *);
@ -59,6 +63,7 @@ struct irq_bypass_producer {
* struct irq_bypass_consumer - IRQ bypass consumer definition * struct irq_bypass_consumer - IRQ bypass consumer definition
* @node: IRQ bypass manager private list management * @node: IRQ bypass manager private list management
* @eventfd: eventfd context used to match producers and consumers * @eventfd: eventfd context used to match producers and consumers
* @producer: The connected producer (NULL if no connection)
* @add_producer: Connect the IRQ consumer to an IRQ producer * @add_producer: Connect the IRQ consumer to an IRQ producer
* @del_producer: Disconnect the IRQ consumer from an IRQ producer * @del_producer: Disconnect the IRQ consumer from an IRQ producer
* @stop: Perform any quiesce operations necessary prior to add/del (optional) * @stop: Perform any quiesce operations necessary prior to add/del (optional)
@ -72,6 +77,8 @@ struct irq_bypass_producer {
struct irq_bypass_consumer { struct irq_bypass_consumer {
struct list_head node; struct list_head node;
struct eventfd_ctx *eventfd; struct eventfd_ctx *eventfd;
struct irq_bypass_producer *producer;
int (*add_producer)(struct irq_bypass_consumer *, int (*add_producer)(struct irq_bypass_consumer *,
struct irq_bypass_producer *); struct irq_bypass_producer *);
void (*del_producer)(struct irq_bypass_consumer *, void (*del_producer)(struct irq_bypass_consumer *,

View File

@ -51,6 +51,10 @@ static int __connect(struct irq_bypass_producer *prod,
if (prod->start) if (prod->start)
prod->start(prod); prod->start(prod);
if (!ret) {
prod->consumer = cons;
cons->producer = prod;
}
return ret; return ret;
} }
@ -72,6 +76,9 @@ static void __disconnect(struct irq_bypass_producer *prod,
cons->start(cons); cons->start(cons);
if (prod->start) if (prod->start)
prod->start(prod); prod->start(prod);
prod->consumer = NULL;
cons->producer = NULL;
} }
/** /**
@ -145,6 +152,7 @@ void irq_bypass_unregister_producer(struct irq_bypass_producer *producer)
list_for_each_entry(consumer, &consumers, node) { list_for_each_entry(consumer, &consumers, node) {
if (consumer->eventfd == producer->eventfd) { if (consumer->eventfd == producer->eventfd) {
WARN_ON_ONCE(producer->consumer != consumer);
__disconnect(producer, consumer); __disconnect(producer, consumer);
break; break;
} }
@ -234,6 +242,7 @@ void irq_bypass_unregister_consumer(struct irq_bypass_consumer *consumer)
list_for_each_entry(producer, &producers, node) { list_for_each_entry(producer, &producers, node) {
if (producer->eventfd == consumer->eventfd) { if (producer->eventfd == consumer->eventfd) {
WARN_ON_ONCE(consumer->producer != producer);
__disconnect(producer, consumer); __disconnect(producer, consumer);
break; break;
} }