public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 4/8] udp: Receive multiple datagrams at once on the pasta sock->tap path
Date: Thu, 15 Dec 2022 12:30:14 +1100	[thread overview]
Message-ID: <20221215013018.1556807-5-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20221215013018.1556807-1-david@gibson.dropbear.id.au>

Usually udp_sock_handler() will receive and forward multiple (up to
32) datagrams in udp_sock_handler(), then forward them all to the tap
interface.  However, when in pasta mode we will only receive and
forward a single datagram at a time.  Change it to receive multiple
datagrams at once, like the other paths.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 udp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/udp.c b/udp.c
index 64c9219..24fa984 100644
--- a/udp.c
+++ b/udp.c
@@ -119,7 +119,6 @@
 
 #define UDP_CONN_TIMEOUT	180 /* s, timeout for ephemeral or local bind */
 #define UDP_MAX_FRAMES		32  /* max # of frames to receive at once */
-#define UDP_TAP_FRAMES		(c->mode == MODE_PASST ? UDP_MAX_FRAMES : 1)
 
 /**
  * struct udp_tap_port - Port tracking based on tap-facing source port
@@ -968,7 +967,7 @@ void udp_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events,
 	else
 		sock_mmh = udp4_l2_mh_sock;
 
-	n = recvmmsg(ref.r.s, sock_mmh, UDP_TAP_FRAMES, 0, NULL);
+	n = recvmmsg(ref.r.s, sock_mmh, UDP_MAX_FRAMES, 0, NULL);
 	if (n <= 0)
 		return;
 
-- 
@@ -119,7 +119,6 @@
 
 #define UDP_CONN_TIMEOUT	180 /* s, timeout for ephemeral or local bind */
 #define UDP_MAX_FRAMES		32  /* max # of frames to receive at once */
-#define UDP_TAP_FRAMES		(c->mode == MODE_PASST ? UDP_MAX_FRAMES : 1)
 
 /**
  * struct udp_tap_port - Port tracking based on tap-facing source port
@@ -968,7 +967,7 @@ void udp_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t events,
 	else
 		sock_mmh = udp4_l2_mh_sock;
 
-	n = recvmmsg(ref.r.s, sock_mmh, UDP_TAP_FRAMES, 0, NULL);
+	n = recvmmsg(ref.r.s, sock_mmh, UDP_MAX_FRAMES, 0, NULL);
 	if (n <= 0)
 		return;
 
-- 
2.38.1


  parent reply	other threads:[~2022-12-15  1:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15  1:30 [PATCH v2 0/8] Don't use additional sockets for receiving "spliced" UDP communications David Gibson
2022-12-15  1:30 ` [PATCH v2 1/8] udp: Move sending pasta tap frames to the end of udp_sock_handler() David Gibson
2022-12-15  1:30 ` [PATCH v2 2/8] udp: Split sending to passt tap interface into separate function David Gibson
2022-12-15  1:30 ` [PATCH v2 3/8] udp: Split receive from preparation and send in udp_sock_handler() David Gibson
2022-12-15  1:30 ` David Gibson [this message]
2022-12-15  1:30 ` [PATCH v2 5/8] udp: Pre-populate msg_names with local address David Gibson
2022-12-15  1:30 ` [PATCH v2 6/8] udp: Unify udp_sock_handler_splice() with udp_sock_handler() David Gibson
2022-12-15  1:30 ` [PATCH v2 7/8] udp: Decide whether to "splice" per datagram rather than per socket David Gibson
2022-12-15  1:30 ` [PATCH v2 8/8] udp: Don't use separate sockets to listen for spliced packets David Gibson
2022-12-16  0:58 ` [PATCH v2 0/8] Don't use additional sockets for receiving "spliced" UDP communications Stefano Brivio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221215013018.1556807-5-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).