From: Asias He <asias@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, mst@redhat.com,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 2/9] virtio-blk: reorganize virtblk_add_req
Date: Sun, 17 Feb 2013 14:38:45 +0800 [thread overview]
Message-ID: <51207AF5.2030600@redhat.com> (raw)
In-Reply-To: <1360671815-2135-3-git-send-email-pbonzini@redhat.com>
On 02/12/2013 08:23 PM, Paolo Bonzini wrote:
> Right now, both virtblk_add_req and virtblk_add_req_wait call
> virtqueue_add_buf. To prepare for the next patches, abstract the call
> to virtqueue_add_buf into a new function __virtblk_add_req, and include
> the waiting logic directly in virtblk_add_req.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Asias He <asias@redhat.com>
> ---
> drivers/block/virtio_blk.c | 55 ++++++++++++++++----------------------------
> 1 files changed, 20 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 8ad21a2..fd8a689 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -100,50 +100,39 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
> return vbr;
> }
>
> -static void virtblk_add_buf_wait(struct virtio_blk *vblk,
> - struct virtblk_req *vbr,
> - unsigned long out,
> - unsigned long in)
> +static inline int __virtblk_add_req(struct virtqueue *vq,
> + struct virtblk_req *vbr,
> + unsigned long out,
> + unsigned long in)
> {
> + return virtqueue_add_buf(vq, vbr->sg, out, in, vbr, GFP_ATOMIC);
> +}
> +
> +static void virtblk_add_req(struct virtblk_req *vbr,
> + unsigned int out, unsigned int in)
> +{
> + struct virtio_blk *vblk = vbr->vblk;
> DEFINE_WAIT(wait);
> + int ret;
>
> - for (;;) {
> + spin_lock_irq(vblk->disk->queue->queue_lock);
> + while (unlikely((ret = __virtblk_add_req(vblk->vq, vbr,
> + out, in)) < 0)) {
> prepare_to_wait_exclusive(&vblk->queue_wait, &wait,
> TASK_UNINTERRUPTIBLE);
>
> + spin_unlock_irq(vblk->disk->queue->queue_lock);
> + io_schedule();
> spin_lock_irq(vblk->disk->queue->queue_lock);
> - if (virtqueue_add_buf(vblk->vq, vbr->sg, out, in, vbr,
> - GFP_ATOMIC) < 0) {
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - io_schedule();
> - } else {
> - virtqueue_kick(vblk->vq);
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - break;
> - }
>
> + finish_wait(&vblk->queue_wait, &wait);
> }
>
> - finish_wait(&vblk->queue_wait, &wait);
> -}
> -
> -static inline void virtblk_add_req(struct virtblk_req *vbr,
> - unsigned int out, unsigned int in)
> -{
> - struct virtio_blk *vblk = vbr->vblk;
> -
> - spin_lock_irq(vblk->disk->queue->queue_lock);
> - if (unlikely(virtqueue_add_buf(vblk->vq, vbr->sg, out, in, vbr,
> - GFP_ATOMIC) < 0)) {
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - virtblk_add_buf_wait(vblk, vbr, out, in);
> - return;
> - }
> virtqueue_kick(vblk->vq);
> spin_unlock_irq(vblk->disk->queue->queue_lock);
> }
>
> -static int virtblk_bio_send_flush(struct virtblk_req *vbr)
> +static void virtblk_bio_send_flush(struct virtblk_req *vbr)
> {
> unsigned int out = 0, in = 0;
>
> @@ -155,11 +144,9 @@ static int virtblk_bio_send_flush(struct virtblk_req *vbr)
> sg_set_buf(&vbr->sg[out + in++], &vbr->status, sizeof(vbr->status));
>
> virtblk_add_req(vbr, out, in);
> -
> - return 0;
> }
>
> -static int virtblk_bio_send_data(struct virtblk_req *vbr)
> +static void virtblk_bio_send_data(struct virtblk_req *vbr)
> {
> struct virtio_blk *vblk = vbr->vblk;
> unsigned int num, out = 0, in = 0;
> @@ -188,8 +175,6 @@ static int virtblk_bio_send_data(struct virtblk_req *vbr)
> }
>
> virtblk_add_req(vbr, out, in);
> -
> - return 0;
> }
>
> static void virtblk_bio_send_data_work(struct work_struct *work)
>
--
Asias
WARNING: multiple messages have this Message-ID (diff)
From: Asias He <asias@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Wanlong Gao <gaowanlong@cn.fujitsu.com>,
mst@redhat.com, Rusty Russell <rusty@rustcorp.com.au>,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 2/9] virtio-blk: reorganize virtblk_add_req
Date: Sun, 17 Feb 2013 14:38:45 +0800 [thread overview]
Message-ID: <51207AF5.2030600@redhat.com> (raw)
In-Reply-To: <1360671815-2135-3-git-send-email-pbonzini@redhat.com>
On 02/12/2013 08:23 PM, Paolo Bonzini wrote:
> Right now, both virtblk_add_req and virtblk_add_req_wait call
> virtqueue_add_buf. To prepare for the next patches, abstract the call
> to virtqueue_add_buf into a new function __virtblk_add_req, and include
> the waiting logic directly in virtblk_add_req.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Asias He <asias@redhat.com>
> ---
> drivers/block/virtio_blk.c | 55 ++++++++++++++++----------------------------
> 1 files changed, 20 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 8ad21a2..fd8a689 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -100,50 +100,39 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
> return vbr;
> }
>
> -static void virtblk_add_buf_wait(struct virtio_blk *vblk,
> - struct virtblk_req *vbr,
> - unsigned long out,
> - unsigned long in)
> +static inline int __virtblk_add_req(struct virtqueue *vq,
> + struct virtblk_req *vbr,
> + unsigned long out,
> + unsigned long in)
> {
> + return virtqueue_add_buf(vq, vbr->sg, out, in, vbr, GFP_ATOMIC);
> +}
> +
> +static void virtblk_add_req(struct virtblk_req *vbr,
> + unsigned int out, unsigned int in)
> +{
> + struct virtio_blk *vblk = vbr->vblk;
> DEFINE_WAIT(wait);
> + int ret;
>
> - for (;;) {
> + spin_lock_irq(vblk->disk->queue->queue_lock);
> + while (unlikely((ret = __virtblk_add_req(vblk->vq, vbr,
> + out, in)) < 0)) {
> prepare_to_wait_exclusive(&vblk->queue_wait, &wait,
> TASK_UNINTERRUPTIBLE);
>
> + spin_unlock_irq(vblk->disk->queue->queue_lock);
> + io_schedule();
> spin_lock_irq(vblk->disk->queue->queue_lock);
> - if (virtqueue_add_buf(vblk->vq, vbr->sg, out, in, vbr,
> - GFP_ATOMIC) < 0) {
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - io_schedule();
> - } else {
> - virtqueue_kick(vblk->vq);
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - break;
> - }
>
> + finish_wait(&vblk->queue_wait, &wait);
> }
>
> - finish_wait(&vblk->queue_wait, &wait);
> -}
> -
> -static inline void virtblk_add_req(struct virtblk_req *vbr,
> - unsigned int out, unsigned int in)
> -{
> - struct virtio_blk *vblk = vbr->vblk;
> -
> - spin_lock_irq(vblk->disk->queue->queue_lock);
> - if (unlikely(virtqueue_add_buf(vblk->vq, vbr->sg, out, in, vbr,
> - GFP_ATOMIC) < 0)) {
> - spin_unlock_irq(vblk->disk->queue->queue_lock);
> - virtblk_add_buf_wait(vblk, vbr, out, in);
> - return;
> - }
> virtqueue_kick(vblk->vq);
> spin_unlock_irq(vblk->disk->queue->queue_lock);
> }
>
> -static int virtblk_bio_send_flush(struct virtblk_req *vbr)
> +static void virtblk_bio_send_flush(struct virtblk_req *vbr)
> {
> unsigned int out = 0, in = 0;
>
> @@ -155,11 +144,9 @@ static int virtblk_bio_send_flush(struct virtblk_req *vbr)
> sg_set_buf(&vbr->sg[out + in++], &vbr->status, sizeof(vbr->status));
>
> virtblk_add_req(vbr, out, in);
> -
> - return 0;
> }
>
> -static int virtblk_bio_send_data(struct virtblk_req *vbr)
> +static void virtblk_bio_send_data(struct virtblk_req *vbr)
> {
> struct virtio_blk *vblk = vbr->vblk;
> unsigned int num, out = 0, in = 0;
> @@ -188,8 +175,6 @@ static int virtblk_bio_send_data(struct virtblk_req *vbr)
> }
>
> virtblk_add_req(vbr, out, in);
> -
> - return 0;
> }
>
> static void virtblk_bio_send_data_work(struct work_struct *work)
>
--
Asias
next prev parent reply other threads:[~2013-02-17 6:38 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 12:23 [PATCH 0/9] virtio: new API for addition of buffers, scatterlist changes Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 1/9] virtio: add functions for piecewise addition of buffers Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 14:56 ` Michael S. Tsirkin
2013-02-12 14:56 ` Michael S. Tsirkin
2013-02-12 15:32 ` Paolo Bonzini
2013-02-12 15:32 ` Paolo Bonzini
2013-02-12 15:43 ` Michael S. Tsirkin
2013-02-12 15:43 ` Michael S. Tsirkin
2013-02-12 15:48 ` Paolo Bonzini
2013-02-12 15:48 ` Paolo Bonzini
2013-02-12 16:13 ` Michael S. Tsirkin
2013-02-12 16:13 ` Michael S. Tsirkin
2013-02-12 16:17 ` Paolo Bonzini
2013-02-12 16:17 ` Paolo Bonzini
2013-02-12 16:35 ` Michael S. Tsirkin
2013-02-12 16:35 ` Michael S. Tsirkin
2013-02-12 16:57 ` Paolo Bonzini
2013-02-12 16:57 ` Paolo Bonzini
2013-02-12 17:34 ` Michael S. Tsirkin
2013-02-12 17:34 ` Michael S. Tsirkin
2013-02-12 18:04 ` Paolo Bonzini
2013-02-12 18:04 ` Paolo Bonzini
2013-02-12 18:23 ` Michael S. Tsirkin
2013-02-12 18:23 ` Michael S. Tsirkin
2013-02-12 20:08 ` Paolo Bonzini
2013-02-12 20:08 ` Paolo Bonzini
2013-02-12 20:49 ` Michael S. Tsirkin
2013-02-12 20:49 ` Michael S. Tsirkin
2013-02-13 8:06 ` Paolo Bonzini
2013-02-13 10:33 ` Michael S. Tsirkin
2013-02-12 18:03 ` [PATCH v2 " Paolo Bonzini
2013-02-12 18:03 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 2/9] virtio-blk: reorganize virtblk_add_req Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-17 6:38 ` Asias He [this message]
2013-02-17 6:38 ` Asias He
2013-02-12 12:23 ` [PATCH 3/9] virtio-blk: use virtqueue_start_buf on bio path Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-17 6:39 ` Asias He
2013-02-17 6:39 ` Asias He
2013-02-12 12:23 ` [PATCH 4/9] virtio-blk: use virtqueue_start_buf on req path Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-17 6:37 ` Asias He
2013-02-17 6:37 ` Asias He
2013-02-18 9:05 ` Paolo Bonzini
2013-02-18 9:05 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 5/9] scatterlist: introduce sg_unmark_end Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 6/9] virtio-net: unmark scatterlist ending after virtqueue_add_buf Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 7/9] virtio-scsi: use virtqueue_start_buf Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 8/9] virtio: introduce and use virtqueue_add_buf_single Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-12 12:23 ` [PATCH 9/9] virtio: reimplement virtqueue_add_buf using new functions Paolo Bonzini
2013-02-12 12:23 ` Paolo Bonzini
2013-02-14 6:00 ` [PATCH 0/9] virtio: new API for addition of buffers, scatterlist changes Rusty Russell
2013-02-14 6:00 ` Rusty Russell
2013-02-14 9:23 ` Paolo Bonzini
2013-02-14 9:23 ` Paolo Bonzini
2013-02-15 18:04 ` Paolo Bonzini
2013-02-15 18:04 ` Paolo Bonzini
2013-02-19 7:49 ` Rusty Russell
2013-02-19 7:49 ` Rusty Russell
2013-02-19 9:11 ` Paolo Bonzini
2013-02-19 9:11 ` Paolo Bonzini
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=51207AF5.2030600@redhat.com \
--to=asias@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.