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.8 required=3.0 tests=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 9206CC7618B for ; Fri, 26 Jul 2019 09:11:44 +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 695132238C for ; Fri, 26 Jul 2019 09:11:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 695132238C 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]:37593 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqwGM-00058s-Ew for qemu-devel@archiver.kernel.org; Fri, 26 Jul 2019 05:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60125) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqwG2-0003z9-Vd for qemu-devel@nongnu.org; Fri, 26 Jul 2019 05:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqwFy-0004NX-NT for qemu-devel@nongnu.org; Fri, 26 Jul 2019 05:11:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqwFy-0004G9-GP for qemu-devel@nongnu.org; Fri, 26 Jul 2019 05:11:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D71E5AFE3 for ; Fri, 26 Jul 2019 09:11:16 +0000 (UTC) Received: from localhost (ovpn-117-212.ams2.redhat.com [10.36.117.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9C4B101E24A; Fri, 26 Jul 2019 09:11:11 +0000 (UTC) From: Stefan Hajnoczi To: virtio-fs@redhat.com, qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:10:59 +0100 Message-Id: <20190726091103.23503-2-stefanha@redhat.com> In-Reply-To: <20190726091103.23503-1-stefanha@redhat.com> References: <20190726091103.23503-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 Jul 2019 09:11:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] virtiofsd: skip unnecessary vu_queue_get_avail_bytes() 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: "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When debug output is disabled there is no need to calculate the number of in/out bytes available. There is also no need to skip a request if there are 0 out bytes. The request parsing code already handles invalid requests. Signed-off-by: Stefan Hajnoczi --- contrib/virtiofsd/fuse_virtio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_vir= tio.c index 083e4fc317..d543c6d30f 100644 --- a/contrib/virtiofsd/fuse_virtio.c +++ b/contrib/virtiofsd/fuse_virtio.c @@ -507,18 +507,16 @@ static void *fv_queue_thread(void *opaque) ret =3D pthread_rwlock_rdlock(&qi->virtio_dev->vu_dispatc= h_rwlock); assert(ret =3D=3D 0); /* there is no possible error case = */ =20 - /* 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); + if (se->debug) { + /* 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); =20 - if (se->debug) fuse_debug("%s: Queue %d gave evalue: %zx availab= le: in: %u out: %u\n", __func__, qi->qidx, (size_t)evalue, in_bytes, out_bytes); - - if (!out_bytes) { - goto next; } + while (1) { bool allocated_bufv =3D false; struct fuse_bufvec bufv; @@ -708,7 +706,6 @@ static void *fv_queue_thread(void *opaque) elem =3D NULL; } =20 -next: pthread_rwlock_unlock(&qi->virtio_dev->vu_dispatch_rwloc= k); } pthread_mutex_destroy(&ch.lock); --=20 2.21.0