public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v2 02/22] inany: Helper to test for various address types
Date: Sun, 18 Feb 2024 21:58:44 +0100	[thread overview]
Message-ID: <20240218215844.767562fc@elisabeth> (raw)
In-Reply-To: <20240206011734.884138-3-david@gibson.dropbear.id.au>

On Tue,  6 Feb 2024 12:17:14 +1100
David Gibson <david@gibson.dropbear.id.au> wrote:

> Add helpers to determine if an inany is loopback, unspecified or multicast,
> regardless of whether it's a "true" IPv6 address or an IPv4 address
> represented as v4-mapped.
> Sometimes we need to know if an inany is a loopback address, unspecified or
> some other particular kind of address, but we don't really care if it is
> IPv4.
> 
> Use the loopback helper to simplify tcp_splice_conn_from_sock() slightly.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  inany.h      | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  tcp_splice.c | 15 +++------------
>  2 files changed, 53 insertions(+), 12 deletions(-)
> 
> diff --git a/inany.h b/inany.h
> index fe652ff7..2058f145 100644
> --- a/inany.h
> +++ b/inany.h
> @@ -55,6 +55,56 @@ static inline bool inany_equals(const union inany_addr *a,
>  	return IN6_ARE_ADDR_EQUAL(&a->a6, &b->a6);
>  }
>  
> +/** inany_is_loopback - Check if address is loopback

Nit: inany_is_loopback() (and four occurrences below).

> + * @a:		IPv[46] address
> + *
> + * Return: true if @a is either ::1 or in 127.0.0.1/8
> + */
> +static inline bool inany_is_loopback(const union inany_addr *a)
> +{
> +	const struct in_addr *v4 = inany_v4(a);
> +
> +	return IN6_IS_ADDR_LOOPBACK(&a->a6) || (v4 && IN4_IS_ADDR_LOOPBACK(v4));
> +}
> +
> +/** inany_is_unspecified - Check if address is unspecified
> + * @a:		IPv[46] address
> + *
> + * Return: true if @a is either :: or 0.0.0.0
> + */
> +static inline bool inany_is_unspecified(const union inany_addr *a)
> +{
> +	const struct in_addr *v4 = inany_v4(a);
> +
> +	return IN6_IS_ADDR_UNSPECIFIED(&a->a6) ||
> +		(v4 && IN4_IS_ADDR_UNSPECIFIED(v4));
> +}
> +
> +/** inany_is_multicast - Check if address is multicast or broadcast
> + * @a:		IPv[46] address
> + *
> + * Return: true if @a is IPv6 multicast or IPv4 multicast or broadcast
> + */
> +static inline bool inany_is_multicast(const union inany_addr *a)
> +{
> +	const struct in_addr *v4 = inany_v4(a);
> +
> +	return IN6_IS_ADDR_MULTICAST(&a->a6) ||
> +		(v4 && (IN4_IS_ADDR_MULTICAST(v4) ||
> +			IN4_IS_ADDR_BROADCAST(v4)));
> +}
> +
> +/** inany_is_unicast - Check if address is specified and unicast
> + * @a:		IPv[46] address
> + *
> + * Return: true if @a is specified and a unicast address
> + */
> +/* cppcheck-suppress unusedFunction */
> +static inline bool inany_is_unicast(const union inany_addr *a)
> +{
> +	return !inany_is_unspecified(a) && !inany_is_multicast(a);
> +}
> +
>  /** inany_from_af - Set IPv[46] address from IPv4 or IPv6 address
>   * @aa:		Pointer to store IPv[46] address
>   * @af:		Address family of @addr
> diff --git a/tcp_splice.c b/tcp_splice.c
> index cc9745e8..4ecc178b 100644
> --- a/tcp_splice.c
> +++ b/tcp_splice.c
> @@ -440,29 +440,20 @@ bool tcp_splice_conn_from_sock(const struct ctx *c,
>  			       struct tcp_splice_conn *conn, int s,
>  			       const struct sockaddr *sa)
>  {
> -	const struct in_addr *a4;
>  	union inany_addr aany;
>  	in_port_t port;
>  
>  	ASSERT(c->mode == MODE_PASTA);
>  
>  	inany_from_sockaddr(&aany, &port, sa);
> -	a4 = inany_v4(&aany);
> -
> -	if (a4) {
> -		if (!IN4_IS_ADDR_LOOPBACK(a4))
> -			return false;
> -		conn->flags = 0;
> -	} else {
> -		if (!IN6_IS_ADDR_LOOPBACK(&aany.a6))
> -			return false;
> -		conn->flags = SPLICE_V6;
> -	}
> +	if (!inany_is_loopback(&aany))
> +		return false;
>  
>  	if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int)))
>  		flow_trace(conn, "failed to set TCP_QUICKACK on %i", s);
>  
>  	conn->f.type = FLOW_TCP_SPLICE;
> +	conn->flags = inany_v4(&aany) ? 0 : SPLICE_V6;
>  	conn->s[0] = s;
>  
>  	if (tcp_splice_new(c, conn, ref.port, ref.pif))


  reply	other threads:[~2024-02-18 20:59 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06  1:17 [PATCH v2 00/22] More flow table preliminaries: address handling improvements David Gibson
2024-02-06  1:17 ` [PATCH v2 01/22] treewide: Use sa_family_t for address family variables David Gibson
2024-02-06  1:17 ` [PATCH v2 02/22] inany: Helper to test for various address types David Gibson
2024-02-18 20:58   ` Stefano Brivio [this message]
2024-02-19  1:48     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 03/22] inany: Add inany_ntop() helper David Gibson
2024-02-06  1:17 ` [PATCH v2 04/22] inany: Provide more conveniently typed constants for special addresses David Gibson
2024-02-06  1:17 ` [PATCH v2 05/22] inany: Introduce union sockaddr_inany David Gibson
2024-02-06  1:17 ` [PATCH v2 06/22] util: Allow IN4_IS_* macros to operate on untyped addresses David Gibson
2024-02-06  1:17 ` [PATCH v2 07/22] tcp, udp: Don't precompute port remappings in epoll references David Gibson
2024-02-06  1:17 ` [PATCH v2 08/22] flow: Add helper to determine a flow's protocol David Gibson
2024-02-06  1:17 ` [PATCH v2 09/22] tcp_splice: Simplify clean up logic David Gibson
2024-02-18 20:59   ` Stefano Brivio
2024-02-19  1:50     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 10/22] tcp_splice: Don't use flow_trace() before setting flow type David Gibson
2024-02-06  1:17 ` [PATCH v2 11/22] flow: Clarify flow entry life cycle, introduce uniform logging David Gibson
2024-02-18 21:00   ` Stefano Brivio
2024-02-19  1:58     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 12/22] tcp, tcp_splice: Helpers for getting sockets from the pools David Gibson
2024-02-18 21:00   ` Stefano Brivio
2024-02-19  1:51     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 13/22] tcp_splice: More specific variable names in new splice path David Gibson
2024-02-18 21:00   ` Stefano Brivio
2024-02-19  1:53     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 14/22] tcp_splice: Merge tcp_splice_new() into its caller David Gibson
2024-02-06  1:17 ` [PATCH v2 15/22] tcp_splice: Make tcp_splice_connect() create its own sockets David Gibson
2024-02-06  1:17 ` [PATCH v2 16/22] tcp_splice: Improve error reporting on connect path David Gibson
2024-02-18 21:01   ` Stefano Brivio
2024-02-19  3:23     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 17/22] tcp_splice: Improve logic deciding when to splice David Gibson
2024-02-06  1:17 ` [PATCH v2 18/22] tcp, tcp_splice: Parse listening socket epoll ref in tcp_listen_handler() David Gibson
2024-02-06  1:17 ` [PATCH v2 19/22] tcp: Validate TCP endpoint addresses David Gibson
2024-02-22 12:45   ` Stefano Brivio
2024-02-23  3:56     ` David Gibson
2024-02-06  1:17 ` [PATCH v2 20/22] tap: Disallow loopback addresses on tap interface David Gibson
2024-02-06  1:17 ` [PATCH v2 21/22] port_fwd: Fix copypasta error in port_fwd_scan_udp() comments David Gibson
2024-02-06  1:17 ` [PATCH v2 22/22] fwd: Rename port_fwd.[ch] and their contents David Gibson
2024-02-27 14:22 ` [PATCH v2 00/22] More flow table preliminaries: address handling improvements 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=20240218215844.767562fc@elisabeth \
    --to=sbrivio@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --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).