External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-12-22 21:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tap: Improve handling of EINTR in tap_passt_input()

Browse Source 
When tap_passt_input() gets an error from recv() it (correctly) does not
print any error message for EINTR, EAGAIN or EWOULDBLOCK.  However in all
three cases it returns from the function.  That makes sense for EAGAIN and
EWOULDBLOCK, since we then want to wait for the next EPOLLIN event before
trying again.  For EINTR, however, it makes more sense to retry immediately
- as it stands we're likely to get a renewer EPOLLIN event immediately in
that case, since we're using level triggered signalling.

So, handle EINTR separately by immediately retrying until we succeed or
get a different type of error.

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 2024-09-06 21:49:37 +10:00 committed by Stefano Brivio
parent 49fc4e0414
commit 11e29054fe
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tap.c
View File

@ -1003,10 +1003,13 @@ static void tap_passt_input(struct ctx *c, const struct timespec *now)
memmove(pkt_buf, partial_frame, partial_len); memmove(pkt_buf, partial_frame, partial_len);
} }
n = recv(c->fd_tap, pkt_buf + partial_len, TAP_BUF_BYTES - partial_len, do {
MSG_DONTWAIT); n = recv(c->fd_tap, pkt_buf + partial_len,
TAP_BUF_BYTES - partial_len, MSG_DONTWAIT);
} while ((n < 0) && errno == EINTR);
if (n < 0) { if (n < 0) {
if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK) { if (errno != EAGAIN && errno != EWOULDBLOCK) {
err_perror("Receive error on guest connection, reset"); err_perror("Receive error on guest connection, reset");
tap_sock_reset(c); tap_sock_reset(c);
} }