Commit ddacf5ef authored by Olaf Hering's avatar Olaf Hering Committed by Konrad Rzeszutek Wilk

xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel

Add new xs_reset_watches function to shutdown watches from old kernel after
kexec boot.  The old kernel does not unregister all watches in the
shutdown path.  They are still active, the double registration can not
be detected by the new kernel.  When the watches fire, unexpected events
will arrive and the xenwatch thread will crash (jumps to NULL).  An
orderly reboot of a hvm guest will destroy the entire guest with all its
resources (including the watches) before it is rebuilt from scratch, so
the missing unregister is not an issue in that case.

With this change the xenstored is instructed to wipe all active watches
for the guest.  However, a patch for xenstored is required so that it
accepts the XS_RESET_WATCHES request from a client (see changeset
23839:42a45baf037d in xen-unstable.hg). Without the patch for xenstored
the registration of watches will fail and some features of a PVonHVM
guest are not available. The guest is still able to boot, but repeated
kexec boots will fail.

[v5: use xs_single instead of passing a dummy string to xs_talkv]
[v4: ignore -EEXIST in xs_reset_watches]
[v3: use XS_RESET_WATCHES instead of XS_INTRODUCE]
[v2: move all code which deals with XS_INTRODUCE into xs_introduce()
    (based on feedback from Ian Campbell); remove casts from kvec assignment]
Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
[v1: Redid the git description a bit]
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 3b082b25
...@@ -620,6 +620,15 @@ static struct xenbus_watch *find_watch(const char *token) ...@@ -620,6 +620,15 @@ static struct xenbus_watch *find_watch(const char *token)
return NULL; return NULL;
} }
static void xs_reset_watches(void)
{
int err;
err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
if (err && err != -EEXIST)
printk(KERN_WARNING "xs_reset_watches failed: %d\n", err);
}
/* Register callback to watch this node. */ /* Register callback to watch this node. */
int register_xenbus_watch(struct xenbus_watch *watch) int register_xenbus_watch(struct xenbus_watch *watch)
{ {
...@@ -896,5 +905,9 @@ int xs_init(void) ...@@ -896,5 +905,9 @@ int xs_init(void)
if (IS_ERR(task)) if (IS_ERR(task))
return PTR_ERR(task); return PTR_ERR(task);
/* shutdown watches for kexec boot */
if (xen_hvm_domain())
xs_reset_watches();
return 0; return 0;
} }
...@@ -29,7 +29,8 @@ enum xsd_sockmsg_type ...@@ -29,7 +29,8 @@ enum xsd_sockmsg_type
XS_IS_DOMAIN_INTRODUCED, XS_IS_DOMAIN_INTRODUCED,
XS_RESUME, XS_RESUME,
XS_SET_TARGET, XS_SET_TARGET,
XS_RESTRICT XS_RESTRICT,
XS_RESET_WATCHES
}; };
#define XS_WRITE_NONE "NONE" #define XS_WRITE_NONE "NONE"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment