From patchwork Wed Jul 16 16:31:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 370807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 885431400B5 for ; Thu, 17 Jul 2014 02:39:39 +1000 (EST) Received: from localhost ([::1]:40331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7SEz-0004XV-OE for incoming@patchwork.ozlabs.org; Wed, 16 Jul 2014 12:39:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7S83-0002C6-Lj for qemu-devel@nongnu.org; Wed, 16 Jul 2014 12:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7S7w-0001YL-UO for qemu-devel@nongnu.org; Wed, 16 Jul 2014 12:32:27 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:52025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7S7w-0001YD-Nl for qemu-devel@nongnu.org; Wed, 16 Jul 2014 12:32:20 -0400 Received: by mail-pd0-f175.google.com with SMTP id r10so34967pdi.20 for ; Wed, 16 Jul 2014 09:32:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1+3Sbz17k5T7cn1EHnEgY415jhG16m6rdk2ZCmT1Lgw=; b=Gg2Ix5zFrpgApb/Z5gtaNl9/5iZrtxVEVnYWGDKPWzuD8GmHzknM5yB72UoVtWNpHd 8sGm0HKB8Xgi5FmbF2BiL36MUkot7SsR477hyJl11YOore/iOQU7ZVVKkVNmYptGRtgc gZIGXlMlonNZXHm+iynC0os0jlT84XRkSpnfnC7+OP1wn2MRCVZiFPoYvRVMTXF7YKCH McTRQjT+LQK1UoccXZWvDUsTLhVEJsfAleNZ7mhAarXX1a5y2wsp3o66p1GM9u0SmY/a jO2htvACQ1EgJZrHIhadTVQ+UeV+teB4+JA+220CHfxYkMqEivvgj0DjcJ7u6U4vyPjq 6rXQ== X-Received: by 10.68.164.4 with SMTP id ym4mr31073762pbb.53.1405528339949; Wed, 16 Jul 2014 09:32:19 -0700 (PDT) Received: from localhost ([183.37.245.13]) by mx.google.com with ESMTPSA id ry10sm72398117pab.38.2014.07.16.09.32.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 16 Jul 2014 09:32:18 -0700 (PDT) From: Ming Lei To: qemu-devel@nongnu.org, Paolo Bonzini , Stefan Hajnoczi Date: Thu, 17 Jul 2014 00:31:14 +0800 Message-Id: <1405528281-23744-8-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405528281-23744-1-git-send-email-ming.lei@canonical.com> References: <1405528281-23744-1-git-send-email-ming.lei@canonical.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.175 Cc: Kevin Wolf , Ming Lei , Fam Zheng , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH RFC 07/14] dataplane: use object pool to speed up allocation for virtio blk request X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org g_slice_new(VirtIOBlockReq), its free pair and access the instance is a bit slow since sizeof(VirtIOBlockReq) takes more than 40KB, so use object pool to speed up its allocation and release. With this patch, ~20% thoughput improvement can be observed in my laptop based VM test, and ~5% improvement is observed in the VM based on server. Signed-off-by: Ming Lei --- hw/block/dataplane/virtio-blk.c | 12 ++++++++++++ hw/block/virtio-blk.c | 13 +++++++++++-- include/hw/virtio/virtio-blk.h | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 2093e4a..828fe99 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -24,6 +24,8 @@ #include "hw/virtio/virtio-bus.h" #include "qom/object_interfaces.h" +#define REQ_POOL_SZ 128 + struct VirtIOBlockDataPlane { bool started; bool starting; @@ -51,6 +53,10 @@ struct VirtIOBlockDataPlane { Error *blocker; void (*saved_complete_request)(struct VirtIOBlockReq *req, unsigned char status); + + VirtIOBlockReq reqs[REQ_POOL_SZ]; + void *free_reqs[REQ_POOL_SZ]; + ObjPool req_pool; }; /* Raise an interrupt to signal guest, if necessary */ @@ -238,6 +244,10 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) return; } + vblk->obj_pool = &s->req_pool; + obj_pool_init(vblk->obj_pool, s->reqs, s->free_reqs, + sizeof(VirtIOBlockReq), REQ_POOL_SZ); + /* Set up guest notifier (irq) */ if (k->set_guest_notifiers(qbus->parent, 1, true) != 0) { fprintf(stderr, "virtio-blk failed to set guest notifier, " @@ -298,6 +308,8 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) aio_context_release(s->ctx); + vblk->obj_pool = NULL; + if (s->raw_format) { qemu_aio_set_bypass_co(s->ctx, false); } diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index c241c50..2a11bc4 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -31,7 +31,11 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) { - VirtIOBlockReq *req = g_slice_new(VirtIOBlockReq); + VirtIOBlockReq *req = obj_pool_get(s->obj_pool); + + if (!req) { + req = g_slice_new(VirtIOBlockReq); + } req->dev = s; req->qiov.size = 0; req->next = NULL; @@ -41,7 +45,11 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) void virtio_blk_free_request(VirtIOBlockReq *req) { if (req) { - g_slice_free(VirtIOBlockReq, req); + if (obj_pool_has_obj(req->dev->obj_pool, req)) { + obj_pool_put(req->dev->obj_pool, req); + } else { + g_slice_free(VirtIOBlockReq, req); + } } } @@ -801,6 +809,7 @@ static void virtio_blk_instance_init(Object *obj) { VirtIOBlock *s = VIRTIO_BLK(obj); + s->obj_pool = NULL; object_property_add_link(obj, "iothread", TYPE_IOTHREAD, (Object **)&s->blk.iothread, qdev_prop_allow_set_link_before_realize, diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index afb7b8d..49ac234 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -18,6 +18,7 @@ #include "hw/block/block.h" #include "sysemu/iothread.h" #include "block/block.h" +#include "qemu/obj_pool.h" #define TYPE_VIRTIO_BLK "virtio-blk-device" #define VIRTIO_BLK(obj) \ @@ -135,6 +136,7 @@ typedef struct VirtIOBlock { Notifier migration_state_notifier; struct VirtIOBlockDataPlane *dataplane; #endif + ObjPool *obj_pool; } VirtIOBlock; typedef struct MultiReqBuffer {