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=-4.1 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, UNWANTED_LANGUAGE_BODY 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 1BAEBC33CAF for ; Thu, 23 Jan 2020 18:36:53 +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 DF59A21D7E for ; Thu, 23 Jan 2020 18:36:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ATrDW+qb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF59A21D7E 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]:34888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuhLX-0006iZ-Kg for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 13:36:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41069) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdZ-0004dH-W7 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdY-0006M4-Pr for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:21 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:60296 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-0006Lv-N4 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798040; 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=Vfmv0A1J+pz8C/UBWFllqkma5QpMSj/FQ+Xvw46UZ1s=; b=ATrDW+qbzEMoLl6iiuQyAVHJ0kBsldfVtGKn2wLeY96E5EZSGzA0kRhH/tLMcqXknOjcC7 bijWx5AYRJ/pJjSFN4HlkcefUKEUGvGlhWe3uDMKGoh3FFWqWz0R5RXj87pIje7pfkmCF+ 6cHxKWK5c2j6D88vlDT54EwVCukqwQs= 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-267-foRb3opaPj2P-eBZowPLYg-1; Thu, 23 Jan 2020 11:47:19 -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 1DFDF8C40BB for ; Thu, 23 Jan 2020 16:47:18 +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 6AAE828991; Thu, 23 Jan 2020 16:47:17 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 023/108] virtiofsd: Poll kick_fd for queue Date: Thu, 23 Jan 2020 16:45:05 +0000 Message-Id: <20200123164630.91498-24-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: foRb3opaPj2P-eBZowPLYg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" In the queue thread poll the kick_fd we're passed. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_virtio.c | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 2a94bb3cca..05e7258712 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -100,13 +101,50 @@ static void fv_panic(VuDev *dev, const char *err) exit(EXIT_FAILURE); } =20 +/* Thread function for individual queues, created when a queue is 'started= ' */ 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 */ + struct pollfd pf[1]; + pf[0].fd =3D qi->kick_fd; + pf[0].events =3D POLLIN; + pf[0].revents =3D 0; + + fuse_log(FUSE_LOG_DEBUG, "%s: Waiting for Queue %d event\n", __fun= c__, + qi->qidx); + int poll_res =3D ppoll(pf, 1, NULL, NULL); + + if (poll_res =3D=3D -1) { + if (errno =3D=3D EINTR) { + fuse_log(FUSE_LOG_INFO, "%s: ppoll interrupted, going arou= nd\n", + __func__); + continue; + } + fuse_log(FUSE_LOG_ERR, "fv_queue_thread ppoll: %m\n"); + break; + } + assert(poll_res =3D=3D 1); + if (pf[0].revents & (POLLERR | POLLHUP | POLLNVAL)) { + fuse_log(FUSE_LOG_ERR, "%s: Unexpected poll revents %x Queue %= d\n", + __func__, pf[0].revents, qi->qidx); + break; + } + assert(pf[0].revents & POLLIN); + fuse_log(FUSE_LOG_DEBUG, "%s: Got queue event on Queue %d\n", __fu= nc__, + qi->qidx); + + eventfd_t evalue; + if (eventfd_read(qi->kick_fd, &evalue)) { + fuse_log(FUSE_LOG_ERR, "Eventfd_read for queue: %m\n"); + break; + } + if (qi->virtio_dev->se->debug) { + fprintf(stderr, "%s: Queue %d gave evalue: %zx\n", __func__, + qi->qidx, (size_t)evalue); + } } =20 return NULL; --=20 2.24.1