From patchwork Thu Oct 24 11:27:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1182977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Tf/cMqMH"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 46zR0J0gJ0z9sQr for ; Thu, 24 Oct 2019 23:10:40 +1100 (AEDT) Received: from localhost ([::1]:40672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNbwr-0003gn-Hs for incoming@patchwork.ozlabs.org; Thu, 24 Oct 2019 08:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39297) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNbHe-0002mh-VP for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNbHd-0008R2-GP for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:28:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34995 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNbHd-0008Qi-CB for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:28:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571916480; 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=2kmNhZHrq0m4CvYxseyl13rsoPKAYCBCzN65QhazXD4=; b=Tf/cMqMH10eTLoin94I7xf+UXzHZS3llJc04Zjh0PNDaDzjJYxoPV3fQw4aM4dcYTUXOm2 hEHfOn2t+hKHDKD/ZmF9wM18GqpuXvNYi3DACjLp1t7nBkqNKC1nmbP4TMlbOVThy5IkR5 tHOEGWCm2R3kC2Jq37gNr90nRSNrkCE= 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-316-mmvMSa-bPmmEGLr66kNHUg-1; Thu, 24 Oct 2019 07:27:57 -0400 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 D754C100550E; Thu, 24 Oct 2019 11:27:54 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-248.ams2.redhat.com [10.36.117.248]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E86C1C93D; Thu, 24 Oct 2019 11:27:52 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, renzhen@linux.alibaba.com, eguan@linux.alibaba.com, ganesh.mahalingam@intel.com, m.mizuma@jp.fujitsu.com, mszeredi@redhat.com, misono.tomohiro@jp.fujitsu.com, tao.peng@linux.alibaba.com, piaojun@huawei.com, stefanha@redhat.com, vgoyal@redhat.com, mst@redhat.com, berrange@redhat.com Subject: [PATCH 08/25] virtiofsd: Plumb fuse_bufvec through to do_write_buf Date: Thu, 24 Oct 2019 12:27:01 +0100 Message-Id: <20191024112718.34657-9-dgilbert@redhat.com> In-Reply-To: <20191024112718.34657-1-dgilbert@redhat.com> References: <20191024112718.34657-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: mmvMSa-bPmmEGLr66kNHUg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Let fuse_session_process_buf_int take a fuse_bufvec * instead of a fuse_buf; and then through to do_write_buf - where in the best case it can pass that stragiht through to op.write_buf without copying (other than ksipping a header). Signed-off-by: Dr. David Alan Gilbert --- contrib/virtiofsd/fuse_i.h | 2 +- contrib/virtiofsd/fuse_lowlevel.c | 67 +++++++++++++++++++------------ contrib/virtiofsd/fuse_virtio.c | 3 +- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/contrib/virtiofsd/fuse_i.h b/contrib/virtiofsd/fuse_i.h index 4b718f1aec..06f3d88a44 100644 --- a/contrib/virtiofsd/fuse_i.h +++ b/contrib/virtiofsd/fuse_i.h @@ -119,7 +119,7 @@ int fuse_send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov, void fuse_free_req(fuse_req_t req); void fuse_session_process_buf_int(struct fuse_session *se, - const struct fuse_buf *buf, struct fuse_chan *ch); + struct fuse_bufvec *bufv, struct fuse_chan *ch); #define FUSE_MAX_MAX_PAGES 256 diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_lowlevel.c index dd046ecf07..2bd2ba00b9 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -1007,11 +1007,12 @@ static void do_write(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) } static void do_write_buf(fuse_req_t req, fuse_ino_t nodeid, const void *inarg, - const struct fuse_buf *ibuf) + struct fuse_bufvec *ibufv) { struct fuse_session *se = req->se; - struct fuse_bufvec bufv = { - .buf[0] = *ibuf, + struct fuse_bufvec *pbufv = ibufv; + struct fuse_bufvec tmpbufv = { + .buf[0] = ibufv->buf[0], .count = 1, }; struct fuse_write_in *arg = (struct fuse_write_in *) inarg; @@ -1021,28 +1022,35 @@ static void do_write_buf(fuse_req_t req, fuse_ino_t nodeid, const void *inarg, fi.fh = arg->fh; fi.writepage = arg->write_flags & FUSE_WRITE_CACHE; - if (se->conn.proto_minor < 9) { - bufv.buf[0].mem = ((char *) arg) + FUSE_COMPAT_WRITE_IN_SIZE; - bufv.buf[0].size -= sizeof(struct fuse_in_header) + - FUSE_COMPAT_WRITE_IN_SIZE; - assert(!(bufv.buf[0].flags & FUSE_BUF_IS_FD)); - } else { - fi.lock_owner = arg->lock_owner; - fi.flags = arg->flags; - if (!(bufv.buf[0].flags & FUSE_BUF_IS_FD)) - bufv.buf[0].mem = PARAM(arg); + if (ibufv->count == 1) { + if (se->conn.proto_minor < 9) { + tmpbufv.buf[0].mem = ((char *) arg) + FUSE_COMPAT_WRITE_IN_SIZE; + tmpbufv.buf[0].size -= sizeof(struct fuse_in_header) + + FUSE_COMPAT_WRITE_IN_SIZE; + assert(!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD)); + } else { + fi.lock_owner = arg->lock_owner; + fi.flags = arg->flags; + if (!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD)) + tmpbufv.buf[0].mem = PARAM(arg); - bufv.buf[0].size -= sizeof(struct fuse_in_header) + - sizeof(struct fuse_write_in); - } - if (bufv.buf[0].size < arg->size) { - fuse_log(FUSE_LOG_ERR, "fuse: do_write_buf: buffer size too small\n"); - fuse_reply_err(req, EIO); - return; + tmpbufv.buf[0].size -= sizeof(struct fuse_in_header) + + sizeof(struct fuse_write_in); + } + if (tmpbufv.buf[0].size < arg->size) { + fuse_log(FUSE_LOG_ERR, "fuse: do_write_buf: buffer size too small\n"); + fuse_reply_err(req, EIO); + return; + } + tmpbufv.buf[0].size = arg->size; + pbufv = &tmpbufv; + } else { + // Input bufv contains the headers in the first element + // and the data in the rest, we need to skip that first element + ibufv->buf[0].size = 0; } - bufv.buf[0].size = arg->size; - se->op.write_buf(req, nodeid, &bufv, arg->offset, &fi); + se->op.write_buf(req, nodeid, pbufv, arg->offset, &fi); } static void do_flush(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) @@ -1979,12 +1987,21 @@ static const char *opname(enum fuse_opcode opcode) void fuse_session_process_buf(struct fuse_session *se, const struct fuse_buf *buf) { - fuse_session_process_buf_int(se, buf, NULL); + struct fuse_bufvec bufv = { .buf[0] = *buf, .count = 1 }; + fuse_session_process_buf_int(se, &bufv, NULL); } +// Restriction: +// bufv is normally a single entry buffer, except for a write +// where (if it's in memory) then the bufv may be multiple entries, +// where the first entry contains all headers and subsequent entries +// contain data +// bufv shall not use any offsets etc to make the data anything +// other than contiguous starting from 0. void fuse_session_process_buf_int(struct fuse_session *se, - const struct fuse_buf *buf, struct fuse_chan *ch) + struct fuse_bufvec *bufv, struct fuse_chan *ch) { + const struct fuse_buf *buf = bufv->buf; struct fuse_in_header *in; const void *inarg; struct fuse_req *req; @@ -2057,7 +2074,7 @@ void fuse_session_process_buf_int(struct fuse_session *se, inarg = (void *) &in[1]; if (in->opcode == FUSE_WRITE && se->op.write_buf) - do_write_buf(req, in->nodeid, inarg, buf); + do_write_buf(req, in->nodeid, inarg, bufv); else fuse_ll_ops[in->opcode].func(req, in->nodeid, inarg); diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virtio.c index 1f09fad93d..68036e2171 100644 --- a/contrib/virtiofsd/fuse_virtio.c +++ b/contrib/virtiofsd/fuse_virtio.c @@ -499,7 +499,8 @@ static void *fv_queue_thread(void *opaque) /* TODO! Endianness of header */ /* TODO: Add checks for fuse_session_exited */ - fuse_session_process_buf_int(se, &fbuf, &ch); + struct fuse_bufvec bufv = { .buf[0] = fbuf, .count = 1 }; + fuse_session_process_buf_int(se, &bufv, &ch); if (!qi->reply_sent) { fuse_log(FUSE_LOG_DEBUG, "%s: elem %d no reply sent\n",