From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: xen-devel@lists.xenproject.org
Cc: Andrew Jones <drjones@redhat.com>,
Julien Grall <julien.grall@linaro.org>,
Keir Fraser <keir@xen.org>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Olaf Hering <olaf@aepfle.de>, Tim Deegan <tim@xen.org>,
David Vrabel <david.vrabel@citrix.com>,
Jan Beulich <jbeulich@suse.com>, Wei Liu <wei.liu2@citrix.com>,
Daniel De Graaf <dgdegra@tycho.nsa.gov>
Subject: [PATCH v9 04/11] xen: evtchn: make evtchn_reset() ready for soft reset
Date: Thu, 16 Jul 2015 18:27:19 +0200 [thread overview]
Message-ID: <1437064046-12174-5-git-send-email-vkuznets@redhat.com> (raw)
In-Reply-To: <1437064046-12174-1-git-send-email-vkuznets@redhat.com>
We need to close all event channel so the domain performing soft reset
will be able to open them back.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
Changes since v8:
- Check !d->controller_pause_count instead of pausing/unpausing the domain
in evtchn_reset(). [Konrad Rzeszutek Wilk]
---
xen/common/event_channel.c | 43 +++++++++++++++++++------------------------
xen/include/xen/event.h | 3 +++
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 7640e30..4fa1e4a 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -981,44 +981,28 @@ int evtchn_unmask(unsigned int port)
}
-static long evtchn_reset(evtchn_reset_t *r)
+int evtchn_reset(struct domain *d)
{
- domid_t dom = r->dom;
- struct domain *d;
- int i, rc;
-
- d = rcu_lock_domain_by_any_id(dom);
- if ( d == NULL )
- return -ESRCH;
+ unsigned int i;
- rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d);
- if ( rc )
- goto out;
+ if ( d != current->domain && !d->controller_pause_count )
+ return -EINVAL;
for ( i = 0; port_is_valid(d, i); i++ )
evtchn_close(d, i, 1);
spin_lock(&d->event_lock);
- if ( (dom == DOMID_SELF) && d->evtchn_fifo )
+ if ( d->evtchn_fifo )
{
- /*
- * Guest domain called EVTCHNOP_reset with DOMID_SELF, destroying
- * FIFO event array and control blocks, resetting evtchn_port_ops to
- * evtchn_port_ops_2l.
- */
+ /* Switching back to 2-level ABI. */
evtchn_fifo_destroy(d);
evtchn_2l_init(d);
}
spin_unlock(&d->event_lock);
- rc = 0;
-
-out:
- rcu_unlock_domain(d);
-
- return rc;
+ return 0;
}
static long evtchn_set_priority(const struct evtchn_set_priority *set_priority)
@@ -1143,9 +1127,20 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
case EVTCHNOP_reset: {
struct evtchn_reset reset;
+ struct domain *d;
+
if ( copy_from_guest(&reset, arg, 1) != 0 )
return -EFAULT;
- rc = evtchn_reset(&reset);
+
+ d = rcu_lock_domain_by_any_id(reset.dom);
+ if ( d == NULL )
+ return -ESRCH;
+
+ rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d);
+ if ( !rc )
+ rc = evtchn_reset(d);
+
+ rcu_unlock_domain(d);
break;
}
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index af923d1..b87924a 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -126,6 +126,9 @@ void evtchn_check_pollers(struct domain *d, unsigned int port);
void evtchn_2l_init(struct domain *d);
+/* Close all event channels and reset to 2-level ABI. */
+int evtchn_reset(struct domain *d);
+
/*
* Low-level event channel port ops.
*/
--
2.4.3
next prev parent reply other threads:[~2015-07-16 16:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 16:27 [PATCH v9 00/11] toolstack-assisted approach to PVHVM guest kexec Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 01/11] xen: introduce SHUTDOWN_soft_reset shutdown reason Vitaly Kuznetsov
2015-07-16 18:42 ` Konrad Rzeszutek Wilk
2015-07-24 11:54 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 02/11] libxl: support " Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 03/11] xl: introduce enum domain_restart_type Vitaly Kuznetsov
2015-07-16 16:27 ` Vitaly Kuznetsov [this message]
2015-07-16 18:43 ` [PATCH v9 04/11] xen: evtchn: make evtchn_reset() ready for soft reset Konrad Rzeszutek Wilk
2015-07-24 11:56 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 05/11] xen: grant_table: implement grant_table_warn_active_grants() Vitaly Kuznetsov
2015-07-16 18:43 ` Konrad Rzeszutek Wilk
2015-07-24 12:00 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 06/11] xen: Introduce XEN_DOMCTL_soft_reset Vitaly Kuznetsov
2015-07-16 18:45 ` Konrad Rzeszutek Wilk
2015-07-17 12:30 ` Vitaly Kuznetsov
2015-07-24 12:03 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 07/11] flask: DOMCTL_soft_reset support Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 08/11] xen: arch-specific hooks for domain_soft_reset() Vitaly Kuznetsov
2015-07-16 18:45 ` Konrad Rzeszutek Wilk
2015-07-24 12:20 ` Jan Beulich
2015-07-24 12:41 ` Vitaly Kuznetsov
2015-07-24 12:45 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 09/11] libxc: support XEN_DOMCTL_soft_reset operation Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 10/11] libxc: add XC_DEVICE_MODEL_SAVE_FILE Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 11/11] (lib)xl: soft reset support Vitaly Kuznetsov
2015-07-16 18:51 ` Konrad Rzeszutek Wilk
2015-07-17 12:33 ` Vitaly Kuznetsov
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=1437064046-12174-5-git-send-email-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=andrew.cooper3@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=drjones@redhat.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@linaro.org \
--cc=keir@xen.org \
--cc=olaf@aepfle.de \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=wei.liu2@citrix.com \
--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).