Skip to content

Commit d277f9d

Browse files
committed
xen/events: increment refcnt only if event channel is refcounted
In bind_evtchn_to_irq_chip() don't increment the refcnt of the event channel blindly. In case the event channel is NOT refcounted, issue a warning instead. Add an additional safety net by doing the refcnt increment only if the caller has specified IRQF_SHARED in the irqflags parameter. Fixes: 9e90e58 ("xen: evtchn: Allow shared registration of IRQ handers") Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Link: https://lore.kernel.org/r/20240313071409.25913-3-jgross@suse.com Signed-off-by: Juergen Gross <jgross@suse.com>
1 parent 51c23bd commit d277f9d

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

drivers/xen/events/events_base.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ int xen_pirq_from_irq(unsigned irq)
11901190
EXPORT_SYMBOL_GPL(xen_pirq_from_irq);
11911191

11921192
static int bind_evtchn_to_irq_chip(evtchn_port_t evtchn, struct irq_chip *chip,
1193-
struct xenbus_device *dev)
1193+
struct xenbus_device *dev, bool shared)
11941194
{
11951195
int ret = -ENOMEM;
11961196
struct irq_info *info;
@@ -1224,7 +1224,8 @@ static int bind_evtchn_to_irq_chip(evtchn_port_t evtchn, struct irq_chip *chip,
12241224
*/
12251225
bind_evtchn_to_cpu(info, 0, false);
12261226
} else if (!WARN_ON(info->type != IRQT_EVTCHN)) {
1227-
info->refcnt++;
1227+
if (shared && !WARN_ON(info->refcnt < 0))
1228+
info->refcnt++;
12281229
}
12291230

12301231
ret = info->irq;
@@ -1237,13 +1238,13 @@ static int bind_evtchn_to_irq_chip(evtchn_port_t evtchn, struct irq_chip *chip,
12371238

12381239
int bind_evtchn_to_irq(evtchn_port_t evtchn)
12391240
{
1240-
return bind_evtchn_to_irq_chip(evtchn, &xen_dynamic_chip, NULL);
1241+
return bind_evtchn_to_irq_chip(evtchn, &xen_dynamic_chip, NULL, false);
12411242
}
12421243
EXPORT_SYMBOL_GPL(bind_evtchn_to_irq);
12431244

12441245
int bind_evtchn_to_irq_lateeoi(evtchn_port_t evtchn)
12451246
{
1246-
return bind_evtchn_to_irq_chip(evtchn, &xen_lateeoi_chip, NULL);
1247+
return bind_evtchn_to_irq_chip(evtchn, &xen_lateeoi_chip, NULL, false);
12471248
}
12481249
EXPORT_SYMBOL_GPL(bind_evtchn_to_irq_lateeoi);
12491250

@@ -1295,7 +1296,8 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
12951296

12961297
static int bind_interdomain_evtchn_to_irq_chip(struct xenbus_device *dev,
12971298
evtchn_port_t remote_port,
1298-
struct irq_chip *chip)
1299+
struct irq_chip *chip,
1300+
bool shared)
12991301
{
13001302
struct evtchn_bind_interdomain bind_interdomain;
13011303
int err;
@@ -1307,14 +1309,14 @@ static int bind_interdomain_evtchn_to_irq_chip(struct xenbus_device *dev,
13071309
&bind_interdomain);
13081310

13091311
return err ? : bind_evtchn_to_irq_chip(bind_interdomain.local_port,
1310-
chip, dev);
1312+
chip, dev, shared);
13111313
}
13121314

13131315
int bind_interdomain_evtchn_to_irq_lateeoi(struct xenbus_device *dev,
13141316
evtchn_port_t remote_port)
13151317
{
13161318
return bind_interdomain_evtchn_to_irq_chip(dev, remote_port,
1317-
&xen_lateeoi_chip);
1319+
&xen_lateeoi_chip, false);
13181320
}
13191321
EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq_lateeoi);
13201322

@@ -1430,7 +1432,8 @@ static int bind_evtchn_to_irqhandler_chip(evtchn_port_t evtchn,
14301432
{
14311433
int irq, retval;
14321434

1433-
irq = bind_evtchn_to_irq_chip(evtchn, chip, NULL);
1435+
irq = bind_evtchn_to_irq_chip(evtchn, chip, NULL,
1436+
irqflags & IRQF_SHARED);
14341437
if (irq < 0)
14351438
return irq;
14361439
retval = request_irq(irq, handler, irqflags, devname, dev_id);
@@ -1471,7 +1474,8 @@ static int bind_interdomain_evtchn_to_irqhandler_chip(
14711474
{
14721475
int irq, retval;
14731476

1474-
irq = bind_interdomain_evtchn_to_irq_chip(dev, remote_port, chip);
1477+
irq = bind_interdomain_evtchn_to_irq_chip(dev, remote_port, chip,
1478+
irqflags & IRQF_SHARED);
14751479
if (irq < 0)
14761480
return irq;
14771481

0 commit comments

Comments
 (0)