On Fri, Feb 02, 2024 at 03:11:42PM +0100, Laurent Vivier wrote:We are going to introduce a variant of the function to use vhost-user buffers rather than passt internal buffers.Not entirely sure the new name really conveys that distinction.Signed-off-by: Laurent Vivier <lvivier(a)redhat.com> --- passt.c | 2 +- udp.c | 6 +++--- udp.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/passt.c b/passt.c index 10042a9b9789..c70caf464e61 100644 --- a/passt.c +++ b/passt.c @@ -389,7 +389,7 @@ loop: tcp_timer_handler(&c, ref); break; case EPOLL_TYPE_UDP: - udp_sock_handler(&c, ref, eventmask, &now); + udp_buf_sock_handler(&c, ref, eventmask, &now); break; case EPOLL_TYPE_ICMP: icmp_sock_handler(&c, AF_INET, ref); diff --git a/udp.c b/udp.c index 77168fb0a2af..9c56168c6340 100644 --- a/udp.c +++ b/udp.c @@ -736,7 +736,7 @@ static void udp_tap_send(const struct ctx *c, #pragma GCC diagnostic pop /** - * udp_sock_handler() - Handle new data from socket + * udp_buf_sock_handler() - Handle new data from socket * @c: Execution context * @ref: epoll reference * @events: epoll events bitmap @@ -744,8 +744,8 @@ static void udp_tap_send(const struct ctx *c, * * #syscalls recvmmsg */ -void udp_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events, - const struct timespec *now) +void udp_buf_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events, + const struct timespec *now) { /* For not entirely clear reasons (data locality?) pasta gets * better throughput if we receive tap datagrams one at a diff --git a/udp.h b/udp.h index 087e4820f93c..6c8519e87f1a 100644 --- a/udp.h +++ b/udp.h @@ -9,8 +9,8 @@ #define UDP_TIMER_INTERVAL 1000 /* ms */ void udp_portmap_clear(void); -void udp_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events, - const struct timespec *now); +void udp_buf_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events, + const struct timespec *now); int udp_tap_handler(struct ctx *c, uint8_t pif, int af, const void *saddr, const void *daddr, const struct pool *p, int idx, const struct timespec *now);-- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson