From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: david.vrabel@citrix.com, konrad.wilk@oracle.com
Cc: xen-devel@lists.xenproject.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] xen/events: Mask a moving irq
Date: Thu, 17 Mar 2016 08:45:50 -0400 [thread overview]
Message-ID: <1458218750-5202-1-git-send-email-boris.ostrovsky__20031.4209716909$1458218956$gmane$org@oracle.com> (raw)
Moving an unmasked irq may result in irq handler being invoked on both
source and target CPUs.
With 2-level this can happen as follows:
On source CPU:
evtchn_2l_handle_events() ->
generic_handle_irq() ->
handle_edge_irq() ->
eoi_pirq():
irq_move_irq(data);
/***** WE ARE HERE *****/
if (VALID_EVTCHN(evtchn))
clear_evtchn(evtchn);
If at this moment target processor is handling an unrelated event in
evtchn_2l_handle_events()'s loop it may pick up our event since target's
cpu_evtchn_mask claims that this event belongs to it *and* the event is
unmasked and still pending. At the same time, source CPU will continue
executing its own handle_edge_irq().
With FIFO interrupt the scenario is similar: irq_move_irq() may result
in a EVTCHNOP_unmask hypercall which, in turn, may make the event
pending on the target CPU.
We can avoid this situation by moving and clearing the event while
keeping event masked.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: stable@vger.kernel.org
---
drivers/xen/events/events_base.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 524c221..c5725ee 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -483,12 +483,23 @@ static void eoi_pirq(struct irq_data *data)
int evtchn = evtchn_from_irq(data->irq);
struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };
int rc = 0;
+ int need_unmask = 0;
- irq_move_irq(data);
+ if (unlikely(irqd_is_setaffinity_pending(data))) {
+ if (VALID_EVTCHN(evtchn))
+ need_unmask = !test_and_set_mask(evtchn);
+ }
if (VALID_EVTCHN(evtchn))
clear_evtchn(evtchn);
+ irq_move_irq(data);
+
+ if (VALID_EVTCHN(evtchn)) {
+ if (unlikely(need_unmask))
+ unmask_evtchn(evtchn);
+ }
+
if (pirq_needs_eoi(data->irq)) {
rc = HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi);
WARN_ON(rc);
@@ -1356,11 +1367,22 @@ static void disable_dynirq(struct irq_data *data)
static void ack_dynirq(struct irq_data *data)
{
int evtchn = evtchn_from_irq(data->irq);
+ int need_unmask = 0;
- irq_move_irq(data);
+ if (unlikely(irqd_is_setaffinity_pending(data))) {
+ if (VALID_EVTCHN(evtchn))
+ need_unmask = !test_and_set_mask(evtchn);
+ }
if (VALID_EVTCHN(evtchn))
clear_evtchn(evtchn);
+
+ irq_move_irq(data);
+
+ if (VALID_EVTCHN(evtchn)) {
+ if (unlikely(need_unmask))
+ unmask_evtchn(evtchn);
+ }
}
static void mask_ack_dynirq(struct irq_data *data)
--
1.7.7.6
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2016-03-17 12:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 12:45 Boris Ostrovsky [this message]
[not found] <1458218750-5202-1-git-send-email-boris.ostrovsky@oracle.com>
2016-03-17 16:03 ` [PATCH] xen/events: Mask a moving irq David Vrabel
[not found] ` <56EAD55A.6020801@citrix.com>
2016-03-17 16:53 ` Boris Ostrovsky
[not found] ` <56EAE0F7.4060703@oracle.com>
2016-03-17 17:29 ` David Vrabel
[not found] ` <56EAE95D.6020006@citrix.com>
2016-03-17 17:49 ` Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='1458218750-5202-1-git-send-email-boris.ostrovsky__20031.4209716909$1458218956$gmane$org@oracle.com' \
--to=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).