aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-13 16:37:43 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-13 11:14:29 +0200
commit484652c6322800b32510d6c74d8fc4c8027a106e (patch)
treef3e6d31485ecc79c51d440c600665d76b43da13e
parent6f2db0e34b5aeeba8d303b8bd82e947a2daa9303 (diff)
downloadpasst-484652c6322800b32510d6c74d8fc4c8027a106e.tar
passt-484652c6322800b32510d6c74d8fc4c8027a106e.tar.gz
passt-484652c6322800b32510d6c74d8fc4c8027a106e.tar.bz2
passt-484652c6322800b32510d6c74d8fc4c8027a106e.tar.lz
passt-484652c6322800b32510d6c74d8fc4c8027a106e.tar.xz
passt-484652c6322800b32510d6c74d8fc4c8027a106e.tar.zst
passt-484652c6322800b32510d6c74d8fc4c8027a106e.zip
udp: Don't pre-initialize msghdr array
In udp_tap_handler() the array of msghdr structures, mm[], is initialized to zero. Since UIO_MAXIOV is 1024, this can be quite a large zero, which is expensive if we only end up using a few of its entries. It also makes it less obvious how we're setting all the control fields at the point we actually invoke sendmmsg(). Rather than pre-initializing it, just initialize each element as we use it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--udp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/udp.c b/udp.c
index c4ebecc..864e7b2 100644
--- a/udp.c
+++ b/udp.c
@@ -968,7 +968,7 @@ void udp_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events,
int udp_tap_handler(struct ctx *c, int af, const void *addr,
const struct pool *p, const struct timespec *now)
{
- struct mmsghdr mm[UIO_MAXIOV] = { 0 };
+ struct mmsghdr mm[UIO_MAXIOV];
struct iovec m[UIO_MAXIOV];
struct sockaddr_in6 s_in6;
struct sockaddr_in s_in;
@@ -1087,6 +1087,10 @@ int udp_tap_handler(struct ctx *c, int af, const void *addr,
mm[i].msg_hdr.msg_iov = m + i;
mm[i].msg_hdr.msg_iovlen = 1;
+ mm[i].msg_hdr.msg_control = NULL;
+ mm[i].msg_hdr.msg_controllen = 0;
+ mm[i].msg_hdr.msg_flags = 0;
+
count++;
}