From: Asias He <asias@redhat.com>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [PATCH 06/16] virtio_blk: remove nents member.
Date: Wed, 20 Feb 2013 17:20:43 +0800 [thread overview]
Message-ID: <5124956B.4060306@redhat.com> (raw)
In-Reply-To: <1361260594-601-7-git-send-email-rusty@rustcorp.com.au>
On 02/19/2013 03:56 PM, Rusty Russell wrote:
> It's simply a flag as to whether we have data now, so make it an
> explicit function parameter rather than a member of struct
> virtblk_req.
>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Asias He <asias@redhat.com>
> ---
> drivers/block/virtio_blk.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 523a70f..6369cb9 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -62,7 +62,6 @@ struct virtblk_req
> struct virtio_blk *vblk;
> int flags;
> u8 status;
> - int nents;
> struct scatterlist sg[];
> };
>
> @@ -104,7 +103,7 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
> static int __virtblk_add_req(struct virtqueue *vq,
> struct virtblk_req *vbr,
> struct scatterlist *data_sg,
> - unsigned data_nents)
> + bool have_data)
> {
> struct scatterlist hdr, tailer, cmd, sense, inhdr, *sgs[6];
> unsigned int num_out = 0, num_in = 0;
> @@ -124,7 +123,7 @@ static int __virtblk_add_req(struct virtqueue *vq,
> sgs[num_out++] = &cmd;
> }
>
> - if (data_nents) {
> + if (have_data) {
> if (vbr->out_hdr.type & VIRTIO_BLK_T_OUT)
> sgs[num_out++] = data_sg;
> else
> @@ -144,7 +143,7 @@ static int __virtblk_add_req(struct virtqueue *vq,
> 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, bool have_data)
> {
> struct virtio_blk *vblk = vbr->vblk;
> DEFINE_WAIT(wait);
> @@ -152,7 +151,7 @@ static void virtblk_add_req(struct virtblk_req *vbr)
>
> spin_lock_irq(vblk->disk->queue->queue_lock);
> while (unlikely((ret = __virtblk_add_req(vblk->vq, vbr, vbr->sg,
> - vbr->nents)) < 0)) {
> + have_data)) < 0)) {
> prepare_to_wait_exclusive(&vblk->queue_wait, &wait,
> TASK_UNINTERRUPTIBLE);
>
> @@ -173,30 +172,31 @@ static void virtblk_bio_send_flush(struct virtblk_req *vbr)
> vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
> vbr->out_hdr.sector = 0;
> vbr->out_hdr.ioprio = 0;
> - vbr->nents = 0;
>
> - virtblk_add_req(vbr);
> + virtblk_add_req(vbr, false);
> }
>
> static void virtblk_bio_send_data(struct virtblk_req *vbr)
> {
> struct virtio_blk *vblk = vbr->vblk;
> struct bio *bio = vbr->bio;
> + bool have_data;
>
> vbr->flags &= ~VBLK_IS_FLUSH;
> vbr->out_hdr.type = 0;
> vbr->out_hdr.sector = bio->bi_sector;
> vbr->out_hdr.ioprio = bio_prio(bio);
>
> - vbr->nents = blk_bio_map_sg(vblk->disk->queue, bio, vbr->sg);
> - if (vbr->nents) {
> + if (blk_bio_map_sg(vblk->disk->queue, bio, vbr->sg)) {
> + have_data = true;
> if (bio->bi_rw & REQ_WRITE)
> vbr->out_hdr.type |= VIRTIO_BLK_T_OUT;
> else
> vbr->out_hdr.type |= VIRTIO_BLK_T_IN;
> - }
> + } else
> + have_data = false;
>
> - virtblk_add_req(vbr);
> + virtblk_add_req(vbr, have_data);
> }
>
> static void virtblk_bio_send_data_work(struct work_struct *work)
>
--
Asias
next prev parent reply other threads:[~2013-02-20 9:20 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-19 7:56 [PATCH 00/16] virtio ring rework Rusty Russell
2013-02-19 7:56 ` [PATCH 01/16] scatterlist: introduce sg_unmark_end Rusty Russell
2013-02-19 7:56 ` [PATCH 02/16] virtio_ring: virtqueue_add_sgs, to add multiple sgs Rusty Russell
2013-02-19 9:15 ` Wanlong Gao
2013-02-20 9:18 ` Asias He
2013-02-24 22:12 ` Michael S. Tsirkin
2013-02-26 5:14 ` Rusty Russell
2013-02-26 9:30 ` Michael S. Tsirkin
2013-02-26 7:02 ` Paolo Bonzini
2013-02-27 7:28 ` Rusty Russell
2013-02-27 7:49 ` Michael S. Tsirkin
2013-02-27 11:21 ` Rusty Russell
[not found] ` <87fw0idmu2.fsf@rustcorp.com.au>
2013-02-28 9:24 ` Paolo Bonzini
2013-03-01 1:01 ` Rusty Russell
2013-02-19 7:56 ` [PATCH 03/16] virtio-blk: reorganize virtblk_add_req Rusty Russell
2013-02-19 7:56 ` [PATCH 04/16] virtio-blk: use virtqueue_start_buf on bio path Rusty Russell
2013-02-20 9:19 ` Asias He
2013-02-21 6:23 ` Rusty Russell
2013-02-19 7:56 ` [PATCH 05/16] virtio-blk: use virtqueue_add_sgs on req path Rusty Russell
2013-02-20 9:20 ` Asias He
2013-02-19 7:56 ` [PATCH 06/16] virtio_blk: remove nents member Rusty Russell
2013-02-20 9:20 ` Asias He [this message]
2013-02-19 7:56 ` [PATCH 07/16] virtio_ring: don't count elements twice for add_buf path Rusty Russell
2013-02-20 10:09 ` Wanlong Gao
2013-02-19 7:56 ` [PATCH 08/16] virtio_ring: virtqueue_add_outbuf / virtqueue_add_inbuf Rusty Russell
2013-02-20 10:09 ` Wanlong Gao
2013-02-21 17:09 ` Michael S. Tsirkin
2013-02-22 0:02 ` Rusty Russell
2013-02-25 21:35 ` Michael S. Tsirkin
2013-02-28 5:08 ` Rusty Russell
2013-02-28 7:01 ` Michael S. Tsirkin
2013-03-06 6:03 ` Rusty Russell
2013-02-19 7:56 ` [PATCH 09/16] virtio_net: use simplified virtqueue accessors Rusty Russell
2013-02-20 10:09 ` Wanlong Gao
2013-02-19 7:56 ` [PATCH 10/16] virtio_net: use virtqueue_add_sgs[] for command buffers Rusty Russell
2013-02-19 7:56 ` [PATCH 11/16] virtio_rng: use simplified virtqueue accessors Rusty Russell
2013-02-19 7:56 ` [PATCH 12/16] virtio_console: " Rusty Russell
2013-02-19 7:56 ` [PATCH 13/16] caif_virtio: " Rusty Russell
2013-02-19 7:56 ` [PATCH 14/16] virtio_rpmsg_bus: " Rusty Russell
2013-02-19 7:56 ` [PATCH 15/16] virtio_balloon: " Rusty Russell
2013-02-19 7:56 ` [PATCH 16/16] 9p/trans_virtio.c: use virtio_add_sgs[] Rusty Russell
2013-02-19 9:15 ` [PATCH 00/16] virtio ring rework Paolo Bonzini
2013-02-21 6:30 ` Rusty Russell
2013-02-20 8:37 ` [PATCH 17/16] virtio-scsi: use virtqueue_add_sgs for command buffers Wanlong Gao
2013-02-20 9:38 ` Asias He
2013-02-20 9:41 ` Wanlong Gao
2013-02-20 9:47 ` [PATCH 17/16 V2] " Wanlong Gao
2013-02-20 10:54 ` Paolo Bonzini
2013-02-20 12:17 ` Asias He
2013-02-21 6:34 ` Rusty Russell
[not found] ` <1361260594-601-11-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:11 ` [PATCH 10/16] virtio_net: use virtqueue_add_sgs[] " Wanlong Gao
2013-02-21 6:27 ` Rusty Russell
2013-02-21 8:30 ` Wanlong Gao
2013-02-21 9:41 ` Jason Wang
2013-02-21 9:43 ` Wanlong Gao
[not found] ` <1361260594-601-12-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:12 ` [PATCH 11/16] virtio_rng: use simplified virtqueue accessors Wanlong Gao
[not found] ` <1361260594-601-13-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:12 ` [PATCH 12/16] virtio_console: " Wanlong Gao
[not found] ` <1361260594-601-14-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:13 ` [PATCH 13/16] caif_virtio: " Wanlong Gao
[not found] ` <1361260594-601-15-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:14 ` [PATCH 14/16] virtio_rpmsg_bus: " Wanlong Gao
[not found] ` <1361260594-601-16-git-send-email-rusty@rustcorp.com.au>
2013-02-20 10:15 ` [PATCH 15/16] virtio_balloon: " Wanlong Gao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5124956B.4060306@redhat.com \
--to=asias@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).