From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753065Ab3BQGi5 (ORCPT ); Sun, 17 Feb 2013 01:38:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60900 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112Ab3BQGi4 (ORCPT ); Sun, 17 Feb 2013 01:38:56 -0500 Message-ID: <51207AF5.2030600@redhat.com> Date: Sun, 17 Feb 2013 14:38:45 +0800 From: Asias He User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Paolo Bonzini CC: linux-kernel@vger.kernel.org, Wanlong Gao , mst@redhat.com, Rusty Russell , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 2/9] virtio-blk: reorganize virtblk_add_req References: <1360671815-2135-1-git-send-email-pbonzini@redhat.com> <1360671815-2135-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1360671815-2135-3-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Asias He > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Asias He Subject: Re: [PATCH 2/9] virtio-blk: reorganize virtblk_add_req Date: Sun, 17 Feb 2013 14:38:45 +0800 Message-ID: <51207AF5.2030600@redhat.com> References: <1360671815-2135-1-git-send-email-pbonzini@redhat.com> <1360671815-2135-3-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, mst@redhat.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org To: Paolo Bonzini Return-path: In-Reply-To: <1360671815-2135-3-git-send-email-pbonzini@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org List-Id: kvm.vger.kernel.org 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 Reviewed-by: Asias He > --- > 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