Commit 8f39db9d authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Rusty Russell

virtio-blk: use virtqueue_add_sgs on bio path

(This is a respin of Paolo Bonzini's patch, but it calls
virtqueue_add_sgs() instead of his multi-part API).

Move the creation of the request header and response footer to
__virtblk_add_req.  vbr->sg only contains the data scatterlist,
the header/footer are added separately using virtqueue_add_sgs().

With this change, virtio-blk (with use_bio) is not relying anymore on
the virtio functions ignoring the end markers in a scatterlist.
The next patch will do the same for the other path.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Reviewed-by: default avatarAsias He <asias@redhat.com>
parent 5ee21a52
...@@ -62,6 +62,7 @@ struct virtblk_req ...@@ -62,6 +62,7 @@ struct virtblk_req
struct virtio_blk *vblk; struct virtio_blk *vblk;
int flags; int flags;
u8 status; u8 status;
int nents;
struct scatterlist sg[]; struct scatterlist sg[];
}; };
...@@ -100,24 +101,36 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk, ...@@ -100,24 +101,36 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
return vbr; return vbr;
} }
static inline int __virtblk_add_req(struct virtqueue *vq, static int __virtblk_add_req(struct virtqueue *vq,
struct virtblk_req *vbr, struct virtblk_req *vbr)
unsigned long out,
unsigned long in)
{ {
return virtqueue_add_buf(vq, vbr->sg, out, in, vbr, GFP_ATOMIC); struct scatterlist hdr, status, *sgs[3];
unsigned int num_out = 0, num_in = 0;
sg_init_one(&hdr, &vbr->out_hdr, sizeof(vbr->out_hdr));
sgs[num_out++] = &hdr;
if (vbr->nents) {
if (vbr->out_hdr.type & VIRTIO_BLK_T_OUT)
sgs[num_out++] = vbr->sg;
else
sgs[num_out + num_in++] = vbr->sg;
}
sg_init_one(&status, &vbr->status, sizeof(vbr->status));
sgs[num_out + num_in++] = &status;
return virtqueue_add_sgs(vq, sgs, num_out, num_in, vbr, GFP_ATOMIC);
} }
static void virtblk_add_req(struct virtblk_req *vbr, static void virtblk_add_req(struct virtblk_req *vbr)
unsigned int out, unsigned int in)
{ {
struct virtio_blk *vblk = vbr->vblk; struct virtio_blk *vblk = vbr->vblk;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
int ret; int ret;
spin_lock_irq(vblk->disk->queue->queue_lock); spin_lock_irq(vblk->disk->queue->queue_lock);
while (unlikely((ret = __virtblk_add_req(vblk->vq, vbr, while (unlikely((ret = __virtblk_add_req(vblk->vq, vbr)) < 0)) {
out, in)) < 0)) {
prepare_to_wait_exclusive(&vblk->queue_wait, &wait, prepare_to_wait_exclusive(&vblk->queue_wait, &wait,
TASK_UNINTERRUPTIBLE); TASK_UNINTERRUPTIBLE);
...@@ -134,22 +147,18 @@ static void virtblk_add_req(struct virtblk_req *vbr, ...@@ -134,22 +147,18 @@ static void virtblk_add_req(struct virtblk_req *vbr,
static void virtblk_bio_send_flush(struct virtblk_req *vbr) static void virtblk_bio_send_flush(struct virtblk_req *vbr)
{ {
unsigned int out = 0, in = 0;
vbr->flags |= VBLK_IS_FLUSH; vbr->flags |= VBLK_IS_FLUSH;
vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH; vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
vbr->out_hdr.sector = 0; vbr->out_hdr.sector = 0;
vbr->out_hdr.ioprio = 0; vbr->out_hdr.ioprio = 0;
sg_set_buf(&vbr->sg[out++], &vbr->out_hdr, sizeof(vbr->out_hdr)); vbr->nents = 0;
sg_set_buf(&vbr->sg[out + in++], &vbr->status, sizeof(vbr->status));
virtblk_add_req(vbr, out, in); virtblk_add_req(vbr);
} }
static void virtblk_bio_send_data(struct virtblk_req *vbr) static void virtblk_bio_send_data(struct virtblk_req *vbr)
{ {
struct virtio_blk *vblk = vbr->vblk; struct virtio_blk *vblk = vbr->vblk;
unsigned int num, out = 0, in = 0;
struct bio *bio = vbr->bio; struct bio *bio = vbr->bio;
vbr->flags &= ~VBLK_IS_FLUSH; vbr->flags &= ~VBLK_IS_FLUSH;
...@@ -157,24 +166,15 @@ static void virtblk_bio_send_data(struct virtblk_req *vbr) ...@@ -157,24 +166,15 @@ static void virtblk_bio_send_data(struct virtblk_req *vbr)
vbr->out_hdr.sector = bio->bi_sector; vbr->out_hdr.sector = bio->bi_sector;
vbr->out_hdr.ioprio = bio_prio(bio); vbr->out_hdr.ioprio = bio_prio(bio);
sg_set_buf(&vbr->sg[out++], &vbr->out_hdr, sizeof(vbr->out_hdr)); vbr->nents = blk_bio_map_sg(vblk->disk->queue, bio, vbr->sg);
if (vbr->nents) {
num = blk_bio_map_sg(vblk->disk->queue, bio, vbr->sg + out); if (bio->bi_rw & REQ_WRITE)
sg_set_buf(&vbr->sg[num + out + in++], &vbr->status,
sizeof(vbr->status));
if (num) {
if (bio->bi_rw & REQ_WRITE) {
vbr->out_hdr.type |= VIRTIO_BLK_T_OUT; vbr->out_hdr.type |= VIRTIO_BLK_T_OUT;
out += num; else
} else {
vbr->out_hdr.type |= VIRTIO_BLK_T_IN; vbr->out_hdr.type |= VIRTIO_BLK_T_IN;
in += num;
}
} }
virtblk_add_req(vbr, out, in); virtblk_add_req(vbr);
} }
static void virtblk_bio_send_data_work(struct work_struct *work) static void virtblk_bio_send_data_work(struct work_struct *work)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment