Attachment 1273561 Details for Bug 1433831 – Patch to make __startup_pirq() thread safe

[patch] Patch to make __startup_pirq() thread safe

0001-xen-events-serialize-__startup_pirq-with-irq_mapping.patch (text/plain), 1.66 KB, created by Vitaly Kuznetsov on 2017-04-24 09:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly Kuznetsov

Created: 2017-04-24 09:48:34 UTC

Size: 1.66 KB

patch

obsolete

>From 124b4d28b23dfdb49cc0d2afc6ce78f14e1230f6 Mon Sep 17 00:00:00 2001
>From: Vitaly Kuznetsov <vkuznets@redhat.com>
>Date: Fri, 21 Apr 2017 16:22:44 +0200
>Subject: [PATCH] xen/events: serialize __startup_pirq() with
> irq_mapping_update_lock
>
>Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>---
> drivers/xen/events/events_base.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
>index 6a53577..f90540a 100644
>--- a/drivers/xen/events/events_base.c
>+++ b/drivers/xen/events/events_base.c
>@@ -515,11 +515,15 @@ static unsigned int __startup_pirq(unsigned int irq)
> {
> 	struct evtchn_bind_pirq bind_pirq;
> 	struct irq_info *info = info_for_irq(irq);
>-	int evtchn = evtchn_from_irq(irq);
>+	int evtchn;
> 	int rc;
> 
> 	BUG_ON(info->type != IRQT_PIRQ);
> 
>+	mutex_lock(&irq_mapping_update_lock);
>+
>+	evtchn = evtchn_from_irq(irq);
>+
> 	if (VALID_EVTCHN(evtchn))
> 		goto out;
> 
>@@ -528,9 +532,10 @@ static unsigned int __startup_pirq(unsigned int irq)
> 	bind_pirq.flags = info->u.pirq.flags & PIRQ_SHAREABLE ?
> 					BIND_PIRQ__WILL_SHARE : 0;
> 	rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
>+
> 	if (rc != 0) {
> 		pr_warn("Failed to obtain physical IRQ %d\n", irq);
>-		return 0;
>+		goto unlock;
> 	}
> 	evtchn = bind_pirq.port;
> 
>@@ -550,12 +555,13 @@ static unsigned int __startup_pirq(unsigned int irq)
> out:
> 	unmask_evtchn(evtchn);
> 	eoi_pirq(irq_get_irq_data(irq));
>-
>-	return 0;
>-
>+	goto unlock;
> err:
> 	pr_err("irq%d: Failed to set port to irq mapping (%d)\n", irq, rc);
> 	xen_evtchn_close(evtchn);
>+
>+unlock:
>+	mutex_unlock(&irq_mapping_update_lock);
> 	return 0;
> }
> 
>-- 
>2.9.3
>

Actions: View | Diff

Attachments on bug 1433831: 1265908 | 1265909 | 1267439 | 1269062 | 1272366 | 1272391 | 1272630 | 1272695 | 1273561 | 1273684