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 081C7C2D0CE for ; Tue, 21 Jan 2020 14:19:03 +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 C5AB62087E for ; Tue, 21 Jan 2020 14:19:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BjLvc8ec" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C5AB62087E 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]:54968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ituMv-0006cm-LJ for qemu-devel@archiver.kernel.org; Tue, 21 Jan 2020 09:19:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52877) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itsi8-0003nL-6I for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:32:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itsi4-00050D-1e for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:32:47 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30568 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 1itsi3-000508-UE for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:32:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579609963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjT5oYMPD4mCz1BM6jWV0B/dQuRDPXbhFF3mo6CCHfw=; b=BjLvc8ecbGwXBCVX+DyVNsB8mNukGG0D8lgunv0Li9whS/dqmwOtJJ8j1BqzfVdfjBa5eF NXzzjIhuxILHzVVRRdj817uMAWnyLiVQIte8nJ2qvqENehKCdCrht4ElRYU0uQ0uRbm680 +kwftV+2JhU9T42j6TLEwsRnLgsRsa8= 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-369-jY4L26EGPR6H2RpenOuy-A-1; Tue, 21 Jan 2020 07:32:42 -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 E44CE800D41; Tue, 21 Jan 2020 12:32:40 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0310760BE0; Tue, 21 Jan 2020 12:32:33 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, berrange@redhat.com, slp@redhat.com, philmd@redhat.com Subject: [PATCH v2 101/109] virtiofsd: use fuse_buf_writev to replace fuse_buf_write for better performance Date: Tue, 21 Jan 2020 12:24:25 +0000 Message-Id: <20200121122433.50803-102-dgilbert@redhat.com> In-Reply-To: <20200121122433.50803-1-dgilbert@redhat.com> References: <20200121122433.50803-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: jY4L26EGPR6H2RpenOuy-A-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] [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: , Cc: m.mizuma@jp.fujitsu.com, misono.tomohiro@jp.fujitsu.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: piaojun fuse_buf_writev() only handles the normal write in which src is buffer and dest is fd. Specially if src buffer represents guest physical address that can't be mapped by the daemon process, IO must be bounced back to the VMM to do it by fuse_buf_copy(). Signed-off-by: Jun Piao Suggested-by: Dr. David Alan Gilbert Suggested-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 --- tools/virtiofsd/buffer.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index 70980550d2..b75f871680 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/virtiofsd/buffer.c @@ -33,7 +33,6 @@ size_t fuse_buf_size(const struct fuse_bufvec *bufv) return size; } =20 -__attribute__((unused)) static ssize_t fuse_buf_writev(struct fuse_buf *out_buf, struct fuse_bufvec *in_buf) { @@ -262,12 +261,29 @@ static int fuse_bufvec_advance(struct fuse_bufvec *bu= fv, size_t len) ssize_t fuse_buf_copy(struct fuse_bufvec *dstv, struct fuse_bufvec *srcv, enum fuse_buf_copy_flags flags) { - size_t copied =3D 0; + size_t copied =3D 0, i; =20 if (dstv =3D=3D srcv) { return fuse_buf_size(dstv); } =20 + /* + * use writev to improve bandwidth when all the + * src buffers already mapped by the daemon + * process + */ + for (i =3D 0; i < srcv->count; i++) { + if (srcv->buf[i].flags & FUSE_BUF_IS_FD) { + break; + } + } + if ((i =3D=3D srcv->count) && (dstv->count =3D=3D 1) && + (dstv->idx =3D=3D 0) && + (dstv->buf[0].flags & FUSE_BUF_IS_FD)) { + dstv->buf[0].pos +=3D dstv->off; + return fuse_buf_writev(&dstv->buf[0], srcv); + } + for (;;) { const struct fuse_buf *src =3D fuse_bufvec_current(srcv); const struct fuse_buf *dst =3D fuse_bufvec_current(dstv); --=20 2.24.1