From: David Gibson <david@gibson.dropbear.id.au>
To: Laurent Vivier <lvivier@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v4 04/10] tap: export pool_flush()/tapX_handler()/packet_add()
Date: Mon, 3 Jun 2024 11:32:17 +1000 [thread overview]
Message-ID: <Zl0dIfIirCO6oeNx@zatzit> (raw)
In-Reply-To: <20240531142344.1420034-5-lvivier@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 5405 bytes --]
On Fri, May 31, 2024 at 04:23:38PM +0200, Laurent Vivier wrote:
Commit message, in particular mentioning why you're going to need this
exported.
Otherwise LGTM, except that..
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tap.c | 97 +++++++++++++++++++++++++++++------------------------------
> tap.h | 7 +++++
> 2 files changed, 55 insertions(+), 49 deletions(-)
>
> diff --git a/tap.c b/tap.c
> index 2ea08491a51f..ab8d760efb11 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -920,6 +920,45 @@ append:
> return in->count;
> }
>
..function comments would be good on the new functions
> +void pool_flush_all(void)
> +{
> + pool_flush(pool_tap4);
> + pool_flush(pool_tap6);
> +}
> +
> +void tap_handler_all(struct ctx *c, const struct timespec *now)
> +{
> + tap4_handler(c, pool_tap4, now);
> + tap6_handler(c, pool_tap6, now);
> +}
> +
> +void packet_add_all_do(struct ctx *c, ssize_t l2len, char *p,
> + const char *func, int line)
> +{
> + const struct ethhdr *eh;
> +
> + pcap(p, l2len);
> +
> + eh = (struct ethhdr *)p;
> +
> + if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) {
> + memcpy(c->mac_guest, eh->h_source, ETH_ALEN);
> + proto_update_l2_buf(c->mac_guest, NULL);
> + }
> +
> + switch (ntohs(eh->h_proto)) {
> + case ETH_P_ARP:
> + case ETH_P_IP:
> + packet_add_do(pool_tap4, l2len, p, func, line);
> + break;
> + case ETH_P_IPV6:
> + packet_add_do(pool_tap6, l2len, p, func, line);
> + break;
> + default:
> + break;
> + }
> +}
> +
> /**
> * tap_sock_reset() - Handle closing or failure of connect AF_UNIX socket
> * @c: Execution context
> @@ -946,7 +985,6 @@ static void tap_sock_reset(struct ctx *c)
> void tap_handler_passt(struct ctx *c, uint32_t events,
> const struct timespec *now)
> {
> - const struct ethhdr *eh;
> ssize_t n, rem;
> char *p;
>
> @@ -959,8 +997,7 @@ redo:
> p = pkt_buf;
> rem = 0;
>
> - pool_flush(pool_tap4);
> - pool_flush(pool_tap6);
> + pool_flush_all();
>
> n = recv(c->fd_tap, p, TAP_BUF_FILL, MSG_DONTWAIT);
> if (n < 0) {
> @@ -987,38 +1024,18 @@ redo:
> /* Complete the partial read above before discarding a malformed
> * frame, otherwise the stream will be inconsistent.
> */
> - if (l2len < (ssize_t)sizeof(*eh) ||
> + if (l2len < (ssize_t)sizeof(struct ethhdr) ||
> l2len > (ssize_t)ETH_MAX_MTU)
> goto next;
>
> - pcap(p, l2len);
> -
> - eh = (struct ethhdr *)p;
> -
> - if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) {
> - memcpy(c->mac_guest, eh->h_source, ETH_ALEN);
> - proto_update_l2_buf(c->mac_guest, NULL);
> - }
> -
> - switch (ntohs(eh->h_proto)) {
> - case ETH_P_ARP:
> - case ETH_P_IP:
> - packet_add(pool_tap4, l2len, p);
> - break;
> - case ETH_P_IPV6:
> - packet_add(pool_tap6, l2len, p);
> - break;
> - default:
> - break;
> - }
> + packet_add_all(c, l2len, p);
>
> next:
> p += l2len;
> n -= l2len;
> }
>
> - tap4_handler(c, pool_tap4, now);
> - tap6_handler(c, pool_tap6, now);
> + tap_handler_all(c, now);
>
> /* We can't use EPOLLET otherwise. */
> if (rem)
> @@ -1043,35 +1060,18 @@ void tap_handler_pasta(struct ctx *c, uint32_t events,
> redo:
> n = 0;
>
> - pool_flush(pool_tap4);
> - pool_flush(pool_tap6);
> + pool_flush_all();
> restart:
> while ((len = read(c->fd_tap, pkt_buf + n, TAP_BUF_BYTES - n)) > 0) {
> - const struct ethhdr *eh = (struct ethhdr *)(pkt_buf + n);
>
> - if (len < (ssize_t)sizeof(*eh) || len > (ssize_t)ETH_MAX_MTU) {
> + if (len < (ssize_t)sizeof(struct ethhdr) ||
> + len > (ssize_t)ETH_MAX_MTU) {
> n += len;
> continue;
> }
>
> - pcap(pkt_buf + n, len);
>
> - if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) {
> - memcpy(c->mac_guest, eh->h_source, ETH_ALEN);
> - proto_update_l2_buf(c->mac_guest, NULL);
> - }
> -
> - switch (ntohs(eh->h_proto)) {
> - case ETH_P_ARP:
> - case ETH_P_IP:
> - packet_add(pool_tap4, len, pkt_buf + n);
> - break;
> - case ETH_P_IPV6:
> - packet_add(pool_tap6, len, pkt_buf + n);
> - break;
> - default:
> - break;
> - }
> + packet_add_all(c, len, pkt_buf + n);
>
> if ((n += len) == TAP_BUF_BYTES)
> break;
> @@ -1082,8 +1082,7 @@ restart:
>
> ret = errno;
>
> - tap4_handler(c, pool_tap4, now);
> - tap6_handler(c, pool_tap6, now);
> + tap_handler_all(c, now);
>
> if (len > 0 || ret == EAGAIN)
> return;
> diff --git a/tap.h b/tap.h
> index 2285a87093f9..3ffb7d6c3a91 100644
> --- a/tap.h
> +++ b/tap.h
> @@ -70,5 +70,12 @@ void tap_handler_passt(struct ctx *c, uint32_t events,
> const struct timespec *now);
> int tap_sock_unix_open(char *sock_path);
> void tap_sock_init(struct ctx *c);
> +void pool_flush_all(void);
> +void tap_handler_all(struct ctx *c, const struct timespec *now);
> +
> +void packet_add_all_do(struct ctx *c, ssize_t l2len, char *p,
> + const char *func, int line);
> +#define packet_add_all(p, l2len, start) \
> + packet_add_all_do(p, l2len, start, __func__, __LINE__)
>
> #endif /* TAP_H */
--
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-06-03 1:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 14:23 [PATCH v4 00/10] Add vhost-user support to passt (part 2) Laurent Vivier
2024-05-31 14:23 ` [PATCH v4 01/10] tcp: inline tcp_l2_buf_fill_headers() Laurent Vivier
2024-05-31 14:23 ` [PATCH v4 02/10] tcp: extract buffer management from tcp_send_flag() Laurent Vivier
2024-06-01 5:43 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 03/10] tcp: move buffers management functions to their own file Laurent Vivier
2024-06-03 1:27 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 04/10] tap: export pool_flush()/tapX_handler()/packet_add() Laurent Vivier
2024-06-03 1:32 ` David Gibson [this message]
2024-05-31 14:23 ` [PATCH v4 05/10] udp: move udpX_l2_buf_t and udpX_l2_mh_sock out of udp_update_hdrX() Laurent Vivier
2024-06-03 2:54 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 06/10] udp: rename udp_sock_handler() to udp_buf_sock_handler() Laurent Vivier
2024-06-03 4:02 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 07/10] vhost-user: compare mode MODE_PASTA and not MODE_PASST Laurent Vivier
2024-06-03 4:04 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 08/10] iov: remove iov_copy() Laurent Vivier
2024-06-03 4:05 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 09/10] tcp: remove tap_hdr parameter Laurent Vivier
2024-06-03 4:12 ` David Gibson
2024-05-31 14:23 ` [PATCH v4 10/10] tap: use in->buf_size rather than sizeof(pkt_buf) Laurent Vivier
2024-06-03 4:20 ` David Gibson
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=Zl0dIfIirCO6oeNx@zatzit \
--to=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=passt-dev@passt.top \
/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).