From nobody Fri Oct 3 11:41:03 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579804435; cv=none; d=zohomail.com; s=zohoarc; b=VoL5N+dsK0OkyoSEu4lMGPpX2A61RFO+EVzQU9Necbrl6eEFwOSyaMVvS6JA42mMxBZCcto85hcz45+SgQG9twhStRkdkdxAAGEu1lIcRRY39pkFTc+DreSMLXz5vnVHE0AD4fDI2SoyX2Fv+tQHn0XkxfJqjuYe/+lm0sWObnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579804435; h=Content-Type:Content-Transfer-Encoding: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=xk0nGF6Ajx9eqP0xDeiR+lB7HWgO5MipbgawTPG4vBM=; b=b8Hp4bT1E3xVSyNvHOmvXtMGbF6x/iILmM2dWZeSQUVVbOH4SKGHnipP+SyghlsN7zwni1W3yDiqRyjXa0iZw9mCwz1OTh0UQYXYeJl2HNhq2MqSWcGPv0c8CCQVk7FGjIv+Er+5iUaoZuNCiSCNgbidVUWMGy2NUvtr8uAhf70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1579804435964821.8366125351109; Thu, 23 Jan 2020 10:33:55 -0800 (PST) Received: from localhost ([::1]:34834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuhIg-000255-AV for importer@patchew.org; Thu, 23 Jan 2020 13:33:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41064) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdZ-0004cY-GH for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdY-0006Lj-4b for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:21 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:22585 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufdY-0006LW-1z for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:20 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-201-a2313x6GOAmIuOp6H_w7ZA-1; Thu, 23 Jan 2020 11:47:18 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21B5018C8C2C for ; Thu, 23 Jan 2020 16:47:17 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D6E919C69; Thu, 23 Jan 2020 16:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xk0nGF6Ajx9eqP0xDeiR+lB7HWgO5MipbgawTPG4vBM=; b=HuAuItShx+CshwcxwJb0ecR8pI6HodJcYYus+Y0I7sXUxGCr8yyDPH48LJdA7C9dL3R/1C meuQh3GFJAiX79vEcTTezu0zq96sJLfgx+YbKAvfrN5DzqJqFucU4a0UG3M91uKwC5D9ZH GliAvRgZbtMrgzRplqJkRigvvfc2KpA= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 022/108] virtiofsd: Start queue threads Date: Thu, 23 Jan 2020 16:45:04 +0000 Message-Id: <20200123164630.91498-23-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: a2313x6GOAmIuOp6H_w7ZA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Start a thread for each queue when we get notified it's been started. Signed-off-by: Dr. David Alan Gilbert fix by: Signed-off-by: Jun Piao Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_virtio.c | 89 +++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 4819e56568..2a94bb3cca 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -11,6 +11,7 @@ * See the file COPYING.LIB */ =20 +#include "qemu/osdep.h" #include "fuse_virtio.h" #include "fuse_i.h" #include "standard-headers/linux/fuse.h" @@ -30,6 +31,15 @@ =20 #include "contrib/libvhost-user/libvhost-user.h" =20 +struct fv_QueueInfo { + pthread_t thread; + struct fv_VuDev *virtio_dev; + + /* Our queue index, corresponds to array position */ + int qidx; + int kick_fd; +}; + /* * We pass the dev element into libvhost-user * and then use it to get back to the outer @@ -38,6 +48,13 @@ struct fv_VuDev { VuDev dev; struct fuse_session *se; + + /* + * The following pair of fields are only accessed in the main + * virtio_loop + */ + size_t nqueues; + struct fv_QueueInfo **qi; }; =20 /* From spec */ @@ -83,6 +100,75 @@ static void fv_panic(VuDev *dev, const char *err) exit(EXIT_FAILURE); } =20 +static void *fv_queue_thread(void *opaque) +{ + struct fv_QueueInfo *qi =3D opaque; + fuse_log(FUSE_LOG_INFO, "%s: Start for queue %d kick_fd %d\n", __func_= _, + qi->qidx, qi->kick_fd); + while (1) { + /* TODO */ + } + + return NULL; +} + +/* Callback from libvhost-user on start or stop of a queue */ +static void fv_queue_set_started(VuDev *dev, int qidx, bool started) +{ + struct fv_VuDev *vud =3D container_of(dev, struct fv_VuDev, dev); + struct fv_QueueInfo *ourqi; + + fuse_log(FUSE_LOG_INFO, "%s: qidx=3D%d started=3D%d\n", __func__, qidx, + started); + assert(qidx >=3D 0); + + /* + * Ignore additional request queues for now. passthrough_ll.c must be + * audited for thread-safety issues first. It was written with a + * well-behaved client in mind and may not protect against all types of + * races yet. + */ + if (qidx > 1) { + fuse_log(FUSE_LOG_ERR, + "%s: multiple request queues not yet implemented, please = only " + "configure 1 request queue\n", + __func__); + exit(EXIT_FAILURE); + } + + if (started) { + /* Fire up a thread to watch this queue */ + if (qidx >=3D vud->nqueues) { + vud->qi =3D realloc(vud->qi, (qidx + 1) * sizeof(vud->qi[0])); + assert(vud->qi); + memset(vud->qi + vud->nqueues, 0, + sizeof(vud->qi[0]) * (1 + (qidx - vud->nqueues))); + vud->nqueues =3D qidx + 1; + } + if (!vud->qi[qidx]) { + vud->qi[qidx] =3D calloc(sizeof(struct fv_QueueInfo), 1); + assert(vud->qi[qidx]); + vud->qi[qidx]->virtio_dev =3D vud; + vud->qi[qidx]->qidx =3D qidx; + } else { + /* Shouldn't have been started */ + assert(vud->qi[qidx]->kick_fd =3D=3D -1); + } + ourqi =3D vud->qi[qidx]; + ourqi->kick_fd =3D dev->vq[qidx].kick_fd; + if (pthread_create(&ourqi->thread, NULL, fv_queue_thread, ourqi)) { + fuse_log(FUSE_LOG_ERR, "%s: Failed to create thread for queue = %d\n", + __func__, qidx); + assert(0); + } + } else { + /* TODO: Kill the thread */ + assert(qidx < vud->nqueues); + ourqi =3D vud->qi[qidx]; + ourqi->kick_fd =3D -1; + } +} + static bool fv_queue_order(VuDev *dev, int qidx) { return false; @@ -92,6 +178,9 @@ static const VuDevIface fv_iface =3D { .get_features =3D fv_get_features, .set_features =3D fv_set_features, =20 + /* Don't need process message, we've not got any at vhost-user level */ + .queue_set_started =3D fv_queue_set_started, + .queue_is_processed_in_order =3D fv_queue_order, }; =20 --=20 2.24.1