Skip to contentSkip to conversation

block/get_block_status: avoid redundant callouts on raw devices

PATCH Superseded Peter Lieven 4 participants 6 messages Oct 2, 2013 Block layer

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 block/get_block_status: avoid redundant callouts on raw devices

if a raw device like an iscsi target or host device is used the current implementation makes a second call out to get the block status of bs->file. however, the raw driver already has called bdrv_get_block_status on bs->file.

v4: use a flag to detect the raw driver instead of the strncmp
hack.

---
 block.c               |    4 ++--
 block/raw_bsd.c       |    6 +++++-
 include/block/block.h |    3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)
block.c +2 -2
index 93e113a..7fa2e43 100644
@@ -3161,7 +3161,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
 
     if (bs->file &&
         (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
-        (ret & BDRV_BLOCK_OFFSET_VALID)) {
+        (ret & BDRV_BLOCK_OFFSET_VALID) && !(ret & BDRV_BLOCK_RAW)) {
         ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                         *pnum, pnum);
         if (ret2 >= 0) {
@@ -3172,7 +3172,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         }
     }
 
-    return ret;
+    return ret & ~BDRV_BLOCK_RAW;
 }
 
 /* Coroutine wrapper for bdrv_get_block_status() */
block/raw_bsd.c +5 -1
index d4ace60..a9e0209 100644
@@ -62,7 +62,11 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                             int64_t sector_num,
                                             int nb_sectors, int *pnum)
 {
-    return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    int64_t ret = bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    if (ret < 0) {
+        return ret;
+    }
+    return ret | BDRV_BLOCK_RAW;
 }
 
 static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs,
include/block/block.h +3 -0
index f808550..cb7019b 100644
@@ -84,6 +84,8 @@ typedef struct BlockDevOps {
 /* BDRV_BLOCK_DATA: data is read from bs->file or another file
  * BDRV_BLOCK_ZERO: sectors read as zero
  * BDRV_BLOCK_OFFSET_VALID: sector stored in bs->file as raw data
+ * BDRV_BLOCK_RAW: used internally to indicate that the request
+ *                 was piped through the raw driver
  *
  * If BDRV_BLOCK_OFFSET_VALID is set, bits 9-62 represent the offset in
  * bs->file where sector data can be read from as raw data.
@@ -105,6 +107,7 @@ typedef struct BlockDevOps {
 #define BDRV_BLOCK_DATA         1
 #define BDRV_BLOCK_ZERO         2
 #define BDRV_BLOCK_OFFSET_VALID 4
+#define BDRV_BLOCK_RAW          8
 #define BDRV_BLOCK_OFFSET_MASK  BDRV_SECTOR_MASK
 
 typedef enum {
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 59 lines · Peter Lieven

if a raw device like an iscsi target or host device is used the current implementation makes a second call out to get the block status of bs->file. however, the raw driver already has called bdrv_get_block_status on bs->file.

v4: use a flag to detect the raw driver instead of the strncmp
hack.

---
 block.c               |    4 ++--
 block/raw_bsd.c       |    6 +++++-
 include/block/block.h |    3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)
block.c +2 -2
index 93e113a..7fa2e43 100644
@@ -3161,7 +3161,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
 
     if (bs->file &&
         (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
-        (ret & BDRV_BLOCK_OFFSET_VALID)) {
+        (ret & BDRV_BLOCK_OFFSET_VALID) && !(ret & BDRV_BLOCK_RAW)) {
         ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                         *pnum, pnum);
         if (ret2 >= 0) {
@@ -3172,7 +3172,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         }
     }
 
-    return ret;
+    return ret & ~BDRV_BLOCK_RAW;
 }
 
 /* Coroutine wrapper for bdrv_get_block_status() */
block/raw_bsd.c +5 -1
index d4ace60..a9e0209 100644
@@ -62,7 +62,11 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                             int64_t sector_num,
                                             int nb_sectors, int *pnum)
 {
-    return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    int64_t ret = bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    if (ret < 0) {
+        return ret;
+    }
+    return ret | BDRV_BLOCK_RAW;
 }
 
 static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs,
include/block/block.h +0 -0
index f808550..cb7019b 100644

