From patchwork Thu Sep 24 15:15:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 304514 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02F9FC4363D for ; Thu, 24 Sep 2020 15:18:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 44B6220BED for ; Thu, 24 Sep 2020 15:18:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K5Tpw03B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44B6220BED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLT14-0007w1-CW for qemu-devel@archiver.kernel.org; Thu, 24 Sep 2020 11:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLSyg-00060a-D4 for qemu-devel@nongnu.org; Thu, 24 Sep 2020 11:16:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kLSye-0003tZ-N8 for qemu-devel@nongnu.org; Thu, 24 Sep 2020 11:16:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600960568; 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; bh=iEGZL8A2wC+bPXPY44DglRT86oA+ZDMni9MGh+VyTuE=; b=K5Tpw03BMtiNg5wxIhI2xuu0XzYxaVZEhP8WOxX+gEAcElb1pbXdBz5S8FghHzBfdt1GRx 9vj27Y9t+nuulL0zu+MkiTpnQZhyw+cGeaivFbyjF3DUyUIlSLTKn8cx385kJehpGnLGzU 6CxeIVT5RRELSx8yQxvlKeR2uJ3X/xI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-305-a2-lhwdnOvyaK55lMGFadQ-1; Thu, 24 Sep 2020 11:15:56 -0400 X-MC-Unique: a2-lhwdnOvyaK55lMGFadQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C641C802B5E; Thu, 24 Sep 2020 15:15:54 +0000 (UTC) Received: from localhost (ovpn-114-5.ams2.redhat.com [10.36.114.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id B55F75576C; Thu, 24 Sep 2020 15:15:50 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 00/13] block/export: convert vhost-user-blk-server to block exports API Date: Thu, 24 Sep 2020 16:15:36 +0100 Message-Id: <20200924151549.913737-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/22 23:02:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.199, 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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Markus Armbruster , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" v2: * Replace unix-socket=str with addr=SocketAddress for consistency with NBD and fd passing support. The new syntax is: --export vhost-user-blk,addr.type=unix,addr.path=/tmp/vhost-user-blk.sock,... * Make addr=SocketAddress mandatory instead of optional [Markus] * Update test-vhost-user-blk.c to use new syntax * Add patch moving vhost-user-server.h to include/ * Add patch to use libvhost-user.a instead of compiling it multiple times This patch series converts Coiby Xu's vhost-user-blk-server from a QOM object to the block exports API. The block exports API provides a standard QMP and command-line interface for managing block exports (NBD, FUSE, vhost-user-blk, etc). A fair amount of init/shutdown code is removed because the block exports API already takes care of that functionality. Most of the patches are vhost-user-blk-server cleanups. The syntax for launching qemu-storage-daemon is: $ qemu-storage-daemon \ --blockdev file,node-name=drive0,filename=test.img \ --export vhost-user-blk,node-name=drive0,id=export0,writable=on,addr.type=unix,addr.path=/tmp/vhost-user-blk.sock QEMU can connect to the vhost-user-blk export like this: $ qemu-system-x86_64 \ -M accel=kvm,memory-backend=mem \ -m 1G \ -object memory-backend-memfd,size=1G,id=mem \ -cpu host \ -chardev socket,path=/tmp/vhost-user-blk.sock,id=char0 \ -device vhost-user-blk-pci,chardev=char0 Based-on: 20200918080912.321299-1-coiby.xu@gmail.com ("[PATCH v10 0/7] vhost-user block device backend implementation") Based-on: 20200907182011.521007-1-kwolf@redhat.com ("[PATCH 00/29] block/export: Add infrastructure and QAPI for block exports") Stefan Hajnoczi (13): block/export: shorten serial string to fit util/vhost-user-server: s/fileds/fields/ typo fix util/vhost-user-server: drop unnecessary QOM cast util/vhost-user-server: drop unnecessary watch deletion block/export: consolidate request structs into VuBlockReq util/vhost-user-server: drop unused DevicePanicNotifier util/vhost-user-server: fix memory leak in vu_message_read() util/vhost-user-server: check EOF when reading payload util/vhost-user-server: rework vu_client_trip() coroutine lifecycle block/export: report flush errors block/export: convert vhost-user-blk server to block export API util/vhost-user-server: move header to include/ util/vhost-user-server: use static library in meson.build MAINTAINERS | 4 +- qapi/block-export.json | 21 +- block/export/vhost-user-blk-server.h | 23 +- {util => include/qemu}/vhost-user-server.h | 32 +- block/export/export.c | 8 +- block/export/vhost-user-blk-server.c | 525 ++++++--------------- tests/qtest/vhost-user-blk-test.c | 2 +- util/vhost-user-server.c | 334 ++++++------- block/export/meson.build | 1 + block/meson.build | 1 - contrib/libvhost-user/meson.build | 1 + meson.build | 6 +- tests/qtest/meson.build | 2 +- util/meson.build | 4 +- 14 files changed, 376 insertions(+), 588 deletions(-) rename {util => include/qemu}/vhost-user-server.h (72%) -- 2.26.2