From patchwork Tue May 31 04:44:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 9143215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 70FB460777 for ; Tue, 31 May 2016 04:48:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66FCF27C05 for ; Tue, 31 May 2016 04:48:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B71828185; Tue, 31 May 2016 04:48:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ED32B2810E for ; Tue, 31 May 2016 04:48:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7bZP-0007V8-3Y; Tue, 31 May 2016 04:46:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7bZN-0007UW-Af for xen-devel@lists.xenproject.org; Tue, 31 May 2016 04:46:21 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 21/CD-25578-C171D475; Tue, 31 May 2016 04:46:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRWlGSWpSXmKPExsVyMfS6o660uG+ 4wYEOc4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNePJtQmMBWdUK348aGBqYPwt1cXIxSEkMINR 4ualHYwgDovASxaJPYsvsoA4EgL9rBJdb1+ydjFyAjkxEmdfNzFC2FUSs1uPMoPYQgJaEpdWr mCBGDWVSeLVjzYmkASbgJnEzMk/WUBsEQFLiROdz5hAipgF3jJKTJ+3kA0kISwQJdF9ezPYJB YBVYlDX46AxXkFvCW6+o5BbZOTOHlsMtgVnAI+Emf/f2CF2Owt8fD3MvYJjAILGBlWMWoUpxa VpRbpGprpJRVlpmeU5CZm5ugaGhjr5aYWFyemp+YkJhXrJefnbmIEhhcDEOxgXLXd8xCjJAeT kiiv1W+fcCG+pPyUyozE4oz4otKc1OJDjBocHAJ9a1ZfYJRiycvPS1WS4GUV9Q0XEixKTU+tS MvMAUYATKkEB4+SCK8jSJq3uCAxtzgzHSJ1itGYY8vva2uZOLZNvbeWSQhskpQ4rzlIqQBIaU ZpHtwgWGReYpSVEuZlBDpTiKcgtSg3swRV/hWjOAejkjBvL8gUnsy8Erh9r4BOYQI6JT7DB+S UkkSElFQDo+zxeaGdW7PWnfjQFbdJYafyRsmuvRe/lJReMAsQYLCwav1f3WggdrM76aF3hypn 8qN+rz1NsRXdpscnLxPdMLed99rHvRyCk8s9zzEWip2U4Ajr2e686dmMJ9NmJ56zDHv482XV7 tenTkbevB62Sp1/9qcGyeCpRjH8lS13dDOv2QsdTGeuU2Ipzkg01GIuKk4EAKC5QeXHAgAA X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1464669979!42968006!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12316 invoked from network); 31 May 2016 04:46:19 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-8.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 May 2016 04:46:19 -0000 Received: by mail-lf0-f65.google.com with SMTP id w16so13582469lfd.0 for ; Mon, 30 May 2016 21:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hslpM8YxiqJJBtq9GNAiQkTlFLo38GfcCj3KqHuHdzA=; b=KgBg7VeM3PrcghQAEUQtEuT88Vx0qw0lu+nzkxXHZLEfbskXsnzL+9awD6GaartmRO tWwIYcEjOQqA1y6SPrxOPVGIVyZtJZ1SV7vx3V17T01wTsVo3he+weRFoNl4qf8MItd5 BoxHPBAC+o2gZQpDcxOonnEnn1/V5eWiR5DW1GAuxZugS9TdNPf/8Nvn3Xb5FAR1FDqI 9A4EvDZPKD/najGxRws8GUj2xmCxaSa3GL69qAX9Pvbgu0x6SvO3TlTgyznAHPmkHaz6 IUbUIlUtKF7fGrdiqaqCYvuORiHGnyUAM/EI07JZKpelbAdG1uwBBLPf5Z2uCokzk/Sl FBQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hslpM8YxiqJJBtq9GNAiQkTlFLo38GfcCj3KqHuHdzA=; b=Zpm54ngWnUcnuWYA5ACCzZQ9L7Q4W9PClre/tECF7O+rpWdOZz0N98WQmF3twA+cpU 6zSyCxAlrPHp9iAai6eNmBwBJKxS1+WWKpUeYr+Y83nTV6Ihrgs/EM7fUrGW0Mms80Xz KeZs4ezM0VLPbZf3NVI2wxfElo1sSKdv0MbuSubociG3WmpY767jkGwx6kt/vaqD6hSG VsSQJ4PrKiqKmJOdxe4DYFYO28hf/GUv7mttypgs0HI9UHVWjzfEYa0lD5cmv/aiMeJ6 IF1q2SRwvtmTLldLpKjTIc8phR24tabxUWCcxAkRe44TjyKaYlgiQp7V3jvh2sLWgae1 Wnqw== X-Gm-Message-State: ALyK8tKuK8z+oit+3XQ5dGpAHpFpo9UgVZPcnGUL0eP2esogqV2zZCdraxTgwxIAV6uSUg== X-Received: by 10.25.157.130 with SMTP id g124mr1060694lfe.10.1464669979248; Mon, 30 May 2016 21:46:19 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id 28sm2653438ljb.13.2016.05.30.21.46.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 May 2016 21:46:18 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com Date: Tue, 31 May 2016 06:44:58 +0200 Message-Id: <1464669898-28495-5-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464669898-28495-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1464669898-28495-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, Paulina Szubarczyk , ian.jackson@eu.citrix.com, P.Gawkowski@ii.pw.edu.pl, anthony.perard@citrix.com Subject: [Xen-devel] [PATCH RESEND 4/4] qemu-xen-dir/hw/block: Cache local buffers used in grant copy X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP If there are still pending requests the buffers are not free() but cached in an array of a size max_request*BLKIF_MAX_SEGMENTS_PER_REQUEST --- hw/block/xen_disk.c | 60 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 43cd9c9..cf80897 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -125,6 +125,10 @@ struct XenBlkDev { /* */ gboolean feature_discard; + /* request buffer cache */ + void **buf_cache; + int buf_cache_free; + /* qemu block driver */ DriveInfo *dinfo; BlockBackend *blk; @@ -284,12 +288,16 @@ err: return -1; } - -static void* get_buffer(void) { +static void* get_buffer(struct XenBlkDev *blkdev) { void *buf; - buf = mmap(NULL, 1 << XC_PAGE_SHIFT, PROT_READ | PROT_WRITE, + if(blkdev->buf_cache_free <= 0) { + buf = mmap(NULL, 1 << XC_PAGE_SHIFT, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); + } else { + blkdev->buf_cache_free--; + buf = blkdev->buf_cache[blkdev->buf_cache_free]; + } if (unlikely(buf == MAP_FAILED)) return NULL; @@ -301,21 +309,40 @@ static int free_buffer(void* buf) { return munmap(buf, 1 << XC_PAGE_SHIFT); } -static int free_buffers(void** page, int count) +static int free_buffers(void** page, int count, struct XenBlkDev *blkdev) { - int i, r = 0; + int i, put_buf_cache = 0, r = 0; + + if (blkdev->more_work && blkdev->requests_inflight < max_requests) { + put_buf_cache = max_requests * BLKIF_MAX_SEGMENTS_PER_REQUEST + - blkdev->buf_cache_free; + } for (i = 0; i < count; i++) { - - if(free_buffer(page[i])) - r = 1; - + if(put_buf_cache > 0) { + blkdev->buf_cache[blkdev->buf_cache_free++] = page[i]; + put_buf_cache--; + } else { + if(free_buffer(page[i])) + r = 1; + } + page[i] = NULL; } return r; } +static void free_buf_cache(struct XenBlkDev *blkdev) { + int i; + for(i = 0; i < blkdev->buf_cache_free; i++) { + free_buffer(blkdev->buf_cache[i]); + } + + blkdev->buf_cache_free = 0; + free(blkdev->buf_cache); +} + static int ioreq_write(struct ioreq *ioreq) { XenGnttab gnt = ioreq->blkdev->xendev.gnttabdev; @@ -343,7 +370,7 @@ static int ioreq_write(struct ioreq *ioreq) offset[i] = ioreq->req.seg[i].first_sect * ioreq->blkdev->file_blk; len[i] = (ioreq->req.seg[i].last_sect - ioreq->req.seg[i].first_sect + 1) * ioreq->blkdev->file_blk; - pages[i] = get_buffer(); + pages[i] = get_buffer(ioreq->blkdev); if(!pages[i]) { xen_be_printf(&ioreq->blkdev->xendev, 0, @@ -357,7 +384,7 @@ static int ioreq_write(struct ioreq *ioreq) xen_be_printf(&ioreq->blkdev->xendev, 0, "failed to copy data for write %d \n", rc); - if(free_buffers(ioreq->page, ioreq->v.niov)) { + if(free_buffers(ioreq->page, ioreq->v.niov, ioreq->blkdev)) { xen_be_printf(&ioreq->blkdev->xendev, 0, "failed to free page, errno %d \n", errno); } @@ -383,7 +410,7 @@ static int ioreq_read_init(struct ioreq *ioreq) } for (i = 0; i < ioreq->v.niov; i++) { - ioreq->page[i] = get_buffer(); + ioreq->page[i] = get_buffer(ioreq->blkdev); if(!ioreq->page[i]) { return -1; } @@ -469,7 +496,7 @@ static void qemu_aio_complete(void *opaque, int ret) "failed to copy read data to guest\n"); } case BLKIF_OP_WRITE: - if(free_buffers(ioreq->page, ioreq->v.niov)) { + if(free_buffers(ioreq->page, ioreq->v.niov, ioreq->blkdev)) { xen_be_printf(&ioreq->blkdev->xendev, 0, "failed to free page, errno %d \n", errno); } @@ -936,6 +963,11 @@ static int blk_connect(struct XenDevice *xendev) } blkdev->cnt_map++; + /* create buffer cache for grant copy operations*/ + blkdev->buf_cache_free = 0; + blkdev->buf_cache = calloc(max_requests * BLKIF_MAX_SEGMENTS_PER_REQUEST, + sizeof(void *)); + switch (blkdev->protocol) { case BLKIF_PROTOCOL_NATIVE: { @@ -972,6 +1004,8 @@ static void blk_disconnect(struct XenDevice *xendev) { struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); + free_buf_cache(blkdev); + if (blkdev->blk) { blk_detach_dev(blkdev->blk, blkdev); blk_unref(blkdev->blk);