virtio-blk: set correct config size for the host driver
PATCH v3 1/1 virtio-blk: set correct config size for the host driver
Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features support" added fields to struct virtio_blk_config. This changes the size of the config space and breaks migration from QEMU 3.1 and older:
qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk'
qemu-system-ppc64: load of migration failed: Invalid argument
Since virtio-blk doesn't support the "discard" and "write zeroes" features, it shouldn't even expose the associated fields in the config space actually. Just include all fields up to num_queues to match QEMU 3.1 and older.
--- hw/block/virtio-blk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
hw/block/virtio-blk.c +10 -4
@@ -28,6 +28,10 @@#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +/* We don't support discard yet, hide associated config fields. */ +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ + max_discard_sectors) +static void virtio_blk_init_request (VirtIOBlock *s,VirtQueue *vq,VirtIOBlockReq *req) {
@@ -761,7 +765,9 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) blkcfg.alignment_offset =0 ; blkcfg.wce =blk_enable_write_cache (s->blk);virtio_stw_p (vdev, &blkcfg.num_queues, s->conf.num_queues); -memcpy (config, &blkcfg,sizeof (struct virtio_blk_config )); +memcpy (config, &blkcfg,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (struct virtio_blk_config )); + }static void virtio_blk_set_config (VirtIODevice *vdev,const uint8_t *config)
@@ -769,7 +775,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)VirtIOBlock *s =VIRTIO_BLK (vdev);struct virtio_blk_config blkcfg; -memcpy (&blkcfg, config,sizeof (blkcfg)); +memcpy (&blkcfg, config,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (blkcfg));aio_context_acquire (blk_get_aio_context (s->blk));blk_set_enable_write_cache (s->blk, blkcfg.wce !=0 );
@@ -952,8 +959,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)return ; } -virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK , -sizeof (struct virtio_blk_config )); +virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK ,VIRTIO_BLK_CFG_SIZE ); s->blk = conf->conf.blk; s->rq =NULL ;
Signature · 1 line
1.9.3
Quoted 11 lines · Changpeng Liu
Commit
caa1ee43"vhost-user-blk: add discard/write zeroes features support" added fields to structvirtio_blk_config. This changes the size of the config space and breaks migration from QEMU 3.1 and older:qemu-system-ppc64:
get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance0x0of device 'pci@800000020000000:01.0/virtio-blk'
qemu-system-ppc64: load of migration failed: Invalid argument
Quoted 6 lines
Since virtio-blk doesn't support the "discard" and "write zeroes" features, it shouldn't even expose the associated fields in the config space actually. Just include all fields up to
num_queuesto match QEMU 3.1 and older.Signed-off-by Changpeng Liu <[email protected]>
OK almost.
Quoted 20 lines
--- hw/block/virtio-blk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)hw/block/virtio-blk.c +4
-0@@ -28,6 +28,10 @@#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +/* We don't support discard yet, hide associated config fields. */ +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ + max_discard_sectors) +static void virtio_blk_init_request (VirtIOBlock *s,VirtQueue *vq,VirtIOBlockReq *req) {
hw/block/virtio-blk.c static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) · line 770
Quoted 7 lines
hw/block/virtio-blk.c +3
-1@@ -761,7 +765,9 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) blkcfg.alignment_offset =0 ; blkcfg.wce =blk_enable_write_cache (s->blk);virtio_stw_p (vdev, &blkcfg.num_queues, s->conf.num_queues); -memcpy (config, &blkcfg,sizeof (struct virtio_blk_config )); +memcpy (config, &blkcfg,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (struct virtio_blk_config )); +
Oh probably sizeof blkcfg here, right?
Also we don't need the empty line here.
Quoted 25 lines
hw/block/virtio-blk.c +3
-3}static void virtio_blk_set_config (VirtIODevice *vdev,const uint8_t *config)@@ -769,7 +775,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)VirtIOBlock *s =VIRTIO_BLK (vdev);struct virtio_blk_config blkcfg; -memcpy (&blkcfg, config,sizeof (blkcfg)); +memcpy (&blkcfg, config,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (blkcfg));aio_context_acquire (blk_get_aio_context (s->blk));blk_set_enable_write_cache (s->blk, blkcfg.wce !=0 );@@ -952,8 +959,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)return ; } -virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK , -sizeof (struct virtio_blk_config )); +virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK ,VIRTIO_BLK_CFG_SIZE ); s->blk = conf->conf.blk; s->rq =NULL ;Signature · 1 line
1.9.3
Quoted 60 lines
-----Original Message-----
From: Michael S. Tsirkin [mailto:[email protected]]
Sent: Tuesday, February 12, 2019 11:11 PM
To: Liu, Changpeng <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3] virtio-blk: set correct config size for the host driverQuoted 6 lines · Changpeng Liu
Commit
caa1ee43"vhost-user-blk: add discard/write zeroes features support" added fields to structvirtio_blk_config. This changes the size of the config space and breaks migration from QEMU 3.1 and older:qemu-system-ppc64:
get_pci_config_device: Bad config data: i=0x10 read: 41device: 1 cmask: ff wmask: 80 w1cmask:0
Quoted 3 lines
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance0x0of device'pci@800000020000000:01.0/virtio-blk'
Quoted 8 lines
qemu-system-ppc64: load of migration failed: Invalid argument
Since virtio-blk doesn't support the "discard" and "write zeroes" features, it shouldn't even expose the associated fields in the config space actually. Just include all fields up to
num_queuesto match QEMU 3.1 and older.Signed-off-by Changpeng Liu <[email protected]>OK almost.
hw/block/virtio-blk.c static void virtio_blk_update_config(VirtIODevice
Quoted 20 lines
--- hw/block/virtio-blk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)hw/block/virtio-blk.c +4
-0@@ -28,6 +28,10 @@#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +/* We don't support discard yet, hide associated config fields. */ +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ + max_discard_sectors) +static void virtio_blk_init_request (VirtIOBlock *s,VirtQueue *vq,VirtIOBlockReq *req) {@@ -761,7 +765,9 @@ static void virtio_blk_update_config(VirtIODevice*vdev,
uint8_t*config)hw/block/virtio-blk.c static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
Quoted 6 lines
hw/block/virtio-blk.c +2
-1blkcfg.alignment_offset =0 ; blkcfg.wce =blk_enable_write_cache (s->blk);virtio_stw_p (vdev, &blkcfg.num_queues, s->conf.num_queues); -memcpy (config, &blkcfg,sizeof (struct virtio_blk_config )); +memcpy (config, &blkcfg,VIRTIO_BLK_CFG_SIZE ); + QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(struct
Quoted 5 lines
virtio_blk_config));hw/block/virtio-blk.c static void virtio_blk_update_config(VirtIODevice · line 770
Quoted 1 line
hw/block/virtio-blk.c +1
-0+Oh probably sizeof blkcfg here, right? Also we don't need the empty line here.
Ok, removed the empty line and use sizeof(blkcfg) instead with v4.
Quoted 28 lines
hw/block/virtio-blk.c static void virtio_blk_set_config(VirtIODevice *vdev,
Quoted 5 lines
hw/block/virtio-blk.c +0
-0}static void virtio_blk_set_config (VirtIODevice *vdev,const uint8_t *config)@@ -769,7 +775,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev,const
uint8_t*config)hw/block/virtio-blk.c static void virtio_blk_device_realize(DeviceState *dev,
Quoted 10 lines
hw/block/virtio-blk.c +2
-1VirtIOBlock *s =VIRTIO_BLK (vdev);struct virtio_blk_config blkcfg; -memcpy (&blkcfg, config,sizeof (blkcfg)); +memcpy (&blkcfg, config,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (blkcfg));aio_context_acquire (blk_get_aio_context (s->blk));blk_set_enable_write_cache (s->blk, blkcfg.wce !=0 );@@ -952,8 +959,7 @@ static void virtio_blk_device_realize(DeviceState *dev,Error **errp)
Quoted 11 lines
hw/block/virtio-blk.c +1
-3return ; } -virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK , -sizeof (struct virtio_blk_config )); +virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK ,VIRTIO_BLK_CFG_SIZE ); s->blk = conf->conf.blk; s->rq =NULL ; --1.9.3
Quoted 11 lines · On Tue, 12 Feb 2019 23:19:49 +0800 Changpeng Liu <[email protected]>…
Commit
caa1ee43"vhost-user-blk: add discard/write zeroes features support" added fields to structvirtio_blk_config. This changes the size of the config space and breaks migration from QEMU 3.1 and older:qemu-system-ppc64:
get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance0x0of device 'pci@800000020000000:01.0/virtio-blk'
qemu-system-ppc64: load of migration failed: Invalid argument
Quoted 7 lines
Since virtio-blk doesn't support the "discard" and "write zeroes" features, it shouldn't even expose the associated fields in the config space actually. Just include all fields up to
num_queuesto match QEMU 3.1 and older.Signed-off-by Changpeng Liu <[email protected]>---
Still looks good to me :)
Quoted 49 lines
hw/block/virtio-blk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)hw/block/virtio-blk.c +10
-4@@ -28,6 +28,10 @@#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +/* We don't support discard yet, hide associated config fields. */ +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ + max_discard_sectors) +static void virtio_blk_init_request (VirtIOBlock *s,VirtQueue *vq,VirtIOBlockReq *req) {@@ -761,7 +765,9 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) blkcfg.alignment_offset =0 ; blkcfg.wce =blk_enable_write_cache (s->blk);virtio_stw_p (vdev, &blkcfg.num_queues, s->conf.num_queues); -memcpy (config, &blkcfg,sizeof (struct virtio_blk_config )); +memcpy (config, &blkcfg,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (struct virtio_blk_config )); + }static void virtio_blk_set_config (VirtIODevice *vdev,const uint8_t *config)@@ -769,7 +775,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)VirtIOBlock *s =VIRTIO_BLK (vdev);struct virtio_blk_config blkcfg; -memcpy (&blkcfg, config,sizeof (blkcfg)); +memcpy (&blkcfg, config,VIRTIO_BLK_CFG_SIZE ); +QEMU_BUILD_BUG_ON (VIRTIO_BLK_CFG_SIZE >sizeof (blkcfg));aio_context_acquire (blk_get_aio_context (s->blk));blk_set_enable_write_cache (s->blk, blkcfg.wce !=0 );@@ -952,8 +959,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)return ; } -virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK , -sizeof (struct virtio_blk_config )); +virtio_init (vdev,"virtio-blk" ,VIRTIO_ID_BLOCK ,VIRTIO_BLK_CFG_SIZE ); s->blk = conf->conf.blk; s->rq =NULL ;