Various blktap related patches (xen part)
cover Various blktap related patches (xen part)
The following patch series is the xen repository part of some blktap related patches that accumulated during SLES 11 development. A qemu-xen part will follow once these are checked in, so the dependencies are met.
The main point is restoring the possibility to use qemu-dm as a backend for blktap devices (and mid-term letting tapdisk die with its duplicated code), but at least the error handling addresses general concerns.
As an overview, we have the following patches:
1) blktapctrl: Select backend by prefix
2) blktap: Export disk type constants for ioemu
3) blktapctrl: Fix too early close of pipes
4) blktap: Move error signaling to blktapctrl
Kevin
PATCH 1/4 blktapctrl: Select backend by prefix
This patch adds support for specifying the backend (tapdisk or ioemu) to blktapctrl. Images can be specified e.g. as tap:tapdisk:aio, tap:ioemu:qcow2 or tap:vmdk. When omitting the backend, a default is chosen based on the image type (currently always tapdisk because ioemu as a backend is broken until a follow-up patch series against qemu-xen is applied)
blktapctrl: Select backend by prefix
This patch adds support for specifying the backend (tapdisk or ioemu) to blktapctrl. Images can be specified e.g. as tap:tapdisk:aio, tap:ioemu:qcow2 or tap:vmdk. When omitting the backend, a default is chosen based on the image type (currently always tapdisk because ioemu as a backend is broken until a follow-up patch series against qemu-xen is applied)
tools/blktap/drivers/blktapctrl.c +30 -5
@@ -148,7 +148,8 @@ static int get_tapdisk_pid(blkif_t *blki* return 0 on success, -1 on error. */ -static int test_path (char *path,char **dev,int *type,blkif_t **blkif) +static int test_path (char *path,char **dev,int *type,blkif_t **blkif, +int * use_ioemu) {char *ptr, handle[10 ];int i, size, found =0 ;
@@ -158,6 +159,17 @@ static int test_path(char *path, char ** *type =MAX_DISK_TYPES +1 ; *blkif =NULL ; +if (!strncmp (path,"tapdisk:" ,strlen ("tapdisk:" ))) { + *use_ioemu =0 ; + path +=strlen ("tapdisk:" ); + }else if (!strncmp (path,"ioemu:" ,strlen ("ioemu:" ))) { + *use_ioemu =1 ; + path +=strlen ("ioemu:" ); + }else { +// Use the default for the image type + *use_ioemu =-1 ; + } +if ( (ptr =strstr (path,":" ))!=NULL ) { handle_len = (ptr - path);memcpy (handle, path, handle_len);
@@ -174,6 +186,8 @@ static int test_path(char *path, char ** }if (found) { +if (*use_ioemu ==-1 ) + *use_ioemu = dtypes[i]->use_ioemu; *type = dtypes[i]->idnum;if (dtypes[i]->single_handler ==1 ) {
@@ -185,6 +199,7 @@ static int test_path(char *path, char ** *blkif = active_disks[dtypes[i] ->idnum]->blkif; } +return 0 ; } }
@@ -504,7 +519,8 @@ static int connect_qemu(blkif_t *blkif,static int tapdisk_ioemu_pid =0 ;static int dom0_readfd =0 ;static int dom0_writefd =0 ; - +int refresh_pid =0 ; +if (asprintf (&rdctldev,BLKTAP_CTRL_DIR "/qemu-read-%d" , domid) <0 )return -1 ;
@@ -523,15 +539,23 @@ static int connect_qemu(blkif_t *blkif,if (tapdisk_ioemu_pid ==0 ||kill (tapdisk_ioemu_pid,0 )) {/* No device model and tapdisk-ioemu doesn't run yet */ DPRINTF ("Launching tapdisk-ioemu\n" ); - tapdisk_ioemu_pid =launch_tapdisk_ioemu (); +launch_tapdisk_ioemu (); dom0_readfd =open_ctrl_socket (wrctldev); dom0_writefd =open_ctrl_socket (rdctldev); + + refresh_pid =1 ; }DPRINTF ("Using tapdisk-ioemu connection\n" ); blkif->fds[READ ] = dom0_readfd; blkif->fds[WRITE ] = dom0_writefd; + +if (refresh_pid) { +get_tapdisk_pid (blkif); + tapdisk_ioemu_pid = blkif->tappid; + } + }else if (access (rdctldev,R_OK |W_OK ) ==0 ) {/* Use existing pipe to the device model */ DPRINTF ("Using qemu-dm connection\n" );
@@ -605,13 +629,14 @@ static int blktapctrl_new_blkif(blkif_timage_t *image;blkif_t *exist =NULL ;static uint16_t next_cookie =0 ; +int use_ioemu;DPRINTF ("Received a poll for a new vbd\n" );if ( ((blk=blkif->info) !=NULL ) && (blk->params !=NULL ) ) {if (blktap_interface_create (ctlfd, &major, &minor, blkif) <0 )return -1 ; -if (test_path (blk->params, &ptr, &type, &exist) !=0 ) { +if (test_path (blk->params, &ptr, &type, &exist, &use_ioemu) !=0 ) {DPRINTF ("Error in blktap device string(%s).\n" , blk->params); goto fail;
@@ -620,7 +645,7 @@ static int blktapctrl_new_blkif(blkif_t blkif->cookie = next_cookie++;if (!exist) { -if (type ==DISK_TYPE_IOEMU ) { +if (use_ioemu) {if (connect_qemu (blkif, blkif->domid)) goto fail; }else {
tools/blktap/drivers/tapdisk.h +8 -12
@@ -145,6 +145,8 @@ typedef struct disk_info {char handle[10 ];/* xend handle, e.g. 'ram' */ int single_handler;/* is there a single controller for all */ /* instances of disk type? */ +int use_ioemu;/* backend provider: 0 = tapdisk; 1 = ioemu */ +#ifdef TAPDISK struct tap_disk *drv;#endif
@@ -167,7 +169,6 @@ extern struct tap_disk tapdisk_qcow2;#define DISK_TYPE_RAM 3#define DISK_TYPE_QCOW 4#define DISK_TYPE_QCOW2 5 -#define DISK_TYPE_IOEMU 6/*Define Individual Disk Parameters here */
@@ -176,6 +177,7 @@ static disk_info_t aio_disk = {"raw image (aio)" ,"aio" ,0 , +0 , #ifdef TAPDISK &tapdisk_aio, #endif
@@ -186,6 +188,7 @@ static disk_info_t sync_disk = {"raw image (sync)" ,"sync" ,0 , +0 , #ifdef TAPDISK &tapdisk_sync, #endif
@@ -196,6 +199,7 @@ static disk_info_t vmdk_disk = {"vmware image (vmdk)" ,"vmdk" ,1 , +0 , #ifdef TAPDISK &tapdisk_vmdk, #endif
@@ -206,6 +210,7 @@ static disk_info_t ram_disk = {"ramdisk image (ram)" ,"ram" ,1 , +0 , #ifdef TAPDISK &tapdisk_ram, #endif
@@ -216,6 +221,7 @@ static disk_info_t qcow_disk = {"qcow disk (qcow)" ,"qcow" ,0 , +0 , #ifdef TAPDISK &tapdisk_qcow, #endif
@@ -226,21 +232,12 @@ static disk_info_t qcow2_disk = {"qcow2 disk (qcow2)" ,"qcow2" ,0 , +0 , #ifdef TAPDISK &tapdisk_qcow2, #endif }; -static disk_info_t ioemu_disk = { -DISK_TYPE_IOEMU , -"ioemu disk" , -"ioemu" , -1 , -#ifdef TAPDISK -NULL -#endif -}; -/*Main disk info array */ static disk_info_t *dtypes[] = { &aio_disk,
@@ -249,7 +246,6 @@ static disk_info_t *dtypes[] = { &ram_disk, &qcow_disk, &qcow2_disk, - &ioemu_disk, }; typedef struct driver_list_entry {
tools/python/xen/xend/server/BlktapController.py +2 -1
@@ -15,7 +15,8 @@ blktap_disk_types = [ 'qcow', 'qcow2', - 'ioemu' + 'ioemu', + 'tapdisk', ] class BlktapController(BlkifController):
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 2/4 blktap: Export disk type constants for ioemu
In reply to Kevin WolfCurrently all disk types that are supported are defined in a header file private to blktapctrl and tapdisk. When restoring ioemu as a backend for blktap these constants are needed by ioemu, so move them to a more public header file.
blktap: Export disk type constants for ioemu
Currently all disk types that are supported are defined in a header file private to blktapctrl and tapdisk. When restoring ioemu as a backend for blktap these constants are needed by ioemu, so move them to a more public header file.
tools/blktap/drivers/tapdisk.h +0 -9
@@ -161,15 +161,6 @@ extern struct tap_disk tapdisk_ram;extern struct tap_disk tapdisk_qcow;extern struct tap_disk tapdisk_qcow2; -#define MAX_DISK_TYPES 20 - -#define DISK_TYPE_AIO 0 -#define DISK_TYPE_SYNC 1 -#define DISK_TYPE_VMDK 2 -#define DISK_TYPE_RAM 3 -#define DISK_TYPE_QCOW 4 -#define DISK_TYPE_QCOW2 5 -/*Define Individual Disk Parameters here */ static disk_info_t aio_disk = {
tools/blktap/lib/blktaplib.h +10 -0
@@ -210,6 +210,16 @@ typedef struct msg_pid {#define CTLMSG_PID 9#define CTLMSG_PID_RSP 10 +/* disk driver types */ +#define MAX_DISK_TYPES 20 + +#define DISK_TYPE_AIO 0 +#define DISK_TYPE_SYNC 1 +#define DISK_TYPE_VMDK 2 +#define DISK_TYPE_RAM 3 +#define DISK_TYPE_QCOW 4 +#define DISK_TYPE_QCOW2 5 +/* xenstore/xenbus: */ #define DOMNAME "Domain-0"int setup_probe_watch (struct xs_handle *h);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 3/4 blktapctrl: Fix too early close of pipes
In reply to Kevin WolfConnections to ioemu have single_handler set, so they are closed as soon as all images of a certain type are closed. This is wrong with
ioemu: All images that belong to the same domain are handled by the same backend process (usually qemu-dm, but also tapdisk-ioemu for domains without device model), regardless of the image type.
This patch checks for the same-domain condition for ioemu connections.
blktapctrl: Fix too early close of pipes
Connections to ioemu have single_handler set, so they are closed as soon as all images of a certain type are closed. This is wrong with
ioemu: All images that belong to the same domain are handled by the same backend process (usually qemu-dm, but also tapdisk-ioemu for domains without device model), regardless of the image type.
This patch checks for the same-domain condition for ioemu connections.
tools/blktap/drivers/blktapctrl.c +27 -0
@@ -231,6 +231,24 @@ static void add_disktype(blkif_t *blkif, entry->pprev = pprev; } +static int qemu_instance_has_disks (pid_t pid) +{ +int i; +int count =0 ; +driver_list_entry_t *entry; + +for (i =0 ; i <MAX_DISK_TYPES ; i++) { + entry = active_disks[i]; +while (entry) { +if ((entry->blkif->tappid == pid) && dtypes[i]->use_ioemu) + count++; + entry = entry->next; + } + } + +return (count !=0 ); +} +static int del_disktype (blkif_t *blkif) {driver_list_entry_t *entry, **pprev;
@@ -255,6 +273,14 @@ static int del_disktype(blkif_t *blkif)DPRINTF ("DEL_DISKTYPE: Freeing entry\n" );free (entry); +/* +* When using ioemu, all disks of one VM are connected to the same +* qemu-dm instance. We may close the file handle only if there is +* no other disk left for this domain. +*/ +if (dtypes[type]->use_ioemu) +return !qemu_instance_has_disks (blkif->tappid); +/* Caller should close() if no single controller, or list is empty. */ return (!dtypes[type]->single_handler || (active_disks[type] ==NULL )); }
@@ -721,6 +747,7 @@ static int unmap_blktapctrl(blkif_t *blk }if (del_disktype (blkif)) { +DPRINTF ("Closing communication pipe to pid %d\n" , blkif->tappid);close (blkif->fds[WRITE ]);close (blkif->fds[READ ]); }
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 4/4 blktap: Move error signaling to blktapctrl
In reply to Kevin WolfUntil now the udev script for blktap devices needs to decide if to signal success or failure to xend. As this script runs completely independent of blktapctrl and tapdisk/ioemu which do the real work, the udev script can't even theoretically know if tapdisk is happy.
This patch removes the udev script and replaces its checks by new ones in libblktap.
blktap: Move error signaling to blktapctrl
Until now the udev script for blktap devices needs to decide if to signal success or failure to xend. As this script runs completely independent of blktapctrl and tapdisk/ioemu which do the real work, the udev script can't even theoretically know if tapdisk is happy.
This patch removes the udev script and replaces its checks by new ones in libblktap.
tools/blktap/drivers/blktapctrl.c +8 -8
@@ -659,9 +659,6 @@ static int blktapctrl_new_blkif(blkif_tDPRINTF ("Received a poll for a new vbd\n" );if ( ((blk=blkif->info) !=NULL ) && (blk->params !=NULL ) ) { -if (blktap_interface_create (ctlfd, &major, &minor, blkif) <0 ) -return -1 ; -if (test_path (blk->params, &ptr, &type, &exist, &use_ioemu) !=0 ) {DPRINTF ("Error in blktap device string(%s).\n" , blk->params);
@@ -685,10 +682,6 @@ static int blktapctrl_new_blkif(blkif_t blkif->fds[WRITE ] = exist->fds[WRITE ]; } -add_disktype (blkif, type); - blkif->major = major; - blkif->minor = minor; - image = (image_t *)malloc (sizeof (image_t)); blkif->prv = (void *)image; blkif->ops = &tapdisk_ops;
@@ -712,11 +705,18 @@ static int blktapctrl_new_blkif(blkif_t goto fail; } +if (blktap_interface_create (ctlfd, &major, &minor, blkif) <0 ) +return -1 ; + + blkif->major = major; + blkif->minor = minor; + +add_disktype (blkif, type); + }else return -1 ;return 0 ; fail: -ioctl (ctlfd,BLKTAP_IOCTL_FREEINTF , minor);return -EINVAL ; }
tools/blktap/lib/xenbus.c +148 -2
191 lines not on this page · raw message
tools/hotplug/Linux/xen-backend.rules +0 -1
@@ -1,4 +1,3 @@ -SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="online", RUN+="$env{script} online"
tools/hotplug/Linux/blktap deleted +0 -93
93 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel