Skip to contentSkip to conversation

block/get_block_status: avoid redundant callouts on raw devices

PATCH Superseded Peter Lieven 3 participants 6 messages Oct 7, 2013 – Oct 8, 2013 Block layer

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 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.

---
v5: add a generic get_lba_status function in the raw driver which
adds the BDRV_BLOCK_RAW flag. bdrv_co_get_block_status will handle the callout to bs->file then.

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

 block.c               |    4 ++++
 block/raw_bsd.c       |    3 ++-
 include/block/block.h |    4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
block.c +4 -0
index 93e113a..38a589e 100644
@@ -3147,6 +3147,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         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)) {
             ret |= BDRV_BLOCK_ZERO;
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);
 }
 
 static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs,
include/block/block.h +4 -0
index f808550..003699e 100644
@@ -84,6 +84,9 @@ 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 answered by the raw driver and that one
+ *                 should look in bs->file directly.
  *
  * 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 +108,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

Il 07/10/2013 07:59, Peter Lieven ha scritto:

Quoted 23 lines

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.

---
v5: add a generic get_lba_status function in the raw driver which
adds the BDRV_BLOCK_RAW flag. bdrv_co_get_block_status will handle the callout to bs->file then.

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

 block.c               |    4 ++++
 block/raw_bsd.c       |    3 ++-
 include/block/block.h |    4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
block.c +0 -0
index 93e113a..38a589e 100644

block.c static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, · line 3151

Quoted 5 lines
block.c +2 -0
@@ -3147,6 +3147,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         return ret;
     }
 
+    if (ret & BDRV_BLOCK_RAW) {
+        return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);

Strictly speaking, this should probably do something like this:

assert(ret & BDRV_BLOCK_OFFSET_VALID);
return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,

                               nb_sectors, pnum);

Or alternatively the raw driver should return just "BDRV_BLOCK_RAW".

As a third option, the raw driver could also return not just BDRV_BLOCK_RAW and BDRV_BLOCK_OFFSET_VALID, but also BDRV_BLOCK_DATA (so that the answer makes some sense even without going down to bs->file).

But I'll let the block maintainers decide what to do.

Paolo

Quoted 42 lines
block.c +2 -0
+    }
+
     if (!(ret & BDRV_BLOCK_DATA)) {
         if (bdrv_has_zero_init(bs)) {
             ret |= BDRV_BLOCK_ZERO;
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);
 }
 
 static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs,
include/block/block.h +4 -0
index f808550..003699e 100644
@@ -84,6 +84,9 @@ 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 answered by the raw driver and that one
+ *                 should look in bs->file directly.
  *
  * 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 +108,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 {
#2 lore raw
Quoted 35 lines · Paolo Bonzini

Il 07/10/2013 07:59, Peter Lieven ha scritto:

Quoted 23 lines

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.

---
v5: add a generic get_lba_status function in the raw driver which
adds the BDRV_BLOCK_RAW flag. bdrv_co_get_block_status will handle the callout to bs->file then.

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

  block.c               |    4 ++++
  block/raw_bsd.c       |    3 ++-
  include/block/block.h |    4 ++++
  3 files changed, 10 insertions(+), 1 deletion(-)
block.c +0 -0
index 93e113a..38a589e 100644

block.c static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, · line 3151

Quoted 5 lines
block.c +2 -0
@@ -3147,6 +3147,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
          return ret;
      }
 
+    if (ret & BDRV_BLOCK_RAW) {
+        return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);

Strictly speaking, this should probably do something like this:

   assert(ret & BDRV_BLOCK_OFFSET_VALID);
   return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                nb_sectors, pnum);
Quoted 7 lines

Or alternatively the raw driver should return just "BDRV_BLOCK_RAW".

As a third option, the raw driver could also return not just BDRV_BLOCK_RAW and BDRV_BLOCK_OFFSET_VALID, but also BDRV_BLOCK_DATA (so that the answer makes some sense even without going down to bs->file).

But I'll let the block maintainers decide what to do.

Okay, I will wait for their feedback.

Peter

#3 lore raw
In reply to Paolo Bonzini
Quoted 36 lines · Paolo Bonzini

Il 07/10/2013 07:59, Peter Lieven ha scritto:

Quoted 23 lines

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.

---
v5: add a generic get_lba_status function in the raw driver which
adds the BDRV_BLOCK_RAW flag. bdrv_co_get_block_status will handle the callout to bs->file then.

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

 block.c               |    4 ++++
 block/raw_bsd.c       |    3 ++-
 include/block/block.h |    4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
block.c +0 -0
index 93e113a..38a589e 100644

block.c static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, · line 3151

Quoted 5 lines
block.c +2 -0
@@ -3147,6 +3147,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
         return ret;
     }
 
+    if (ret & BDRV_BLOCK_RAW) {
+        return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);

Strictly speaking, this should probably do something like this:

assert(ret & BDRV_BLOCK_OFFSET_VALID);
return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,

                               nb_sectors, pnum);
Quoted 7 lines

Or alternatively the raw driver should return just "BDRV_BLOCK_RAW".

As a third option, the raw driver could also return not just BDRV_BLOCK_RAW and BDRV_BLOCK_OFFSET_VALID, but also BDRV_BLOCK_DATA (so that the answer makes some sense even without going down to bs->file).

But I'll let the block maintainers decide what to do.

The return value is a bitfield, so let's use those bits and take Option 3.

Stefan

#4 lore raw
In reply to Paolo Bonzini
Quoted 27 lines · Paolo Bonzini

Il 07/10/2013 07:59, Peter Lieven ha scritto:

Quoted 26 lines

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.

---
v5: add a generic get_lba_status function in the raw driver which
adds the BDRV_BLOCK_RAW flag. bdrv_co_get_block_status will handle the callout to bs->file then.

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

  block.c               |    4 ++++
  block/raw_bsd.c       |    3 ++-
  include/block/block.h |    4 ++++
  3 files changed, 10 insertions(+), 1 deletion(-)
block.c +0 -0
index 93e113a..38a589e 100644
@@ -3147,6 +3147,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
          return ret;
      }
 
Quoted 7 lines

block.c static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, · line 3151

Quoted 2 lines
block.c +2 -0
+    if (ret & BDRV_BLOCK_RAW) {
+        return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum);

Strictly speaking, this should probably do something like this:

   assert(ret & BDRV_BLOCK_OFFSET_VALID);
   return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                nb_sectors, pnum);

shouldn't the last line be:

return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,

                               *pnum, pnum);

This would of course require *pnum = nb_sectors in raw_co_get_block_status ?

#5 lore raw

Il 08/10/2013 14:05, Peter Lieven ha scritto:

Quoted 5 lines
Quoted 5 lines

Strictly speaking, this should probably do something like this:

   assert(ret & BDRV_BLOCK_OFFSET_VALID);
   return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
                                nb_sectors, pnum);
Quoted 8 lines

shouldn't the last line be:

return bdrv_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,

                               *pnum, pnum);

This would of course require *pnum = nb_sectors in raw_co_get_block_status ?

Yes for both questions.

Paolo