search for: virtio_blk_outhdr

Now that QEmu reuses linux virtio headers, we noticed a typo in the exported virtio block header. Fix it up. I'd like these merged for 4.0 so that Qemu 2.3 can alredy get it right. Michael S. Tsirkin (2): virtio_blk: typo fix virtio_blk: fix comment for virtio 1.0 include/uapi/linux/virtio_blk.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- MST

Now that QEmu reuses linux virtio headers, we noticed a typo in the exported virtio block header. Fix it up. I'd like these merged for 4.0 so that Qemu 2.3 can alredy get it right. Michael S. Tsirkin (2): virtio_blk: typo fix virtio_blk: fix comment for virtio 1.0 include/uapi/linux/virtio_blk.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- MST

Without this fix attempts to do scsi passthrough on virtio_blk will crash the system on virtually mapped stacks, which is something happening during boot with many distros.

Without this fix attempts to do scsi passthrough on virtio_blk will crash the system on virtually mapped stacks, which is something happening during boot with many distros.

Fix up comment to match virtio 1.0 logic: virtio_blk_outhdr isn't the first elements anymore, the only requirement is that it comes first in the s/g list. Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- include/uapi/linux/virtio_blk.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_blk...

"Michael S. Tsirkin" <mst at redhat.com> writes: > Fix up comment to match virtio 1.0 logic: > virtio_blk_outhdr isn't the first elements anymore, > the only requirement is that it comes first in > the s/g list. > > Signed-off-by: Michael S. Tsirkin <mst at redhat.com> Thanks, both applied. Cheers, Rusty.

Fix up comment to match virtio 1.0 logic: virtio_blk_outhdr isn't the first elements anymore, the only requirement is that it comes first in the s/g list. Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- include/uapi/linux/virtio_blk.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_blk...

"Michael S. Tsirkin" <mst at redhat.com> writes: > Fix up comment to match virtio 1.0 logic: > virtio_blk_outhdr isn't the first elements anymore, > the only requirement is that it comes first in > the s/g list. > > Signed-off-by: Michael S. Tsirkin <mst at redhat.com> Thanks, both applied. Cheers, Rusty.

...isk structure for the kernel. */ struct gendisk *disk; - /* Request tracking. */ - struct list_head reqs; - mempool_t *pool; /* Process context for config space updates */ @@ -55,7 +52,6 @@ struct virtio_blk struct virtblk_req { - struct list_head list; struct request *req; struct virtio_blk_outhdr out_hdr; struct virtio_scsi_inhdr in_hdr; @@ -99,7 +95,6 @@ static void blk_done(struct virtqueue *vq) } __blk_end_request_all(vbr->req, error); - list_del(&vbr->list); mempool_free(vbr, vblk->pool); } /* In case queue is stopped waiting for more buffers. */ @@ -184,7...

...isk structure for the kernel. */ struct gendisk *disk; - /* Request tracking. */ - struct list_head reqs; - mempool_t *pool; /* Process context for config space updates */ @@ -55,7 +52,6 @@ struct virtio_blk struct virtblk_req { - struct list_head list; struct request *req; struct virtio_blk_outhdr out_hdr; struct virtio_scsi_inhdr in_hdr; @@ -99,7 +95,6 @@ static void blk_done(struct virtqueue *vq) } __blk_end_request_all(vbr->req, error); - list_del(&vbr->list); mempool_free(vbr, vblk->pool); } /* In case queue is stopped waiting for more buffers. */ @@ -184,7...

...0 +#define VIRTIO_BLK_T_OUT 1 + +/* This bit says it's a scsi command, not an actual read or write. */ +#define VIRTIO_BLK_T_SCSI_CMD 2 + +/* Barrier before this op. */ +#define VIRTIO_BLK_T_BARRIER 0x80000000 + +/* This is the first element of the read scatter-gather list. */ +struct virtio_blk_outhdr +{ + /* VIRTIO_BLK_T* */ + uint32_t type; + /* io priority. */ + uint32_t ioprio; + /* Sector (ie. 512 byte offset) */ + uint64_t sector; + /* Where to put reply. */ + uint64_t id; +}; + +#define VIRTIO_BLK_S_OK 0 +#define VIRTIO_BLK_S_IOERR 1 +#define VIRTIO_BLK_S...

...0 +#define VIRTIO_BLK_T_OUT 1 + +/* This bit says it's a scsi command, not an actual read or write. */ +#define VIRTIO_BLK_T_SCSI_CMD 2 + +/* Barrier before this op. */ +#define VIRTIO_BLK_T_BARRIER 0x80000000 + +/* This is the first element of the read scatter-gather list. */ +struct virtio_blk_outhdr +{ + /* VIRTIO_BLK_T* */ + uint32_t type; + /* io priority. */ + uint32_t ioprio; + /* Sector (ie. 512 byte offset) */ + uint64_t sector; + /* Where to put reply. */ + uint64_t id; +}; + +#define VIRTIO_BLK_S_OK 0 +#define VIRTIO_BLK_S_IOERR 1 +#define VIRTIO_BLK_S...

