public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Jon Maloy <jmaloy@redhat.com>
To: sbrivio@redhat.com, david@gibson.dropbear.id.au,
	jmaloy@redhat.com, passt-dev@passt.top
Subject: [PATCH v9 2/5] fwd: Unify guest accessibility checks with unified address array
Date: Fri, 20 Nov 2026 14:24:34 -0500	[thread overview]
Message-ID: <20261120192437.1860855-3-jmaloy@redhat.com> (raw)
In-Reply-To: <20261120192437.1860855-1-jmaloy@redhat.com>

We replace the fwd_guest_accessible4() and fwd_guest_accessible6()
functions with a unified fwd_guest_accessible() function that handles
both address families. With the unified address array, we can check
all configured addresses in a single pass using for_each_addr() with
family filter AF_UNSPEC.

Signed-off-by: Jon Maloy <jmaloy@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

---
v6: -Some fixes based on feedback from David Gibson

v7: -Added curly brackets to for_each_loop() in fwd_guest_accessible(),
     as suggested by Stefano Brivio.

v9: Adapted to changes due to rebase and earlier changes in series
---
 fwd.c | 71 +++++++++++++----------------------------------------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/fwd.c b/fwd.c
index 48764c50..5716c9ad 100644
--- a/fwd.c
+++ b/fwd.c
@@ -847,20 +847,19 @@ static bool is_dns_flow(uint8_t proto, const struct flowside *ini)
 }
 
 /**
- * fwd_guest_accessible4() - Is IPv4 address guest-accessible
+ * fwd_guest_accessible() - Is address guest-accessible
  * @c:		Execution context
- * @addr:	Host visible IPv4 address
+ * @addr:	Host visible address (IPv4 or IPv6)
  *
  * Return: true if @addr on the host is accessible to the guest without
  *         translation, false otherwise
  */
-static bool fwd_guest_accessible4(const struct ctx *c,
-				  const struct in_addr *addr)
+static bool fwd_guest_accessible(const struct ctx *c,
+				 const union inany_addr *addr)
 {
 	const struct guest_addr *a;
-	const struct in_addr *a4;
 
-	if (IN4_IS_ADDR_LOOPBACK(addr))
+	if (inany_is_loopback(addr))
 		return false;
 
 	/* In socket interfaces 0.0.0.0 generally means "any" or unspecified,
@@ -868,39 +867,18 @@ static bool fwd_guest_accessible4(const struct ctx *c,
 	 * that has a different meaning for host and guest, we can't let it
 	 * through untranslated.
 	 */
-	if (IN4_IS_ADDR_UNSPECIFIED(addr))
+	if (inany_is_unspecified(addr))
 		return false;
 
-	/* For IPv4, addr_seen is initialised to addr, so is always a valid
-	 * address
+	/* Check against all configured guest addresses */
+	for_each_addr(a, c->addrs, c->addr_count, AF_UNSPEC) {
+		if (inany_equals(addr, &a->addr))
+			return false;
+	}
+	/* Also check addr_seen: it tracks the address the guest is actually
+	 * using, which may differ from configured addresses.
 	 */
-	a = fwd_get_addr(c, AF_INET, true, CONF_ADDR_ANY);
-	a4 = a ? inany_v4(&a->addr) : NULL;
-	if ((a4 && IN4_ARE_ADDR_EQUAL(addr, a4)) ||
-	    IN4_ARE_ADDR_EQUAL(addr, &c->ip4.addr_seen))
-		return false;
-
-	return true;
-}
-
-/**
- * fwd_guest_accessible6() - Is IPv6 address guest-accessible
- * @c:		Execution context
- * @addr:	Host visible IPv6 address
- *
- * Return: true if @addr on the host is accessible to the guest without
- *         translation, false otherwise
- */
-static bool fwd_guest_accessible6(const struct ctx *c,
-				  const struct in6_addr *addr)
-{
-	const struct guest_addr *a;
-
-	if (IN6_IS_ADDR_LOOPBACK(addr))
-		return false;
-
-	a = fwd_get_addr(c, AF_INET6, true, CONF_ADDR_ANY);
-	if (a && IN6_ARE_ADDR_EQUAL(addr, &a->addr.a6))
+	if (inany_equals4(addr, &c->ip4.addr_seen))
 		return false;
 
 	/* For IPv6, addr_seen starts unspecified, because we don't know what LL
@@ -908,31 +886,12 @@ static bool fwd_guest_accessible6(const struct ctx *c,
 	 * if it has been set to a real address.
 	 */
 	if (!IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr_seen) &&
-	    IN6_ARE_ADDR_EQUAL(addr, &c->ip6.addr_seen))
+	    inany_equals6(addr, &c->ip6.addr_seen))
 		return false;
 
 	return true;
 }
 
-/**
- * fwd_guest_accessible() - Is IPv[46] address guest-accessible
- * @c:		Execution context
- * @addr:	Host visible IPv[46] address
- *
- * Return: true if @addr on the host is accessible to the guest without
- *         translation, false otherwise
- */
-static bool fwd_guest_accessible(const struct ctx *c,
-				 const union inany_addr *addr)
-{
-	const struct in_addr *a4 = inany_v4(addr);
-
-	if (a4)
-		return fwd_guest_accessible4(c, a4);
-
-	return fwd_guest_accessible6(c, &addr->a6);
-}
-
 /**
  * nat_outbound() - Apply address translation for outbound (TAP to HOST)
  * @c:		Execution context
-- 
2.56.1


  parent reply	other threads:[~2026-11-20 19:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 19:24 [PATCH v9 0/5] Introduce multiple addresses Jon Maloy
2026-11-20 19:24 ` [PATCH v9 1/5] tap, conf: Replace addr_fixed with CONF_ADDR_USER flag check Jon Maloy
2026-11-20 19:24 ` Jon Maloy [this message]
2026-11-20 19:24 ` [PATCH v9 3/5] arp: Check all configured addresses in ARP filtering Jon Maloy
2026-11-20 19:24 ` [PATCH v9 4/5] conf: Allow multiple -a/--address options per address family Jon Maloy
2026-11-20 19:24 ` [PATCH v9 5/5] netlink, conf: Read all addresses from template interface at startup Jon Maloy

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=20261120192437.1860855-3-jmaloy@redhat.com \
    --to=jmaloy@redhat.com \
    --cc=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).