From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 3D9005A0275 for ; Wed, 28 Feb 2024 02:52:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709085128; bh=X72NQRakhGMCoSxeGj6256Va6NBRvq1U3mwh77+xtNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KFU45tW6SYrH03gdAQRFoj/15FN34xLLpWL0hWYO3KMlBofRuAU+Pi0hyD+AVgxuT Wwy4FgYZeAbtB7FW+7DSrBSqNgHE7s5sdIDAUlfYfLPuV2J1r1hvBc2D4gsqmY+JXu naLB70eSp9vRI+VJwZLw/NseR4OuFoDA3bXYkUyGndthOK+CbeMLRYdGP8+kUUHZYU 9E0Unv3ejIkrWcdmkrv/gGuaat5LHklvoDwJMV4MlyQSq59EdjdVgHeMSrG8r/gqWU n48JKj/9wR9kkNWgns5gJzKFxT5Mrcrf6x6ZZbGidRAVRQcP9+ql8m5aKDHsiRxdg1 hjZH2h4hkDlfg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Tky5h6rQsz4wyk; Wed, 28 Feb 2024 12:52:08 +1100 (AEDT) From: David Gibson To: Laurent Vivier , passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 7/7] tap: Use write_remainder() in tap_send_frames_passt() Date: Wed, 28 Feb 2024 12:52:06 +1100 Message-ID: <20240228015206.1214242-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240228015206.1214242-1-david@gibson.dropbear.id.au> References: <20240228015206.1214242-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZA5MOPE52SV2KGJD5HSP7OITAM2LSDSE X-Message-ID-Hash: ZA5MOPE52SV2KGJD5HSP7OITAM2LSDSE X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When we determine we have sent a partial frame in tap_send_frames_passt(), we call tap_send_remainder() to send the remainder of it. The logic in that function is very similar to that in the more general write_remainder() except that it uses send() instead of write()/writev(). But we are dealing specifically with the qemu socket here, which is a connected stream socket. In that case write()s do the same thing as send() with the options we were using, so we can just reuse write_remainder(). Signed-off-by: David Gibson --- tap.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/tap.c b/tap.c index 87d176b7..8a9a68b7 100644 --- a/tap.c +++ b/tap.c @@ -349,30 +349,6 @@ static size_t tap_send_frames_pasta(const struct ctx *c, return i; } -/** - * tap_send_remainder() - Send remainder of a partially sent frame - * @c: Execution context - * @iov: Partially sent buffer - * @offset: Number of bytes already sent from @iov - */ -static void tap_send_remainder(const struct ctx *c, const struct iovec *iov, - size_t offset) -{ - const char *base = (char *)iov->iov_base; - size_t len = iov->iov_len; - - while (offset < len) { - ssize_t sent = send(c->fd_tap, base + offset, len - offset, - MSG_NOSIGNAL); - if (sent < 0) { - err("tap: partial frame send (missing %zu bytes): %s", - len - offset, strerror(errno)); - return; - } - offset += sent; - } -} - /** * tap_send_frames_passt() - Send multiple frames to the passt tap * @c: Execution context @@ -403,7 +379,10 @@ static size_t tap_send_frames_passt(const struct ctx *c, if (i < n && buf_offset) { /* A partial frame was sent */ - tap_send_remainder(c, &iov[i], buf_offset); + if (write_remainder(c->fd_tap, &iov[i], 1, buf_offset) < 0) { + err("tap: partial frame send: %s", strerror(errno)); + return i; + } i++; } -- 2.43.2