From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [RFC PATCH 17/17] raw: implement is_allocated
Date: Thu, 8 Mar 2012 18:15:17 +0100 [thread overview]
Message-ID: <1331226917-6658-18-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1331226917-6658-1-git-send-email-pbonzini@redhat.com>
SEEK_DATA and SEEK_HOLE can be used to implement the is_allocated
callback for raw files. These currently work on btrfs, with an XFS
implementation also coming soon.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/raw-posix.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
block/raw.c | 8 ++++++
2 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 56aabc7..c0b32e1 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -105,6 +105,13 @@
#define O_DIRECT O_DSYNC
#endif
+#ifndef SEEK_DATA
+#define SEEK_DATA 3
+#endif
+#ifndef SEEK_HOLE
+#define SEEK_HOLE 4
+#endif
+
#define FTYPE_FILE 0
#define FTYPE_CD 1
#define FTYPE_FD 2
@@ -583,6 +590,60 @@ static int raw_create(const char *filename, QEMUOptionParameter *options)
return result;
}
+/*
+ * Returns true iff the specified sector is present in the disk image. Drivers
+ * not implementing the functionality are assumed to not support backing files,
+ * hence all their sectors are reported as allocated.
+ *
+ * If 'sector_num' is beyond the end of the disk image the return value is 0
+ * and 'pnum' is set to 0.
+ *
+ * 'pnum' is set to the number of sectors (including and immediately following
+ * the specified sector) that are known to be in the same
+ * allocated/unallocated state.
+ *
+ * 'nb_sectors' is the max value 'pnum' should be set to. If nb_sectors goes
+ * beyond the end of the disk image it will be clamped.
+ */
+static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs,
+ int64_t sector_num,
+ int nb_sectors, int *pnum)
+{
+ off_t start, data, hole;
+ int ret, num;
+ BDRVRawState *s = bs->opaque;
+
+ ret = fd_open(bs);
+ if (ret < 0) {
+ return ret;
+ }
+
+ start = sector_num * BDRV_SECTOR_SIZE;
+ hole = lseek(s->fd, start, SEEK_HOLE);
+ if (hole == -1) {
+ /* -ENXIO indicates that sector_num was past the end of the file.
+ * There is a virtual hole there. */
+ assert(errno != -ENXIO);
+
+ /* Most likely EINVAL. Assume everything is allocated. */
+ return 1;
+ }
+
+ if (hole == start) {
+ /* On a hole. We need another syscall to find its end. */
+ data = lseek(s->fd, start, SEEK_DATA);
+ assert (data != -1);
+ num = (data - start) / BDRV_SECTOR_SIZE;
+ } else {
+ data = start;
+ num = (hole - start) / BDRV_SECTOR_SIZE;
+ }
+
+ /* Clamping to the file size is done by the kernel. */
+ *pnum = MIN(nb_sectors, num);
+ return data == start;
+}
+
#ifdef CONFIG_XFS
static int xfs_discard(BDRVRawState *s, int64_t sector_num, int nb_sectors)
{
@@ -661,6 +722,7 @@ static BlockDriver bdrv_file = {
.bdrv_close = raw_close,
.bdrv_create = raw_create,
.bdrv_co_discard = raw_co_discard,
+ .bdrv_co_is_allocated = raw_co_is_allocated,
.bdrv_aio_readv = raw_aio_readv,
.bdrv_aio_writev = raw_aio_writev,
diff --git a/block/raw.c b/block/raw.c
index 3618c2d..e433bf2 100644
--- a/block/raw.c
+++ b/block/raw.c
@@ -30,6 +30,13 @@ static int coroutine_fn raw_co_flush(BlockDriverState *bs)
return bdrv_co_flush(bs->file);
}
+static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs,
+ int64_t sector_num,
+ int nb_sectors, int *pnum)
+{
+ return bdrv_co_is_allocated(bs->file, sector_num, nb_sectors, pnum);
+}
+
static int64_t raw_getlength(BlockDriverState *bs)
{
return bdrv_getlength(bs->file);
@@ -119,6 +126,7 @@ static BlockDriver bdrv_raw = {
.bdrv_co_readv = raw_co_readv,
.bdrv_co_writev = raw_co_writev,
.bdrv_co_flush_to_disk = raw_co_flush,
+ .bdrv_co_is_allocated = raw_co_is_allocated,
.bdrv_co_discard = raw_co_discard,
.bdrv_probe = raw_probe,
--
1.7.7.6
next prev parent reply other threads:[~2012-03-08 17:16 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 17:15 [Qemu-devel] [RFC PATCH 00/17] Improvements around discard and write zeroes Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 01/17] qemu-iotests: add a simple test for write_zeroes Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 02/17] qed: make write-zeroes bounce buffer smaller than a single cluster Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 03/17] block: add discard properties to BlockDriverInfo Paolo Bonzini
2012-03-09 16:47 ` Kevin Wolf
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 04/17] qed: implement bdrv_aio_discard Paolo Bonzini
2012-03-09 16:31 ` Kevin Wolf
2012-03-09 17:53 ` Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 05/17] block: pass around qiov for write_zeroes operation Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 06/17] block: use bdrv_{co, aio}_discard for write_zeroes operations Paolo Bonzini
2012-03-09 16:37 ` Kevin Wolf
2012-03-09 18:06 ` Paolo Bonzini
2012-03-10 18:02 ` Richard Laager
2012-03-12 12:27 ` Paolo Bonzini
2012-03-12 13:04 ` Kevin Wolf
2012-03-13 19:13 ` Richard Laager
2012-03-14 7:41 ` Paolo Bonzini
2012-03-14 12:01 ` Kevin Wolf
2012-03-14 12:14 ` Paolo Bonzini
2012-03-14 12:37 ` Kevin Wolf
2012-03-14 12:49 ` Paolo Bonzini
2012-03-14 13:04 ` Kevin Wolf
2012-03-24 15:33 ` Christoph Hellwig
2012-03-24 15:30 ` Christoph Hellwig
2012-03-26 19:40 ` Richard Laager
2012-03-27 10:20 ` Kevin Wolf
2012-03-24 15:29 ` Christoph Hellwig
2012-03-26 9:44 ` Daniel P. Berrange
2012-03-26 9:56 ` Christoph Hellwig
2012-03-15 0:42 ` Richard Laager
2012-03-15 9:36 ` Paolo Bonzini
2012-03-16 0:47 ` Richard Laager
2012-03-16 9:34 ` Paolo Bonzini
2012-03-24 15:27 ` Christoph Hellwig
2012-03-26 19:40 ` Richard Laager
2012-03-27 9:08 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 07/17] block: make high level discard operation always zero Paolo Bonzini
2012-03-08 17:55 ` Avi Kivity
2012-03-09 16:42 ` Kevin Wolf
2012-03-12 10:42 ` Avi Kivity
2012-03-12 11:04 ` Kevin Wolf
2012-03-12 12:03 ` Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 08/17] block: kill the write zeroes operation Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 09/17] ide: issue discard asynchronously but serialize the pieces Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 10/17] ide/scsi: add discard_zeroes_data property Paolo Bonzini
2012-03-08 18:13 ` Avi Kivity
2012-03-08 18:14 ` Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 11/17] ide/scsi: prepare for flipping the discard defaults Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard Paolo Bonzini
2012-03-08 18:17 ` Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 13/17] block: fallback from discard to writes Paolo Bonzini
2012-03-24 15:35 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 14/17] block: support FALLOC_FL_PUNCH_HOLE trimming Paolo Bonzini
2012-03-09 8:20 ` Chris Wedgwood
2012-03-09 8:31 ` Paolo Bonzini
2012-03-09 8:35 ` Chris Wedgwood
2012-03-09 8:40 ` Paolo Bonzini
2012-03-09 10:31 ` Stefan Hajnoczi
2012-03-09 10:43 ` Paolo Bonzini
2012-03-09 10:53 ` Stefan Hajnoczi
2012-03-09 10:57 ` Paolo Bonzini
2012-03-09 20:36 ` Richard Laager
2012-03-12 9:34 ` Paolo Bonzini
2012-03-24 15:40 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 15/17] raw: add get_info Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 16/17] qemu-io: fix the alloc command Paolo Bonzini
2012-03-08 17:15 ` Paolo Bonzini [this message]
2012-03-24 15:42 ` [Qemu-devel] [RFC PATCH 17/17] raw: implement is_allocated Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331226917-6658-18-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).