From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1WSl9z-000064-4q for mharc-qemu-trivial@gnu.org; Wed, 26 Mar 2014 06:34:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSdGc-0003xO-Uj for qemu-trivial@nongnu.org; Tue, 25 Mar 2014 22:08:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSdGU-0000yV-ND for qemu-trivial@nongnu.org; Tue, 25 Mar 2014 22:08:34 -0400 Received: from g6t1524.atlanta.hp.com ([15.193.200.67]:18255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSdFx-0000rB-O9; Tue, 25 Mar 2014 22:07:53 -0400 Received: from g5t1633.atlanta.hp.com (g5t1633.atlanta.hp.com [16.201.144.132]) by g6t1524.atlanta.hp.com (Postfix) with ESMTP id 1E56972; Wed, 26 Mar 2014 02:07:52 +0000 (UTC) Received: from [16.187.245.69] (unknown [16.187.245.69]) by g5t1633.atlanta.hp.com (Postfix) with ESMTP id 83B1863; Wed, 26 Mar 2014 02:07:50 +0000 (UTC) Message-ID: <53323655.7070102@hp.com> Date: Wed, 26 Mar 2014 10:07:17 +0800 From: "Li, ZhenHua" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, qemu-stable@nongnu.org References: <1395799358-16499-1-git-send-email-zhen-hual@hp.com> In-Reply-To: <1395799358-16499-1-git-send-email-zhen-hual@hp.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 15.193.200.67 X-Mailman-Approved-At: Wed, 26 Mar 2014 06:34:14 -0400 Cc: "Li, Zhen-Hua" Subject: Re: [Qemu-trivial] [PATCH 1/1] virtio-blk: Use a req pool instead of malloc/free X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 02:08:43 -0000 I am sorry that seems it was not sent out before I subscribed to the list. So I send this patch again. On 03/26/2014 10:02 AM, Li, Zhen-Hua wrote: > From: "Li, ZhenHua" > > In virtio-blk module, when there is new request, new req structure > will be created by malloc. Use a req pool instead of this, will increase > performance; > > Increacement: about 5% to 10%. > > Signed-off-by: Li, ZhenHua > --- > hw/block/virtio-blk.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 75 insertions(+), 12 deletions(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index 8a568e5..da5b570 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -39,6 +39,70 @@ typedef struct VirtIOBlockReq > BlockAcctCookie acct; > } VirtIOBlockReq; > > +#define POOL_PAGE 512 > +static VirtIOBlockReq * * req_pool; > +static char * req_pool_used; > +static unsigned long req_pool_size = 0; > + > +static void remalloc_reqs(void){ > + unsigned long old_size = req_pool_size; > + unsigned long int i; > + char * old_used = req_pool_used; > + VirtIOBlockReq * * old_pool = req_pool; > + > + req_pool_size += POOL_PAGE; > + req_pool_used = (char * )malloc(req_pool_size * sizeof(char)); > + req_pool = (VirtIOBlockReq * * )malloc(req_pool_size * sizeof(VirtIOBlockReq *)); > + > + if(old_size != 0){ > + memcpy(req_pool_used, old_used, old_size*(sizeof(char))); > + memcpy(req_pool, old_pool, old_size*(sizeof(VirtIOBlockReq *))); > + } > + for(i=old_size; i + req_pool[i] = (VirtIOBlockReq *)malloc(sizeof(VirtIOBlockReq)); > + req_pool_used[i] = 0; > + } > + > + if(old_size != 0){ > + free(old_used); > + free(old_pool); > + } > +} > +static VirtIOBlockReq * req_pool_get_new(void){ > + unsigned long int i; > + char * used; > + VirtIOBlockReq * * req; > + > + if(req_pool_size == 0){ > + remalloc_reqs(); > + } > + for(i=0, used=req_pool_used, req=req_pool; > + i + if(*used == 0){ > + *used = 1; > + return *req; > + } > + } > + remalloc_reqs(); > + req_pool_used[req_pool_size-POOL_PAGE] = 1; > + *req = req_pool[req_pool_size-POOL_PAGE]; > + return *req; > +} > + > +static void virtio_blk_free_request(VirtIOBlockReq *req0){ > + unsigned long int i; > + char * used; > + VirtIOBlockReq * * req; > + > + for(i=0, used=req_pool_used, req=req_pool; > + i + if(*req == req0){ > + *used = 0; > + } > + } > +} > + > + > static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) > { > VirtIOBlock *s = req->dev; > @@ -63,7 +127,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, > } else if (action == BDRV_ACTION_REPORT) { > virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); > bdrv_acct_done(s->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > > bdrv_error_action(s->bs, action, is_read, error); > @@ -84,7 +148,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret) > > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > bdrv_acct_done(req->dev->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > > static void virtio_blk_flush_complete(void *opaque, int ret) > @@ -99,25 +163,24 @@ static void virtio_blk_flush_complete(void *opaque, int ret) > > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > bdrv_acct_done(req->dev->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > - > static VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) > { > - VirtIOBlockReq *req = g_malloc(sizeof(*req)); > + VirtIOBlockReq *req ; > + req = req_pool_get_new(); > req->dev = s; > req->qiov.size = 0; > req->next = NULL; > return req; > } > - > static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s) > { > VirtIOBlockReq *req = virtio_blk_alloc_request(s); > > if (req != NULL) { > if (!virtqueue_pop(s->vq, &req->elem)) { > - g_free(req); > + virtio_blk_free_request(req); > return NULL; > } > } > @@ -142,7 +205,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) > */ > if (req->elem.out_num < 2 || req->elem.in_num < 3) { > virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); > - g_free(req); > + virtio_blk_free_request(req); > return; > } > > @@ -232,7 +295,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) > stl_p(&req->scsi->data_len, hdr.dxfer_len); > > virtio_blk_req_complete(req, status); > - g_free(req); > + virtio_blk_free_request(req); > return; > #else > abort(); > @@ -242,7 +305,7 @@ fail: > /* Just put anything nonzero so that the ioctl fails in the guest. */ > stl_p(&req->scsi->errors, 255); > virtio_blk_req_complete(req, status); > - g_free(req); > + virtio_blk_free_request(req); > } > > typedef struct MultiReqBuffer { > @@ -375,7 +438,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, > s->blk.serial ? s->blk.serial : "", > MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES)); > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > - g_free(req); > + virtio_blk_free_request(req); > } else if (type & VIRTIO_BLK_T_OUT) { > qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1], > req->elem.out_num - 1); > @@ -387,7 +450,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, > virtio_blk_handle_read(req); > } else { > virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); > - g_free(req); > + virtio_blk_free_request(req); > } > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSdG6-0003Qv-7L for qemu-devel@nongnu.org; Tue, 25 Mar 2014 22:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSdFx-0000rJ-Te for qemu-devel@nongnu.org; Tue, 25 Mar 2014 22:08:02 -0400 Message-ID: <53323655.7070102@hp.com> Date: Wed, 26 Mar 2014 10:07:17 +0800 From: "Li, ZhenHua" MIME-Version: 1.0 References: <1395799358-16499-1-git-send-email-zhen-hual@hp.com> In-Reply-To: <1395799358-16499-1-git-send-email-zhen-hual@hp.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/1] virtio-blk: Use a req pool instead of malloc/free List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, qemu-stable@nongnu.org Cc: "Li, Zhen-Hua" I am sorry that seems it was not sent out before I subscribed to the list. So I send this patch again. On 03/26/2014 10:02 AM, Li, Zhen-Hua wrote: > From: "Li, ZhenHua" > > In virtio-blk module, when there is new request, new req structure > will be created by malloc. Use a req pool instead of this, will increase > performance; > > Increacement: about 5% to 10%. > > Signed-off-by: Li, ZhenHua > --- > hw/block/virtio-blk.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 75 insertions(+), 12 deletions(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index 8a568e5..da5b570 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -39,6 +39,70 @@ typedef struct VirtIOBlockReq > BlockAcctCookie acct; > } VirtIOBlockReq; > > +#define POOL_PAGE 512 > +static VirtIOBlockReq * * req_pool; > +static char * req_pool_used; > +static unsigned long req_pool_size = 0; > + > +static void remalloc_reqs(void){ > + unsigned long old_size = req_pool_size; > + unsigned long int i; > + char * old_used = req_pool_used; > + VirtIOBlockReq * * old_pool = req_pool; > + > + req_pool_size += POOL_PAGE; > + req_pool_used = (char * )malloc(req_pool_size * sizeof(char)); > + req_pool = (VirtIOBlockReq * * )malloc(req_pool_size * sizeof(VirtIOBlockReq *)); > + > + if(old_size != 0){ > + memcpy(req_pool_used, old_used, old_size*(sizeof(char))); > + memcpy(req_pool, old_pool, old_size*(sizeof(VirtIOBlockReq *))); > + } > + for(i=old_size; i + req_pool[i] = (VirtIOBlockReq *)malloc(sizeof(VirtIOBlockReq)); > + req_pool_used[i] = 0; > + } > + > + if(old_size != 0){ > + free(old_used); > + free(old_pool); > + } > +} > +static VirtIOBlockReq * req_pool_get_new(void){ > + unsigned long int i; > + char * used; > + VirtIOBlockReq * * req; > + > + if(req_pool_size == 0){ > + remalloc_reqs(); > + } > + for(i=0, used=req_pool_used, req=req_pool; > + i + if(*used == 0){ > + *used = 1; > + return *req; > + } > + } > + remalloc_reqs(); > + req_pool_used[req_pool_size-POOL_PAGE] = 1; > + *req = req_pool[req_pool_size-POOL_PAGE]; > + return *req; > +} > + > +static void virtio_blk_free_request(VirtIOBlockReq *req0){ > + unsigned long int i; > + char * used; > + VirtIOBlockReq * * req; > + > + for(i=0, used=req_pool_used, req=req_pool; > + i + if(*req == req0){ > + *used = 0; > + } > + } > +} > + > + > static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) > { > VirtIOBlock *s = req->dev; > @@ -63,7 +127,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, > } else if (action == BDRV_ACTION_REPORT) { > virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); > bdrv_acct_done(s->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > > bdrv_error_action(s->bs, action, is_read, error); > @@ -84,7 +148,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret) > > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > bdrv_acct_done(req->dev->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > > static void virtio_blk_flush_complete(void *opaque, int ret) > @@ -99,25 +163,24 @@ static void virtio_blk_flush_complete(void *opaque, int ret) > > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > bdrv_acct_done(req->dev->bs, &req->acct); > - g_free(req); > + virtio_blk_free_request(req); > } > - > static VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) > { > - VirtIOBlockReq *req = g_malloc(sizeof(*req)); > + VirtIOBlockReq *req ; > + req = req_pool_get_new(); > req->dev = s; > req->qiov.size = 0; > req->next = NULL; > return req; > } > - > static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s) > { > VirtIOBlockReq *req = virtio_blk_alloc_request(s); > > if (req != NULL) { > if (!virtqueue_pop(s->vq, &req->elem)) { > - g_free(req); > + virtio_blk_free_request(req); > return NULL; > } > } > @@ -142,7 +205,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) > */ > if (req->elem.out_num < 2 || req->elem.in_num < 3) { > virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); > - g_free(req); > + virtio_blk_free_request(req); > return; > } > > @@ -232,7 +295,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) > stl_p(&req->scsi->data_len, hdr.dxfer_len); > > virtio_blk_req_complete(req, status); > - g_free(req); > + virtio_blk_free_request(req); > return; > #else > abort(); > @@ -242,7 +305,7 @@ fail: > /* Just put anything nonzero so that the ioctl fails in the guest. */ > stl_p(&req->scsi->errors, 255); > virtio_blk_req_complete(req, status); > - g_free(req); > + virtio_blk_free_request(req); > } > > typedef struct MultiReqBuffer { > @@ -375,7 +438,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, > s->blk.serial ? s->blk.serial : "", > MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES)); > virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); > - g_free(req); > + virtio_blk_free_request(req); > } else if (type & VIRTIO_BLK_T_OUT) { > qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1], > req->elem.out_num - 1); > @@ -387,7 +450,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, > virtio_blk_handle_read(req); > } else { > virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP); > - g_free(req); > + virtio_blk_free_request(req); > } > } > >