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

tap: Split out handling of EPOLLIN events

Browse source 
Currently, tap_handler_pas{st,ta}() check for EPOLLRDHUP, EPOLLHUP and
EPOLLERR events, then assume anything left is EPOLLIN.  We have some future
cases that may want to also handle EPOLLOUT, so in preparation explicitly
handle EPOLLIN, moving the logic to a subfunction.

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:36 +10:00 committed by Stefano Brivio
parent 63513e54f3
commit 49fc4e0414
1 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
tap.c
View file

@ -982,24 +982,17 @@ static void tap_sock_reset(struct ctx *c)
} }
/** /**
* tap_handler_passt() - Packet handler for AF_UNIX file descriptor * tap_passt_input() - Handler for new data on the socket to qemu
* @c: Execution context * @c: Execution context
* @events: epoll events
* @now: Current timestamp * @now: Current timestamp
*/ */
void tap_handler_passt(struct ctx *c, uint32_t events, static void tap_passt_input(struct ctx *c, const struct timespec *now)
const struct timespec *now)
{ {
static const char *partial_frame; static const char *partial_frame;
static ssize_t partial_len = 0; static ssize_t partial_len = 0;
ssize_t n; ssize_t n;
char *p; char *p;
if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR)) {
tap_sock_reset(c);
return;
}
tap_flush_pools(); tap_flush_pools();
if (partial_len) { if (partial_len) {
@ -1052,20 +1045,33 @@ void tap_handler_passt(struct ctx *c, uint32_t events,
} }
/** /**
* tap_handler_pasta() - Packet handler for /dev/net/tun file descriptor * tap_handler_passt() - Event handler for AF_UNIX file descriptor
* @c: Execution context * @c: Execution context
* @events: epoll events * @events: epoll events
* @now: Current timestamp * @now: Current timestamp
*/ */
void tap_handler_pasta(struct ctx *c, uint32_t events, void tap_handler_passt(struct ctx *c, uint32_t events,
const struct timespec *now) const struct timespec *now)
{
if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR)) {
tap_sock_reset(c);
return;
}
if (events & EPOLLIN)
tap_passt_input(c, now);
}
/**
* tap_pasta_input() - Handler for new data on the socket to hypervisor
* @c: Execution context
* @now: Current timestamp
*/
static void tap_pasta_input(struct ctx *c, const struct timespec *now)
{ {
ssize_t n, len; ssize_t n, len;
int ret; int ret;
if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR))
die("Disconnect event on /dev/net/tun device, exiting");
redo: redo:
n = 0; n = 0;
@ -1102,6 +1108,22 @@ restart:
die("Error on tap device, exiting"); die("Error on tap device, exiting");
} }
/**
* tap_handler_pasta() - Packet handler for /dev/net/tun file descriptor
* @c: Execution context
* @events: epoll events
* @now: Current timestamp
*/
void tap_handler_pasta(struct ctx *c, uint32_t events,
const struct timespec *now)
{
if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR))
die("Disconnect event on /dev/net/tun device, exiting");
if (events & EPOLLIN)
tap_pasta_input(c, now);
}
/** /**
* tap_sock_unix_open() - Create and bind AF_UNIX socket * tap_sock_unix_open() - Create and bind AF_UNIX socket
* @sock_path: Socket path. If empty, set on return (UNIX_SOCK_PATH as prefix) * @sock_path: Socket path. If empty, set on return (UNIX_SOCK_PATH as prefix)