xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com, Stefano.Stabellini@eu.citrix.com,
	Ian.Campbell@citrix.com, tim@xen.org,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH WIP 5/6] xen: fix unmask_evtchn for HVM guests
Date: Fri, 22 Jun 2012 17:14:44 +0100	[thread overview]
Message-ID: <1340381685-22529-5-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <1340381685-22529-1-git-send-email-stefano.stabellini@eu.citrix.com>

When unmask_evtchn is called, if we already have an event pending, we
just set evtchn_pending_sel waiting for irq to be re-enabled. That is
because x86 pv guests overwrite the irq_enable pvops with
xen_irq_enable_direct that also handles pending events.

However x86 HVM guests and ARM guests do not change or do not have the
irq_enable pvop, so this scheme doesn't work properly for them.
Considering that having a pending irq when unmask_evtchn is called is
not very common, and it is better to keep the native_irq_enable
implementation for HVM guests and ARM guests, the best thing to do is
just using the EVTCHNOP_unmask callback (Xen re-injects pending
events in response).

Considering that this patch fixes a bug on x86 for current PV on HVM
guests, I'll resend it separately.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 drivers/xen/events.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index eae0d0b..0132505 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -372,8 +372,11 @@ static void unmask_evtchn(int port)
 
 	BUG_ON(!irqs_disabled());
 
-	/* Slow path (hypercall) if this is a non-local port. */
-	if (unlikely(cpu != cpu_from_evtchn(port))) {
+	/* Slow path (hypercall) if this is a non-local port or if this is
+	 * an hvm domain and an event is pending (hvm domains don't have
+	 * their own implementation of irq_enable). */
+	if (unlikely((cpu != cpu_from_evtchn(port)) ||
+			(xen_hvm_domain() && sync_test_bit(port, &s->evtchn_pending[0])))) {
 		struct evtchn_unmask unmask = { .port = port };
 		(void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
 	} else {
-- 
1.7.2.5

  parent reply	other threads:[~2012-06-22 16:14 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-22 16:13 [PATCH WIP 0/6] xen/arm: PV console support Stefano Stabellini
2012-06-22 16:14 ` [PATCH WIP 1/6] xen/arm: fix the shared_info and vcpu_info structs Stefano Stabellini
2012-06-22 16:14   ` [PATCH WIP 2/6] xen/arm: Introduce xen_guest_init Stefano Stabellini
2012-07-09 14:45     ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-09 15:08       ` David Vrabel
2012-07-12 11:49         ` Roger Pau Monne
2012-07-12 12:04           ` David Vrabel
2012-07-12 17:50             ` Stefano Stabellini
2012-07-12 18:00               ` Ian Campbell
2012-07-13 16:38       ` Stefano Stabellini
2012-06-22 16:14   ` [PATCH WIP 3/6] xen/arm: get privilege status Stefano Stabellini
2012-07-09 14:41     ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-12 17:43       ` Stefano Stabellini
2012-06-22 16:14   ` [PATCH WIP 4/6] xen/arm: implement hvm_op Stefano Stabellini
2012-06-22 16:14   ` Stefano Stabellini [this message]
2012-06-22 16:14   ` [PATCH WIP 6/6] xen/arm: enable evtchn irqs Stefano Stabellini
2012-07-09 14:40     ` Konrad Rzeszutek Wilk
2012-07-13 17:14       ` Stefano Stabellini
2012-07-16 14:57         ` Konrad Rzeszutek Wilk
2012-07-18 16:51           ` Stefano Stabellini
2012-07-19 23:30             ` Konrad Rzeszutek Wilk
2012-07-20 11:09               ` Stefano Stabellini
2012-07-20 14:36                 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-20 15:23                   ` Stefano Stabellini
2012-07-25 18:43                     ` Konrad Rzeszutek Wilk
2012-07-26 13:53                       ` Stefano Stabellini
2012-06-22 16:26   ` [PATCH] xen/events: fix unmask_evtchn for PV on HVM guests Stefano Stabellini
2012-07-09 14:19     ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-13 17:48       ` Stefano Stabellini
2012-07-16 15:14         ` Konrad Rzeszutek Wilk
2012-07-18 18:17           ` Stefano Stabellini
2012-08-22 11:20             ` Stefano Stabellini
2012-08-22 14:03               ` Konrad Rzeszutek Wilk
2012-08-22 15:01                 ` Stefano Stabellini
2012-07-09 14:41   ` [PATCH WIP 1/6] xen/arm: fix the shared_info and vcpu_info structs Konrad Rzeszutek Wilk
2012-07-13 16:48     ` Stefano Stabellini
2012-07-13 17:08       ` Ian Campbell
2012-07-16 14:57         ` Konrad Rzeszutek Wilk
2012-07-18 16:46           ` Stefano Stabellini

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=1340381685-22529-5-git-send-email-stefano.stabellini@eu.citrix.com \
    --to=stefano.stabellini@eu.citrix.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tim@xen.org \
    --cc=xen-devel@lists.xensource.com \
    /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).