From nobody Mon Feb 9 10:58:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620769192; cv=none; d=zohomail.com; s=zohoarc; b=A/Y6M6PvX/CyXQ0R73cI1GMimWvpcJUxQwcH01Yp7dZ/dFyzikmmvwaSDmixR18IUkH1nh4KOaHINwvRhtkj9o/VQPcDnvxIoxPSqpPBkwFJ4sb9+VD76YOWaZRNqt8Fahf3QqXIH2Iag8QLiEo6ymJJLcKzKaqxScPOJEdUQRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620769192; h=Content-Type:Content-Transfer-Encoding:Cc: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=cL1WEfKepQlLzmmLve0HJY68rlVR1MwsjyvgpvASs9k=; b=i7ve5Yhcm6mCcQsPxNQNstKuw8LxrPtvDn+rt1F5x3j66B9ecgHh6Ji7s2n+iZIkQx4nqJ7dX7uSpMRu5nRza9rFZ70xa5TwteCQM7Z8M1qufBNMYorc6d83ueO6q/myb5DU7pfkoBaYB8O950D8YLFgu0+Dgh9/KtecZIF5lcI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620769192281192.27972878048467; Tue, 11 May 2021 14:39:52 -0700 (PDT) Received: from localhost ([::1]:50396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lga6Y-0001q4-Vh for importer@patchew.org; Tue, 11 May 2021 17:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lga4j-0007TU-8P for qemu-devel@nongnu.org; Tue, 11 May 2021 17:37:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lga4h-0005wa-HV for qemu-devel@nongnu.org; Tue, 11 May 2021 17:37:56 -0400 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-572-27zqZE4eORyKf2K4VGUwmA-1; Tue, 11 May 2021 17:37:53 -0400 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 32BBE18BA293 for ; Tue, 11 May 2021 21:37:52 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-221.rdu2.redhat.com [10.10.115.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96F8B60C04; Tue, 11 May 2021 21:37:47 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 5626C225FD2; Tue, 11 May 2021 17:37:43 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620769074; 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=cL1WEfKepQlLzmmLve0HJY68rlVR1MwsjyvgpvASs9k=; b=UpDcSBZ3VZLRW3LkjU35FeZBrXOM0rw9g7DGee6mzGwcUrS/mIlve36FpDxHCJVhh3rfqJ pg2UA7n5eVcdNM+jHVq3qKcQbnoXB7xtFzjAyKcDp2HxdGRgSf0/TnNfNX6fYEnDzuzCae CNxN8zigzBK0ALbCaNuJjeWm0ZiW0yw= X-MC-Unique: 27zqZE4eORyKf2K4VGUwmA-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH 6/7] virtiofsd: Check EOF before short read Date: Tue, 11 May 2021 17:37:35 -0400 Message-Id: <20210511213736.281016-7-vgoyal@redhat.com> In-Reply-To: <20210511213736.281016-1-vgoyal@redhat.com> References: <20210511213736.281016-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vgoyal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: dgilbert@redhat.com, vgoyal@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In virtio_send_data_iov() we are checking first for short read and then EOF condition. Change the order. Basically check for error and EOF first and last remaining piece is short ready which will lead to retry automatically at the end of while loop. Just that it is little simpler to read to the code. There is no need to call "continue" and also one less call of "len-=3Dret". Signed-off-by: Vivek Goyal Reviewed-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_virtio.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 434fe401cf..aa53808ef9 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -410,25 +410,24 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, __func__, len); goto err; } - fuse_log(FUSE_LOG_DEBUG, "%s: preadv ret=3D%d len=3D%zd\n", __func= __, - ret, len); - if (ret < len && ret) { - fuse_log(FUSE_LOG_DEBUG, "%s: ret < len\n", __func__); - /* Skip over this much next time around */ - iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, ret); - buf->buf[0].pos +=3D ret; - len -=3D ret; =20 - /* Lets do another read */ - continue; - } if (!ret) { /* EOF case? */ fuse_log(FUSE_LOG_DEBUG, "%s: !ret len remaining=3D%zd\n", __f= unc__, len); break; } + fuse_log(FUSE_LOG_DEBUG, "%s: preadv ret=3D%d len=3D%zd\n", __func= __, + ret, len); + len -=3D ret; + /* Short read. Retry reading remaining bytes */ + if (len) { + fuse_log(FUSE_LOG_DEBUG, "%s: ret < len\n", __func__); + /* Skip over this much next time around */ + iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, ret); + buf->buf[0].pos +=3D ret; + } } while (len); =20 /* Need to fix out->len on EOF */ --=20 2.25.4