From patchwork Wed Jan 9 11:27:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongji Xie X-Patchwork-Id: 10753887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED23A17FB for ; Wed, 9 Jan 2019 11:31:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCD8B28F4B for ; Wed, 9 Jan 2019 11:31:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D17BF28F5C; Wed, 9 Jan 2019 11:31:10 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11EBD28F5B for ; Wed, 9 Jan 2019 11:31:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:35354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghC4i-0003cY-AM for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Jan 2019 06:31:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghC1j-0000tD-9T for qemu-devel@nongnu.org; Wed, 09 Jan 2019 06:28:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghC1i-0004J3-ET for qemu-devel@nongnu.org; Wed, 09 Jan 2019 06:28:03 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:44669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghC1i-0004Hf-7g for qemu-devel@nongnu.org; Wed, 09 Jan 2019 06:28:02 -0500 Received: by mail-pl1-x644.google.com with SMTP id e11so3453309plt.11 for ; Wed, 09 Jan 2019 03:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R1acYzi45ES3MQAv7iC3m1nLc5Pfp8ailgufHkJhY+4=; b=aQ61dFPxHduDjrbqoAZ1znrhXtOW8a92LSaXIHcFA2VmrIO8ftWic/GAwFOf0f6xzg tMuW+ufj3Cl82dE44kzBm9qm2ZWgk66512CYaPOu1wYeEHcmPoJ+bv8lhmmtmo3x/Cem RQBvqMcIicHrF1pum1FykJ+mJZ0mCZ7617yO+2DzssoNBIyAm6wReXbholms/pJlXlO5 Vqq5+7tyq71/4BSN7JkWseiO3knQ7o9SyaTrNee1SOm4J1HiBsDlFLDl38mLPUPziPEV cPkqF5SqigmungX4LOPdC1JE1qBqnTEhfKZT/fF5oOTRlPcvmtfUxZ7bJOxVjSGOhtTP dnpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R1acYzi45ES3MQAv7iC3m1nLc5Pfp8ailgufHkJhY+4=; b=E8RDmhxlDlDR+trf+ZgZacqBFdEFSKlWKibzm7wNNmyATFAF2AiNZhvL744gEDkwbm R0b/kxk8ASY0d602IajZo7HPiED0AGUObCcc8LivA/giOPtCSVVWdJRUVVOirB6tqPvc AN6uRlgamPG/yL6NubC5/c5Jfq6ZaCJxAvC5HLHPh5ORBwH82Djw6Nu59TFKhq8XzsAP wxHJDqWIzJR2fkLGKJeb0FYBjryzutD6wsge4rTEd7lpiwl9rl6UZaE4OZmVORulhnvC FvrzSN+4kwJPSxSQxeShu2YmGDqRJH/uGnDIJiNWeFvyJ1+GZsug8BTLZYJ+LuAqpjNJ 2AYw== X-Gm-Message-State: AJcUukeqkaopDkBGaG/GwR3/LjQ0PwQ0fVQVPEC93PZg4mdfT9DJgG4f 1XiD+xZUKaNqutboW5VIZ0A= X-Google-Smtp-Source: ALg8bN4akOKfFO6TgK+PHeB3uXwO6XCEYYN5UCluIlXzHapXpWzDchoTYtuwFWS10oCDxYjXo0+O/A== X-Received: by 2002:a17:902:3f81:: with SMTP id a1mr5596986pld.258.1547033281458; Wed, 09 Jan 2019 03:28:01 -0800 (PST) Received: from localhost ([116.247.112.152]) by smtp.gmail.com with ESMTPSA id d18sm109326422pfj.47.2019.01.09.03.28.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 03:28:01 -0800 (PST) From: elohimes@gmail.com X-Google-Original-From: xieyongji@baidu.com To: mst@redhat.com, marcandre.lureau@redhat.com, berrange@redhat.com, jasowang@redhat.com, maxime.coquelin@redhat.com, yury-kotov@yandex-team.ru, wrfsh@yandex-team.ru Date: Wed, 9 Jan 2019 19:27:26 +0800 Message-Id: <20190109112728.9214-6-xieyongji@baidu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190109112728.9214-1-xieyongji@baidu.com> References: <20190109112728.9214-1-xieyongji@baidu.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::644 Subject: [Qemu-devel] [PATCH v4 for-4.0 5/7] vhost-user-blk: Add support to get/set inflight buffer 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: nixun@baidu.com, qemu-devel@nongnu.org, lilin24@baidu.com, zhangyu31@baidu.com, chaiwen@baidu.com, Xie Yongji Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Xie Yongji This patch adds support for vhost-user-blk device to get/set inflight buffer from/to backend. Signed-off-by: Xie Yongji Signed-off-by: Zhang Yu --- hw/block/vhost-user-blk.c | 26 ++++++++++++++++++++++++++ include/hw/virtio/vhost-user-blk.h | 1 + 2 files changed, 27 insertions(+) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 1451940845..e1c48b938c 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -126,6 +126,13 @@ static void vhost_user_blk_start(VirtIODevice *vdev) } s->dev.acked_features = vdev->guest_features; + + ret = vhost_dev_set_inflight(&s->dev, s->inflight); + if (ret < 0) { + error_report("Error set inflight: %d", -ret); + goto err_guest_notifiers; + } + ret = vhost_dev_start(&s->dev, vdev); if (ret < 0) { error_report("Error starting vhost: %d", -ret); @@ -245,6 +252,13 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) } } +static void vhost_user_blk_reset(VirtIODevice *vdev) +{ + VHostUserBlk *s = VHOST_USER_BLK(vdev); + + vhost_dev_reset_inflight(s->inflight); +} + static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -284,6 +298,8 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) vhost_user_blk_handle_output); } + s->inflight = g_new0(struct vhost_inflight, 1); + s->dev.nvqs = s->num_queues; s->dev.vqs = g_new(struct vhost_virtqueue, s->dev.nvqs); s->dev.vq_index = 0; @@ -309,12 +325,19 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) s->blkcfg.num_queues = s->num_queues; } + ret = vhost_dev_get_inflight(&s->dev, s->inflight); + if (ret < 0) { + error_setg(errp, "vhost-user-blk: get inflight failed"); + goto vhost_err; + } + return; vhost_err: vhost_dev_cleanup(&s->dev); virtio_err: g_free(s->dev.vqs); + g_free(s->inflight); virtio_cleanup(vdev); vhost_user_cleanup(user); @@ -329,7 +352,9 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev, Error **errp) vhost_user_blk_set_status(vdev, 0); vhost_dev_cleanup(&s->dev); + vhost_dev_free_inflight(s->inflight); g_free(s->dev.vqs); + g_free(s->inflight); virtio_cleanup(vdev); if (s->vhost_user) { @@ -379,6 +404,7 @@ static void vhost_user_blk_class_init(ObjectClass *klass, void *data) vdc->set_config = vhost_user_blk_set_config; vdc->get_features = vhost_user_blk_get_features; vdc->set_status = vhost_user_blk_set_status; + vdc->reset = vhost_user_blk_reset; } static const TypeInfo vhost_user_blk_info = { diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h index d52944aeeb..445516604a 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -36,6 +36,7 @@ typedef struct VHostUserBlk { uint32_t queue_size; uint32_t config_wce; struct vhost_dev dev; + struct vhost_inflight *inflight; VhostUserState *vhost_user; } VHostUserBlk;