|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH RFC for-4.6 4/4] libxl: Allow local access for block devices with hotplug scripts
pygrub and qemuu need to be able to access a VM's disks locally in
order to be able to pull out the kernel and provide emulated disk
access, respectively. This can be done either by accessing the local
disk directly, or by plugging the target disk into dom0 to allow
access.
Unfortunately, while the plugging machinery works for pygrub, it does
not yet work for qemuu; meaning that disk hotplug scripts cannot be
used with HVM domains.
Fortunately, disks using hotplug scripts created in dom0 do create a
block device as part of set-up, which can be accessed locally.
First, modify the write_dev function in block-common to add an extra
parameter: "physical-device-path", the path to the physical device
which is passed to blkback. All hotplug scripts that use write_dev
will automatically gain the new functionality.
Second, modify libxl__device_disk_setdefault() to be able to fish this
path out of xenstore and pass it back.
We need the target domid to find the appropriate xenstore node, so add that to
libxl__disk_local_state.
This allows qemuu to boot with block devices created with hotplug scripts.
Unfortunately it does not allow pygrub to access a device locally
without having to plug it in, because when pygrub runs the guests'
disks have not yet been set up.
Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
---
CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
CC: Ian Jackson <ian.jackson@xxxxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
CC: Roger Pau Monne <roger.pau@xxxxxxxxxx>
---
tools/hotplug/Linux/block-common.sh | 5 ++++-
tools/libxl/libxl.c | 42 ++++++++++++++++++++++++++++++++++---
tools/libxl/libxl_bootloader.c | 1 +
tools/libxl/libxl_dm.c | 2 +-
tools/libxl/libxl_internal.h | 4 +++-
5 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/tools/hotplug/Linux/block-common.sh
b/tools/hotplug/Linux/block-common.sh
index ee95009..1aecd7e 100644
--- a/tools/hotplug/Linux/block-common.sh
+++ b/tools/hotplug/Linux/block-common.sh
@@ -58,8 +58,9 @@ device_major_minor()
#
write_dev() {
local mm
+ local dev="$1"
- mm=$(device_major_minor "$1")
+ mm=$(device_major_minor "$dev")
if [ -z $mm ]
then
@@ -68,6 +69,8 @@ write_dev() {
xenstore_write "$XENBUS_PATH/physical-device" "$mm"
+ xenstore_write "$XENBUS_PATH/physical-device-path" "$dev"
+
success
}
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index c67caee..680539e 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2325,7 +2325,7 @@ int libxl__device_disk_setdefault(libxl__gc *gc,
libxl_device_disk *disk)
}
int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
- libxl_device_disk *disk,
+ const libxl_device_disk *disk,
libxl__device *device)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -2485,6 +2485,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t
domid,
if (!libxl__device_physdisk_major_minor(dev, &major,
&minor))
flexarray_append_pair(back, "physical-device",
libxl__sprintf(gc, "%x:%x",
major, minor));
+ flexarray_append_pair(back, "physical-device-path", dev);
}
assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD);
@@ -3047,6 +3048,7 @@ static char * libxl__alloc_vdev(libxl__gc *gc, void
*get_vdev_user,
/* Callbacks */
char * libxl__device_disk_find_local_path(libxl__gc *gc,
+ libxl_domid domid,
const libxl_device_disk *disk,
bool qdisk_direct) {
char *path = NULL;
@@ -3077,6 +3079,40 @@ char * libxl__device_disk_find_local_path(libxl__gc *gc,
path = libxl__strdup(gc, disk->pdev_path);
LOG(DEBUG, "Directly accessing local QDISK target %s", path);
goto out;
+ }
+
+ /*
+ * If the format isn't raw and / or we're using a script, then see
+ * if the script has written a path to the "cooked" node
+ */
+ if(disk->script) {
+ libxl__device device;
+ char * be_path, *pdpath;
+ int rc;
+
+ LOG(DEBUG, "Run from a script; checking for physical-device-path (vdev
%s)",
+ disk->vdev);
+
+ rc = libxl__device_from_disk(gc, domid, disk, &device);
+ if (rc < 0)
+ goto out;
+
+ /* Needs: dompath, device type, domid */
+ be_path = libxl__device_backend_path(gc, &device);
+
+ /* FIXME: Do we need to wait for things to be set up here? */
+
+ pdpath = libxl__sprintf(gc, "%s/physical-device-path", be_path);
+
+ LOG(DEBUG, "Attempting to read node %s", pdpath);
+ path = libxl__xs_read(gc, XBT_NULL, pdpath);
+
+ if (path)
+ LOG(DEBUG, "Accessing cooked block device %s", path);
+ else
+ LOG(DEBUG, "No physical-device-path, can't access locally.");
+
+ goto out;
}
out:
@@ -3103,7 +3139,8 @@ void libxl__device_disk_local_initiate_attach(libxl__egc
*egc,
LOG(DEBUG, "Trying to find local path");
- if ((dls->diskpath = libxl__device_disk_find_local_path(gc, in_disk,
false))) {
+ if ((dls->diskpath = libxl__device_disk_find_local_path(gc, dls->domid,
+ in_disk, false))) {
LOG(DEBUG, "Local path found, executing callback.");
dls->callback(egc, dls, 0);
} else {
@@ -3118,7 +3155,6 @@ void libxl__device_disk_local_initiate_attach(libxl__egc
*egc,
rc = libxl__device_disk_setdefault(gc, disk);
if (rc) goto out;
- /* If we can't find a local path, attach it */
libxl__prepare_ao_device(ao, &dls->aodev);
dls->aodev.callback = local_device_attach_cb;
device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk, &dls->aodev,
diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c
index 95dde98..bd0c81f 100644
--- a/tools/libxl/libxl_bootloader.c
+++ b/tools/libxl/libxl_bootloader.c
@@ -382,6 +382,7 @@ void libxl__bootloader_run(libxl__egc *egc,
libxl__bootloader_state *bl)
/* This sets the state of the dls struct from Undefined to Idle */
libxl__device_disk_local_init(&bl->dls);
bl->dls.ao = ao;
+ bl->dls.domid = bl->domid;
bl->dls.in_disk = bl->disk;
bl->dls.blkdev_start = info->blkdev_start;
bl->dls.callback = bootloader_disk_attached_cb;
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index a54e758..df1acd0 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -1142,7 +1142,7 @@ static int libxl__build_device_model_args_new(libxl__gc
*gc,
disks[i].format);
else
target_path = libxl__device_disk_find_local_path(gc,
- &disks[i],
true);
+ guest_domid, &disks[i],
true);
if (!target_path) {
LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "No way to get local"
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index f58b8c9..294c1a5 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1677,7 +1677,7 @@ _hidden char *libxl__blktap_devpath(libxl__gc *gc,
_hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params);
_hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
- libxl_device_disk *disk,
+ const libxl_device_disk *disk,
libxl__device *device);
/* Calls poll() again - useful to check whether a signaled condition
@@ -2618,6 +2618,7 @@ typedef void libxl__disk_local_state_callback(libxl__egc*,
struct libxl__disk_local_state {
/* filled by the user */
libxl__ao *ao;
+ libxl_domid domid;
const libxl_device_disk *in_disk;
libxl_device_disk disk;
const char *blkdev_start;
@@ -2642,6 +2643,7 @@ static inline void
libxl__device_disk_local_init(libxl__disk_local_state *dls)
* See if we can find a way to access a disk locally
*/
_hidden char * libxl__device_disk_find_local_path(libxl__gc *gc,
+ libxl_domid domid,
const libxl_device_disk
*disk,
bool qdisk_direct);
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |