[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Add support for fd: protocol
From: |
Corey Bryant |
Subject: |
[Qemu-devel] [PATCH] Add support for fd: protocol |
Date: |
Fri, 20 May 2011 14:48:23 -0400 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110303 Lightning/1.0b2 Thunderbird/3.1.9 |
sVirt provides SELinux MAC isolation for Qemu guest processes and their
corresponding resources (image files). sVirt provides this support
by labeling guests and resources with security labels that are stored
in file system extended attributes. Some file systems, such as NFS, do
not support the extended attribute security namespace, which is needed
for image file isolation when using the sVirt SELinux security driver
in libvirt.
The proposed solution entails a combination of Qemu, libvirt, and
SELinux patches that work together to isolate multiple guests' images
when they're stored in the same NFS mount. This results in an
environment where sVirt isolation and NFS image file isolation can both
be provided.
Currently, Qemu opens an image file in addition to performing the
necessary read and write operations. The proposed solution will move
the open out of Qemu and into libvirt. Once libvirt opens an image
file for the guest, it will pass the file descriptor to Qemu via a
new fd: protocol.
If the image file resides in an NFS mount, the following SELinux policy
changes will provide image isolation:
- A new SELinux boolean is created (e.g. virt_read_write_nfs) to
allow Qemu (svirt_t) to only have SELinux read and write
permissions on nfs_t files
- Qemu (svirt_t) also gets SELinux use permissions on libvirt
(virtd_t) file descriptors
Following is a sample invocation of Qemu using the fd: protocol:
qemu -drive file=fd:4,format=qcow2
This patch contains the Qemu code to support this solution. I would
like to solicit input from the libvirt community prior to starting
the libvirt patch.
This patch was tested with the following formats: raw, cow, qcow,
qcow2, vmdk, using the fd: protocol as well as existing file name
support. Non-valid file descriptors were also tested.
Signed-off-by: Corey Bryant <address@hidden>
---
block/raw-posix.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++-------
qemu-doc.texi | 12 +++++++++
qemu-options.hx | 8 ++++--
3 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index a95c8d4..6554b06 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -142,7 +142,8 @@ static int raw_open_common(BlockDriverState *bs, const char
*filename,
int bdrv_flags, int open_flags)
{
BDRVRawState *s = bs->opaque;
- int fd, ret;
+ int fd = -1;
+ int ret;
s->open_flags = open_flags | O_BINARY;
s->open_flags &= ~O_ACCMODE;
@@ -159,15 +160,16 @@ static int raw_open_common(BlockDriverState *bs, const
char *filename,
else if (!(bdrv_flags & BDRV_O_CACHE_WB))
s->open_flags |= O_DSYNC;
- s->fd = -1;
- fd = qemu_open(filename, s->open_flags, 0644);
- if (fd < 0) {
- ret = -errno;
- if (ret == -EROFS)
- ret = -EACCES;
- return ret;
+ if (s->fd == -1) {
+ fd = qemu_open(filename, s->open_flags, 0644);
+ if (fd < 0) {
+ ret = -errno;
+ if (ret == -EROFS)
+ ret = -EACCES;
+ return ret;
+ }
+ s->fd = fd;
}
- s->fd = fd;
s->aligned_buf = NULL;
if ((bdrv_flags & BDRV_O_NOCACHE)) {
@@ -224,6 +226,7 @@ static int raw_open(BlockDriverState *bs, const char
*filename, int flags)
{
BDRVRawState *s = bs->opaque;
+ s->fd = -1;
s->type = FTYPE_FILE;
return raw_open_common(bs, filename, flags, 0);
}
@@ -819,6 +822,50 @@ static BlockDriver bdrv_file = {
.create_options = raw_create_options,
};
+static int raw_open_fd(BlockDriverState *bs, const char *filename, int flags)
+{
+ BDRVRawState *s = bs->opaque;
+ const char *fd_str;
+ int i;
+
+ /* extract the file descriptor - fail if it's not fd: */
+ if (!strstart(filename, "fd:", &fd_str)) {
+ return -EINVAL;
+ }
+
+ for (i = 0; fd_str[i] != '\0'; i++) {
+ if (!qemu_isdigit(fd_str[i]))
+ return -EBADF;
+ }
+
+ s->fd = atoi(fd_str);
+ s->type = FTYPE_FILE;
+
+ return raw_open_common(bs, filename, flags, 0);
+}
+
+static BlockDriver bdrv_file_fd = {
+ .format_name = "file",
+ .protocol_name = "fd",
+ .instance_size = sizeof(BDRVRawState),
+ .bdrv_probe = NULL, /* no probe for protocols */
+ .bdrv_file_open = raw_open_fd,
+ .bdrv_read = raw_read,
+ .bdrv_write = raw_write,
+ .bdrv_close = raw_close,
+ .bdrv_flush = raw_flush,
+ .bdrv_discard = raw_discard,
+
+ .bdrv_aio_readv = raw_aio_readv,
+ .bdrv_aio_writev = raw_aio_writev,
+ .bdrv_aio_flush = raw_aio_flush,
+
+ .bdrv_truncate = raw_truncate,
+ .bdrv_getlength = raw_getlength,
+
+ .create_options = raw_create_options,
+};
+
/***********************************************/
/* host device */
@@ -927,6 +974,7 @@ static int hdev_open(BlockDriverState *bs, const char
*filename, int flags)
}
#endif
+ s->fd = -1;
s->type = FTYPE_FILE;
#if defined(__linux__)
{
@@ -1097,6 +1145,7 @@ static int floppy_open(BlockDriverState *bs, const char
*filename, int flags)
BDRVRawState *s = bs->opaque;
int ret;
+ s->fd = -1;
s->type = FTYPE_FD;
/* open will not fail even if no floppy is inserted, so add O_NONBLOCK */
@@ -1209,6 +1258,7 @@ static int cdrom_open(BlockDriverState *bs, const char
*filename, int flags)
{
BDRVRawState *s = bs->opaque;
+ s->fd = -1;
s->type = FTYPE_CD;
/* open will not fail even if no CD is inserted, so add O_NONBLOCK */
@@ -1313,6 +1363,7 @@ static int cdrom_open(BlockDriverState *bs, const char
*filename, int flags)
BDRVRawState *s = bs->opaque;
int ret;
+ s->fd = -1;
s->type = FTYPE_CD;
ret = raw_open_common(bs, filename, flags, 0);
@@ -1432,6 +1483,7 @@ static void bdrv_file_init(void)
* Register all the drivers. Note that order is important, the driver
* registered last will get probed first.
*/
+ bdrv_register(&bdrv_file_fd);
bdrv_register(&bdrv_file);
bdrv_register(&bdrv_host_device);
#ifdef __linux__
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 47e1991..fea8882 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -412,6 +412,7 @@ snapshots.
* disk_images_fat_images:: Virtual FAT disk images
* disk_images_nbd:: NBD access
* disk_images_sheepdog:: Sheepdog disk images
+* disk_images_fd:: File descriptor access
@end menu
@node disk_images_quickstart
@@ -686,6 +687,17 @@ qemu-img create
sheepdog:@var{hostname}:@var{port}:@var{image} @var{size}
qemu sheepdog:@var{hostname}:@var{port}:@var{image}
@end example
address@hidden disk_images_fd
address@hidden File descriptor access
+
+QEMU can access an image file that was opened outside of the QEMU
+process. The format option is required when passing a file descriptor
+to QEMU.
+
address@hidden
+qemu -drive file=fd:4,format=qcow2
address@hidden example
+
@node pcsys_network
@section Network emulation
diff --git a/qemu-options.hx b/qemu-options.hx
index 5876fc5..7cf5358 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -116,7 +116,7 @@ using @file{/dev/cdrom} as filename (@pxref{host_drives}).
ETEXI
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
- "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
+ "-drive [file=[fd:]file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
" [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
" [,cache=writethrough|writeback|none|unsafe][,format=f]\n"
" [,serial=s][,addr=A][,id=name][,aio=threads|native]\n"
@@ -129,10 +129,12 @@ STEXI
Define a new drive. Valid options are:
@table @option
address@hidden address@hidden
address@hidden file=[fd:address@hidden
This option defines which disk image (@pxref{disk_images}) to use with
this drive. If the filename contains comma, you must double it
-(for instance, "file=my,,file" to use file "my,file").
+(for instance, "file=my,,file" to use file "my,file").
@option{fd:address@hidden
+specifies the file descriptor of an already open disk
+image. @address@hidden is required by @option{fd:address@hidden
@item address@hidden
This option defines on which type on interface the drive is connected.
Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio.
-- 1.7.1
- [Qemu-devel] [PATCH] Add support for fd: protocol,
Corey Bryant <=
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Anthony Liguori, 2011/05/20
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Blue Swirl, 2011/05/20
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Anthony Liguori, 2011/05/20
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Blue Swirl, 2011/05/20
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Kevin Wolf, 2011/05/23
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Markus Armbruster, 2011/05/23
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Kevin Wolf, 2011/05/23
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Blue Swirl, 2011/05/23
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Anthony Liguori, 2011/05/23
- Re: [Qemu-devel] [PATCH] Add support for fd: protocol, Corey Bryant, 2011/05/23