include/block/block.h typedef struct BlockDevOps { · line 88

Quoted 5 lines
include/block/block.h +2 -0
@@ -84,6 +84,8 @@ typedef struct BlockDevOps {
 /* BDRV_BLOCK_DATA: data is read from bs->file or another file
  * BDRV_BLOCK_ZERO: sectors read as zero
  * BDRV_BLOCK_OFFSET_VALID: sector stored in bs->file as raw data
+ * BDRV_BLOCK_RAW: used internally to indicate that the request
+ *                 was piped through the raw driver

Sorry I didn't review this earlier but this flag looks hacky and I'm not confident about merging the patch yet.

The patch makes me wonder if the raw_bsd driver should avoid calling bs->file itself:

return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |

       (sector_num << BDRV_SECTOR_BITS);

Let block.c:bdrv_co_get_block_status() call down into bs->file.

The problem is then the protocol cannot report unallocated sectors with this approach.

I think we want to preserve bs' offset while taking the other flags from bs->file (DATA, ZERO).

Peter, Paolo: What do you think of this approach?

Stefan

#2 lore raw

Il 02/10/2013 17:06, Stefan Hajnoczi ha scritto:

Quoted 9 lines

Sorry I didn't review this earlier but this flag looks hacky and I'm not confident about merging the patch yet.

The patch makes me wonder if the raw_bsd driver should avoid calling bs->file itself:

return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |

       (sector_num << BDRV_SECTOR_BITS);
Quoted 7 lines

Let block.c:bdrv_co_get_block_status() call down into bs->file.

The problem is then the protocol cannot report unallocated sectors with this approach.

I think we want to preserve bs' offset while taking the other flags from bs->file (DATA, ZERO).

This would cause other changes. For example, a qcow2 with full metadata preallocation (i.e. all L2 tables are there but it points to holes) would not return DATA anymore. I think this is wrong, and especially a change from the old is_allocated API.

However, a variant on this idea could be to return

   BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
        (sector_num << BDRV_SECTOR_BITS);

and then BDRV_BLOCK_RAW would mean "take DATA and ZERO from bs->file".

Paolo

Quoted 1 line

Peter, Paolo: What do you think of this approach?

#3 lore raw

Am 02.10.2013 17:13, schrieb Paolo Bonzini:

Quoted 22 lines

Il 02/10/2013 17:06, Stefan Hajnoczi ha scritto:

Quoted 9 lines

Sorry I didn't review this earlier but this flag looks hacky and I'm not confident about merging the patch yet.

The patch makes me wonder if the raw_bsd driver should avoid calling bs->file itself:

return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |

       (sector_num << BDRV_SECTOR_BITS);
Quoted 7 lines

Let block.c:bdrv_co_get_block_status() call down into bs->file.

The problem is then the protocol cannot report unallocated sectors with this approach.

I think we want to preserve bs' offset while taking the other flags from bs->file (DATA, ZERO).

This would cause other changes. For example, a qcow2 with full metadata preallocation (i.e. all L2 tables are there but it points to holes) would not return DATA anymore. I think this is wrong, and especially a change from the old is_allocated API.

Quoted 6 lines

However, a variant on this idea could be to return

   BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
        (sector_num << BDRV_SECTOR_BITS);

and then BDRV_BLOCK_RAW would mean "take DATA and ZERO from bs->file".

I am fine with that.

Peter

#4 lore raw
In reply to Paolo Bonzini

Am 02.10.2013 17:13, schrieb Paolo Bonzini:

Quoted 22 lines

Il 02/10/2013 17:06, Stefan Hajnoczi ha scritto:

Quoted 9 lines

Sorry I didn't review this earlier but this flag looks hacky and I'm not confident about merging the patch yet.

The patch makes me wonder if the raw_bsd driver should avoid calling bs->file itself:

return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |

       (sector_num << BDRV_SECTOR_BITS);
Quoted 7 lines

Let block.c:bdrv_co_get_block_status() call down into bs->file.

The problem is then the protocol cannot report unallocated sectors with this approach.

I think we want to preserve bs' offset while taking the other flags from bs->file (DATA, ZERO).

This would cause other changes. For example, a qcow2 with full metadata preallocation (i.e. all L2 tables are there but it points to holes) would not return DATA anymore. I think this is wrong, and especially a change from the old is_allocated API.

Quoted 6 lines

However, a variant on this idea could be to return

   BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
        (sector_num << BDRV_SECTOR_BITS);

and then BDRV_BLOCK_RAW would mean "take DATA and ZERO from bs->file".

Like this?

block.c +4 -0
index 93e113a..71fab1f 100644
@@ -3146,6 +3146,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         *pnum = 0;
         return ret;
     }
+   
+    if (ret & BDRV_BLOCK_RAW) {
+        return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    }
 
     if (!(ret & BDRV_BLOCK_DATA)) {
         if (bdrv_has_zero_init(bs)) {
block/raw_bsd.c +2 -1
index d4ace60..308d605 100644
@@ -62,7 +62,8 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                             int64_t sector_num,
                                             int nb_sectors, int *pnum)
 {
-    return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);
+    return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
+           (sector_num << BDRV_SECTOR_BITS);
 }
Reviewed-by on v4 1/1
#5 lore raw
In reply to Peter Lieven
Quoted 7 lines · Peter Lieven

if a raw device like an iscsi target or host device is used the current implementation makes a second call out to get the block status of bs->file. however, the raw driver already has called bdrv_get_block_status on bs->file.

v4: use a flag to detect the raw driver instead of the strncmp
hack.

The v4 designation...

Quoted 3 lines

---

...should appear after the --- separator (useful to reviewers, but doesn't need to be part of the git history).

Quoted 4 lines
 block.c               |    4 ++--
 block/raw_bsd.c       |    6 +++++-
 include/block/block.h |    3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)
Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org