From patchwork Thu Jan 25 05:46:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 865756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3zRrkp5fsxz9sQm for ; Thu, 25 Jan 2018 16:51:30 +1100 (AEDT) Received: from localhost ([::1]:45566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeaRc-00018y-RT for incoming@patchwork.ozlabs.org; Thu, 25 Jan 2018 00:51:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeaNZ-0006tb-4a for qemu-devel@nongnu.org; Thu, 25 Jan 2018 00:47:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeaNY-0007fo-7Q for qemu-devel@nongnu.org; Thu, 25 Jan 2018 00:47:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeaNY-0007dw-2n for qemu-devel@nongnu.org; Thu, 25 Jan 2018 00:47:16 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51FA3C04AC4A; Thu, 25 Jan 2018 05:47:15 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-118.pek2.redhat.com [10.72.12.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E9F65D6A8; Thu, 25 Jan 2018 05:47:14 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 13:46:44 +0800 Message-Id: <20180125054648.18747-11-famz@redhat.com> In-Reply-To: <20180125054648.18747-1-famz@redhat.com> References: <20180125054648.18747-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 25 Jan 2018 05:47:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 10/14] block/nvme: Implement .bdrv_(un)register_buf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Forward these two calls to the IOVA manager. Signed-off-by: Fam Zheng Message-Id: <20180110091846.10699-6-famz@redhat.com> Reviewed-by: Stefan Hajnoczi Message-Id: <20180116060901.17413-6-famz@redhat.com> Signed-off-by: Fam Zheng --- block/nvme.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/block/nvme.c b/block/nvme.c index 99cc7702ad..30616f50c7 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1145,6 +1145,27 @@ static void nvme_aio_unplug(BlockDriverState *bs) } } +static void nvme_register_buf(BlockDriverState *bs, void *host, size_t size) +{ + int ret; + BDRVNVMeState *s = bs->opaque; + + ret = qemu_vfio_dma_map(s->vfio, host, size, false, NULL); + if (ret) { + /* FIXME: we may run out of IOVA addresses after repeated + * bdrv_register_buf/bdrv_unregister_buf, because nvme_vfio_dma_unmap + * doesn't reclaim addresses for fixed mappings. */ + error_report("nvme_register_buf failed: %s", strerror(-ret)); + } +} + +static void nvme_unregister_buf(BlockDriverState *bs, void *host) +{ + BDRVNVMeState *s = bs->opaque; + + qemu_vfio_dma_unmap(s->vfio, host); +} + static BlockDriver bdrv_nvme = { .format_name = "nvme", .protocol_name = "nvme", @@ -1170,6 +1191,9 @@ static BlockDriver bdrv_nvme = { .bdrv_io_plug = nvme_aio_plug, .bdrv_io_unplug = nvme_aio_unplug, + + .bdrv_register_buf = nvme_register_buf, + .bdrv_unregister_buf = nvme_unregister_buf, }; static void bdrv_nvme_init(void)