From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>,
Laurent Vivier <lvivier@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 6/6] tap: Use write_remainder() in tap_send_frames_passt()
Date: Thu, 22 Feb 2024 16:56:02 +1100 [thread overview]
Message-ID: <20240222055602.1872516-7-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240222055602.1872516-1-david@gibson.dropbear.id.au>
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 <david@gibson.dropbear.id.au>
---
tap.c | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/tap.c b/tap.c
index 7f0389f3..d2c66acb 100644
--- a/tap.c
+++ b/tap.c
@@ -348,30 +348,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
@@ -402,7 +378,10 @@ static size_t tap_send_frames_passt(const struct ctx *c,
if (i < n && offset) {
/* A partial frame was sent */
- tap_send_remainder(c, &iov[i], offset);
+ if (write_remainder(c->fd_tap, &iov[i], 1, offset) < 0) {
+ err("tap: partial frame send: %s", strerror(errno));
+ return i;
+ }
i++;
}
--
@@ -348,30 +348,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
@@ -402,7 +378,10 @@ static size_t tap_send_frames_passt(const struct ctx *c,
if (i < n && offset) {
/* A partial frame was sent */
- tap_send_remainder(c, &iov[i], offset);
+ if (write_remainder(c->fd_tap, &iov[i], 1, offset) < 0) {
+ err("tap: partial frame send: %s", strerror(errno));
+ return i;
+ }
i++;
}
--
2.43.2
prev parent reply other threads:[~2024-02-22 5:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 5:55 [PATCH 0/6] Allow more use of iovecs in pcap and tap interfaces David Gibson
2024-02-22 5:55 ` [PATCH 1/6] util: Add helper to find offset into io vector David Gibson
2024-02-27 14:23 ` Stefano Brivio
2024-02-27 23:27 ` David Gibson
2024-02-22 5:55 ` [PATCH 2/6] pcap: Update pcap_frame() to take an iovec and offset David Gibson
2024-02-27 14:23 ` Stefano Brivio
2024-02-22 5:55 ` [PATCH 3/6] util: Add write_remainder() helper David Gibson
2024-02-27 14:25 ` Stefano Brivio
2024-02-28 0:44 ` David Gibson
2024-02-28 6:24 ` Stefano Brivio
2024-02-28 9:04 ` David Gibson
2024-02-28 9:22 ` Stefano Brivio
2024-02-22 5:56 ` [PATCH 4/6] pcap: Handle short writes in pcap_frame() David Gibson
2024-02-22 5:56 ` [PATCH 5/6] pcap: Allow pcap_frame() and pcap_multiple() to take multi-buffer frames David Gibson
2024-02-27 14:26 ` Stefano Brivio
2024-02-22 5:56 ` David Gibson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240222055602.1872516-7-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).