In response to Avi's excellent analysis, I've updated virtio as promised (apologies for the delay, travel got in the way). === This attempts to implement a "virtual I/O" layer which should allow common drivers to be efficiently used across most virtual I/O mechanisms. It will no-doubt need further enhancement. The details of probing the device are left to hypervisor-specific

In response to Avi's excellent analysis, I've updated virtio as promised (apologies for the delay, travel got in the way). === This attempts to implement a "virtual I/O" layer which should allow common drivers to be efficiently used across most virtual I/O mechanisms. It will no-doubt need further enhancement. The details of probing the device are left to hypervisor-specific

...@@ -114,6 +119,9 @@ struct virtio_blk_config { /* Get device ID command */ #define VIRTIO_BLK_T_GET_ID 8 +/* Discard command */ +#define VIRTIO_BLK_T_DISCARD 16 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -133,6 +141,17 @@ struct virtio_blk_outhdr { __virtio64 sector; }; +/* + * Array of discard ranges for each request. + */ +struct virtio_blk_discard { + /* start discard lba */ + __virtio64 slba; + /* number of discard sectors */ + __virtio32 nlba; + __virtio32 reserved; +}; + #ifndef VIRTIO_BLK_NO_LEGACY struct virtio_scsi_inhdr {...

...@@ -114,6 +119,9 @@ struct virtio_blk_config { /* Get device ID command */ #define VIRTIO_BLK_T_GET_ID 8 +/* Discard command */ +#define VIRTIO_BLK_T_DISCARD 16 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -133,6 +141,17 @@ struct virtio_blk_outhdr { __virtio64 sector; }; +/* + * Array of discard ranges for each request. + */ +struct virtio_blk_discard { + /* start discard lba */ + __virtio64 slba; + /* number of discard sectors */ + __virtio32 nlba; + __virtio32 reserved; +}; + #ifndef VIRTIO_BLK_NO_LEGACY struct virtio_scsi_inhdr {...

...irtio_blk_config { /* Get device ID command */ #define VIRTIO_BLK_T_GET_ID 8 +/* Discard command */ +#define VIRTIO_BLK_T_DISCARD 16 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -127,8 +131,12 @@ struct virtio_blk_config { struct virtio_blk_outhdr { /* VIRTIO_BLK_T* */ __virtio32 type; - /* io priority. */ - __virtio32 ioprio; + union { + /* io priority. */ + __virtio32 ioprio; + /* discard number of sectors */ + __virtio32 discard_nr_sectors; + } u; /* Sector (ie. 512 byte offset) */ __virtio64 sector; }; -- 1.9.3

...irtio_blk_config { /* Get device ID command */ #define VIRTIO_BLK_T_GET_ID 8 +/* Discard command */ +#define VIRTIO_BLK_T_DISCARD 16 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -127,8 +131,12 @@ struct virtio_blk_config { struct virtio_blk_outhdr { /* VIRTIO_BLK_T* */ __virtio32 type; - /* io priority. */ - __virtio32 ioprio; + union { + /* io priority. */ + __virtio32 ioprio; + /* discard number of sectors */ + __virtio32 discard_nr_sectors; + } u; /* Sector (ie. 512 byte offset) */ __virtio64 sector; }; -- 1.9.3

...gt; > > +/* Discard command */ > > +#define VIRTIO_BLK_T_DISCARD 16 > > + > > #ifndef VIRTIO_BLK_NO_LEGACY > > /* Barrier before this op. */ > > #define VIRTIO_BLK_T_BARRIER 0x80000000 > > @@ -127,8 +131,12 @@ struct virtio_blk_config { > > struct virtio_blk_outhdr { > > /* VIRTIO_BLK_T* */ > > __virtio32 type; > > - /* io priority. */ > > - __virtio32 ioprio; > > + union { > > + /* io priority. */ > > + __virtio32 ioprio; > > + /* discard number of sectors */ > > + __virtio32 discard_nr_sectors; &...

...gt; > > +/* Discard command */ > > +#define VIRTIO_BLK_T_DISCARD 16 > > + > > #ifndef VIRTIO_BLK_NO_LEGACY > > /* Barrier before this op. */ > > #define VIRTIO_BLK_T_BARRIER 0x80000000 > > @@ -127,8 +131,12 @@ struct virtio_blk_config { > > struct virtio_blk_outhdr { > > /* VIRTIO_BLK_T* */ > > __virtio32 type; > > - /* io priority. */ > > - __virtio32 ioprio; > > + union { > > + /* io priority. */ > > + __virtio32 ioprio; > > + /* discard number of sectors */ > > + __virtio32 discard_nr_sectors; &...