From nobody Tue Nov 18 09:16:58 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1608706173; cv=none; d=zohomail.com; s=zohoarc; b=m1mPaVzDvvrHVKYUg6r/Mt9qoZT5W8kkjnTSnXT72oGAbIa+ODBAyPf/bb0srCO4v0rtlkCoZFTgYLoEwFirMeXunHaiEnSrE/HqUlij7D/Po/Cb8JmCYL03phOmtk8ds6lRJsK1uL8Qm9lYKvhViSla9DNEsUWuOc4lqFQtObo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608706173; h=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=ct6/nR9xMNU7Sfb4QESR/oKKHhRGfArDdtu3OVwK7sM=; b=OaMYsYrGBQK4kUFC9ftd8NVgzxTzGEgzlYW6Nz7MDtJC5KTD0m6miQuXZ+Srpq9WqtbpYEQvApo9CsNPtr+kGGRPPo2npe20s+9q30ujJd9Qkvcwv5RYxPReAa9dzE1+lfHs0Q9RTlAW9cN31HLHpwQIJgvGIsaBAaV4u4AzcYM= 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 1608706173235835.9186215855848; Tue, 22 Dec 2020 22:49:33 -0800 (PST) Received: from localhost ([::1]:43026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krxxk-0003QY-6k for importer@patchew.org; Wed, 23 Dec 2020 01:49:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krxT9-0007RJ-Kn for qemu-devel@nongnu.org; Wed, 23 Dec 2020 01:17:56 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:35350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krxT4-00070k-D1 for qemu-devel@nongnu.org; Wed, 23 Dec 2020 01:17:55 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BN6A70P094461; Wed, 23 Dec 2020 06:17:41 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 35k0cw6fek-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 23 Dec 2020 06:17:40 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BN6Fd3w153492; Wed, 23 Dec 2020 06:15:40 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3030.oracle.com with ESMTP id 35k0e9dw11-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 23 Dec 2020 06:15:40 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0BN6FPb2024907; Wed, 23 Dec 2020 06:15:26 GMT Received: from flaka.hsd1.ca.comcast.net (/67.180.143.163) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 22 Dec 2020 22:15:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2020-01-29; bh=ct6/nR9xMNU7Sfb4QESR/oKKHhRGfArDdtu3OVwK7sM=; b=USb9XXlURL/Y0tYZ+QjbUYz+QKUiKAvU0Q+NbdSAFnJf4ofmYhjdW0N5Piw5kmeLiqJz t8BSoy6Wla0Qr+mKmKvB7gWTAMqlCKbcjpfTu9VFo2U3wq5ZKM2cpMDUfa6T4WYA+77z NQ0LHQpzY6B41TmuB9vPqi2Ip86Iycgo1ExdPbRK9A7qTtR2E/NzDs0lhR7R1BhwC6Nh OQykcyNTZJtR0k+10oS1CJrFngfYbe3gu8Vbt5ppDo/68Q1HWrs7mBdLcfkDtMvvSUVO 45aH+aX3ismWRj6oREjp1u3jkFpJWHWZMsCoDIfda08bfBT9qpcXk98Gm55JaXLjUdEr kg== From: elena.ufimtseva@oracle.com To: qemu-devel@nongnu.org Subject: [PATCH v15 08/20] multi-process: add qio channel read function Date: Tue, 22 Dec 2020 22:14:43 -0800 Message-Id: <42569c768066e334186ea8567847d96c8ebb0ad9.1608702853.git.elena.ufimtseva@oracle.com> X-Mailer: git-send-email 2.25.GIT In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9843 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012230047 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9843 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 phishscore=0 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012230046 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=141.146.126.78; envelope-from=elena.ufimtseva@oracle.com; helo=aserp2120.oracle.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=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: elena.ufimtseva@oracle.com, fam@euphon.net, swapnil.ingle@nutanix.com, john.g.johnson@oracle.com, kraxel@redhat.com, jag.raman@oracle.com, quintela@redhat.com, mst@redhat.com, armbru@redhat.com, kanth.ghatraju@oracle.com, felipe@nutanix.com, thuth@redhat.com, ehabkost@redhat.com, konrad.wilk@oracle.com, dgilbert@redhat.com, alex.williamson@redhat.com, stefanha@redhat.com, thanos.makatos@nutanix.com, kwolf@redhat.com, berrange@redhat.com, mreitz@redhat.com, ross.lagerwall@citrix.com, marcandre.lureau@gmail.com, pbonzini@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" From: Elena Ufimtseva Adds qio_channel_readv_full_all() to read both data and FDs. Refactors existing code to use this function. Signed-off-by: Elena Ufimtseva Signed-off-by: John G Johnson Signed-off-by: Jagannathan Raman --- include/io/channel.h | 25 +++++++++++++ io/channel.c | 85 +++++++++++++++++++++++++++++++------------- 2 files changed, 85 insertions(+), 25 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index 2378567d4b..429ece9a05 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -774,6 +774,31 @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc, IOHandler *io_write, void *opaque); =20 +/** + * qio_channel_readv_full_all: + * @ioc: the channel object + * @iov: the array of memory regions to read data to + * @niov: the length of the @iov array + * @fds: an array of file handles to read + * @nfds: number of file handles in @fds + * @errp: pointer to a NULL-initialized error object + * + * + * Behaves like qio_channel_readv_full but will attempt + * to read all data specified (file handles and memory regions). + * The function will wait for all requested data + * to be read, yielding from the current coroutine + * if required. + * + * Returns: 0 if all bytes were read, or -1 on error + */ + +int qio_channel_readv_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int **fds, size_t *nfds, + Error **errp); + /** * qio_channel_writev_full_all: * @ioc: the channel object diff --git a/io/channel.c b/io/channel.c index bde1f6d0f4..5edaea1fac 100644 --- a/io/channel.c +++ b/io/channel.c @@ -91,11 +91,49 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, const struct iovec *iov, size_t niov, Error **errp) +{ + int ret =3D qio_channel_readv_full_all(ioc, iov, niov, NULL, NULL, err= p); + + if (ret =3D=3D -ECANCELED) { + error_prepend(errp, + "Unexpected end-of-file before all bytes were read: = "); + ret =3D -1; + } + + return ret; +} + +int qio_channel_readv_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) +{ + int ret =3D qio_channel_readv_all_eof(ioc, iov, niov, errp); + + if (ret =3D=3D 0) { + error_setg(errp, + "Unexpected end-of-file before all bytes were read"); + return -1; + } + if (ret =3D=3D 1) { + return 0; + } + + return ret; +} + +int qio_channel_readv_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int **fds, size_t *nfds, + Error **errp) { int ret =3D -1; struct iovec *local_iov =3D g_new(struct iovec, niov); struct iovec *local_iov_head =3D local_iov; unsigned int nlocal_iov =3D niov; + int **local_fds =3D fds; + size_t *local_nfds =3D nfds; bool partial =3D false; =20 nlocal_iov =3D iov_copy(local_iov, nlocal_iov, @@ -104,7 +142,8 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, =20 while (nlocal_iov > 0) { ssize_t len; - len =3D qio_channel_readv(ioc, local_iov, nlocal_iov, errp); + len =3D qio_channel_readv_full(ioc, local_iov, nlocal_iov, local_f= ds, + local_nfds, errp); if (len =3D=3D QIO_CHANNEL_ERR_BLOCK) { if (qemu_in_coroutine()) { qio_channel_yield(ioc, G_IO_IN); @@ -112,20 +151,33 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, qio_channel_wait(ioc, G_IO_IN); } continue; - } else if (len < 0) { - goto cleanup; - } else if (len =3D=3D 0) { - if (partial) { - error_setg(errp, - "Unexpected end-of-file before all bytes were r= ead"); + } + + if (len <=3D 0) { + size_t fd_idx =3D nfds ? *nfds : 0; + if (partial && (len =3D=3D 0)) { + ret =3D -ECANCELED; } else { - ret =3D 0; + ret =3D len; + } + + while (fds && fd_idx) { + close(*fds[fd_idx - 1]); + fd_idx--; + } + + if (fds) { + g_free(*fds); } + goto cleanup; } =20 partial =3D true; iov_discard_front(&local_iov, &nlocal_iov, len); + + local_fds =3D NULL; + local_nfds =3D 0; } =20 ret =3D 1; @@ -135,23 +187,6 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, return ret; } =20 -int qio_channel_readv_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp) -{ - int ret =3D qio_channel_readv_all_eof(ioc, iov, niov, errp); - - if (ret =3D=3D 0) { - ret =3D -1; - error_setg(errp, - "Unexpected end-of-file before all bytes were read"); - } else if (ret =3D=3D 1) { - ret =3D 0; - } - return ret; -} - int qio_channel_writev_all(QIOChannel *ioc, const struct iovec *iov, size_t niov, --=20 2.25.GIT