From: Anthony PERARD <anthony.perard@citrix.com>
To: Xen Devel <xen-devel@lists.xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Keir Fraser <keir@xen.org>,
Ian Campbell <ian.campbell@citrix.com>,
Jan Beulich <jbeulich@suse.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH V3] xen: Fix BUFIOREQ evtchn init for a stubdom.
Date: Mon, 2 Jul 2012 16:41:16 +0100 [thread overview]
Message-ID: <1341243676-2369-1-git-send-email-anthony.perard@citrix.com> (raw)
This is a missing part from the previous patch that add the BUFIOREQ_EVTCHN
parameter. This patch changes the ownership of the buifioreq event channel to
the stubdom (when HVM_PARAM_DM_DOMAIN is set within the stubdom).
This patch introduces an helper to replace a xen port.
This fix the initialization of QEMU inside the stubdomain.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
Change v3:
For the bufioreq replacement:
- the code is now out of the vcpu loop
- the code does not take a lock anymore
- rename int *port to int *p_port
Change v2:
- an helper
- the replacement of the buferioreq evtchn is inside iorp->lock now.
xen/arch/x86/hvm/hvm.c | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index e0d495d..c2dfa73 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -3664,6 +3664,21 @@ static int hvmop_flush_tlb_all(void)
return 0;
}
+static int hvm_replace_event_channel(struct vcpu *v, uint64_t remote_domid,
+ int *p_port)
+{
+ int old_port, new_port;
+
+ new_port = alloc_unbound_xen_event_channel(v, remote_domid, NULL);
+ if ( new_port < 0 )
+ return new_port;
+
+ /* xchg() ensures that only we free_xen_event_channel() */
+ old_port = xchg(p_port, new_port);
+ free_xen_event_channel(v, old_port);
+ return 0;
+}
+
long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
{
@@ -3775,19 +3790,16 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
rc = 0;
domain_pause(d); /* safe to change per-vcpu xen_port */
iorp = &d->arch.hvm_domain.ioreq;
+ if (d->vcpu[0])
+ hvm_replace_event_channel(d->vcpu[0], a.value,
+ (int*)&d->vcpu[0]->domain->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN]);
for_each_vcpu ( d, v )
{
- int old_port, new_port;
- new_port = alloc_unbound_xen_event_channel(
- v, a.value, NULL);
- if ( new_port < 0 )
- {
- rc = new_port;
+ rc = hvm_replace_event_channel(v, a.value,
+ &v->arch.hvm_vcpu.xen_port);
+ if ( rc )
break;
- }
- /* xchg() ensures that only we free_xen_event_channel() */
- old_port = xchg(&v->arch.hvm_vcpu.xen_port, new_port);
- free_xen_event_channel(v, old_port);
+
spin_lock(&iorp->lock);
if ( iorp->va != NULL )
get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port;
--
Anthony PERARD
next reply other threads:[~2012-07-02 15:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 15:41 Anthony PERARD [this message]
2012-07-02 15:58 ` [PATCH V3] xen: Fix BUFIOREQ evtchn init for a stubdom Jan Beulich
2012-07-02 16:01 ` Jan Beulich
2012-07-02 19:37 ` Keir Fraser
2012-07-02 16:05 ` Anthony PERARD
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=1341243676-2369-1-git-send-email-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.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).