mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp: Combine two parts of passt tap send path together

Browse source 
tcp_l2_buf_flush() open codes the "primary" send of message to the passt
tap interface, but calls tcp_l2_buf_flush_part() to handle the case of a
short send.  Combine these two passt-specific operations into
tcp_l2_buf_flush_passt() which is a little cleaner and will enable furrther
cleanups.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2023-01-06 11:43:07 +11:00 committed by Stefano Brivio
parent d3089eb0ea
commit 99f0be3cad
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tcp.c
View file

@ -1419,19 +1419,25 @@ static int tcp_l2_buf_write_one(struct ctx *c, const struct iovec *iov)
} }
/** /**
* tcp_l2_buf_flush_part() - Ensure a complete last message on partial sendmsg() * tcp_l2_buf_flush_passt() - Send a message on the passt tap interface
* @c: Execution context * @c: Execution context
* @mh: Message header that was partially sent by sendmsg() * @mh: Message header that was partially sent by sendmsg()
* @sent: Bytes already sent * @buf_bytes: Total number of bytes to send
*/ */
static void tcp_l2_buf_flush_part(const struct ctx *c, static void tcp_l2_buf_flush_passt(const struct ctx *c,
const struct msghdr *mh, size_t sent) const struct msghdr *mh, size_t buf_bytes)
{ {
size_t end = 0, missing; size_t end = 0, missing, sent;
struct iovec *iov; struct iovec *iov;
unsigned int i; unsigned int i;
ssize_t n;
char *p; char *p;
n = sendmsg(c->fd_tap, mh, MSG_NOSIGNAL | MSG_DONTWAIT);
if (n < 0 || ((sent = (size_t)n) == buf_bytes))
return;
/* Ensure a complete last message on partial sendmsg() */
for (i = 0, iov = mh->msg_iov; i < mh->msg_iovlen; i++, iov++) { for (i = 0, iov = mh->msg_iov; i < mh->msg_iovlen; i++, iov++) {
end += iov->iov_len; end += iov->iov_len;
if (end >= sent) if (end >= sent)
@ -1458,9 +1464,7 @@ static void tcp_l2_buf_flush(struct ctx *c, struct msghdr *mh,
return; return;
if (c->mode == MODE_PASST) { if (c->mode == MODE_PASST) {
size_t n = sendmsg(c->fd_tap, mh, MSG_NOSIGNAL | MSG_DONTWAIT); tcp_l2_buf_flush_passt(c, mh, *buf_bytes);
if (n > 0 && n < *buf_bytes)
tcp_l2_buf_flush_part(c, mh, n);
} else { } else {
size_t i; size_t i;