From nobody Fri Oct 3 11:31:13 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=1579803206; cv=none; d=zohomail.com; s=zohoarc; b=miNX6ETT6L8R91dJQwOEfTp8WHDyZKneLsk5g3KGJasFvQrRrzMRT4H1DjkyFxXsD0+5YcUOOiPu9P2QL2JxAWZcJnHMBpOINOiUGe0vLslsSNvCBj7fAp7lCPcDVwxbkuPMVb9bd00uvtWYc0K5xPbT6ne9K2RGRlhsPqC4IcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579803206; 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=zbK2M664VeD4EebvP9HVM8XSFfKMYMH/6meiQEmwLDE=; b=ledqjabiD29z5ZR+F8t2okt0fFIge4Q2thfVPGfnukLSCMLeaRKU0wcuAqnU6F4D5FeDgPKYIlNczx9iAhi30JNBTXNXqAOmlulSWNQFk8u8cPUh2nHwDLtfQjCXh2AzjDwE5eUTqH3oGy1q5fVMsC1o9yQS1sVnjys0MojrpJY= 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 1579803206392634.2090121666603; Thu, 23 Jan 2020 10:13:26 -0800 (PST) Received: from localhost ([::1]:34450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iugyq-0000A6-Lc for importer@patchew.org; Thu, 23 Jan 2020 13:13:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41083) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdb-0004et-6c for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdZ-0006MW-MC for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:23 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:20485 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 1iufdZ-0006MK-JD for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:21 -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-370-L0UhLyiFPZiI4mv8NYJV0A-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 1CCCC8B95B5 for ; Thu, 23 Jan 2020 16:47:19 +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 6869128991; Thu, 23 Jan 2020 16:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798041; 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=zbK2M664VeD4EebvP9HVM8XSFfKMYMH/6meiQEmwLDE=; b=KovCAUj3B+kcQpvgdAdx5dH7vISiFr7XLuhJxGvmBaeKUnegkBfc+XQDLiXkwxpo9IuTXb oHD1rd90q9Bs2Q01PFe3HKpCaaFHdoBJyopN67A/uHvXewPyYLRwpRMK+g38lu282k7oqT H/g3Rh0Ep9j8bTrZBleBSGTCTwkIj7A= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 024/108] virtiofsd: Start reading commands from queue Date: Thu, 23 Jan 2020 16:45:06 +0000 Message-Id: <20200123164630.91498-25-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: L0UhLyiFPZiI4mv8NYJV0A-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: 205.139.110.61 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" Pop queue elements off queues, copy the data from them and pass that to fuse. Note: 'out' in a VuVirtqElement is from QEMU 'in' in libfuse is into the daemon So we read from the out iov's to get a fuse_in_header When we get a kick we've got to read all the elements until the queue is empty. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_i.h | 2 + tools/virtiofsd/fuse_virtio.c | 99 +++++++++++++++++++++++++++++++++-- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index ec04449069..1126723d18 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -14,6 +14,7 @@ #include "fuse_lowlevel.h" =20 struct fv_VuDev; +struct fv_QueueInfo; =20 struct fuse_req { struct fuse_session *se; @@ -75,6 +76,7 @@ struct fuse_chan { pthread_mutex_t lock; int ctr; int fd; + struct fv_QueueInfo *qi; }; =20 /** diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 05e7258712..3841b20129 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -12,6 +12,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/iov.h" #include "fuse_virtio.h" #include "fuse_i.h" #include "standard-headers/linux/fuse.h" @@ -32,6 +33,7 @@ =20 #include "contrib/libvhost-user/libvhost-user.h" =20 +struct fv_VuDev; struct fv_QueueInfo { pthread_t thread; struct fv_VuDev *virtio_dev; @@ -101,10 +103,41 @@ static void fv_panic(VuDev *dev, const char *err) exit(EXIT_FAILURE); } =20 +/* + * Copy from an iovec into a fuse_buf (memory only) + * Caller must ensure there is space + */ +static void copy_from_iov(struct fuse_buf *buf, size_t out_num, + const struct iovec *out_sg) +{ + void *dest =3D buf->mem; + + while (out_num) { + size_t onelen =3D out_sg->iov_len; + memcpy(dest, out_sg->iov_base, onelen); + dest +=3D onelen; + out_sg++; + out_num--; + } +} + /* Thread function for individual queues, created when a queue is 'started= ' */ static void *fv_queue_thread(void *opaque) { struct fv_QueueInfo *qi =3D opaque; + struct VuDev *dev =3D &qi->virtio_dev->dev; + struct VuVirtq *q =3D vu_get_queue(dev, qi->qidx); + struct fuse_session *se =3D qi->virtio_dev->se; + struct fuse_chan ch; + struct fuse_buf fbuf; + + fbuf.mem =3D NULL; + fbuf.flags =3D 0; + + fuse_mutex_init(&ch.lock); + ch.fd =3D (int)0xdaff0d111; + ch.qi =3D qi; + fuse_log(FUSE_LOG_INFO, "%s: Start for queue %d kick_fd %d\n", __func_= _, qi->qidx, qi->kick_fd); while (1) { @@ -141,11 +174,71 @@ static void *fv_queue_thread(void *opaque) 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); + /* out is from guest, in is too guest */ + unsigned int in_bytes, out_bytes; + vu_queue_get_avail_bytes(dev, q, &in_bytes, &out_bytes, ~0, ~0); + + fuse_log(FUSE_LOG_DEBUG, + "%s: Queue %d gave evalue: %zx available: in: %u out: %u\= n", + __func__, qi->qidx, (size_t)evalue, in_bytes, out_bytes); + + while (1) { + /* + * An element contains one request and the space to send our + * response They're spread over multiple descriptors in a + * scatter/gather set and we can't trust the guest to keep them + * still; so copy in/out. + */ + VuVirtqElement *elem =3D vu_queue_pop(dev, q, sizeof(VuVirtqEl= ement)); + if (!elem) { + break; + } + + if (!fbuf.mem) { + fbuf.mem =3D malloc(se->bufsize); + assert(fbuf.mem); + assert(se->bufsize > sizeof(struct fuse_in_header)); + } + /* The 'out' part of the elem is from qemu */ + unsigned int out_num =3D elem->out_num; + struct iovec *out_sg =3D elem->out_sg; + size_t out_len =3D iov_size(out_sg, out_num); + fuse_log(FUSE_LOG_DEBUG, + "%s: elem %d: with %d out desc of length %zd\n", __fu= nc__, + elem->index, out_num, out_len); + + /* + * The elem should contain a 'fuse_in_header' (in to fuse) + * plus the data based on the len in the header. + */ + if (out_len < sizeof(struct fuse_in_header)) { + fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for in_heade= r\n", + __func__, elem->index); + assert(0); /* TODO */ + } + if (out_len > se->bufsize) { + fuse_log(FUSE_LOG_ERR, "%s: elem %d too large for buffer\n= ", + __func__, elem->index); + assert(0); /* TODO */ + } + copy_from_iov(&fbuf, out_num, out_sg); + fbuf.size =3D out_len; + + /* TODO! Endianness of header */ + + /* TODO: Fixup fuse_send_msg */ + /* TODO: Add checks for fuse_session_exited */ + fuse_session_process_buf_int(se, &fbuf, &ch); + + /* TODO: vu_queue_push(dev, q, elem, qi->write_count); */ + vu_queue_notify(dev, q); + + free(elem); + elem =3D NULL; } } + pthread_mutex_destroy(&ch.lock); + free(fbuf.mem); =20 return NULL; } --=20 2.24.1