WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] xenstored: allow guests to reintroduce themselves

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] xenstored: allow guests to reintroduce themselves
From: Olaf Hering <olaf@xxxxxxxxx>
Date: Mon, 01 Aug 2011 14:38:36 +0200
Delivery-date: Mon, 01 Aug 2011 05:40:10 -0700
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1312202359; l=2470; s=domk; d=aepfle.de; h=To:From:Date:Subject:Content-Transfer-Encoding:MIME-Version: Content-Type:X-RZG-CLASS-ID:X-RZG-AUTH; bh=xNThc7lI6NXClNb7c6zYo0TFL/0=; b=MNjdLNNrUEXX9bW3su3IvcCg3BKp1OkavxQXKTQXWI2eYl4uy9HKtGU/5jnoDy5kypQ 75xTFtOQ4pLcgOWRmNR2ZWH88DFWpNJ9gywUBPWEJBapbfanuyuNdtaiHZpzZOqywP9QW 0s538KrZ1zLgoeyJpjzciD8FF7eZgPlMcBk=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.7.5
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1312202176 -7200
# Node ID edb96c34f4a638e8ba97933b6bd76ff72836353e
# Parent  0f36c2eec2e1576b4db6538b5f22d625587c1a15
xenstored: allow guests to reintroduce themselves

During kexec all old watches have to be removed, otherwise the new
kernel will receive unexpected events. Allow a guest to introduce itself
and cleanup all of its watches.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff -r 0f36c2eec2e1 -r edb96c34f4a6 tools/xenstore/xenstored_domain.c
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -315,7 +315,7 @@ void do_introduce(struct connection *con
 {
        struct domain *domain;
        char *vec[3];
-       unsigned int domid;
+       unsigned int domid, target;
        unsigned long mfn;
        evtchn_port_t port;
        int rc;
@@ -326,7 +326,7 @@ void do_introduce(struct connection *con
                return;
        }
 
-       if (conn->id != 0 || !conn->can_write) {
+       if (!conn->can_write) {
                send_error(conn, EACCES);
                return;
        }
@@ -340,19 +340,26 @@ void do_introduce(struct connection *con
                send_error(conn, EINVAL);
                return;
        }
+       /* Allow guest to reset all watches */
+       if (domid != DOMID_SELF && conn->id != 0) {
+               send_error(conn, EACCES);
+               return;
+       }
 
-       domain = find_domain_by_domid(domid);
+       target = domid == DOMID_SELF ? conn->id : domid;
+
+       domain = find_domain_by_domid(target);
 
        if (domain == NULL) {
                interface = xc_map_foreign_range(
-                       *xc_handle, domid,
+                       *xc_handle, target,
                        getpagesize(), PROT_READ|PROT_WRITE, mfn);
                if (!interface) {
                        send_error(conn, errno);
                        return;
                }
                /* Hang domain off "in" until we're finished. */
-               domain = new_domain(in, domid, port);
+               domain = new_domain(in, target, port);
                if (!domain) {
                        munmap(interface, getpagesize());
                        send_error(conn, errno);
@@ -365,11 +372,11 @@ void do_introduce(struct connection *con
                talloc_steal(domain->conn, domain);
 
                fire_watches(NULL, "@introduceDomain", false);
-       } else if ((domain->mfn == mfn) && (domain->conn != conn)) {
+       } else if ((domain->mfn == mfn) && ((domain->conn != conn) || domid == 
DOMID_SELF)) {
                /* Use XS_INTRODUCE for recreating the xenbus event-channel. */
                if (domain->port)
                        xc_evtchn_unbind(xce_handle, domain->port);
-               rc = xc_evtchn_bind_interdomain(xce_handle, domid, port);
+               rc = xc_evtchn_bind_interdomain(xce_handle, target, port);
                domain->port = (rc == -1) ? 0 : rc;
                domain->remote_port = port;
        } else {

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel