Decouple block device removal from device removal
cover Decouple block device removal from device removal
This patch series decouples the detachment of a block device from the removal of the backing pci-device. Removal of a hotplugged pci device requires the guest to respond before qemu tears down the block device. In some cases, the guest may not respond leaving the guest with continued access to the block device.
The new monitor command, drive_unplug, will revoke a guests access to the block device independently of the removal of the pci device.
The first patch adds a new drive find method, the second patch implements the monitor command and block layer changes.
PATCH 1/2 Add drive_get_by_id
Add a function to find a drive by id string.
--- blockdev.c | 12 ++++++++++++ blockdev.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-)
blockdev.c +12 -0
@@ -75,6 +75,18 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit)return NULL ; } +DriveInfo *drive_get_by_id (const char *id) +{ +DriveInfo *dinfo; + + QTAILQ_FOREACH(dinfo, &drives, next) { +if (strcmp (id, dinfo->id)) +continue ; +return dinfo; + } +return NULL ; +} +int drive_get_max_bus (BlockInterfaceType type) {int max_bus;
blockdev.h +1 -0
@@ -38,6 +38,7 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);int drive_get_max_bus (BlockInterfaceType type);void drive_uninit (DriveInfo *dinfo);DriveInfo *drive_get_by_blockdev (BlockDriverState *bs); +DriveInfo *drive_get_by_id (const char *id);QemuOpts *drive_add (const char *file,const char *fmt, ...)GCC_FMT_ATTR (2 ,3 );DriveInfo *drive_init (QemuOpts *arg,int default_to_scsi,int *fatal_error);
Signature · 1 line
1.6.3.3
Re: [Qemu-devel] [PATCH 1/2] Add drive_get_by_id
Quoted 13 lines · Ryan Harper
Add a function to find a drive by id string.
Signed-off-by Ryan Harper <[email protected]>---
blockdev.c | 12 ++++++++++++
blockdev.h | 1 +2 files changed, 13 insertions(+), 0 deletions(-)blockdev.c +0
-0
blockdev.c DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit) · line 84
Quoted 10 lines
blockdev.c +7
-0@@ -75,6 +75,18 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit) return NULL; } +DriveInfo *drive_get_by_id (const char *id) +{ + DriveInfo *dinfo; + + QTAILQ_FOREACH(dinfo, &drives, next) { + if (strcmp(id, dinfo->id)) + continue;
QEMU coding style uses curly braces even for 1-line if statements:
if (strcmp(id, dinfo->id)) {
continue;
}Stefan
PATCH 2/2 Fix Block Hotplug race with drive_unplug()
In reply to Ryan HarperBlock hot unplug is racy since the guest is required to acknowlege the ACPI unplug event; this may not happen synchronously with the device removal command
This series aims to close a gap where by mgmt applications that assume the block resource has been removed without confirming that the guest has acknowledged the removal may re-assign the underlying device to a second guest leading to data leakage.
This series introduces a new montor command to decouple asynchornous device removal from restricting guest access to a block device. We do this by creating a new monitor command drive_unplug which maps to a bdrv_unplug() command which does a bdrv_flush() and bdrv_close(). Once complete, subsequent IO is rejected from the device and the guest will get IO errors but continue to function.
A subsequent device removal command can be issued to remove the device, to which the guest may or maynot respond, but as long as the unplugged bit is set, no IO will be sumbitted.
--- block.c | 6 ++++++ block.h | 1 + blockdev.c | 26 ++++++++++++++++++++++++++ blockdev.h | 1 + hmp-commands.hx | 15 +++++++++++++++ 5 files changed, 49 insertions(+), 0 deletions(-)
block.c +6 -0
@@ -1328,6 +1328,12 @@ void bdrv_set_removable(BlockDriverState *bs, int removable) } } +void bdrv_unplug (BlockDriverState *bs) +{ +bdrv_flush (bs); +bdrv_close (bs); +} +int bdrv_is_removable (BlockDriverState *bs) {return bs->removable;
block.h +1 -0
@@ -171,6 +171,7 @@ void bdrv_set_on_error(BlockDriverState *bs, BlockErrorAction on_read_error, BlockErrorAction on_write_error);BlockErrorAction bdrv_get_on_error (BlockDriverState *bs,int is_read);void bdrv_set_removable (BlockDriverState *bs,int removable); +void bdrv_unplug (BlockDriverState *bs);int bdrv_is_removable (BlockDriverState *bs);int bdrv_is_read_only (BlockDriverState *bs);int bdrv_is_sg (BlockDriverState *bs);
blockdev.c +26 -0
@@ -609,3 +609,29 @@ int do_change_block(Monitor *mon, const char *device, }return monitor_read_bdrv_key_start (mon, bs,NULL ,NULL ); } + +int do_drive_unplug (Monitor *mon,const QDict *qdict,QObject **ret_data) +{ +DriveInfo *dinfo; +BlockDriverState *bs; +const char *id; + +if (!qdict_haskey (qdict,"id" )) { +qerror_report (QERR_MISSING_PARAMETER ,"id" ); +return -1 ; + } + + id =qdict_get_str (qdict,"id" ); + dinfo =drive_get_by_id (id); +if (!dinfo) { +qerror_report (QERR_DEVICE_NOT_FOUND , id); +return -1 ; + } + +/* mark block device unplugged */ + bs = dinfo->bdrv; +bdrv_unplug (bs); + +return 0 ; +} +
blockdev.h +1 -0
@@ -52,5 +52,6 @@ int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data);int do_block_set_passwd (Monitor *mon,const QDict *qdict,QObject **ret_data);int do_change_block (Monitor *mon,const char *device,const char *filename,const char *fmt); +int do_drive_unplug (Monitor *mon,const QDict *qdict,QObject **ret_data);#endif
hmp-commands.hx +15 -0
@@ -68,6 +68,21 @@ Eject a removable medium (use -f to force it). ETEXI { + .name = "drive_unplug", + .args_type = "id:s", + .params = "device", + .help = "unplug block device", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_drive_unplug, + }, + +STEXI +@item unplug @var{device} +@findex unplug +Unplug block device. +ETEXI + + { .name = "change", .args_type = "device:B,target:F,arg:s?", .params = "device filename [format]",
Signature · 1 line
1.6.3.3
Re: [Qemu-devel] [PATCH 2/2] Fix Block Hotplug race with drive_unplug()
Quoted 32 lines · Ryan Harper
Block hot unplug is racy since the guest is required to acknowlege the ACPI unplug event; this may not happen synchronously with the device removal command
This series aims to close a gap where by mgmt applications that assume the block resource has been removed without confirming that the guest has acknowledged the removal may re-assign the underlying device to a second guest leading to data leakage.
This series introduces a new montor command to decouple asynchornous device removal from restricting guest access to a block device. We do this by creating a new monitor command
drive_unplugwhich maps to abdrv_unplug()command which does abdrv_flush()andbdrv_close(). Once complete, subsequent IO is rejected from the device and the guest will get IO errors but continue to function.A subsequent device removal command can be issued to remove the device, to which the guest may or maynot respond, but as long as the unplugged bit is set, no IO will be sumbitted.
Signed-off-by Ryan Harper <[email protected]>---
block.c | 6 ++++++
block.h | 1 +
blockdev.c | 26 ++++++++++++++++++++++++++blockdev.h| 1 +
hmp-commands.hx | 15 +++++++++++++++5 files changed, 49 insertions(+), 0 deletions(-)block.c +0
-0
block.c void bdrv_set_removable(BlockDriverState *bs, int removable) · line 1334
Quoted 7 lines
block.c +4
-0@@ -1328,6 +1328,12 @@ void bdrv_set_removable(BlockDriverState *bs, int removable) } } +void bdrv_unplug (BlockDriverState *bs) +{ + bdrv_flush(bs); + bdrv_close(bs);
bdrv_flush() does not wait for pending aio requests to complete. bdrv_close() does not wait either.
A VM with a qcow2 image file and pending aio requests could bdrv_unplug() and free the qcow2 state before aio completions occur. If a completion is handled after bdrv_close(), the qcow2 in-memory state has been freed and we get memory corruption or a crash.
I think the solution is to use qemu_aio_flush() before bdrv_flush(). I waits until all pending aio requests have been completed.
Stefan