From nobody Tue Nov 18 18:23:22 2025 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=1611598225; cv=none; d=zohomail.com; s=zohoarc; b=iUthISQX/PgFeOxw1LyU2J8xZqXY2LR9FmDNgB3sEsXWOlPnlPuU0Rsj9GyMksIUxsi3y4xsNBzyDX6NMv79Z0+c0ZoeuxrVGQvnFezBhG2RUTaGSc4m/nwXa85KbFVfCLjk7DgxO6+9A28moU4kswJh+QgEPrQ7m1fDeUMw054= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611598225; 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=YmEUC9rCNqDqwD5zQ92uQmGlnwpe6P4xyRXIFapD23A=; b=dx844Zfa+WOR7NRPyfNHZoCVs2sgCrVJ3fxzRnZfRstJNAn2EeadnqZZ5E07HdByJ92bD0OjXMoiTRFN4kJsHBfoUswCOi0fNuz4UxVjqsQrKIf2azt80WqbmTSL2CIdcK/IpHC2gZKKxRbuokbE8XCcHQJS9RJBX3qBRCTAFX8= 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 1611598225724370.8442190953938; Mon, 25 Jan 2021 10:10:25 -0800 (PST) Received: from localhost ([::1]:55800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l46Jk-0000bV-Ie for importer@patchew.org; Mon, 25 Jan 2021 13:10:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l46Bl-0001SV-3U for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:02:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l46BY-0006l6-V4 for qemu-devel@nongnu.org; Mon, 25 Jan 2021 13:02:08 -0500 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-2D5W2i-RM0mrobIlyaL-_Q-1; Mon, 25 Jan 2021 13:01:53 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A78B91081B2B for ; Mon, 25 Jan 2021 18:01:52 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-119.rdu2.redhat.com [10.10.116.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD59A5D6DC; Mon, 25 Jan 2021 18:01:38 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 3DD4E225FCD; Mon, 25 Jan 2021 13:01:38 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611597716; 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=YmEUC9rCNqDqwD5zQ92uQmGlnwpe6P4xyRXIFapD23A=; b=UPQB+x2nxElTB4cwmsVJVMwVc2X3tuS3ArFFsSNaM5kq8F6+uukKkeoWUWw9HOygt4DDwC RUC7k9bPm+k5sdqW+VTlcb4IP8iAHe7jam3Wqc9vvNZKJRJhm1+hj3eO5uAwbEx1LaU+gq vvQa4l4ZWd3p1chcrDL2+zxNXThvceM= X-MC-Unique: 2D5W2i-RM0mrobIlyaL-_Q-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH 3/6] vhost-user: Return error code from slave_read() Date: Mon, 25 Jan 2021 13:01:12 -0500 Message-Id: <20210125180115.22936-4-vgoyal@redhat.com> In-Reply-To: <20210125180115.22936-1-vgoyal@redhat.com> References: <20210125180115.22936-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=63.128.21.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, 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: marcandre.lureau@redhat.com, stefanha@redhat.com, dgilbert@redhat.com, vgoyal@redhat.com, mst@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" Right now slave_read() is called through main event loop and does not return error. In next few patches I want to call slave_read() from vhost device shutdown path as well and want to know if an error happened so that caller can give up and return error accordingly. Hence, create helper function do_slave_read(), which returns an integer. Success is 0 and negative number is error code. slave_read() calls do_slave_read() and ignores error code. Signed-off-by: Vivek Goyal --- hw/virtio/vhost-user.c | 43 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index d95dbc39e3..867cac034f 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1401,7 +1401,7 @@ static uint64_t vhost_user_slave_handle_vring_host_no= tifier( return false; } =20 -static void slave_read(void *opaque) +static int do_slave_read(void *opaque) { struct vhost_dev *dev =3D opaque; struct vhost_user *u =3D dev->opaque; @@ -1432,13 +1432,22 @@ static void slave_read(void *opaque) size =3D recvmsg(u->slave_fd, &msgh, 0); } while (size < 0 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)); =20 - if (size !=3D VHOST_USER_HDR_SIZE) { + if (size < 0) { + ret =3D -errno; error_report("Failed to read from slave."); goto err; } =20 + if (size !=3D VHOST_USER_HDR_SIZE) { + error_report("Failed to read %lu bytes from slave.", + VHOST_USER_HDR_SIZE); + ret =3D -EBADMSG; + goto err; + } + if (msgh.msg_flags & MSG_CTRUNC) { error_report("Truncated message."); + ret =3D -EBADMSG; goto err; } =20 @@ -1456,6 +1465,7 @@ static void slave_read(void *opaque) error_report("Failed to read msg header." " Size %d exceeds the maximum %zu.", hdr.size, VHOST_USER_PAYLOAD_SIZE); + ret =3D -EBADMSG; goto err; } =20 @@ -1464,8 +1474,15 @@ static void slave_read(void *opaque) size =3D read(u->slave_fd, &payload, hdr.size); } while (size < 0 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)); =20 - if (size !=3D hdr.size) { + if (size =3D=3D -1) { error_report("Failed to read payload from slave."); + ret =3D errno; + goto err; + } + + if (size !=3D hdr.size) { + error_report("Failed to read %d payload bytes from slave.", hdr.si= ze); + ret =3D -EBADMSG; goto err; } =20 @@ -1529,13 +1546,22 @@ static void slave_read(void *opaque) size =3D writev(u->slave_fd, iovec, ARRAY_SIZE(iovec)); } while (size < 0 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)); =20 - if (size !=3D VHOST_USER_HDR_SIZE + hdr.size) { + if (size =3D=3D -1) { error_report("Failed to send msg reply to slave."); + ret =3D -errno; + goto err; + } + + if (size !=3D VHOST_USER_HDR_SIZE + hdr.size) { + error_report("Failed to send msg reply to slave. Wrote %d byte= s" + " expected %lu bytes.", size, + VHOST_USER_HDR_SIZE + hdr.size); + ret =3D -EIO; goto err; } } =20 - return; + return 0; =20 err: qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL); @@ -1546,7 +1572,12 @@ err: close(fd[i]); } } - return; + return ret; +} + +static void slave_read(void *opaque) +{ + do_slave_read(opaque); } =20 static int vhost_setup_slave_channel(struct vhost_dev *dev) --=20 2.25.4