Skip to contentSkip to conversation

nbd: Honor server's advertised minimum block size

PATCH In review Eric Blake 2 participants 3 messages Feb 15, 2018 – Feb 21, 2018 Block layer

lore
Share & tools
lore

Eric Blake

author
#0 lore raw

PATCH 1/1 nbd: Honor server's advertised minimum block size

Commit 79ba8c98 (v2.7) changed the setting of request_alignment to occur only during bdrv_refresh_limits(), rather than at at bdrv_open() time; but at the time, NBD was unaffected, because it still used sector-based callbacks, so the block layer defaulted NBD to use 512 request_alignment.

Later, commit 70c4fb26 (also v2.7) changed NBD to use byte-based callbacks, without setting request_alignment. This resulted in NBD using request_alignment of 1, which works great when the server supports it (as is the case for qemu-nbd), but falls apart miserably if the server requires alignment (but only if qemu actually sends a sub-sector request; qemu-io can do it, but most qemu operations still perform on sectors or larger).

Even later, the NBD protocol was updated to document that clients should learn the server's minimum alignment during NBD_OPT_GO; and recommended that clients should assume a minimum size of 512 unless the server understands NBD_OPT_GO and replied with a smaller size. Commit 081dd1fe (v2.10) attempted to do that, by assigning request_alignment to whatever was learned from the server; but it has two flaws: the assignment is done during bdrv_open() so it gets unconditionally wiped out back to 1 during any later bdrv_refresh_limits(); and the code is not using a default of 512 when the server did not report a minimum size.

Fix these issues by moving the assignment to request_alignment to the right function, and by using a sane default when the server does not advertise a minimum size.

---
 block/nbd-client.c | 3 ---
 block/nbd.c        | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
block/nbd-client.c +0 -3
index 9206652e45c..7b68499b76a 100644
@@ -846,9 +846,6 @@ int nbd_client_init(BlockDriverState *bs,
     if (client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES) {
         bs->supported_zero_flags |= BDRV_REQ_MAY_UNMAP;
     }
-    if (client->info.min_block > bs->bl.request_alignment) {
-        bs->bl.request_alignment = client->info.min_block;
-    }
 
     qemu_co_mutex_init(&client->send_mutex);
     qemu_co_queue_init(&client->free_sema);
block/nbd.c +2 -0
index ef81a9f53ba..69b5fd5e8fa 100644
@@ -474,8 +474,10 @@ static int nbd_co_flush(BlockDriverState *bs)
 static void nbd_refresh_limits(BlockDriverState *bs, Error **errp)
 {
     NBDClientSession *s = nbd_get_client_session(bs);
+    uint32_t min = s->info.min_block;
     uint32_t max = MIN_NON_ZERO(NBD_MAX_BUFFER_SIZE, s->info.max_block);
 
+    bs->bl.request_alignment = min ? min : BDRV_SECTOR_SIZE;
     bs->bl.max_pdiscard = max;
     bs->bl.max_pwrite_zeroes = max;
     bs->bl.max_transfer = max;
Signature · 1 line
2.14.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 55 lines · Eric Blake

Commit 79ba8c98 (v2.7) changed the setting of request_alignment to occur only during bdrv_refresh_limits(), rather than at at bdrv_open() time; but at the time, NBD was unaffected, because it still used sector-based callbacks, so the block layer defaulted NBD to use 512 request_alignment.

Later, commit 70c4fb26 (also v2.7) changed NBD to use byte-based callbacks, without setting request_alignment. This resulted in NBD using request_alignment of 1, which works great when the server supports it (as is the case for qemu-nbd), but falls apart miserably if the server requires alignment (but only if qemu actually sends a sub-sector request; qemu-io can do it, but most qemu operations still perform on sectors or larger).

Even later, the NBD protocol was updated to document that clients should learn the server's minimum alignment during NBD_OPT_GO; and recommended that clients should assume a minimum size of 512 unless the server understands NBD_OPT_GO and replied with a smaller size. Commit 081dd1fe (v2.10) attempted to do that, by assigning request_alignment to whatever was learned from the server; but it has two flaws: the assignment is done during bdrv_open() so it gets unconditionally wiped out back to 1 during any later bdrv_refresh_limits(); and the code is not using a default of 512 when the server did not report a minimum size.

Fix these issues by moving the assignment to request_alignment to the right function, and by using a sane default when the server does not advertise a minimum size.

---
  block/nbd-client.c | 3 ---
  block/nbd.c        | 2 ++
  2 files changed, 2 insertions(+), 3 deletions(-)
block/nbd-client.c +0 -3
index 9206652e45c..7b68499b76a 100644
@@ -846,9 +846,6 @@ int nbd_client_init(BlockDriverState *bs,
      if (client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES) {
          bs->supported_zero_flags |= BDRV_REQ_MAY_UNMAP;
      }
-    if (client->info.min_block > bs->bl.request_alignment) {
-        bs->bl.request_alignment = client->info.min_block;
-    }
 
      qemu_co_mutex_init(&client->send_mutex);
      qemu_co_queue_init(&client->free_sema);
block/nbd.c +0 -0
index ef81a9f53ba..69b5fd5e8fa 100644

block/nbd.c static int nbd_co_flush(BlockDriverState *bs) · line 483

Quoted 10 lines
block/nbd.c +2 -0
@@ -474,8 +474,10 @@ static int nbd_co_flush(BlockDriverState *bs)
  static void nbd_refresh_limits(BlockDriverState *bs, Error **errp)
  {
      NBDClientSession *s = nbd_get_client_session(bs);
+    uint32_t min = s->info.min_block;
      uint32_t max = MIN_NON_ZERO(NBD_MAX_BUFFER_SIZE, s->info.max_block);
 
+    bs->bl.request_alignment = min ? min : BDRV_SECTOR_SIZE;
      bs->bl.max_pdiscard = max;
      bs->bl.max_pwrite_zeroes = max;
      bs->bl.max_transfer = max;
Signature · 2 lines
Best regards,
Vladimir
author
#2 lore raw
Quoted 12 lines · Vladimir Sementsov-Ogievskiy
Quoted 11 lines · Eric Blake

Commit 79ba8c98 (v2.7) changed the setting of request_alignment to occur only during bdrv_refresh_limits(), rather than at at bdrv_open() time; but at the time, NBD was unaffected, because it still used sector-based callbacks, so the block layer defaulted NBD to use 512 request_alignment.

Fix these issues by moving the assignment to request_alignment to the right function, and by using a sane default when the server does not advertise a minimum size.

Quoted 5 lines
Quoted 3 lines

---

Thanks; applied to my NBD queue.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org