public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Laurent Vivier <lvivier@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v8 5/8] tcp: Export headers functions
Date: Mon, 14 Oct 2024 15:29:39 +1100	[thread overview]
Message-ID: <ZwyeM8Rfv42HXuej@zatzit.fritz.box> (raw)
In-Reply-To: <20241010122903.1188992-6-lvivier@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 4409 bytes --]

On Thu, Oct 10, 2024 at 02:28:59PM +0200, Laurent Vivier wrote:
> Export tcp_fill_headers[4|6]() and tcp_update_check_tcp[4|6]().
> 
> They'll be needed by vhost-user.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  tcp.c          | 30 +++++++++++++++---------------
>  tcp_internal.h | 15 +++++++++++++++
>  2 files changed, 30 insertions(+), 15 deletions(-)
> 
> diff --git a/tcp.c b/tcp.c
> index 9617b7ac2404..eae02b1647e3 100644
> --- a/tcp.c
> +++ b/tcp.c
> @@ -761,9 +761,9 @@ static void tcp_sock_set_bufsize(const struct ctx *c, int s)
>   * @iov_cnt:	Length of the array
>   * @l4offset:	IPv4 payload offset in the iovec array
>   */
> -static void tcp_update_check_tcp4(const struct iphdr *iph,
> -				  const struct iovec *iov, int iov_cnt,
> -				  size_t l4offset)
> +void tcp_update_check_tcp4(const struct iphdr *iph,
> +			   const struct iovec *iov, int iov_cnt,
> +			   size_t l4offset)
>  {
>  	uint16_t l4len = ntohs(iph->tot_len) - sizeof(struct iphdr);
>  	struct in_addr saddr = { .s_addr = iph->saddr };
> @@ -813,9 +813,9 @@ static void tcp_update_check_tcp4(const struct iphdr *iph,
>   * @iov_cnt:	Length of the array
>   * @l4offset:	IPv6 payload offset in the iovec array
>   */
> -static void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
> -				  const struct iovec *iov, int iov_cnt,
> -				  size_t l4offset)
> +void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
> +			   const struct iovec *iov, int iov_cnt,
> +			   size_t l4offset)
>  {
>  	uint16_t l4len = ntohs(ip6h->payload_len);
>  	size_t check_ofs;
> @@ -982,11 +982,11 @@ static void tcp_fill_header(struct tcphdr *th,
>   *
>   * Return: The IPv4 payload length, host order
>   */
> -static size_t tcp_fill_headers4(const struct tcp_tap_conn *conn,
> -				struct tap_hdr *taph,
> -				struct iphdr *iph, struct tcp_payload_t *bp,
> -				size_t dlen, const uint16_t *check,
> -				uint32_t seq, bool no_tcp_csum)
> +size_t tcp_fill_headers4(const struct tcp_tap_conn *conn,
> +			 struct tap_hdr *taph,
> +			 struct iphdr *iph, struct tcp_payload_t *bp,
> +			 size_t dlen, const uint16_t *check,
> +			 uint32_t seq, bool no_tcp_csum)
>  {
>  	const struct flowside *tapside = TAPFLOW(conn);
>  	const struct in_addr *src4 = inany_v4(&tapside->oaddr);
> @@ -1034,10 +1034,10 @@ static size_t tcp_fill_headers4(const struct tcp_tap_conn *conn,
>   *
>   * Return: The IPv6 payload length, host order
>   */
> -static size_t tcp_fill_headers6(const struct tcp_tap_conn *conn,
> -				struct tap_hdr *taph,
> -				struct ipv6hdr *ip6h, struct tcp_payload_t *bp,
> -				size_t dlen, uint32_t seq, bool no_tcp_csum)
> +size_t tcp_fill_headers6(const struct tcp_tap_conn *conn,
> +			 struct tap_hdr *taph,
> +			 struct ipv6hdr *ip6h, struct tcp_payload_t *bp,
> +			 size_t dlen, uint32_t seq, bool no_tcp_csum)
>  {
>  	const struct flowside *tapside = TAPFLOW(conn);
>  	size_t l4len = dlen + sizeof(bp->th);
> diff --git a/tcp_internal.h b/tcp_internal.h
> index 2f74ffeff8f3..8e87f98b470f 100644
> --- a/tcp_internal.h
> +++ b/tcp_internal.h
> @@ -118,6 +118,21 @@ void tcp_rst_do(const struct ctx *c, struct tcp_tap_conn *conn);
>  		tcp_rst_do(c, conn);					\
>  	} while (0)
>  
> +void tcp_update_check_tcp4(const struct iphdr *iph,
> +			   const struct iovec *iov, int iov_cnt,
> +			   size_t l4offset);
> +void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
> +			   const struct iovec *iov, int iov_cnt,
> +			   size_t l4offset);
> +size_t tcp_fill_headers4(const struct tcp_tap_conn *conn,
> +			 struct tap_hdr *taph,
> +			 struct iphdr *iph, struct tcp_payload_t *bp,
> +			 size_t dlen, const uint16_t *check,
> +			 uint32_t seq, bool no_tcp_csum);
> +size_t tcp_fill_headers6(const struct tcp_tap_conn *conn,
> +			 struct tap_hdr *taph,
> +			 struct ipv6hdr *ip6h, struct tcp_payload_t *bp,
> +			 size_t dlen, uint32_t seq, bool no_tcp_csum);
>  size_t tcp_l2_buf_fill_headers(const struct tcp_tap_conn *conn,
>  			       struct iovec *iov, size_t dlen,
>  			       const uint16_t *check, uint32_t seq,

-- 
David Gibson (he or they)	| 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 --]

  reply	other threads:[~2024-10-14  5:02 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-10 12:28 [PATCH v8 0/8] Add vhost-user support to passt. (part 3) Laurent Vivier
2024-10-10 12:28 ` [PATCH v8 1/8] packet: replace struct desc by struct iovec Laurent Vivier
2024-10-10 12:28 ` [PATCH v8 2/8] vhost-user: introduce virtio API Laurent Vivier
2024-10-10 12:28 ` [PATCH v8 3/8] vhost-user: introduce vhost-user API Laurent Vivier
2024-10-10 12:28 ` [PATCH v8 4/8] udp: Prepare udp.c to be shared with vhost-user Laurent Vivier
2024-10-14  4:29   ` David Gibson
2024-10-10 12:28 ` [PATCH v8 5/8] tcp: Export headers functions Laurent Vivier
2024-10-14  4:29   ` David Gibson [this message]
2024-10-10 12:29 ` [PATCH v8 6/8] passt: rename tap_sock_init() to tap_backend_init() Laurent Vivier
2024-10-14  4:30   ` David Gibson
2024-10-14 22:38   ` Stefano Brivio
2024-10-10 12:29 ` [PATCH v8 7/8] vhost-user: add vhost-user Laurent Vivier
2024-10-15  3:23   ` David Gibson
2024-10-16 10:07     ` Laurent Vivier
2024-10-16 16:26       ` Stefano Brivio
2024-10-15 19:54   ` Stefano Brivio
2024-10-16  0:41     ` David Gibson
2024-10-17  0:10       ` Stefano Brivio
2024-10-17 11:25         ` Stefano Brivio
2024-10-17 11:54           ` Laurent Vivier
2024-10-17 17:18           ` Laurent Vivier
2024-10-17 17:25             ` Laurent Vivier
2024-10-17 17:33             ` Stefano Brivio
2024-10-17 21:21               ` Stefano Brivio
2024-10-22 12:59         ` Laurent Vivier
2024-10-22 13:19           ` Stefano Brivio
2024-10-22 18:19             ` Stefano Brivio
2024-10-22 18:22               ` Stefano Brivio
2024-10-23 15:27           ` Laurent Vivier
2024-10-23 16:23             ` Stefano Brivio
2024-10-17  0:10   ` Stefano Brivio
2024-10-17  7:28     ` Laurent Vivier
2024-10-17  8:33       ` Stefano Brivio
2024-11-14 10:20     ` Laurent Vivier
2024-11-14 14:23       ` Stefano Brivio
2024-11-14 15:16         ` Laurent Vivier
2024-11-14 15:38           ` Stefano Brivio
2024-11-14 10:23     ` Laurent Vivier
2024-11-14 14:23       ` Stefano Brivio
2024-11-15  8:30         ` Laurent Vivier
2024-11-15 10:08           ` Stefano Brivio
2024-11-14 10:29     ` Laurent Vivier
2024-11-14 14:23       ` Stefano Brivio
2024-11-15 11:13         ` Laurent Vivier
2024-11-15 11:23           ` Stefano Brivio
2024-10-10 12:29 ` [PATCH v8 8/8] test: Add tests for passt in vhost-user mode Laurent Vivier
2024-10-15  3:40   ` David Gibson
2024-10-15 19:54   ` Stefano Brivio
2024-10-16  8:06     ` Laurent Vivier
2024-10-16  9:47       ` 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=ZwyeM8Rfv42HXuej@zatzit.fritz.box \
    --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).