From: David Gibson <david@gibson.dropbear.id.au>
To: Laurent Vivier <lvivier@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v3 01/11] tcp: inline tcp_l2_buf_fill_headers()
Date: Fri, 31 May 2024 15:22:35 +1000 [thread overview]
Message-ID: <ZllemwS86usJdzFK@zatzit> (raw)
In-Reply-To: <20240529101909.1120078-2-lvivier@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 4561 bytes --]
On Wed, May 29, 2024 at 12:18:59PM +0200, Laurent Vivier wrote:
> It only calls tcp_fill_headers4() and tcp_fill_headers6() according
> to the connection IP version.
>
> We can inline them in tcp_data_to_tap() that already has a switch
> on the IP version. In tcp_send_flag(), it will ease to separate code
> from the common part and the buffer/vhost-user parts.
It's my intention at some point to merge more of the IPv4 and IPv6
parallel arrays. I also hope to get rid of CONN_V4() replacing it
with explicit tests on the address that's relevant in the specific
context. Both will be necessary to allow v4 <-> v6 NAT.
I have a slight concern that this patch and the ones immediately after
it might make that trickier. Probably not by that much, though, and I
don't really want to delay the vhost-user stuff, so:
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tcp.c | 54 +++++++++++++++++++-----------------------------------
> 1 file changed, 19 insertions(+), 35 deletions(-)
>
> diff --git a/tcp.c b/tcp.c
> index 06acb41e4d90..6f221995f3bc 100644
> --- a/tcp.c
> +++ b/tcp.c
> @@ -1401,37 +1401,6 @@ static size_t tcp_fill_headers6(const struct ctx *c,
> return l4len;
> }
>
> -/**
> - * tcp_l2_buf_fill_headers() - Fill 802.3, IP, TCP headers in pre-cooked buffers
> - * @c: Execution context
> - * @conn: Connection pointer
> - * @iov: Pointer to an array of iovec of TCP pre-cooked buffers
> - * @dlen: TCP payload length
> - * @check: Checksum, if already known
> - * @seq: Sequence number for this segment
> - *
> - * Return: IP payload length, host order
> - */
> -static size_t tcp_l2_buf_fill_headers(const struct ctx *c,
> - const struct tcp_tap_conn *conn,
> - struct iovec *iov, size_t dlen,
> - const uint16_t *check, uint32_t seq)
> -{
> - const struct in_addr *a4 = inany_v4(&conn->faddr);
> -
> - if (a4) {
> - return tcp_fill_headers4(c, conn, iov[TCP_IOV_TAP].iov_base,
> - iov[TCP_IOV_IP].iov_base,
> - iov[TCP_IOV_PAYLOAD].iov_base, dlen,
> - check, seq);
> - }
> -
> - return tcp_fill_headers6(c, conn, iov[TCP_IOV_TAP].iov_base,
> - iov[TCP_IOV_IP].iov_base,
> - iov[TCP_IOV_PAYLOAD].iov_base, dlen,
> - seq);
> -}
> -
> /**
> * tcp_update_seqack_wnd() - Update ACK sequence and window to guest/tap
> * @c: Execution context
> @@ -1642,8 +1611,17 @@ static int tcp_send_flag(struct ctx *c, struct tcp_tap_conn *conn, int flags)
> th->syn = !!(flags & SYN);
> th->fin = !!(flags & FIN);
>
> - l4len = tcp_l2_buf_fill_headers(c, conn, iov, optlen, NULL,
> - conn->seq_to_tap);
> + if (CONN_V4(conn)) {
> + l4len = tcp_fill_headers4(c, conn, iov[TCP_IOV_TAP].iov_base,
> + iov[TCP_IOV_IP].iov_base,
> + iov[TCP_IOV_PAYLOAD].iov_base, optlen,
> + NULL, conn->seq_to_tap);
> + } else {
> + l4len = tcp_fill_headers6(c, conn, iov[TCP_IOV_TAP].iov_base,
> + iov[TCP_IOV_IP].iov_base,
> + iov[TCP_IOV_PAYLOAD].iov_base, optlen,
> + conn->seq_to_tap);
> + }
> iov[TCP_IOV_PAYLOAD].iov_len = l4len;
>
> if (th->ack) {
> @@ -2146,7 +2124,10 @@ static void tcp_data_to_tap(const struct ctx *c, struct tcp_tap_conn *conn,
> tcp4_seq_update[tcp4_payload_used].len = dlen;
>
> iov = tcp4_l2_iov[tcp4_payload_used++];
> - l4len = tcp_l2_buf_fill_headers(c, conn, iov, dlen, check, seq);
> + l4len = tcp_fill_headers4(c, conn, iov[TCP_IOV_TAP].iov_base,
> + iov[TCP_IOV_IP].iov_base,
> + iov[TCP_IOV_PAYLOAD].iov_base, dlen,
> + check, seq);
> iov[TCP_IOV_PAYLOAD].iov_len = l4len;
> if (tcp4_payload_used > TCP_FRAMES_MEM - 1)
> tcp_payload_flush(c);
> @@ -2155,7 +2136,10 @@ static void tcp_data_to_tap(const struct ctx *c, struct tcp_tap_conn *conn,
> tcp6_seq_update[tcp6_payload_used].len = dlen;
>
> iov = tcp6_l2_iov[tcp6_payload_used++];
> - l4len = tcp_l2_buf_fill_headers(c, conn, iov, dlen, NULL, seq);
> + l4len = tcp_fill_headers6(c, conn, iov[TCP_IOV_TAP].iov_base,
> + iov[TCP_IOV_IP].iov_base,
> + iov[TCP_IOV_PAYLOAD].iov_base, dlen,
> + seq);
> iov[TCP_IOV_PAYLOAD].iov_len = l4len;
> if (tcp6_payload_used > TCP_FRAMES_MEM - 1)
> tcp_payload_flush(c);
--
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-05-31 5:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-29 10:18 [PATCH v3 00/11] Add vhost-user support to passt (part 2) Laurent Vivier
2024-05-29 10:18 ` [PATCH v3 01/11] tcp: inline tcp_l2_buf_fill_headers() Laurent Vivier
2024-05-31 5:22 ` David Gibson [this message]
2024-05-29 10:19 ` [PATCH v3 02/11] tcp: extract buffer management from tcp_send_flag() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 03/11] tcp: extract buffer management from tcp_conn_tap_mss() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 04/11] tcp: move buffers management functions to their own file Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 05/11] tap: export pool_flush()/tapX_handler()/packet_add() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 06/11] udp: move udpX_l2_buf_t and udpX_l2_mh_sock out of udp_update_hdrX() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 07/11] udp: rename udp_sock_handler() to udp_buf_sock_handler() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 08/11] vhost-user: compare mode MODE_PASTA and not MODE_PASST Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 09/11] iov: remove iov_copy() Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 10/11] tcp: remove tap_hdr parameter Laurent Vivier
2024-05-29 10:19 ` [PATCH v3 11/11] tap: use in->buf_size rather than sizeof(pkt_buf) Laurent Vivier
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=ZllemwS86usJdzFK@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).