From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 027AEC433EF for ; Wed, 23 Mar 2022 11:27:58 +0000 (UTC) Received: from localhost ([::1]:56798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWz9h-0002Yp-Sd for qemu-devel@archiver.kernel.org; Wed, 23 Mar 2022 07:27:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWz01-00016r-O3 for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:17:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWyzz-0002Pr-VE for qemu-devel@nongnu.org; Wed, 23 Mar 2022 07:17:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648034275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zquN7zevoWdWPGg9D4ZbVKxJqDbEcY0jrX91R7b2DmQ=; b=iHSGCs0N/NplD/QXYNCmt2qHXn6loc1W3/CW+B22rvmqLxq3znEDuha7Wc1xNwMhQGikxV gJxUxpw1zxoPGyK7cJuqDt1c931siw6cXYfbMrMPTpm93qOGJJOLGcjiZIQqSgHLbq+cRv ktldMlmzzdEla925Zd3ExaAGaIy3yog= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-536-f98vVDZhNQyUO9AONga3SA-1; Wed, 23 Mar 2022 07:17:54 -0400 X-MC-Unique: f98vVDZhNQyUO9AONga3SA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B7CD9802809; Wed, 23 Mar 2022 11:17:53 +0000 (UTC) Received: from localhost (unknown [10.39.194.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D7AF565DBD; Wed, 23 Mar 2022 11:17:53 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [RFC 7/8] blkio: implement BDRV_REQ_REGISTERED_BUF optimization Date: Wed, 23 Mar 2022 11:17:26 +0000 Message-Id: <20220323111727.1100209-8-stefanha@redhat.com> In-Reply-To: <20220323111727.1100209-1-stefanha@redhat.com> References: <20220323111727.1100209-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Kevin Wolf , Thomas Huth , Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org, "Michael S. Tsirkin" , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alberto Faria , Markus Armbruster , Yanan Wang , Eduardo Habkost , Hanna Reitz , Stefan Hajnoczi , Paolo Bonzini , Fam Zheng , Eric Blake , sgarzare@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid bounce buffers when QEMUIOVector elements are within previously registered bdrv_register_buf() buffers. The idea is that emulated storage controllers will register guest RAM using bdrv_register_buf() and set the BDRV_REQ_REGISTERED_BUF on I/O requests. Therefore no blkio_add_mem_region() calls are necessary in the performance-critical I/O code path. This optimization doesn't apply if the I/O buffer is internally allocated by QEMU (e.g. qcow2 metadata). There we still take the slow path because BDRV_REQ_REGISTERED_BUF is not set. Signed-off-by: Stefan Hajnoczi --- block/blkio.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 4 deletions(-) diff --git a/block/blkio.c b/block/blkio.c index dd2308b967..78f4ca5f49 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -1,7 +1,9 @@ #include "qemu/osdep.h" #include #include "block/block_int.h" +#include "exec/memory.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qapi/qmp/qdict.h" #include "qemu/module.h" @@ -26,6 +28,9 @@ typedef struct { /* Can we skip adding/deleting blkio_mem_regions? */ bool needs_mem_regions; + /* Are file descriptors necessary for blkio_mem_regions? */ + bool needs_mem_region_fd; + /* * blkio_completion_fd_poll() stashes the next completion for * blkio_completion_fd_poll_ready(). @@ -170,6 +175,8 @@ static BlockAIOCB *blkio_aio_preadv(BlockDriverState *bs, int64_t offset, BlockCompletionFunc *cb, void *opaque) { BDRVBlkioState *s = bs->opaque; + bool needs_mem_regions = + s->needs_mem_regions && !(flags & BDRV_REQ_REGISTERED_BUF); struct iovec *iov = qiov->iov; int iovcnt = qiov->niov; BlkioAIOCB *acb; @@ -179,7 +186,7 @@ static BlockAIOCB *blkio_aio_preadv(BlockDriverState *bs, int64_t offset, acb = blkio_aiocb_get(bs, cb, opaque); - if (s->needs_mem_regions) { + if (needs_mem_regions) { if (blkio_aiocb_init_mem_region_locked(acb, bytes) < 0) { qemu_aio_unref(&acb->common); return NULL; @@ -194,7 +201,7 @@ static BlockAIOCB *blkio_aio_preadv(BlockDriverState *bs, int64_t offset, ret = blkioq_readv(s->blkioq, offset, iov, iovcnt, acb, 0); if (ret < 0) { - if (s->needs_mem_regions) { + if (needs_mem_regions) { blkio_free_mem_region(s->blkio, &acb->mem_region); qemu_iovec_destroy(&acb->qiov); } @@ -215,6 +222,8 @@ static BlockAIOCB *blkio_aio_pwritev(BlockDriverState *bs, int64_t offset, { uint32_t blkio_flags = (flags & BDRV_REQ_FUA) ? BLKIO_REQ_FUA : 0; BDRVBlkioState *s = bs->opaque; + bool needs_mem_regions = + s->needs_mem_regions && !(flags & BDRV_REQ_REGISTERED_BUF); struct iovec *iov = qiov->iov; int iovcnt = qiov->niov; BlkioAIOCB *acb; @@ -224,7 +233,7 @@ static BlockAIOCB *blkio_aio_pwritev(BlockDriverState *bs, int64_t offset, acb = blkio_aiocb_get(bs, cb, opaque); - if (s->needs_mem_regions) { + if (needs_mem_regions) { if (blkio_aiocb_init_mem_region_locked(acb, bytes) < 0) { qemu_aio_unref(&acb->common); return NULL; @@ -238,7 +247,7 @@ static BlockAIOCB *blkio_aio_pwritev(BlockDriverState *bs, int64_t offset, ret = blkioq_writev(s->blkioq, offset, iov, iovcnt, acb, blkio_flags); if (ret < 0) { - if (s->needs_mem_regions) { + if (needs_mem_regions) { blkio_free_mem_region(s->blkio, &acb->mem_region); } qemu_aio_unref(&acb->common); @@ -286,6 +295,83 @@ static void blkio_io_unplug(BlockDriverState *bs) } } +static void blkio_register_buf(BlockDriverState *bs, void *host, size_t size) +{ + BDRVBlkioState *s = bs->opaque; + char *errmsg; + int ret; + struct blkio_mem_region region = (struct blkio_mem_region){ + .addr = host, + .len = size, + .fd = -1, + }; + + if (((uintptr_t)host | size) % s->mem_region_alignment) { + error_report_once("%s: skipping unaligned buf %p with size %zu", + __func__, host, size); + return; /* skip unaligned */ + } + + /* Attempt to find the fd for a MemoryRegion */ + if (s->needs_mem_region_fd) { + int fd = -1; + ram_addr_t offset; + MemoryRegion *mr; + + /* + * bdrv_register_buf() is called with the BQL held so mr lives at least + * until this function returns. + */ + mr = memory_region_from_host(host, &offset); + if (mr) { + fd = memory_region_get_fd(mr); + } + if (fd == -1) { + error_report_once("%s: skipping fd-less buf %p with size %zu", + __func__, host, size); + return; /* skip if there is no fd */ + } + + region.fd = fd; + region.fd_offset = offset; + } + + WITH_QEMU_LOCK_GUARD(&s->lock) { + ret = blkio_add_mem_region(s->blkio, ®ion, &errmsg); + } + + if (ret < 0) { + error_report_once("Failed to add blkio mem region %p with size %zu: %s", + host, size, errmsg); + free(errmsg); + } +} + +static void blkio_unregister_buf(BlockDriverState *bs, void *host, size_t size) +{ + BDRVBlkioState *s = bs->opaque; + char *errmsg; + int ret; + struct blkio_mem_region region = (struct blkio_mem_region){ + .addr = host, + .len = size, + }; + + if (((uintptr_t)host | size) % s->mem_region_alignment) { + return; /* skip unaligned */ + } + + WITH_QEMU_LOCK_GUARD(&s->lock) { + ret = blkio_del_mem_region(s->blkio, ®ion, &errmsg); + } + + if (ret < 0) { + error_report_once("Failed to delete blkio mem region %p with size %zu: %s", + host, size, errmsg); + free(errmsg); + } +} + static void blkio_parse_filename_io_uring(const char *filename, QDict *options, Error **errp) { @@ -356,6 +442,18 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags, return ret; } + ret = blkio_get_bool(s->blkio, + "needs-mem-region-fd", + &s->needs_mem_region_fd, + &errmsg); + if (ret < 0) { + error_setg_errno(errp, -ret, + "failed to get needs-mem-region-fd: %s", errmsg); + free(errmsg); + blkio_destroy(&s->blkio); + return ret; + } + ret = blkio_get_uint64(s->blkio, "mem-region-alignment", &s->mem_region_alignment, @@ -436,6 +534,8 @@ static BlockDriver bdrv_io_uring = { .bdrv_aio_pwritev = blkio_aio_pwritev, .bdrv_aio_flush = blkio_aio_flush, .bdrv_io_unplug = blkio_io_unplug, + .bdrv_register_buf = blkio_register_buf, + .bdrv_unregister_buf = blkio_unregister_buf, /* * TODO -- 2.35.1