From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1ECAC00454 for ; Thu, 12 Dec 2019 16:55:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90D1F22527 for ; Thu, 12 Dec 2019 16:55:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dIxI39of" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90D1F22527 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifRkB-0004pv-B4 for qemu-devel@archiver.kernel.org; Thu, 12 Dec 2019 11:55:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45529) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifRVD-0005Iy-HY for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:39:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifRVC-0001SN-4T for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:39:47 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:56622 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 1ifRVC-0001Rg-08 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:39:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576168785; 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=1luCXZrdxqKoSPR+HiU/ctUOTfC03fMruiZm8svsaGE=; b=dIxI39ofKb46ZP521M5YKS/WPIc1A/QNqJgepE1y6EvkE9fMxOZobAx1YA45O1zxEVMZ6T 6LMT0gMPBy2WZDAjlXLRa4Oab8l6PxNQ1UY7e+QMA1trQ63ArbGn8Imf1VvYT2lPDjnnhS BNBIilMpzSaimpb4ter95z8HSaHMsyQ= 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-43-CLsR1Ds7MN2T15OKoQHirQ-1; Thu, 12 Dec 2019 11:39:43 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70C5C1800D42 for ; Thu, 12 Dec 2019 16:39:42 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-226.ams2.redhat.com [10.36.116.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94D7E60BE1; Thu, 12 Dec 2019 16:39:41 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com Subject: [PATCH 020/104] virtiofsd: Start queue threads Date: Thu, 12 Dec 2019 16:37:40 +0000 Message-Id: <20191212163904.159893-21-dgilbert@redhat.com> In-Reply-To: <20191212163904.159893-1-dgilbert@redhat.com> References: <20191212163904.159893-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: CLsR1Ds7MN2T15OKoQHirQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 1bbbf570ac..94f9db76df 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 o= f + * 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.23.0