From patchwork Thu Jan 23 11:57:31 2020 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: 1228032 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.a=rsa-sha256 header.s=mimecast20190719 header.b=W2uUP8UC; 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 483PGx6NcQz9sNF for ; Fri, 24 Jan 2020 01:07:21 +1100 (AEDT) Received: from localhost ([::1]:57656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iud8h-0001qv-Ck for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 09:07:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub9A-0002VD-KB for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub98-0005E5-E5 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:40 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48017 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 1iub98-0005De-96 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780777; 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=i36g49Wr23XnPzHPj1e2Sazsa2bVz3Y92a1xoz/YYmg=; b=W2uUP8UCUdiDvQiyd0O0bQ1pAcRjQQWQJpDjOJ4GqHL/iZnyoDLxTszlR5fpEWImD60VR3 qZJwfZ8AieFNYJm+xfzwUe9EjOp0Jc3iSwGL4jbHqSmVaWV17PW/+hrjpt6fkSOmzvRslu xutXDoULzuks6R73ktd0C0115OCBxhI= 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-84-hEmSgJVrMoGBQ6c6Nz878w-1; Thu, 23 Jan 2020 06:59:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68EB21005512 for ; Thu, 23 Jan 2020 11:59:35 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8A981CB; Thu, 23 Jan 2020 11:59:34 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 041/111] virtiofsd: Plumb fuse_bufvec through to do_write_buf Date: Thu, 23 Jan 2020 11:57:31 +0000 Message-Id: <20200123115841.138849-42-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: hEmSgJVrMoGBQ6c6Nz878w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 straight through to op.write_buf without copying (other than skipping a header). Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Stefan Hajnoczi Reviewed-by: Masayoshi Mizuma Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_i.h | 2 +- tools/virtiofsd/fuse_lowlevel.c | 61 ++++++++++++++++++++++----------- tools/virtiofsd/fuse_virtio.c | 3 +- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index 45995f3246..a20854f1c4 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -100,7 +100,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_bufvec *bufv, struct fuse_chan *ch); diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index 95f4db8fcf..7e10995adc 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -1004,11 +1004,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; @@ -1018,22 +1019,31 @@ 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; - 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); - } - - 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; + if (ibufv->count == 1) { + 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); + } + 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) @@ -2024,13 +2034,24 @@ 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_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; @@ -2108,7 +2129,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/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 635f87756a..fd588a4829 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -501,7 +501,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",