From nobody Tue Apr 30 07:02:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592160140; cv=none; d=zohomail.com; s=zohoarc; b=iTKxvYVIvCRcHUR6nNOop3TAiTjRr0gTtZWNwxSaiUR4hpFwtO4EuFokKWRBAmwWD365oFN1KYBV5QqTx5uLvDDmXZlPyuWrIl+Z9dxeaaMPjNPDq49KY0ALgH9QSgXpv23+IZ0uPBK1YYKotlkxyUq1v6nhxTOJXCrQaZysiDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592160140; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U9CnHALVYdsVWTM68fMZ0Wu5EANSFnq3fDn4WbtRxY0=; b=Oz8KXR2Sx2gXmzDQeg1ACdOdGLHI/0/iHnRotd/++aT/1no4yGbmto9YcHhA7N+gVZ1V+npn2C7zOZ8fuSxRbQLsmn+3xAaUjXgEVyUhSw54cIDymBEeqRsc8Ez0FRNxqBKJzJuh5GqmXMQ80LjuLZ2lGE1NGVK6V4eqicojw/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592160140923183.18095134348755; Sun, 14 Jun 2020 11:42:20 -0700 (PDT) Received: from localhost ([::1]:51900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkXaF-0004wG-My for importer@patchew.org; Sun, 14 Jun 2020 14:42:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkXXe-0008Pt-QS for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:38 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:34433) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkXXc-00018h-U8 for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:38 -0400 Received: by mail-pl1-x641.google.com with SMTP id n9so5872689plk.1 for ; Sun, 14 Jun 2020 11:39:31 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id 4sm1491293pgk.68.2020.06.14.11.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 11:39:29 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=U9CnHALVYdsVWTM68fMZ0Wu5EANSFnq3fDn4WbtRxY0=; b=vYGk09hGFd/zYSz/AaG3ql1n0cOe8Ed3pzivCqZ+qA5xTbuOjAbioilHxQt3LaZl1y qtVRrv+Sc14GeRotw9qGop1cP+yDqCEt7ZY9qE/vG4T4zivqiOXGhar/K7iet9bHb1bj 9h5kfAvrfEuYNjM1+QXd2ZdgQGa3KdGi+h6bITPOWV2yWMLbQZ4FIbgU0LKk/klSte33 o2H2N+RLfnnEcn7bdLwP2GSYnvvSANaoWXWeEOhJk30ianMsO3G0IIFJGJBZErivUTfT JRQ29r+bZssdShuDyCBwE41tCKDTvO+gmK9J9v5imuWKzEmS6oVKvc/ztJeTJuZuxQ0+ JNTA== 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:mime-version:content-transfer-encoding; bh=U9CnHALVYdsVWTM68fMZ0Wu5EANSFnq3fDn4WbtRxY0=; b=LOd2Mp+vf3QmYboCExYceuN8dWOOiQCBM/XaR7v2YnRHvNHaFR5ylkP9iXSVk6FSEJ D1X8k4vBiH3XGv2PiOpPYuYysJGLLRAAiA+BMYaYzp2JAx7+Cx0nxkRhCqKlAO2zae/P hhyBsAaxaTgn2J7s60dmKe6sPAOvIGOHzmGDWtNKoxrPNH15TZD/a7R+csmJtKT38Fw1 fDFsVpMBvXz6opJjLrFQPgMz01MESs9ZgESLrDBrtlCdIdXo/2fZCKFRkDWo3RKzwTOr pyk2mOec5WRfIEKKKQbMcSuFoNzdTDN3aOa4LTxRlx5/g3qdO3LUp9OzElgT1bTvzMmX zhtQ== X-Gm-Message-State: AOAM531q1wEIIqR+gGSX3T8dMAGCmerB1DRgD5zpdRPADQEWenCn52ej 2LYJemITrpxixYlS6bKvPUScNljUfyrqHQ== X-Google-Smtp-Source: ABdhPJxKGWTP8lBxhwDIk1S/zkCLZM7MU3sJvbqOaSvpr45pjpY45y+DoZHot5S7wnnZNY/6dV5bHw== X-Received: by 2002:a17:902:b48d:: with SMTP id y13mr14115633plr.79.1592159969834; Sun, 14 Jun 2020 11:39:29 -0700 (PDT) From: Coiby Xu To: qemu-devel@nongnu.org Subject: [PATCH v9 1/5] Allow vu_message_read to be replaced Date: Mon, 15 Jun 2020 02:39:03 +0800 Message-Id: <20200614183907.514282-2-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614183907.514282-1-coiby.xu@gmail.com> References: <20200614183907.514282-1-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::641; envelope-from=coiby.xu@gmail.com; helo=mail-pl1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, bharatlkmlkvm@gmail.com, Coiby Xu , stefanha@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Allow vu_message_read to be replaced by one which will make use of the QIOChannel functions. Thus reading vhost-user message won't stall the guest. Signed-off-by: Coiby Xu --- contrib/libvhost-user/libvhost-user-glib.c | 2 +- contrib/libvhost-user/libvhost-user.c | 11 ++++++----- contrib/libvhost-user/libvhost-user.h | 21 +++++++++++++++++++++ tests/vhost-user-bridge.c | 2 ++ tools/virtiofsd/fuse_virtio.c | 4 ++-- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-= user/libvhost-user-glib.c index 53f1ca4cdd..0df2ec9271 100644 --- a/contrib/libvhost-user/libvhost-user-glib.c +++ b/contrib/libvhost-user/libvhost-user-glib.c @@ -147,7 +147,7 @@ vug_init(VugDev *dev, uint16_t max_queues, int socket, g_assert(dev); g_assert(iface); =20 - if (!vu_init(&dev->parent, max_queues, socket, panic, set_watch, + if (!vu_init(&dev->parent, max_queues, socket, panic, NULL, set_watch, remove_watch, iface)) { return false; } diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/= libvhost-user.c index 3bca996c62..0c7368baa2 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -67,8 +67,6 @@ /* The version of inflight buffer */ #define INFLIGHT_VERSION 1 =20 -#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) - /* The version of the protocol we support */ #define VHOST_USER_VERSION 1 #define LIBVHOST_USER_DEBUG 0 @@ -412,7 +410,7 @@ vu_process_message_reply(VuDev *dev, const VhostUserMsg= *vmsg) goto out; } =20 - if (!vu_message_read(dev, dev->slave_fd, &msg_reply)) { + if (!dev->read_msg(dev, dev->slave_fd, &msg_reply)) { goto out; } =20 @@ -647,7 +645,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg= *vmsg) /* Wait for QEMU to confirm that it's registered the handler for the * faults. */ - if (!vu_message_read(dev, dev->sock, vmsg) || + if (!dev->read_msg(dev, dev->sock, vmsg) || vmsg->size !=3D sizeof(vmsg->payload.u64) || vmsg->payload.u64 !=3D 0) { vu_panic(dev, "failed to receive valid ack for postcopy set-mem-ta= ble"); @@ -1653,7 +1651,7 @@ vu_dispatch(VuDev *dev) int reply_requested; bool need_reply, success =3D false; =20 - if (!vu_message_read(dev, dev->sock, &vmsg)) { + if (!dev->read_msg(dev, dev->sock, &vmsg)) { goto end; } =20 @@ -1704,6 +1702,7 @@ vu_deinit(VuDev *dev) } =20 if (vq->kick_fd !=3D -1) { + dev->remove_watch(dev, vq->kick_fd); close(vq->kick_fd); vq->kick_fd =3D -1; } @@ -1751,6 +1750,7 @@ vu_init(VuDev *dev, uint16_t max_queues, int socket, vu_panic_cb panic, + vu_read_msg_cb read_msg, vu_set_watch_cb set_watch, vu_remove_watch_cb remove_watch, const VuDevIface *iface) @@ -1768,6 +1768,7 @@ vu_init(VuDev *dev, =20 dev->sock =3D socket; dev->panic =3D panic; + dev->read_msg =3D read_msg ? read_msg : vu_message_read; dev->set_watch =3D set_watch; dev->remove_watch =3D remove_watch; dev->iface =3D iface; diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/= libvhost-user.h index f30394fab6..d756da8548 100644 --- a/contrib/libvhost-user/libvhost-user.h +++ b/contrib/libvhost-user/libvhost-user.h @@ -30,6 +30,8 @@ =20 #define VHOST_MEMORY_MAX_NREGIONS 8 =20 +#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) + typedef enum VhostSetConfigType { VHOST_SET_CONFIG_TYPE_MASTER =3D 0, VHOST_SET_CONFIG_TYPE_MIGRATION =3D 1, @@ -205,6 +207,7 @@ typedef uint64_t (*vu_get_features_cb) (VuDev *dev); typedef void (*vu_set_features_cb) (VuDev *dev, uint64_t features); typedef int (*vu_process_msg_cb) (VuDev *dev, VhostUserMsg *vmsg, int *do_reply); +typedef bool (*vu_read_msg_cb) (VuDev *dev, int sock, VhostUserMsg *vmsg); typedef void (*vu_queue_set_started_cb) (VuDev *dev, int qidx, bool starte= d); typedef bool (*vu_queue_is_processed_in_order_cb) (VuDev *dev, int qidx); typedef int (*vu_get_config_cb) (VuDev *dev, uint8_t *config, uint32_t len= ); @@ -373,6 +376,23 @@ struct VuDev { bool broken; uint16_t max_queues; =20 + /* @read_msg: custom method to read vhost-user message + * + * Read data from vhost_user socket fd and fill up + * the passed VhostUserMsg *vmsg struct. + * + * If reading fails, it should close the received set of file + * descriptors as socket message's auxiliary data. + * + * For the details, please refer to vu_message_read in libvhost-user.c + * which will be used by default if not custom method is provided when + * calling vu_init + * + * Returns: true if vhost-user message successfully received, + * otherwise return false. + * + */ + vu_read_msg_cb read_msg; /* @set_watch: add or update the given fd to the watch set, * call cb when condition is met */ vu_set_watch_cb set_watch; @@ -416,6 +436,7 @@ bool vu_init(VuDev *dev, uint16_t max_queues, int socket, vu_panic_cb panic, + vu_read_msg_cb read_msg, vu_set_watch_cb set_watch, vu_remove_watch_cb remove_watch, const VuDevIface *iface); diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 6c3d490611..bd43607a4d 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -520,6 +520,7 @@ vubr_accept_cb(int sock, void *ctx) VHOST_USER_BRIDGE_MAX_QUEUES, conn_fd, vubr_panic, + NULL, vubr_set_watch, vubr_remove_watch, &vuiface)) { @@ -573,6 +574,7 @@ vubr_new(const char *path, bool client) VHOST_USER_BRIDGE_MAX_QUEUES, dev->sock, vubr_panic, + NULL, vubr_set_watch, vubr_remove_watch, &vuiface)) { diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 3b6d16a041..666945c897 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -980,8 +980,8 @@ int virtio_session_mount(struct fuse_session *se) se->vu_socketfd =3D data_sock; se->virtio_dev->se =3D se; pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL); - vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, fv_set_wat= ch, - fv_remove_watch, &fv_iface); + vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL, + fv_set_watch, fv_remove_watch, &fv_iface); =20 return 0; } --=20 2.27.0 From nobody Tue Apr 30 07:02:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592160064; cv=none; d=zohomail.com; s=zohoarc; b=Z5zQEQfRMinX7usKIT/zXCMb0bFBy1c+MQw9p7OAOc3u7X8oCUrSVqCnYnUTPECnc02ntovEHkXVgH12j2O5eOMwsgTjNeDJD1w91qb+PGet6hhgwkKEFhqwCTtE70vzj2eJFfepaTu5ZfHEJZskoVw+7MNl5QlhTL2PSzln1AI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592160064; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cmxBQrA+sytNwthQ8QVqk9DggYfm2DatGhLl09VI8ws=; b=F394/rCKtWFYLEw/qSIgALtnMbB/8PrBGeAhT2PNEjH6BbnnIK58R+AnlfqHzmY7VL/jD1ubxdvmHuvWnqeMVSN2Emzk62sIXUWBDM5FIwDkE0fNeQ88C0RHbAhLto962X2mL/UQkm+KWQFijmvhNTgTKjKfrHd5q8o7VjHei3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592160064084527.9760063615422; Sun, 14 Jun 2020 11:41:04 -0700 (PDT) Received: from localhost ([::1]:45040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkXZ0-00029t-DP for importer@patchew.org; Sun, 14 Jun 2020 14:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkXXj-0008VP-L4 for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:43 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:46954) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkXXh-000198-Dj for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:43 -0400 Received: by mail-pl1-x642.google.com with SMTP id n2so5841223pld.13 for ; Sun, 14 Jun 2020 11:39:35 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id i67sm11552545pfb.82.2020.06.14.11.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 11:39:33 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=cmxBQrA+sytNwthQ8QVqk9DggYfm2DatGhLl09VI8ws=; b=ukHcB4niWh2XWXM2zImbYY/kJxfEoAoCXHwF0JjAunoh74n9WY2nQzAcB1QaYq+mt5 oO1afNue7hMOrmyuQSw6skuxXENKN3XxWp3KtA2QUd/Rgq1cEQvi3y1EtA0Tl7DIQeOS OjvFXLa3IE50vxIDX/IluSBm/YhjoGtNxnhACGcDUmzTCldUQTtDfGSKkBOVoPf8RVuU 5Pwh2W2cKtdg93p5o3MNAdZWl5XoPOFNPbXDG1pwNGgfVVWUk45BVCc3Pc7pwhWdF8LS RidDdTDETSdcy3Cub9yoIMQXwDeUuDfR7MoXeN0Jjhud2W3gRXeBukucJ0f3E4OazXTK IDTw== 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:mime-version:content-transfer-encoding; bh=cmxBQrA+sytNwthQ8QVqk9DggYfm2DatGhLl09VI8ws=; b=Y9nXSo7BM/BCw6mo5226hri06kCURvRGc7J9FgpKVGfMSZwsJO8tBq5l3q8hEiqfnR Zt8yPxoxbDITtTH3BrwrxMWKzNhfnDiAbMP2AzF6oaVttQNgIuJqPU8ScJUXJOlSm7Bw epYY4QHInWcuIEd7Z+TJc5MjQaq1WO4M/OayVKqFAowdYXT6lwqnwkwa79bVUqve/YwO p2dZrTcacWt2Lzub2Nw4g1p9jBrRqti2y42f/9cmw+eoH518W8NmucE2R+Q71bdanm3F SoJGjHBxmATMhSslgjFxFanyLUz+nRxPIb7XPhpfRixZkmwdk4AkdZ3EFcE6VbXP0HmO AeFQ== X-Gm-Message-State: AOAM531ikjUNaPcVANFRF0cvI5GjwqY6FbCgjppkBIiHotb793H/tyMw GPtM+veuItg1s0WJRcUr1Q6lobioEO+6oQ== X-Google-Smtp-Source: ABdhPJwjUtXHJRw0UZRFB7vL0Qzea6w1wYTbPSg8uPdU80ZdBFr0mbXQ2xLN9Wcqd5bE8XC/MLZbdA== X-Received: by 2002:a17:90b:f09:: with SMTP id br9mr7918007pjb.168.1592159974050; Sun, 14 Jun 2020 11:39:34 -0700 (PDT) From: Coiby Xu To: qemu-devel@nongnu.org Subject: [PATCH v9 2/5] generic vhost user server Date: Mon, 15 Jun 2020 02:39:04 +0800 Message-Id: <20200614183907.514282-3-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614183907.514282-1-coiby.xu@gmail.com> References: <20200614183907.514282-1-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::642; envelope-from=coiby.xu@gmail.com; helo=mail-pl1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, bharatlkmlkvm@gmail.com, Coiby Xu , stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Sharing QEMU devices via vhost-user protocol. Only one vhost-user client can connect to the server one time. Signed-off-by: Coiby Xu --- util/Makefile.objs | 1 + util/vhost-user-server.c | 400 +++++++++++++++++++++++++++++++++++++++ util/vhost-user-server.h | 61 ++++++ 3 files changed, 462 insertions(+) create mode 100644 util/vhost-user-server.c create mode 100644 util/vhost-user-server.h diff --git a/util/Makefile.objs b/util/Makefile.objs index cc5e37177a..b4d4af06dc 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -66,6 +66,7 @@ util-obj-y +=3D hbitmap.o util-obj-y +=3D main-loop.o util-obj-y +=3D nvdimm-utils.o util-obj-y +=3D qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-$(CONFIG_LINUX) +=3D vhost-user-server.o util-obj-y +=3D qemu-coroutine-sleep.o util-obj-y +=3D qemu-co-shared-resource.o util-obj-y +=3D qemu-sockets.o diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c new file mode 100644 index 0000000000..393beeb6b9 --- /dev/null +++ b/util/vhost-user-server.c @@ -0,0 +1,400 @@ +/* + * Sharing QEMU devices via vhost-user protocol + * + * Author: Coiby Xu + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include +#include "qemu/main-loop.h" +#include "vhost-user-server.h" + +static void vmsg_close_fds(VhostUserMsg *vmsg) +{ + int i; + for (i =3D 0; i < vmsg->fd_num; i++) { + close(vmsg->fds[i]); + } +} + +static void vmsg_unblock_fds(VhostUserMsg *vmsg) +{ + int i; + for (i =3D 0; i < vmsg->fd_num; i++) { + qemu_set_nonblock(vmsg->fds[i]); + } +} + +static void vu_accept(QIONetListener *listener, QIOChannelSocket *sioc, + gpointer opaque); + +static void close_client(VuServer *server) +{ + vu_deinit(&server->vu_dev); + object_unref(OBJECT(server->sioc)); + object_unref(OBJECT(server->ioc)); + server->sioc_slave =3D NULL; + object_unref(OBJECT(server->ioc_slave)); + /* + * Set the callback function for network listener so another + * vhost-user client can connect to this server + */ + qio_net_listener_set_client_func(server->listener, + vu_accept, + server, + NULL); +} + +static void panic_cb(VuDev *vu_dev, const char *buf) +{ + VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); + + if (buf) { + error_report("vu_panic: %s", buf); + } + + if (server->sioc) { + close_client(server); + server->sioc =3D NULL; + } + + if (server->device_panic_notifier) { + server->device_panic_notifier(server); + } +} + +static QIOChannel *slave_io_channel(VuServer *server, int fd, + Error **local_err) +{ + if (server->sioc_slave) { + if (fd =3D=3D server->sioc_slave->fd) { + return server->ioc_slave; + } + } else { + server->sioc_slave =3D qio_channel_socket_new_fd(fd, local_err); + if (!*local_err) { + server->ioc_slave =3D QIO_CHANNEL(server->sioc_slave); + return server->ioc_slave; + } + } + + return NULL; +} + +static bool coroutine_fn +vu_message_read(VuDev *vu_dev, int conn_fd, VhostUserMsg *vmsg) +{ + struct iovec iov =3D { + .iov_base =3D (char *)vmsg, + .iov_len =3D VHOST_USER_HDR_SIZE, + }; + int rc, read_bytes =3D 0; + Error *local_err =3D NULL; + /* + * Store fds/nfds returned from qio_channel_readv_full into + * temporary variables. + * + * VhostUserMsg is a packed structure, gcc will complain about passing + * pointer to a packed structure member if we pass &VhostUserMsg.fd_num + * and &VhostUserMsg.fds directly when calling qio_channel_readv_full, + * thus two temporary variables nfds and fds are used here. + */ + size_t nfds =3D 0, nfds_t =3D 0; + int *fds_t =3D NULL; + VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); + QIOChannel *ioc =3D NULL; + + if (conn_fd =3D=3D server->sioc->fd) { + ioc =3D server->ioc; + } else { + /* Slave communication will also use this function to read msg */ + ioc =3D slave_io_channel(server, conn_fd, &local_err); + } + + if (!ioc) { + error_report_err(local_err); + goto fail; + } + + assert(qemu_in_coroutine()); + do { + /* + * qio_channel_readv_full may have short reads, keeping calling it + * until getting VHOST_USER_HDR_SIZE or 0 bytes in total + */ + rc =3D qio_channel_readv_full(ioc, &iov, 1, &fds_t, &nfds_t, &loca= l_err); + if (rc < 0) { + if (rc =3D=3D QIO_CHANNEL_ERR_BLOCK) { + qio_channel_yield(ioc, G_IO_IN); + continue; + } else { + error_report_err(local_err); + return false; + } + } + read_bytes +=3D rc; + if (nfds_t > 0) { + if (nfds + nfds_t > G_N_ELEMENTS(vmsg->fds)) { + error_report("A maximum of %d fds are allowed, " + "however got %lu fds now", + VHOST_MEMORY_MAX_NREGIONS, nfds + nfds_t); + goto fail; + } + memcpy(vmsg->fds + nfds, fds_t, + nfds_t *sizeof(vmsg->fds[0])); + nfds +=3D nfds_t; + g_free(fds_t); + } + if (read_bytes =3D=3D VHOST_USER_HDR_SIZE || rc =3D=3D 0) { + break; + } + iov.iov_base =3D (char *)vmsg + read_bytes; + iov.iov_len =3D VHOST_USER_HDR_SIZE - read_bytes; + } while (true); + + vmsg->fd_num =3D nfds; + /* qio_channel_readv_full will make socket fds blocking, unblock them = */ + vmsg_unblock_fds(vmsg); + if (vmsg->size > sizeof(vmsg->payload)) { + error_report("Error: too big message request: %d, " + "size: vmsg->size: %u, " + "while sizeof(vmsg->payload) =3D %zu", + vmsg->request, vmsg->size, sizeof(vmsg->payload)); + goto fail; + } + + struct iovec iov_payload =3D { + .iov_base =3D (char *)&vmsg->payload, + .iov_len =3D vmsg->size, + }; + if (vmsg->size) { + rc =3D qio_channel_readv_all_eof(ioc, &iov_payload, 1, &local_err); + if (rc =3D=3D -1) { + error_report_err(local_err); + goto fail; + } + } + + return true; + +fail: + vmsg_close_fds(vmsg); + + return false; +} + + +static void vu_client_start(VuServer *server); +static coroutine_fn void vu_client_trip(void *opaque) +{ + VuServer *server =3D opaque; + + while (!server->aio_context_changed && server->sioc) { + vu_dispatch(&server->vu_dev); + } + + if (server->aio_context_changed && server->sioc) { + server->aio_context_changed =3D false; + vu_client_start(server); + } +} + +static void vu_client_start(VuServer *server) +{ + server->co_trip =3D qemu_coroutine_create(vu_client_trip, server); + aio_co_enter(server->ctx, server->co_trip); +} + +/* + * a wrapper for vu_kick_cb + * + * since aio_dispatch can only pass one user data pointer to the + * callback function, pack VuDev and pvt into a struct. Then unpack it + * and pass them to vu_kick_cb + */ +static void kick_handler(void *opaque) +{ + KickInfo *kick_info =3D opaque; + kick_info->cb(kick_info->vu_dev, 0, (void *) kick_info->index); +} + + +static void +set_watch(VuDev *vu_dev, int fd, int vu_evt, + vu_watch_cb cb, void *pvt) +{ + + VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); + g_assert(vu_dev); + g_assert(fd >=3D 0); + long index =3D (intptr_t) pvt; + g_assert(cb); + KickInfo *kick_info =3D &server->kick_info[index]; + if (!kick_info->cb) { + kick_info->fd =3D fd; + kick_info->cb =3D cb; + qemu_set_nonblock(fd); + aio_set_fd_handler(server->ioc->ctx, fd, false, kick_handler, + NULL, NULL, kick_info); + kick_info->vu_dev =3D vu_dev; + } +} + + +static void remove_watch(VuDev *vu_dev, int fd) +{ + VuServer *server; + int i; + int index =3D -1; + g_assert(vu_dev); + g_assert(fd >=3D 0); + + server =3D container_of(vu_dev, VuServer, vu_dev); + for (i =3D 0; i < vu_dev->max_queues; i++) { + if (server->kick_info[i].fd =3D=3D fd) { + index =3D i; + break; + } + } + + if (index =3D=3D -1) { + return; + } + server->kick_info[i].cb =3D NULL; + aio_set_fd_handler(server->ioc->ctx, fd, false, NULL, NULL, NULL, NULL= ); +} + + +static void vu_accept(QIONetListener *listener, QIOChannelSocket *sioc, + gpointer opaque) +{ + VuServer *server =3D opaque; + + if (server->sioc) { + warn_report("Only one vhost-user client is allowed to " + "connect the server one time"); + return; + } + + if (!vu_init(&server->vu_dev, server->max_queues, sioc->fd, panic_cb, + vu_message_read, set_watch, remove_watch, server->vu_ifac= e)) { + error_report("Failed to initialized libvhost-user"); + return; + } + + /* + * Unset the callback function for network listener to make another + * vhost-user client keeping waiting until this client disconnects + */ + qio_net_listener_set_client_func(server->listener, + NULL, + NULL, + NULL); + server->sioc =3D sioc; + server->kick_info =3D g_new0(KickInfo, server->max_queues); + /* + * Increase the object reference, so sioc will not freed by + * qio_net_listener_channel_func which will call object_unref(OBJECT(s= ioc)) + */ + object_ref(OBJECT(server->sioc)); + qio_channel_set_name(QIO_CHANNEL(sioc), "vhost-user client"); + server->ioc =3D QIO_CHANNEL(sioc); + object_ref(OBJECT(server->ioc)); + qio_channel_attach_aio_context(server->ioc, server->ctx); + qio_channel_set_blocking(QIO_CHANNEL(server->sioc), false, NULL); + vu_client_start(server); +} + + +void vhost_user_server_stop(VuServer *server) +{ + if (!server) { + return; + } + + if (server->sioc) { + close_client(server); + object_unref(OBJECT(server->sioc)); + } + + if (server->listener) { + qio_net_listener_disconnect(server->listener); + object_unref(OBJECT(server->listener)); + } + + g_free(server->kick_info); +} + +static void detach_context(VuServer *server) +{ + int i; + AioContext *ctx =3D server->ioc->ctx; + qio_channel_detach_aio_context(server->ioc); + for (i =3D 0; i < server->vu_dev.max_queues; i++) { + if (server->kick_info[i].cb) { + aio_set_fd_handler(ctx, server->kick_info[i].fd, false, NULL, + NULL, NULL, NULL); + } + } +} + +static void attach_context(VuServer *server, AioContext *ctx) +{ + int i; + qio_channel_attach_aio_context(server->ioc, ctx); + server->aio_context_changed =3D true; + if (server->co_trip) { + aio_co_schedule(ctx, server->co_trip); + } + for (i =3D 0; i < server->vu_dev.max_queues; i++) { + if (server->kick_info[i].cb) { + aio_set_fd_handler(ctx, server->kick_info[i].fd, false, + kick_handler, NULL, NULL, + &server->kick_info[i]); + } + } +} + +void vhost_user_server_set_aio_context(AioContext *ctx, VuServer *server) +{ + server->ctx =3D ctx ? ctx : qemu_get_aio_context(); + if (!server->sioc) { + return; + } + if (ctx) { + attach_context(server, ctx); + } else { + detach_context(server); + } +} + + +bool vhost_user_server_start(VuServer *server, + SocketAddress *socket_addr, + AioContext *ctx, + uint16_t max_queues, + DevicePanicNotifierFn *device_panic_notifier, + const VuDevIface *vu_iface, + Error **errp) +{ + server->listener =3D qio_net_listener_new(); + if (qio_net_listener_open_sync(server->listener, socket_addr, 1, + errp) < 0) { + return false; + } + + qio_net_listener_set_name(server->listener, "vhost-user-backend-listen= er"); + + server->vu_iface =3D vu_iface; + server->max_queues =3D max_queues; + server->ctx =3D ctx; + server->device_panic_notifier =3D device_panic_notifier; + qio_net_listener_set_client_func(server->listener, + vu_accept, + server, + NULL); + + return true; +} diff --git a/util/vhost-user-server.h b/util/vhost-user-server.h new file mode 100644 index 0000000000..5baf58f96a --- /dev/null +++ b/util/vhost-user-server.h @@ -0,0 +1,61 @@ +/* + * Sharing QEMU devices via vhost-user protocol + * + * Author: Coiby Xu + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#ifndef VHOST_USER_SERVER_H +#define VHOST_USER_SERVER_H + +#include "contrib/libvhost-user/libvhost-user.h" +#include "io/channel-socket.h" +#include "io/channel-file.h" +#include "io/net-listener.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "standard-headers/linux/virtio_blk.h" + +typedef struct KickInfo { + VuDev *vu_dev; + int fd; /*kick fd*/ + long index; /*queue index*/ + vu_watch_cb cb; +} KickInfo; + +typedef struct VuServer { + QIONetListener *listener; + AioContext *ctx; + void (*device_panic_notifier)(struct VuServer *server) ; + int max_queues; + const VuDevIface *vu_iface; + VuDev vu_dev; + QIOChannel *ioc; /* The I/O channel with the client */ + QIOChannelSocket *sioc; /* The underlying data channel with the client= */ + /* IOChannel for fd provided via VHOST_USER_SET_SLAVE_REQ_FD */ + QIOChannel *ioc_slave; + QIOChannelSocket *sioc_slave; + Coroutine *co_trip; /* coroutine for processing VhostUserMsg */ + KickInfo *kick_info; /* an array with the length of the queue number */ + /* restart coroutine co_trip if AIOContext is changed */ + bool aio_context_changed; +} VuServer; + + +typedef void DevicePanicNotifierFn(struct VuServer *server); + +bool vhost_user_server_start(VuServer *server, + SocketAddress *unix_socket, + AioContext *ctx, + uint16_t max_queues, + DevicePanicNotifierFn *device_panic_notifier, + const VuDevIface *vu_iface, + Error **errp); + +void vhost_user_server_stop(VuServer *server); + +void vhost_user_server_set_aio_context(AioContext *ctx, VuServer *server); + +#endif /* VHOST_USER_SERVER_H */ --=20 2.27.0 From nobody Tue Apr 30 07:02:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592160063; cv=none; d=zohomail.com; s=zohoarc; b=a0+KbsNNGIHkm3urHcWEB0nAUocMSumfxc0FWNikWNKpJ9SofSwcQ4w0gfQka95Qsj6jfCenQ+bjjsgjAQFvMctdnxCeqtngdB4MRw6Peh0GuQLV3h4c1RF85hwbWaqsJkhD/PLYRL6/MlSdewxfw1NFN6L35/YNVcGCWi9IC+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592160063; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gQsW4GQWWocPFSbE+a86Ei8A/IwEA+wxuYPi/uczMr0=; b=YahntKsKlobLjjylVQM97BHx57l1yQ2Ku7pqC2Ep6Tbodj4c25eHJdkvqvVwWlpQaNA2W8X34z4bJlmhOIyZhHUlb2MakNDZTpTMJUfc9Y7ZPDmPwQZhuCD5QR2Y559AuKIXrVWbAKECqkzVLXv2WSOfJBKbHgv9A9PU8YwVn3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592160063318614.0676992509292; Sun, 14 Jun 2020 11:41:03 -0700 (PDT) Received: from localhost ([::1]:45092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkXZ0-0002BG-0t for importer@patchew.org; Sun, 14 Jun 2020 14:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkXXm-000078-8R for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:46 -0400 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:38223) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkXXk-00019O-HG for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:45 -0400 Received: by mail-pj1-x1044.google.com with SMTP id d6so6077023pjs.3 for ; Sun, 14 Jun 2020 11:39:39 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id b14sm11354728pft.23.2020.06.14.11.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 11:39:37 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=gQsW4GQWWocPFSbE+a86Ei8A/IwEA+wxuYPi/uczMr0=; b=vG4bEski6KSEwz4+7HUke8OoTTMfVacq5DiGsS9R6i1oYX+/PWuG2GD7JhO9h+1Nxj krruUxzrtLDDvnSVSxLgwJZlWmHfniBLOc+h/e/oitcUhVbTWW8RujZv1wSurdHs7nvW H4c4gykcaqbqmHilw25M3rcm2+6q7SynaXy2vEtzDbemZSFLAIibFg2gYmIUvYw0SMMG mCEmuMfSgNouVrs4f3I4Zxgo8syObJCM9cuZ8O8fh0Akd8stJjaiSBrUyfQKHPGo3M45 4fnSqyxbeu0LLLvdH93ZsHVB4NaKc0600+4PRxeu9N6kG34r/k8M88AwmrkZAHC4cNDD 82JA== 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:mime-version:content-transfer-encoding; bh=gQsW4GQWWocPFSbE+a86Ei8A/IwEA+wxuYPi/uczMr0=; b=Q+l6Fe+Vla2yXY95B7QYDAJJHqt/BD7+wXuwYWBkdZLBd24nVcwC92wfhuobw3T+lc y/HvE8q0mOv942l5N+hLLhCEQVNBTy0ZpbgHGiN6vZGscd87F6Ur9dgHOZUKJ244I+hp ICok7BxA1ZNOhmUzqQNI2jFWL1V/NYuQUyZK8K7CS6RgxU5fmg91/wv8/EwwDZoGlkk8 hgs+LtGQCuVeG01EIIMedPKADxTp7Dc5AfxSiO1JWcxba2MiPpffIy87z8swD0R1al9B rtyvoSSkJ7sKJHQ26KwMocz06ejtYEK7Cns4apln1S6/Gjk7V1zwUYeRENgskH5/gxss gzMQ== X-Gm-Message-State: AOAM533Tfaoi0khOQNq9ORTLqBvWL9IUi5tAQbdUzbqbBS4hYMpuOMRK 3fAZzmwxCm8oDLogsnzVkmkJ0MbkxF5Fvms7 X-Google-Smtp-Source: ABdhPJy6O9eEqIOZwHe6oOuPyehX9iYTSrAO1JY5u4Js1B5q7vbc1hZNbj4TWn7dacb8yoDh6Gj33Q== X-Received: by 2002:a17:90a:a405:: with SMTP id y5mr8534338pjp.15.1592159978079; Sun, 14 Jun 2020 11:39:38 -0700 (PDT) From: Coiby Xu To: qemu-devel@nongnu.org Subject: [PATCH v9 3/5] move logical block size check function to a common utility function Date: Mon, 15 Jun 2020 02:39:05 +0800 Message-Id: <20200614183907.514282-4-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614183907.514282-1-coiby.xu@gmail.com> References: <20200614183907.514282-1-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1044; envelope-from=coiby.xu@gmail.com; helo=mail-pj1-x1044.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Coiby Xu , bharatlkmlkvm@gmail.com, stefanha@redhat.com, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move logical block size check function in hw/core/qdev-properties.c:set_blo= cksize() to util/block-helpers.c Signed-off-by: Coiby Xu --- hw/core/qdev-properties.c | 18 +++------------ util/Makefile.objs | 1 + util/block-helpers.c | 46 +++++++++++++++++++++++++++++++++++++++ util/block-helpers.h | 7 ++++++ 4 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 util/block-helpers.c create mode 100644 util/block-helpers.h diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index cc924815da..a4a6aa5204 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -14,6 +14,7 @@ #include "qapi/visitor.h" #include "chardev/char.h" #include "qemu/uuid.h" +#include "util/block-helpers.h" =20 void qdev_prop_set_after_realize(DeviceState *dev, const char *name, Error **errp) @@ -736,8 +737,6 @@ static void set_blocksize(Object *obj, Visitor *v, cons= t char *name, Property *prop =3D opaque; uint16_t value, *ptr =3D qdev_get_prop_ptr(dev, prop); Error *local_err =3D NULL; - const int64_t min =3D 512; - const int64_t max =3D 32768; =20 if (dev->realized) { qdev_prop_set_after_realize(dev, name, errp); @@ -749,21 +748,10 @@ static void set_blocksize(Object *obj, Visitor *v, co= nst char *name, error_propagate(errp, local_err); return; } - /* value of 0 means "unset" */ - if (value && (value < min || value > max)) { - error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, - dev->id ? : "", name, (int64_t)value, min, max); + check_logical_block_size(dev->id ? : "", name, value, errp); + if (errp) { return; } - - /* We rely on power-of-2 blocksizes for bitmasks */ - if ((value & (value - 1)) !=3D 0) { - error_setg(errp, - "Property %s.%s doesn't take value '%" PRId64 "', it's n= ot a power of 2", - dev->id ?: "", name, (int64_t)value); - return; - } - *ptr =3D value; } =20 diff --git a/util/Makefile.objs b/util/Makefile.objs index b4d4af06dc..fa5380ddab 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -66,6 +66,7 @@ util-obj-y +=3D hbitmap.o util-obj-y +=3D main-loop.o util-obj-y +=3D nvdimm-utils.o util-obj-y +=3D qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-y +=3D block-helpers.o util-obj-$(CONFIG_LINUX) +=3D vhost-user-server.o util-obj-y +=3D qemu-coroutine-sleep.o util-obj-y +=3D qemu-co-shared-resource.o diff --git a/util/block-helpers.c b/util/block-helpers.c new file mode 100644 index 0000000000..d31309cc0e --- /dev/null +++ b/util/block-helpers.c @@ -0,0 +1,46 @@ +/* + * Block utility functions + * + * Copyright (c) 2020 Coiby Xu + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qmp/qerror.h" +#include "block-helpers.h" + +/* + * Logical block size input validation + * + * The size should meet the following conditions: + * 1. min=3D512 + * 2. max=3D32768 + * 3. a power of 2 + * + * Moved from hw/core/qdev-properties.c:set_blocksize() + */ +void check_logical_block_size(const char *id, const char *name, uint16_t v= alue, + Error **errp) +{ + const int64_t min =3D 512; + const int64_t max =3D 32768; + + /* value of 0 means "unset" */ + if (value && (value < min || value > max)) { + error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, + id, name, (int64_t)value, min, max); + return; + } + + /* We rely on power-of-2 blocksizes for bitmasks */ + if ((value & (value - 1)) !=3D 0) { + error_setg(errp, + "Property %s.%s doesn't take value '%" PRId64 + "', it's not a power of 2", + id, name, (int64_t)value); + return; + } +} diff --git a/util/block-helpers.h b/util/block-helpers.h new file mode 100644 index 0000000000..f06be282a1 --- /dev/null +++ b/util/block-helpers.h @@ -0,0 +1,7 @@ +#ifndef BLOCK_HELPERS_H +#define BLOCK_HELPERS_H + +void check_logical_block_size(const char *id, const char *name, uint16_t v= alue, + Error **errp); + +#endif /* BLOCK_HELPERS_H */ --=20 2.27.0 From nobody Tue Apr 30 07:02:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592160165; cv=none; d=zohomail.com; s=zohoarc; b=cmwqt0IJCBp4fBEL5Mf+hOUjKVS+QHzR42YXfM1MYv4ZwjZIZrRx30M/vWS/mATuoM6IbOkgCczWTmjYXx9fa1jOa7kTFEDLLxjgMbgxqfmoDa3RLJLR29ggml87//vw58pvG4ePerUNPMCd0Bm35aLG0iJq2z/Q9l9ZKAzVdCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592160165; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ad6sbyfgFNzItZ05nbt0MN6OXnBHAbtpjWk2gNipkIg=; b=ZqMV8YUWMhQ97m64UvsIB4ThykF2k4exZO9GrNWF+nYdFqYgVPkK9AKk1ElqITwqmwnIRyiEcPOK66/s0WWixdpSnqEo2CiRjsv5jXq1Bc+1gW5DhqhWWRaBAVfHAKem5PdEmgHtsE/a6lEAuKD4uUJ87y3ciwHd7hYLqxv5NxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15921601656131021.5055968956946; Sun, 14 Jun 2020 11:42:45 -0700 (PDT) Received: from localhost ([::1]:53098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkXae-0005RX-A5 for importer@patchew.org; Sun, 14 Jun 2020 14:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkXXy-0000Qk-0J; Sun, 14 Jun 2020 14:39:58 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:55351) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkXXu-00019l-L0; Sun, 14 Jun 2020 14:39:57 -0400 Received: by mail-pj1-x102d.google.com with SMTP id ne5so5784478pjb.5; Sun, 14 Jun 2020 11:39:43 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id 191sm10861573pfz.30.2020.06.14.11.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 11:39:41 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ad6sbyfgFNzItZ05nbt0MN6OXnBHAbtpjWk2gNipkIg=; b=HJoxHpoP0Zs4QoxgOFscdR3e8UrU2W2FMOKt45GInmE2hhmXxHeDmxVxHDgX2Fr6BB wFUf25nGvKwOsbdh4AWWeONkEvkssg3xbnIoGMv0UNJlF9IxL6WgZ5jMVp/Wy4maYLT7 UxexQHkPhDMt7b3XB6iyx9Dt9zPwC7XnaGbCPMboJx3rm8lbCxCCavO51uxJKwobH2yh lHPp6KPPBAGZTW9K1pryqPSkBQINrocxPjuVsywi0d53jVQx5uKLmsr+g7gS++PPiyUr +kA/wV6Mu5pRfsfiQJBHA5jaUMkmPwXzc6Ehv+9rY6ttZJu5vvKnn22YLT85+jqtGOnl 5x1Q== 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:mime-version:content-transfer-encoding; bh=ad6sbyfgFNzItZ05nbt0MN6OXnBHAbtpjWk2gNipkIg=; b=Opg2OfWTl+PZrcuLCpS4Bqqazo34O7hgrH0iQNkdO6T26RaXy9bEJVgTyTTEpD/wI9 xPGN2otoMJuYiVytB14Sq0aSMcqtzqhgYOUuqdElYShmX7IaoxVZuvLKhj0yZEZ5GFQI wQiavh5+HQzJlA7k7nv78qCfDVj91ay7jW21GGqPbyPymhpW9AuVYY0s4eZa1uJ+34eg xKmapCpjDkgmBeoSNJWRKdOrBM6QfKRROP3tijuL+HCOlFOW2N/iWV/IPM1VwhCGUmyg akZ0j1LepSQJy2mBgnMrPYa3k8GZCiPa3B1Nh1/TAFW6VwoBlePP7oR3YjOaYF7cCdG0 VCiw== X-Gm-Message-State: AOAM531034ptK19JY3uQ+HCPIOXO8sxe3/Pp3aSv62thJWnDgfdP86mL d3xasi9v7JZsR5o9PJgZtZlZ0vYOXzVyeYRv X-Google-Smtp-Source: ABdhPJwNxU5UO9L0Yvq3BgdLdTyfW0fqZ/tvinx8PkGXnGt2e70C5OWXtbsthSx/E+pwhabD6yRq+w== X-Received: by 2002:a17:90a:326d:: with SMTP id k100mr8968570pjb.191.1592159982263; Sun, 14 Jun 2020 11:39:42 -0700 (PDT) From: Coiby Xu To: qemu-devel@nongnu.org Subject: [PATCH v9 4/5] vhost-user block device backend server Date: Mon, 15 Jun 2020 02:39:06 +0800 Message-Id: <20200614183907.514282-5-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614183907.514282-1-coiby.xu@gmail.com> References: <20200614183907.514282-1-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=coiby.xu@gmail.com; helo=mail-pj1-x102d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, "open list:Block layer core" , Coiby Xu , Max Reitz , bharatlkmlkvm@gmail.com, stefanha@redhat.com, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" By making use of libvhost-user, block device drive can be shared to the connected vhost-user client. Only one client can connect to the server one time. Since vhost-user-server needs a block drive to be created first, delay the creation of this object. Signed-off-by: Coiby Xu --- block/Makefile.objs | 1 + block/export/vhost-user-blk-server.c | 669 +++++++++++++++++++++++++++ block/export/vhost-user-blk-server.h | 35 ++ softmmu/vl.c | 4 + 4 files changed, 709 insertions(+) create mode 100644 block/export/vhost-user-blk-server.c create mode 100644 block/export/vhost-user-blk-server.h diff --git a/block/Makefile.objs b/block/Makefile.objs index 3635b6b4c1..0eb7eff470 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -24,6 +24,7 @@ block-obj-y +=3D throttle-groups.o block-obj-$(CONFIG_LINUX) +=3D nvme.o =20 block-obj-y +=3D nbd.o +block-obj-$(CONFIG_LINUX) +=3D export/vhost-user-blk-server.o ../contrib/l= ibvhost-user/libvhost-user.o block-obj-$(CONFIG_SHEEPDOG) +=3D sheepdog.o block-obj-$(CONFIG_LIBISCSI) +=3D iscsi.o block-obj-$(if $(CONFIG_LIBISCSI),y,n) +=3D iscsi-opts.o diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c new file mode 100644 index 0000000000..bbf2ceaa9b --- /dev/null +++ b/block/export/vhost-user-blk-server.c @@ -0,0 +1,669 @@ +/* + * Sharing QEMU block devices via vhost-user protocal + * + * Author: Coiby Xu + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "block/block.h" +#include "vhost-user-blk-server.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "sysemu/block-backend.h" +#include "util/block-helpers.h" + +enum { + VHOST_USER_BLK_MAX_QUEUES =3D 1, +}; +struct virtio_blk_inhdr { + unsigned char status; +}; + + +typedef struct VuBlockReq { + VuVirtqElement *elem; + int64_t sector_num; + size_t size; + struct virtio_blk_inhdr *in; + struct virtio_blk_outhdr out; + VuServer *server; + struct VuVirtq *vq; +} VuBlockReq; + + +static void vu_block_req_complete(VuBlockReq *req) +{ + VuDev *vu_dev =3D &req->server->vu_dev; + + /* IO size with 1 extra status byte */ + vu_queue_push(vu_dev, req->vq, req->elem, req->size + 1); + vu_queue_notify(vu_dev, req->vq); + + if (req->elem) { + free(req->elem); + } + + g_free(req); +} + +static VuBlockDev *get_vu_block_device_by_server(VuServer *server) +{ + return container_of(server, VuBlockDev, vu_server); +} + +static int coroutine_fn +vu_block_discard_write_zeroes(VuBlockReq *req, struct iovec *iov, + uint32_t iovcnt, uint32_t type) +{ + struct virtio_blk_discard_write_zeroes desc; + ssize_t size =3D iov_to_buf(iov, iovcnt, 0, &desc, sizeof(desc)); + if (unlikely(size !=3D sizeof(desc))) { + error_report("Invalid size %ld, expect %ld", size, sizeof(desc)); + return -EINVAL; + } + + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(req->server); + uint64_t range[2] =3D { le64_to_cpu(desc.sector) << 9, + le32_to_cpu(desc.num_sectors) << 9 }; + if (type =3D=3D VIRTIO_BLK_T_DISCARD) { + if (blk_co_pdiscard(vdev_blk->backend, range[0], range[1]) =3D=3D = 0) { + return 0; + } + } else if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) { + if (blk_co_pwrite_zeroes(vdev_blk->backend, + range[0], range[1], 0) =3D=3D 0) { + return 0; + } + } + + return -EINVAL; +} + + +static void coroutine_fn vu_block_flush(VuBlockReq *req) +{ + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(req->server); + BlockBackend *backend =3D vdev_blk->backend; + blk_co_flush(backend); +} + + +struct req_data { + VuServer *server; + VuVirtq *vq; + VuVirtqElement *elem; +}; + +static void coroutine_fn vu_block_virtio_process_req(void *opaque) +{ + struct req_data *data =3D opaque; + VuServer *server =3D data->server; + VuVirtq *vq =3D data->vq; + VuVirtqElement *elem =3D data->elem; + uint32_t type; + VuBlockReq *req; + + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + BlockBackend *backend =3D vdev_blk->backend; + + struct iovec *in_iov =3D elem->in_sg; + struct iovec *out_iov =3D elem->out_sg; + unsigned in_num =3D elem->in_num; + unsigned out_num =3D elem->out_num; + /* refer to hw/block/virtio_blk.c */ + if (elem->out_num < 1 || elem->in_num < 1) { + error_report("virtio-blk request missing headers"); + free(elem); + return; + } + + req =3D g_new0(VuBlockReq, 1); + req->server =3D server; + req->vq =3D vq; + req->elem =3D elem; + + if (unlikely(iov_to_buf(out_iov, out_num, 0, &req->out, + sizeof(req->out)) !=3D sizeof(req->out))) { + error_report("virtio-blk request outhdr too short"); + goto err; + } + + iov_discard_front(&out_iov, &out_num, sizeof(req->out)); + + if (in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) { + error_report("virtio-blk request inhdr too short"); + goto err; + } + + /* We always touch the last byte, so just see how big in_iov is. */ + req->in =3D (void *)in_iov[in_num - 1].iov_base + + in_iov[in_num - 1].iov_len + - sizeof(struct virtio_blk_inhdr); + iov_discard_back(in_iov, &in_num, sizeof(struct virtio_blk_inhdr)); + + + type =3D le32_to_cpu(req->out.type); + switch (type & ~VIRTIO_BLK_T_BARRIER) { + case VIRTIO_BLK_T_IN: + case VIRTIO_BLK_T_OUT: { + ssize_t ret =3D 0; + bool is_write =3D type & VIRTIO_BLK_T_OUT; + req->sector_num =3D le64_to_cpu(req->out.sector); + + int64_t offset =3D req->sector_num * vdev_blk->blk_size; + QEMUIOVector qiov; + if (is_write) { + qemu_iovec_init_external(&qiov, out_iov, out_num); + ret =3D blk_co_pwritev(backend, offset, qiov.size, + &qiov, 0); + } else { + qemu_iovec_init_external(&qiov, in_iov, in_num); + ret =3D blk_co_preadv(backend, offset, qiov.size, + &qiov, 0); + } + if (ret >=3D 0) { + req->in->status =3D VIRTIO_BLK_S_OK; + } else { + req->in->status =3D VIRTIO_BLK_S_IOERR; + } + break; + } + case VIRTIO_BLK_T_FLUSH: + vu_block_flush(req); + req->in->status =3D VIRTIO_BLK_S_OK; + break; + case VIRTIO_BLK_T_GET_ID: { + size_t size =3D MIN(iov_size(&elem->in_sg[0], in_num), + VIRTIO_BLK_ID_BYTES); + snprintf(elem->in_sg[0].iov_base, size, "%s", "vhost_user_blk_serv= er"); + req->in->status =3D VIRTIO_BLK_S_OK; + req->size =3D elem->in_sg[0].iov_len; + break; + } + case VIRTIO_BLK_T_DISCARD: + case VIRTIO_BLK_T_WRITE_ZEROES: { + int rc; + rc =3D vu_block_discard_write_zeroes(req, &elem->out_sg[1], + out_num, type); + if (rc =3D=3D 0) { + req->in->status =3D VIRTIO_BLK_S_OK; + } else { + req->in->status =3D VIRTIO_BLK_S_IOERR; + } + break; + } + default: + req->in->status =3D VIRTIO_BLK_S_UNSUPP; + break; + } + + vu_block_req_complete(req); + return; + +err: + free(elem); + g_free(req); + return; +} + + + +static void vu_block_process_vq(VuDev *vu_dev, int idx) +{ + VuServer *server; + VuVirtq *vq; + + server =3D container_of(vu_dev, VuServer, vu_dev); + assert(server); + + vq =3D vu_get_queue(vu_dev, idx); + assert(vq); + VuVirtqElement *elem; + while (1) { + elem =3D vu_queue_pop(vu_dev, vq, sizeof(VuVirtqElement) + + sizeof(VuBlockReq)); + if (elem) { + struct req_data req_data =3D { + .server =3D server, + .vq =3D vq, + .elem =3D elem + }; + Coroutine *co =3D qemu_coroutine_create(vu_block_virtio_proces= s_req, + &req_data); + aio_co_enter(server->ioc->ctx, co); + } else { + break; + } + } +} + +static void vu_block_queue_set_started(VuDev *vu_dev, int idx, bool starte= d) +{ + VuVirtq *vq; + + assert(vu_dev); + + vq =3D vu_get_queue(vu_dev, idx); + vu_set_queue_handler(vu_dev, vq, started ? vu_block_process_vq : NULL); +} + +static uint64_t vu_block_get_features(VuDev *dev) +{ + uint64_t features; + VuServer *server =3D container_of(dev, VuServer, vu_dev); + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + features =3D 1ull << VIRTIO_BLK_F_SIZE_MAX | + 1ull << VIRTIO_BLK_F_SEG_MAX | + 1ull << VIRTIO_BLK_F_TOPOLOGY | + 1ull << VIRTIO_BLK_F_BLK_SIZE | + 1ull << VIRTIO_BLK_F_FLUSH | + 1ull << VIRTIO_BLK_F_DISCARD | + 1ull << VIRTIO_BLK_F_WRITE_ZEROES | + 1ull << VIRTIO_BLK_F_CONFIG_WCE | + 1ull << VIRTIO_F_VERSION_1 | + 1ull << VIRTIO_RING_F_INDIRECT_DESC | + 1ull << VIRTIO_RING_F_EVENT_IDX | + 1ull << VHOST_USER_F_PROTOCOL_FEATURES; + + if (!vdev_blk->writable) { + features |=3D 1ull << VIRTIO_BLK_F_RO; + } + + return features; +} + +static uint64_t vu_block_get_protocol_features(VuDev *dev) +{ + return 1ull << VHOST_USER_PROTOCOL_F_CONFIG | + 1ull << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD; +} + +static int +vu_block_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len) +{ + VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + memcpy(config, &vdev_blk->blkcfg, len); + + return 0; +} + +static int +vu_block_set_config(VuDev *vu_dev, const uint8_t *data, + uint32_t offset, uint32_t size, uint32_t flags) +{ + VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); + VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + uint8_t wce; + + /* don't support live migration */ + if (flags !=3D VHOST_SET_CONFIG_TYPE_MASTER) { + return -EINVAL; + } + + + if (offset !=3D offsetof(struct virtio_blk_config, wce) || + size !=3D 1) { + return -EINVAL; + } + + wce =3D *data; + if (wce =3D=3D vdev_blk->blkcfg.wce) { + /* Do nothing as same with old configuration */ + return 0; + } + + vdev_blk->blkcfg.wce =3D wce; + blk_set_enable_write_cache(vdev_blk->backend, wce); + return 0; +} + + +/* + * When the client disconnects, it sends a VHOST_USER_NONE request + * and vu_process_message will simple call exit which cause the VM + * to exit abruptly. + * To avoid this issue, process VHOST_USER_NONE request ahead + * of vu_process_message. + * + */ +static int vu_block_process_msg(VuDev *dev, VhostUserMsg *vmsg, int *do_re= ply) +{ + if (vmsg->request =3D=3D VHOST_USER_NONE) { + dev->panic(dev, "disconnect"); + return true; + } + return false; +} + + +static const VuDevIface vu_block_iface =3D { + .get_features =3D vu_block_get_features, + .queue_set_started =3D vu_block_queue_set_started, + .get_protocol_features =3D vu_block_get_protocol_features, + .get_config =3D vu_block_get_config, + .set_config =3D vu_block_set_config, + .process_msg =3D vu_block_process_msg, +}; + +static void blk_aio_attached(AioContext *ctx, void *opaque) +{ + VuBlockDev *vub_dev =3D opaque; + aio_context_acquire(ctx); + vhost_user_server_set_aio_context(ctx, &vub_dev->vu_server); + aio_context_release(ctx); +} + +static void blk_aio_detach(void *opaque) +{ + VuBlockDev *vub_dev =3D opaque; + AioContext *ctx =3D vub_dev->vu_server.ctx; + aio_context_acquire(ctx); + vhost_user_server_set_aio_context(NULL, &vub_dev->vu_server); + aio_context_release(ctx); +} + + +static void +vu_block_initialize_config(BlockDriverState *bs, + struct virtio_blk_config *config, uint32_t blk_= size) +{ + config->capacity =3D bdrv_getlength(bs) >> BDRV_SECTOR_BITS; + config->blk_size =3D blk_size; + config->size_max =3D 0; + config->seg_max =3D 128 - 2; + config->min_io_size =3D 1; + config->opt_io_size =3D 1; + config->num_queues =3D VHOST_USER_BLK_MAX_QUEUES; + config->max_discard_sectors =3D 32768; + config->max_discard_seg =3D 1; + config->discard_sector_alignment =3D config->blk_size >> 9; + config->max_write_zeroes_sectors =3D 32768; + config->max_write_zeroes_seg =3D 1; +} + + +static VuBlockDev *vu_block_init(VuBlockDev *vu_block_device, Error **errp) +{ + + BlockBackend *blk; + Error *local_error =3D NULL; + const char *node_name =3D vu_block_device->node_name; + bool writable =3D vu_block_device->writable; + /* + * Don't allow resize while the vhost user server is running, + * otherwise we don't care what happens with the node. + */ + uint64_t perm =3D BLK_PERM_CONSISTENT_READ; + int ret; + + AioContext *ctx; + + BlockDriverState *bs =3D bdrv_lookup_bs(node_name, node_name, &local_e= rror); + + if (!bs) { + error_propagate(errp, local_error); + return NULL; + } + + if (bdrv_is_read_only(bs)) { + writable =3D false; + } + + if (writable) { + perm |=3D BLK_PERM_WRITE; + } + + ctx =3D bdrv_get_aio_context(bs); + aio_context_acquire(ctx); + bdrv_invalidate_cache(bs, NULL); + aio_context_release(ctx); + + blk =3D blk_new(bdrv_get_aio_context(bs), perm, + BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED | + BLK_PERM_WRITE | BLK_PERM_GRAPH_MOD); + ret =3D blk_insert_bs(blk, bs, errp); + + if (ret < 0) { + goto fail; + } + + blk_set_enable_write_cache(blk, false); + + blk_set_allow_aio_context_change(blk, true); + + vu_block_device->blkcfg.wce =3D 0; + vu_block_device->backend =3D blk; + if (!vu_block_device->blk_size) { + vu_block_device->blk_size =3D BDRV_SECTOR_SIZE; + } + vu_block_device->blkcfg.blk_size =3D vu_block_device->blk_size; + blk_set_guest_block_size(blk, vu_block_device->blk_size); + vu_block_initialize_config(bs, &vu_block_device->blkcfg, + vu_block_device->blk_size); + return vu_block_device; + +fail: + blk_unref(blk); + return NULL; +} + +static void vhost_user_blk_server_stop(VuBlockDev *vu_block_device) +{ + if (!vu_block_device) { + return; + } + + vhost_user_server_stop(&vu_block_device->vu_server); + + if (vu_block_device->backend) { + blk_remove_aio_context_notifier(vu_block_device->backend, blk_aio_= attached, + blk_aio_detach, vu_block_device); + } + + blk_unref(vu_block_device->backend); + +} + + +static void vhost_user_blk_server_start(VuBlockDev *vu_block_device, + Error **errp) +{ + SocketAddress *addr =3D vu_block_device->addr; + + if (!vu_block_init(vu_block_device, errp)) { + return; + } + + AioContext *ctx =3D bdrv_get_aio_context(blk_bs(vu_block_device->backe= nd)); + + if (!vhost_user_server_start(&vu_block_device->vu_server, addr, ctx, + VHOST_USER_BLK_MAX_QUEUES, + NULL, &vu_block_iface, + errp)) { + goto error; + } + + blk_add_aio_context_notifier(vu_block_device->backend, blk_aio_attache= d, + blk_aio_detach, vu_block_device); + vu_block_device->running =3D true; + return; + + error: + vhost_user_blk_server_stop(vu_block_device); +} + +static bool vu_prop_modificable(VuBlockDev *vus, Error **errp) +{ + if (vus->running) { + error_setg(errp, "The property can't be modified " + "while the server is running"); + return false; + } + return true; +} +static void vu_set_node_name(Object *obj, const char *value, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + + if (vus->node_name) { + if (!vu_prop_modificable(vus, errp)) { + return; + } + g_free(vus->node_name); + } + + vus->node_name =3D g_strdup(value); +} + +static char *vu_get_node_name(Object *obj, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + return g_strdup(vus->node_name); +} + + +static void vu_set_unix_socket(Object *obj, const char *value, + Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + + if (vus->addr) { + if (!vu_prop_modificable(vus, errp)) { + return; + } + g_free(vus->addr->u.q_unix.path); + g_free(vus->addr); + } + + SocketAddress *addr =3D g_new0(SocketAddress, 1); + addr->type =3D SOCKET_ADDRESS_TYPE_UNIX; + addr->u.q_unix.path =3D g_strdup(value); + vus->addr =3D addr; +} + +static char *vu_get_unix_socket(Object *obj, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + return g_strdup(vus->addr->u.q_unix.path); +} + +static bool vu_get_block_writable(Object *obj, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + return vus->writable; +} + +static void vu_set_block_writable(Object *obj, bool value, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + + if (!vu_prop_modificable(vus, errp)) { + return; + } + + vus->writable =3D value; +} + +static void vu_get_blk_size(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + uint32_t value =3D vus->blk_size; + + visit_type_uint32(v, name, &value, errp); +} + +static void vu_set_blk_size(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); + + Error *local_err =3D NULL; + uint32_t value; + + if (!vu_prop_modificable(vus, errp)) { + return; + } + + visit_type_uint32(v, name, &value, &local_err); + if (local_err) { + goto out; + } + + check_logical_block_size(object_get_typename(obj), name, value, &local= _err); + if (local_err) { + goto out; + } + + vus->blk_size =3D value; + +out: + error_propagate(errp, local_err); + vus->blk_size =3D value; +} + + +static void vhost_user_blk_server_instance_finalize(Object *obj) +{ + VuBlockDev *vub =3D VHOST_USER_BLK_SERVER(obj); + + vhost_user_blk_server_stop(vub); +} + +static void vhost_user_blk_server_complete(UserCreatable *obj, Error **err= p) +{ + Error *local_error =3D NULL; + VuBlockDev *vub =3D VHOST_USER_BLK_SERVER(obj); + + vhost_user_blk_server_start(vub, &local_error); + + if (local_error) { + error_propagate(errp, local_error); + return; + } +} + +static void vhost_user_blk_server_class_init(ObjectClass *klass, + void *class_data) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); + ucc->complete =3D vhost_user_blk_server_complete; + + object_class_property_add_bool(klass, "writable", + vu_get_block_writable, + vu_set_block_writable); + + object_class_property_add_str(klass, "node-name", + vu_get_node_name, + vu_set_node_name); + + object_class_property_add_str(klass, "unix-socket", + vu_get_unix_socket, + vu_set_unix_socket); + + object_class_property_add(klass, "logical-block-size", "uint32", + vu_get_blk_size, vu_set_blk_size, + NULL, NULL); +} + +static const TypeInfo vhost_user_blk_server_info =3D { + .name =3D TYPE_VHOST_USER_BLK_SERVER, + .parent =3D TYPE_OBJECT, + .instance_size =3D sizeof(VuBlockDev), + .instance_finalize =3D vhost_user_blk_server_instance_finalize, + .class_init =3D vhost_user_blk_server_class_init, + .interfaces =3D (InterfaceInfo[]) { + {TYPE_USER_CREATABLE}, + {} + }, +}; + +static void vhost_user_blk_server_register_types(void) +{ + type_register_static(&vhost_user_blk_server_info); +} + +type_init(vhost_user_blk_server_register_types) diff --git a/block/export/vhost-user-blk-server.h b/block/export/vhost-user= -blk-server.h new file mode 100644 index 0000000000..5398e5d352 --- /dev/null +++ b/block/export/vhost-user-blk-server.h @@ -0,0 +1,35 @@ +/* + * Sharing QEMU block devices via vhost-user protocal + * + * Author: Coiby Xu + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#ifndef VHOST_USER_BLK_SERVER_H +#define VHOST_USER_BLK_SERVER_H +#include "util/vhost-user-server.h" + +typedef struct VuBlockDev VuBlockDev; +#define TYPE_VHOST_USER_BLK_SERVER "vhost-user-blk-server" +#define VHOST_USER_BLK_SERVER(obj) \ + OBJECT_CHECK(VuBlockDev, obj, TYPE_VHOST_USER_BLK_SERVER) + +/* vhost user block device */ +struct VuBlockDev { + Object parent_obj; + char *node_name; + SocketAddress *addr; + AioContext *ctx; + VuServer vu_server; + bool running; + uint32_t blk_size; + BlockBackend *backend; + QIOChannelSocket *sioc; + QTAILQ_ENTRY(VuBlockDev) next; + struct virtio_blk_config blkcfg; + bool writable; +}; + +#endif /* VHOST_USER_BLK_SERVER_H */ diff --git a/softmmu/vl.c b/softmmu/vl.c index 05d1a4cb6b..838df3e57a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2520,6 +2520,10 @@ static bool object_create_initial(const char *type, = QemuOpts *opts) } #endif =20 + /* Reason: vhost-user-blk-server property "node-name" */ + if (g_str_equal(type, "vhost-user-blk-server")) { + return false; + } /* * Reason: filter-* property "netdev" etc. */ --=20 2.27.0 From nobody Tue Apr 30 07:02:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592160192; cv=none; d=zohomail.com; s=zohoarc; b=kyA2yJwPRthjWbEcqiZVu7CAe9rf0Y8m4GTIOZlt8DnCx2Mkh2mItdfTRcs4KUjPuN7/HVyA1j8V80O8j3SzzmJnwmZQwTMravom5pqg3i8elWUIIb8+zHesfkDaJ+feDwNMpwKD9wiJj9kVtVAr5DfdSLvLJbD7FnNywMdjLu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592160192; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7saJnamrymwH2nGRGksLvE1AsJhSn/MiAqqMTYrKkGw=; b=KsWRRb8E2HoPnOzxNECHNaske3fE1yAbwekHjY+v8TWS3eQ7wmZI+fGRWBp4dSOKI7JI2fWFxAH94dp0pMYYkkFcnuoIjY9gtyAN/zgua8SPWat3QV7Ae6TjQ7ya0qYjo3HZCUzQYQiH6YukzxQipsDDwCvhzymYjHnc/0KTqik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592160192365166.52493770695833; Sun, 14 Jun 2020 11:43:12 -0700 (PDT) Received: from localhost ([::1]:55336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkXb5-0006LX-0s for importer@patchew.org; Sun, 14 Jun 2020 14:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkXXx-0000Nd-4n for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:57 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:33062) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkXXt-0001AC-Tc for qemu-devel@nongnu.org; Sun, 14 Jun 2020 14:39:56 -0400 Received: by mail-pf1-x441.google.com with SMTP id b201so6840818pfb.0 for ; Sun, 14 Jun 2020 11:39:48 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id i22sm11544617pfo.92.2020.06.14.11.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 11:39:46 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=7saJnamrymwH2nGRGksLvE1AsJhSn/MiAqqMTYrKkGw=; b=IQw9U73i87/q8o+GwkxcoLoUsSVQaf9aMQDRfFZs4Y1WOU9aAWnOIgWAvaGNZfpjwy ZZSpUFiCZNuJZqIeN40nGZBWE3Rc/qOjzYc/ODdSEkj1CW4cYjDJDuJJ8g///swEi5XM +4GR5NcLi52yiGp1fmCKcQPqt25ublF1AL8onEcIEDx0tdK1ODE9lf2RlnNLi6A4jNU/ sW+AaGssWsTTrer2/nzcUQMQMldkFIuYcXN3vSOq+BCkAfqVspN6F3WTOx2EsJ2nDLbq n/Ps6ziS0fEbiqJzEqHFv3PpoivfxBRnseecCkH1CKydypC7W+z7EyGi5AuU41n4eGnl OPEQ== 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:mime-version:content-transfer-encoding; bh=7saJnamrymwH2nGRGksLvE1AsJhSn/MiAqqMTYrKkGw=; b=QkiE4S/fg6BQoPs5mk28DJNsvpLIaJOBymyCFNbL93Hb0J09L1D7K15PBvG29CfKMQ 2F7v674tNBuRrOXbUAxrdz5XhUsKW48vkrELfJU0QnDdW2ejY8okVJaLEStYjiJLJiwF 1SlIOXnwGh5ghdVQB8hAyxpDfvekEhkQIShQzh+yna1t+o7OVa1WkL74Vftjw1mcdBov 0SnQ1jZIETDUDfB2S6eeYa+KLskdES9kxnJD5dXdw4kSWAMOi9KnuFae307rcDdty68l rTkw9oJ3X076doe4d0XMx6HCYZ5QQ6PyL0i6q4i1SMQitj3wpKFKcAchzJIn3HTiYwFq fjIQ== X-Gm-Message-State: AOAM530joW3bffSkpH8D6IsdIoI2jpk3z8ZAxHAUU2M3T/rZhWiqnaiT xPFcdswWc8KFDt3v5h6u1HY187/0XhqhmL44 X-Google-Smtp-Source: ABdhPJz2H2Qn+zS/rOG83CtDiPNNniESIjaZaYKNBMD6iMP9t/+aW29M8TmQImukb61nnnaVMSluMg== X-Received: by 2002:aa7:84cf:: with SMTP id x15mr20133115pfn.214.1592159986688; Sun, 14 Jun 2020 11:39:46 -0700 (PDT) From: Coiby Xu To: qemu-devel@nongnu.org Subject: [PATCH v9 5/5] new qTest case to test the vhost-user-blk-server Date: Mon, 15 Jun 2020 02:39:07 +0800 Message-Id: <20200614183907.514282-6-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614183907.514282-1-coiby.xu@gmail.com> References: <20200614183907.514282-1-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=coiby.xu@gmail.com; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, Laurent Vivier , Thomas Huth , Coiby Xu , bharatlkmlkvm@gmail.com, stefanha@redhat.com, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This test case has the same tests as tests/virtio-blk-test.c except for tests have block_resize. Since vhost-user server can only server one client one time, two instances of qemu-storage-daemon are launched for the hotplug test. In order to not block scripts/tap-driver.pl, vhost-user-blk-server will send "quit" command to qemu-storage-daemon's QMP monitor. So a function is added to libqtest.c to establish socket connection with socket server. Signed-off-by: Coiby Xu --- tests/Makefile.include | 3 +- tests/qtest/Makefile.include | 2 + tests/qtest/libqos/vhost-user-blk.c | 130 +++++ tests/qtest/libqos/vhost-user-blk.h | 48 ++ tests/qtest/libqtest.c | 35 +- tests/qtest/libqtest.h | 17 + tests/qtest/vhost-user-blk-test.c | 739 ++++++++++++++++++++++++++++ 7 files changed, 971 insertions(+), 3 deletions(-) create mode 100644 tests/qtest/libqos/vhost-user-blk.c create mode 100644 tests/qtest/libqos/vhost-user-blk.h create mode 100644 tests/qtest/vhost-user-blk-test.c diff --git a/tests/Makefile.include b/tests/Makefile.include index c2397de8ed..303235b40f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -638,7 +638,8 @@ endef $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/a= ll $(check-qtest-y) $(call do_test_human,$(check-qtest-$*-y:%=3Dtests/qtest/%$(EXESUF)) $(che= ck-qtest-generic-y:%=3Dtests/qtest/%$(EXESUF)), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ - QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) + QTEST_QEMU_IMG=3D./qemu-img$(EXESUF) \ + QTEST_QEMU_STORAGE_DAEMON_BINARY=3D./qemu-storage-daemon$(EXESUF)) =20 check-unit: $(check-unit-y) $(call do_test_human, $^) diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index 9e5a51d033..b6f081cb26 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -186,6 +186,7 @@ libqos-obj-y +=3D tests/qtest/libqos/virtio.o libqos-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/libqos/virtio-9p.o libqos-obj-y +=3D tests/qtest/libqos/virtio-balloon.o libqos-obj-y +=3D tests/qtest/libqos/virtio-blk.o +libqos-obj-$(CONFIG_LINUX) +=3D tests/qtest/libqos/vhost-user-blk.o libqos-obj-y +=3D tests/qtest/libqos/virtio-mmio.o libqos-obj-y +=3D tests/qtest/libqos/virtio-net.o libqos-obj-y +=3D tests/qtest/libqos/virtio-pci.o @@ -230,6 +231,7 @@ qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/qtest/= vhost-user-test.o $(chardev qos-test-obj-y +=3D tests/qtest/virtio-test.o qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/qtest/virtio-9p-test.o qos-test-obj-y +=3D tests/qtest/virtio-blk-test.o +qos-test-obj-$(CONFIG_LINUX) +=3D tests/qtest/vhost-user-blk-test.o qos-test-obj-y +=3D tests/qtest/virtio-net-test.o qos-test-obj-y +=3D tests/qtest/virtio-rng-test.o qos-test-obj-y +=3D tests/qtest/virtio-scsi-test.o diff --git a/tests/qtest/libqos/vhost-user-blk.c b/tests/qtest/libqos/vhost= -user-blk.c new file mode 100644 index 0000000000..3de9c59194 --- /dev/null +++ b/tests/qtest/libqos/vhost-user-blk.c @@ -0,0 +1,130 @@ +/* + * libqos driver framework + * + * Based on tests/qtest/libqos/virtio-blk.c + * + * Copyright (c) 2020 Coiby Xu + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +#include "qemu/osdep.h" +#include "libqtest.h" +#include "qemu/module.h" +#include "standard-headers/linux/virtio_blk.h" +#include "libqos/qgraph.h" +#include "libqos/vhost-user-blk.h" + +#define PCI_SLOT 0x04 +#define PCI_FN 0x00 + +/* virtio-blk-device */ +static void *qvhost_user_blk_get_driver(QVhostUserBlk *v_blk, + const char *interface) +{ + if (!g_strcmp0(interface, "vhost-user-blk")) { + return v_blk; + } + if (!g_strcmp0(interface, "virtio")) { + return v_blk->vdev; + } + + fprintf(stderr, "%s not present in vhost-user-blk-device\n", interface= ); + g_assert_not_reached(); +} + +static void *qvhost_user_blk_device_get_driver(void *object, + const char *interface) +{ + QVhostUserBlkDevice *v_blk =3D object; + return qvhost_user_blk_get_driver(&v_blk->blk, interface); +} + +static void *vhost_user_blk_device_create(void *virtio_dev, + QGuestAllocator *t_alloc, + void *addr) +{ + QVhostUserBlkDevice *vhost_user_blk =3D g_new0(QVhostUserBlkDevice, 1); + QVhostUserBlk *interface =3D &vhost_user_blk->blk; + + interface->vdev =3D virtio_dev; + + vhost_user_blk->obj.get_driver =3D qvhost_user_blk_device_get_driver; + + return &vhost_user_blk->obj; +} + +/* virtio-blk-pci */ +static void *qvhost_user_blk_pci_get_driver(void *object, const char *inte= rface) +{ + QVhostUserBlkPCI *v_blk =3D object; + if (!g_strcmp0(interface, "pci-device")) { + return v_blk->pci_vdev.pdev; + } + return qvhost_user_blk_get_driver(&v_blk->blk, interface); +} + +static void *vhost_user_blk_pci_create(void *pci_bus, QGuestAllocator *t_a= lloc, + void *addr) +{ + QVhostUserBlkPCI *vhost_user_blk =3D g_new0(QVhostUserBlkPCI, 1); + QVhostUserBlk *interface =3D &vhost_user_blk->blk; + QOSGraphObject *obj =3D &vhost_user_blk->pci_vdev.obj; + + virtio_pci_init(&vhost_user_blk->pci_vdev, pci_bus, addr); + interface->vdev =3D &vhost_user_blk->pci_vdev.vdev; + + g_assert_cmphex(interface->vdev->device_type, =3D=3D, VIRTIO_ID_BLOCK); + + obj->get_driver =3D qvhost_user_blk_pci_get_driver; + + return obj; +} + +static void vhost_user_blk_register_nodes(void) +{ + /* + * FIXME: every test using these two nodes needs to setup a + * -drive,id=3Ddrive0 otherwise QEMU is not going to start. + * Therefore, we do not include "produces" edge for virtio + * and pci-device yet. + */ + + char *arg =3D g_strdup_printf("id=3Ddrv0,chardev=3Dchar1,addr=3D%x.%x", + PCI_SLOT, PCI_FN); + + QPCIAddress addr =3D { + .devfn =3D QPCI_DEVFN(PCI_SLOT, PCI_FN), + }; + + QOSGraphEdgeOptions opts =3D { }; + + /* virtio-blk-device */ + /** opts.extra_device_opts =3D "drive=3Ddrive0"; */ + qos_node_create_driver("vhost-user-blk-device", vhost_user_blk_device_= create); + qos_node_consumes("vhost-user-blk-device", "virtio-bus", &opts); + qos_node_produces("vhost-user-blk-device", "vhost-user-blk"); + + /* virtio-blk-pci */ + opts.extra_device_opts =3D arg; + add_qpci_address(&opts, &addr); + qos_node_create_driver("vhost-user-blk-pci", vhost_user_blk_pci_create= ); + qos_node_consumes("vhost-user-blk-pci", "pci-bus", &opts); + qos_node_produces("vhost-user-blk-pci", "vhost-user-blk"); + + g_free(arg); +} + +libqos_init(vhost_user_blk_register_nodes); diff --git a/tests/qtest/libqos/vhost-user-blk.h b/tests/qtest/libqos/vhost= -user-blk.h new file mode 100644 index 0000000000..40a85d808d --- /dev/null +++ b/tests/qtest/libqos/vhost-user-blk.h @@ -0,0 +1,48 @@ +/* + * libqos driver framework + * + * Based on tests/qtest/libqos/virtio-blk.c + * + * Copyright (c) 2020 Coiby Xu + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +#ifndef TESTS_LIBQOS_VHOST_USER_BLK_H +#define TESTS_LIBQOS_VHOST_USER_BLK_H + +#include "libqos/qgraph.h" +#include "libqos/virtio.h" +#include "libqos/virtio-pci.h" + +typedef struct QVhostUserBlk QVhostUserBlk; +typedef struct QVhostUserBlkPCI QVhostUserBlkPCI; +typedef struct QVhostUserBlkDevice QVhostUserBlkDevice; + +struct QVhostUserBlk { + QVirtioDevice *vdev; +}; + +struct QVhostUserBlkPCI { + QVirtioPCIDevice pci_vdev; + QVhostUserBlk blk; +}; + +struct QVhostUserBlkDevice { + QOSGraphObject obj; + QVhostUserBlk blk; +}; + +#endif diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 49075b55a1..02cc09f893 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -52,8 +52,7 @@ typedef struct QTestClientTransportOps { QTestRecvFn recv_line; /* for receiving qtest command responses */ } QTestTransportOps; =20 -struct QTestState -{ +struct QTestState { int fd; int qmp_fd; pid_t qemu_pid; /* our child QEMU process */ @@ -608,6 +607,38 @@ QDict *qtest_qmp_receive(QTestState *s) return qmp_fd_receive(s->qmp_fd); } =20 +QTestState *qtest_create_state_with_qmp_fd(int fd) +{ + QTestState *qmp_test_state =3D g_new0(QTestState, 1); + qmp_test_state->qmp_fd =3D fd; + return qmp_test_state; +} + +int qtest_socket_client(char *server_socket_path) +{ + struct sockaddr_un serv_addr; + int sock; + int ret; + int retries =3D 0; + sock =3D socket(PF_UNIX, SOCK_STREAM, 0); + g_assert_cmpint(sock, !=3D, -1); + serv_addr.sun_family =3D AF_UNIX; + snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path), "%s", + server_socket_path); + + do { + ret =3D connect(sock, (struct sockaddr *)&serv_addr, sizeof(serv_a= ddr)); + if (ret =3D=3D 0) { + break; + } + retries +=3D 1; + g_usleep(G_USEC_PER_SEC); + } while (retries < 3); + + g_assert_cmpint(ret, =3D=3D, 0); + return sock; +} + /** * Allow users to send a message without waiting for the reply, * in the case that they choose to discard all replies up until diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index f5cf93c386..c73c0a9bbe 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -132,6 +132,23 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ..= .) void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); =20 +/** + * qtest_socket_client: + * @server_socket_path: the socket server's path + * + * Connect to a socket server. + */ +int qtest_socket_client(char *server_socket_path); + +/** + * qtest_create_state_with_qmp_fd: + * @fd: socket fd + * + * Wrap socket fd in QTestState to make use of qtest_qmp* + * functions + */ +QTestState *qtest_create_state_with_qmp_fd(int fd); + /** * qtest_vqmp_fds: * @s: #QTestState instance to operate on. diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk= -test.c new file mode 100644 index 0000000000..56e3d8f338 --- /dev/null +++ b/tests/qtest/vhost-user-blk-test.c @@ -0,0 +1,739 @@ +/* + * QTest testcase for VirtIO Block Device + * + * Copyright (c) 2014 SUSE LINUX Products GmbH + * Copyright (c) 2014 Marc Mar=C3=AD + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "libqtest-single.h" +#include "qemu/bswap.h" +#include "qemu/module.h" +#include "standard-headers/linux/virtio_blk.h" +#include "standard-headers/linux/virtio_pci.h" +#include "libqos/qgraph.h" +#include "libqos/vhost-user-blk.h" +#include "libqos/libqos-pc.h" + +/* TODO actually test the results and get rid of this */ +#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__)) + +#define TEST_IMAGE_SIZE (64 * 1024 * 1024) +#define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000) +#define PCI_SLOT_HP 0x06 + +typedef struct QVirtioBlkReq { + uint32_t type; + uint32_t ioprio; + uint64_t sector; + char *data; + uint8_t status; +} QVirtioBlkReq; + + +#ifdef HOST_WORDS_BIGENDIAN +static const bool host_is_big_endian =3D true; +#else +static const bool host_is_big_endian; /* false */ +#endif + +static inline void virtio_blk_fix_request(QVirtioDevice *d, QVirtioBlkReq = *req) +{ + if (qvirtio_is_big_endian(d) !=3D host_is_big_endian) { + req->type =3D bswap32(req->type); + req->ioprio =3D bswap32(req->ioprio); + req->sector =3D bswap64(req->sector); + } +} + + +static inline void virtio_blk_fix_dwz_hdr(QVirtioDevice *d, + struct virtio_blk_discard_write_zeroes *dwz_hdr) +{ + if (qvirtio_is_big_endian(d) !=3D host_is_big_endian) { + dwz_hdr->sector =3D bswap64(dwz_hdr->sector); + dwz_hdr->num_sectors =3D bswap32(dwz_hdr->num_sectors); + dwz_hdr->flags =3D bswap32(dwz_hdr->flags); + } +} + +static uint64_t virtio_blk_request(QGuestAllocator *alloc, QVirtioDevice *= d, + QVirtioBlkReq *req, uint64_t data_size) +{ + uint64_t addr; + uint8_t status =3D 0xFF; + + switch (req->type) { + case VIRTIO_BLK_T_IN: + case VIRTIO_BLK_T_OUT: + g_assert_cmpuint(data_size % 512, =3D=3D, 0); + break; + case VIRTIO_BLK_T_DISCARD: + case VIRTIO_BLK_T_WRITE_ZEROES: + g_assert_cmpuint(data_size % + sizeof(struct virtio_blk_discard_write_zeroes), = =3D=3D, 0); + break; + default: + g_assert_cmpuint(data_size, =3D=3D, 0); + } + + addr =3D guest_alloc(alloc, sizeof(*req) + data_size); + + virtio_blk_fix_request(d, req); + + memwrite(addr, req, 16); + memwrite(addr + 16, req->data, data_size); + memwrite(addr + 16 + data_size, &status, sizeof(status)); + + return addr; +} + +/* Returns the request virtqueue so the caller can perform further tests */ +static QVirtQueue *test_basic(QVirtioDevice *dev, QGuestAllocator *alloc) +{ + QVirtioBlkReq req; + uint64_t req_addr; + uint64_t capacity; + uint64_t features; + uint32_t free_head; + uint8_t status; + char *data; + QTestState *qts =3D global_qtest; + QVirtQueue *vq; + + features =3D qvirtio_get_features(dev); + features =3D features & ~(QVIRTIO_F_BAD_FEATURE | + (1u << VIRTIO_RING_F_INDIRECT_DESC) | + (1u << VIRTIO_RING_F_EVENT_IDX) | + (1u << VIRTIO_BLK_F_SCSI)); + qvirtio_set_features(dev, features); + + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + + vq =3D qvirtqueue_setup(dev, alloc, 0); + + qvirtio_set_driver_ok(dev); + + /* Write and read with 3 descriptor layout */ + /* Write request */ + req.type =3D VIRTIO_BLK_T_OUT; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + guest_free(alloc, req_addr); + + /* Read request */ + req.type =3D VIRTIO_BLK_T_IN; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + + req_addr =3D virtio_blk_request(alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + data =3D g_malloc0(512); + memread(req_addr + 16, data, 512); + g_assert_cmpstr(data, =3D=3D, "TEST"); + g_free(data); + + guest_free(alloc, req_addr); + + if (features & (1u << VIRTIO_BLK_F_WRITE_ZEROES)) { + struct virtio_blk_discard_write_zeroes dwz_hdr; + void *expected; + + /* + * WRITE_ZEROES request on the same sector of previous test where + * we wrote "TEST". + */ + req.type =3D VIRTIO_BLK_T_WRITE_ZEROES; + req.data =3D (char *) &dwz_hdr; + dwz_hdr.sector =3D 0; + dwz_hdr.num_sectors =3D 1; + dwz_hdr.flags =3D 0; + + virtio_blk_fix_dwz_hdr(dev, &dwz_hdr); + + req_addr =3D virtio_blk_request(alloc, dev, &req, sizeof(dwz_hdr)); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, sizeof(dwz_hdr), false, tru= e); + qvirtqueue_add(qts, vq, req_addr + 16 + sizeof(dwz_hdr), 1, true, + false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 16 + sizeof(dwz_hdr)); + g_assert_cmpint(status, =3D=3D, 0); + + guest_free(alloc, req_addr); + + /* Read request to check if the sector contains all zeroes */ + req.type =3D VIRTIO_BLK_T_IN; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + + req_addr =3D virtio_blk_request(alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + data =3D g_malloc(512); + expected =3D g_malloc0(512); + memread(req_addr + 16, data, 512); + g_assert_cmpmem(data, 512, expected, 512); + g_free(expected); + g_free(data); + + guest_free(alloc, req_addr); + } + + if (features & (1u << VIRTIO_BLK_F_DISCARD)) { + struct virtio_blk_discard_write_zeroes dwz_hdr; + + req.type =3D VIRTIO_BLK_T_DISCARD; + req.data =3D (char *) &dwz_hdr; + dwz_hdr.sector =3D 0; + dwz_hdr.num_sectors =3D 1; + dwz_hdr.flags =3D 0; + + virtio_blk_fix_dwz_hdr(dev, &dwz_hdr); + + req_addr =3D virtio_blk_request(alloc, dev, &req, sizeof(dwz_hdr)); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, sizeof(dwz_hdr), false, tru= e); + qvirtqueue_add(qts, vq, req_addr + 16 + sizeof(dwz_hdr), + 1, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 16 + sizeof(dwz_hdr)); + g_assert_cmpint(status, =3D=3D, 0); + + guest_free(alloc, req_addr); + } + + if (features & (1u << VIRTIO_F_ANY_LAYOUT)) { + /* Write and read with 2 descriptor layout */ + /* Write request */ + req.type =3D VIRTIO_BLK_T_OUT; + req.ioprio =3D 1; + req.sector =3D 1; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 528, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + guest_free(alloc, req_addr); + + /* Read request */ + req.type =3D VIRTIO_BLK_T_IN; + req.ioprio =3D 1; + req.sector =3D 1; + req.data =3D g_malloc0(512); + + req_addr =3D virtio_blk_request(alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 513, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + data =3D g_malloc0(512); + memread(req_addr + 16, data, 512); + g_assert_cmpstr(data, =3D=3D, "TEST"); + g_free(data); + + guest_free(alloc, req_addr); + } + + return vq; +} + +static void basic(void *obj, void *data, QGuestAllocator *t_alloc) +{ + QVhostUserBlk *blk_if =3D obj; + QVirtQueue *vq; + + vq =3D test_basic(blk_if->vdev, t_alloc); + qvirtqueue_cleanup(blk_if->vdev->bus, vq, t_alloc); + +} + +static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) +{ + QVirtQueue *vq; + QVhostUserBlk *blk_if =3D obj; + QVirtioDevice *dev =3D blk_if->vdev; + QVirtioBlkReq req; + QVRingIndirectDesc *indirect; + uint64_t req_addr; + uint64_t capacity; + uint64_t features; + uint32_t free_head; + uint8_t status; + char *data; + QTestState *qts =3D global_qtest; + + features =3D qvirtio_get_features(dev); + g_assert_cmphex(features & (1u << VIRTIO_RING_F_INDIRECT_DESC), !=3D, = 0); + features =3D features & ~(QVIRTIO_F_BAD_FEATURE | + (1u << VIRTIO_RING_F_EVENT_IDX) | + (1u << VIRTIO_BLK_F_SCSI)); + qvirtio_set_features(dev, features); + + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + + vq =3D qvirtqueue_setup(dev, t_alloc, 0); + qvirtio_set_driver_ok(dev); + + /* Write request */ + req.type =3D VIRTIO_BLK_T_OUT; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); + + g_free(req.data); + + indirect =3D qvring_indirect_desc_setup(qts, dev, t_alloc, 2); + qvring_indirect_desc_add(dev, qts, indirect, req_addr, 528, false); + qvring_indirect_desc_add(dev, qts, indirect, req_addr + 528, 1, true); + free_head =3D qvirtqueue_add_indirect(qts, vq, indirect); + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + g_free(indirect); + guest_free(t_alloc, req_addr); + + /* Read request */ + req.type =3D VIRTIO_BLK_T_IN; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); + + g_free(req.data); + + indirect =3D qvring_indirect_desc_setup(qts, dev, t_alloc, 2); + qvring_indirect_desc_add(dev, qts, indirect, req_addr, 16, false); + qvring_indirect_desc_add(dev, qts, indirect, req_addr + 16, 513, true); + free_head =3D qvirtqueue_add_indirect(qts, vq, indirect); + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + data =3D g_malloc0(512); + memread(req_addr + 16, data, 512); + g_assert_cmpstr(data, =3D=3D, "TEST"); + g_free(data); + + g_free(indirect); + guest_free(t_alloc, req_addr); + qvirtqueue_cleanup(dev->bus, vq, t_alloc); +} + + +static void idx(void *obj, void *u_data, QGuestAllocator *t_alloc) +{ + QVirtQueue *vq; + QVhostUserBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; + QVirtioDevice *dev =3D &pdev->vdev; + QVirtioBlkReq req; + uint64_t req_addr; + uint64_t capacity; + uint64_t features; + uint32_t free_head; + uint32_t write_head; + uint32_t desc_idx; + uint8_t status; + char *data; + QOSGraphObject *blk_object =3D obj; + QPCIDevice *pci_dev =3D blk_object->get_driver(blk_object, "pci-device= "); + QTestState *qts =3D global_qtest; + + if (qpci_check_buggy_msi(pci_dev)) { + return; + } + + qpci_msix_enable(pdev->pdev); + qvirtio_pci_set_msix_configuration_vector(pdev, t_alloc, 0); + + features =3D qvirtio_get_features(dev); + features =3D features & ~(QVIRTIO_F_BAD_FEATURE | + (1u << VIRTIO_RING_F_INDIRECT_DESC) | + (1u << VIRTIO_F_NOTIFY_ON_EMPTY) | + (1u << VIRTIO_BLK_F_SCSI)); + qvirtio_set_features(dev, features); + + capacity =3D qvirtio_config_readq(dev, 0); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); + + vq =3D qvirtqueue_setup(dev, t_alloc, 0); + qvirtqueue_pci_msix_setup(pdev, (QVirtQueuePCI *)vq, t_alloc, 1); + + qvirtio_set_driver_ok(dev); + + /* Write request */ + req.type =3D VIRTIO_BLK_T_OUT; + req.ioprio =3D 1; + req.sector =3D 0; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + + /* Write request */ + req.type =3D VIRTIO_BLK_T_OUT; + req.ioprio =3D 1; + req.sector =3D 1; + req.data =3D g_malloc0(512); + strcpy(req.data, "TEST"); + + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); + + g_free(req.data); + + /* Notify after processing the third request */ + qvirtqueue_set_used_event(qts, vq, 2); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); + write_head =3D free_head; + + /* No notification expected */ + status =3D qvirtio_wait_status_byte_no_isr(qts, dev, + vq, req_addr + 528, + QVIRTIO_BLK_TIMEOUT_US); + g_assert_cmpint(status, =3D=3D, 0); + + guest_free(t_alloc, req_addr); + + /* Read request */ + req.type =3D VIRTIO_BLK_T_IN; + req.ioprio =3D 1; + req.sector =3D 1; + req.data =3D g_malloc0(512); + + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); + + g_free(req.data); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + + qvirtqueue_kick(qts, dev, vq, free_head); + + /* We get just one notification for both requests */ + qvirtio_wait_used_elem(qts, dev, vq, write_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); + g_assert(qvirtqueue_get_buf(qts, vq, &desc_idx, NULL)); + g_assert_cmpint(desc_idx, =3D=3D, free_head); + + status =3D readb(req_addr + 528); + g_assert_cmpint(status, =3D=3D, 0); + + data =3D g_malloc0(512); + memread(req_addr + 16, data, 512); + g_assert_cmpstr(data, =3D=3D, "TEST"); + g_free(data); + + guest_free(t_alloc, req_addr); + + /* End test */ + qpci_msix_disable(pdev->pdev); + + qvirtqueue_cleanup(dev->bus, vq, t_alloc); +} + +static void pci_hotplug(void *obj, void *data, QGuestAllocator *t_alloc) +{ + QVirtioPCIDevice *dev1 =3D obj; + QVirtioPCIDevice *dev; + QTestState *qts =3D dev1->pdev->bus->qts; + + /* plug secondary disk */ + qtest_qmp_device_add(qts, "vhost-user-blk-pci", "drv1", + "{'addr': %s, 'chardev': 'char2'}", + stringify(PCI_SLOT_HP) ".0"); + + dev =3D virtio_pci_new(dev1->pdev->bus, + &(QPCIAddress) { .devfn =3D QPCI_DEVFN(PCI_SLOT_H= P, 0) + }); + g_assert_nonnull(dev); + g_assert_cmpint(dev->vdev.device_type, =3D=3D, VIRTIO_ID_BLOCK); + qvirtio_pci_device_disable(dev); + qos_object_destroy((QOSGraphObject *)dev); + + /* unplug secondary disk */ + qpci_unplug_acpi_device_test(qts, "drv1", PCI_SLOT_HP); +} + +/* + * Check that setting the vring addr on a non-existent virtqueue does + * not crash. + */ +static void test_nonexistent_virtqueue(void *obj, void *data, + QGuestAllocator *t_alloc) +{ + QVhostUserBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; + QPCIBar bar0; + QPCIDevice *dev; + + dev =3D qpci_device_find(pdev->pdev->bus, QPCI_DEVFN(4, 0)); + g_assert(dev !=3D NULL); + qpci_device_enable(dev); + + bar0 =3D qpci_iomap(dev, 0, NULL); + + qpci_io_writeb(dev, bar0, VIRTIO_PCI_QUEUE_SEL, 2); + qpci_io_writel(dev, bar0, VIRTIO_PCI_QUEUE_PFN, 1); + + g_free(dev); +} + +static const char *qtest_qemu_storage_daemon_binary(void) +{ + const char *qemu_storage_daemon_bin; + + qemu_storage_daemon_bin =3D getenv("QTEST_QEMU_STORAGE_DAEMON_BINARY"); + if (!qemu_storage_daemon_bin) { + fprintf(stderr, "Environment variable " + "QTEST_QEMU_STORAGE_DAEMON_BINARY required\n"); + exit(0); + } + + return qemu_storage_daemon_bin; +} + +static void drive_destroy(void *path) +{ + unlink(path); + g_free(path); + qos_invalidate_command_line(); +} + + +static char *drive_create(void) +{ + int fd, ret; + /** vhost-user-blk won't recognize drive located in /tmp */ + char *t_path =3D g_strdup("qtest.XXXXXX"); + + /** Create a temporary raw image */ + fd =3D mkstemp(t_path); + g_assert_cmpint(fd, >=3D, 0); + ret =3D ftruncate(fd, TEST_IMAGE_SIZE); + g_assert_cmpint(ret, =3D=3D, 0); + close(fd); + + g_test_queue_destroy(drive_destroy, t_path); + return t_path; +} + +static char sock_path_tempate[] =3D "/tmp/qtest.vhost_user_blk.XXXXXX"; +static char qmp_sock_path_tempate[] =3D "/tmp/qtest.vhost_user_blk.qmp.XXX= XXX"; + + +static void quit_storage_daemon(void *qmp_test_state) +{ + qobject_unref(qtest_qmp((QTestState *)qmp_test_state, "{ 'execute': 'q= uit' }")); + g_free(qmp_test_state); +} + +static char *start_vhost_user_blk(void) +{ + int fd, qmp_fd; + char *sock_path =3D g_strdup(sock_path_tempate); + char *qmp_sock_path =3D g_strdup(qmp_sock_path_tempate); + QTestState *qmp_test_state; + fd =3D mkstemp(sock_path); + g_assert_cmpint(fd, >=3D, 0); + g_test_queue_destroy(drive_destroy, sock_path); + + + qmp_fd =3D mkstemp(qmp_sock_path); + g_assert_cmpint(qmp_fd, >=3D, 0); + g_test_queue_destroy(drive_destroy, qmp_sock_path); + + /* create image file */ + const char *img_path =3D drive_create(); + + const char *vhost_user_blk_bin =3D qtest_qemu_storage_daemon_binary(); + gchar *command =3D g_strdup_printf( + "exec %s " + "--blockdev driver=3Dfile,node-name=3Ddisk,filename=3D%s " + "--object vhost-user-blk-server,id=3Ddisk,unix-socket=3D%s," + "node-name=3Ddisk,writable=3Don " + "--chardev socket,id=3Dqmp,path=3D%s,server,nowait --monitor c= hardev=3Dqmp", + vhost_user_blk_bin, img_path, sock_path, qmp_sock_path); + + + g_test_message("starting vhost-user backend: %s", command); + pid_t pid =3D fork(); + if (pid =3D=3D 0) { + execlp("/bin/sh", "sh", "-c", command, NULL); + exit(1); + } + g_free(command); + + qmp_test_state =3D qtest_create_state_with_qmp_fd( + qtest_socket_client(qmp_sock_path)); + /* + * Ask qemu-storage-daemon to quit so it + * will not block scripts/tap-driver.pl. + */ + g_test_queue_destroy(quit_storage_daemon, qmp_test_state); + + qobject_unref(qtest_qmp(qmp_test_state, + "{ 'execute': 'qmp_capabilities' }")); + return sock_path; +} + + +static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg) +{ + char *sock_path1 =3D start_vhost_user_blk(); + g_string_append_printf(cmd_line, + " -object memory-backend-memfd,id=3Dmem,size=3D= 128M,share=3Don -numa node,memdev=3Dmem " + "-chardev socket,id=3Dchar1,path=3D%s ", sock_p= ath1); + return arg; +} + + +/* + * Setup for hotplug. + * + * Since vhost-user server only serves one vhost-user client one time, + * another exprot + * + */ +static void *vhost_user_blk_hotplug_test_setup(GString *cmd_line, void *ar= g) +{ + vhost_user_blk_test_setup(cmd_line, arg); + char *sock_path2 =3D start_vhost_user_blk(); + /* "-chardev socket,id=3Dchar2" is used for pci_hotplug*/ + g_string_append_printf(cmd_line, "-chardev socket,id=3Dchar2,path=3D%s= ", + sock_path2); + return arg; +} + +static void register_vhost_user_blk_test(void) +{ + QOSGraphTestOptions opts =3D { + .before =3D vhost_user_blk_test_setup, + }; + + /* + * tests for vhost-user-blk and vhost-user-blk-pci + * The tests are borrowed from tests/virtio-blk-test.c. But some tests + * regarding block_resize don't work for vhost-user-blk. + * vhost-user-blk device doesn't have -drive, so tests containing + * block_resize are also abandoned, + * - config + * - resize + */ + qos_add_test("basic", "vhost-user-blk", basic, &opts); + qos_add_test("indirect", "vhost-user-blk", indirect, &opts); + qos_add_test("idx", "vhost-user-blk-pci", idx, &opts); + qos_add_test("nxvirtq", "vhost-user-blk-pci", + test_nonexistent_virtqueue, &opts); + + opts.before =3D vhost_user_blk_hotplug_test_setup; + qos_add_test("hotplug", "vhost-user-blk-pci", pci_hotplug, &opts); +} + +libqos_init(register_vhost_user_blk_test); --=20 2.27.0