From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=C7rp5Hze; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 774415A0285 for ; Sun, 29 Jun 2025 19:13:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751217237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GVCx6OKT8HA1tNLyA1k1Tw+ulB3TU7xVUBdAgd8FaS8=; b=C7rp5HzeTh2ihb56/q6GtrVUdTmkNt+prYUEFBZhyelvyRiNCpLy/QyhPjMaclmUI+CTgI 7rnqYeNhkFM9or3BUzagrEhQaArzBudVWx/Xb85fFKkgxvgScfIjpg2ktBBytnf7yz9+xI REjzx5IVNs+WVON1/z+DfH+DhM7xWSQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-161-hIydT8x0Nf2DcbrRUKEcFw-1; Sun, 29 Jun 2025 13:13:55 -0400 X-MC-Unique: hIydT8x0Nf2DcbrRUKEcFw-1 X-Mimecast-MFC-AGG-ID: hIydT8x0Nf2DcbrRUKEcFw_1751217235 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D42C019560BE; Sun, 29 Jun 2025 17:13:54 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.rmtcaqc.csb (unknown [10.22.64.73]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FF45195609D; Sun, 29 Jun 2025 17:13:52 +0000 (UTC) From: Jon Maloy To: sbrivio@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, jmaloy@redhat.com, passt-dev@passt.top Subject: [PATCH v3 2/8] arp/ndp: respond with true MAC address of LAN local remote hosts Date: Sun, 29 Jun 2025 13:13:41 -0400 Message-ID: <20250629171348.86323-3-jmaloy@redhat.com> In-Reply-To: <20250629171348.86323-1-jmaloy@redhat.com> References: <20250629171348.86323-1-jmaloy@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 19OruLpV4X_PDgZ-4ZIsldmcyV_r7z5EYFs31LIgOrw_1751217235 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 7L3CRSY4KRZPXCABM3W7QMMIIEN63T7F X-Message-ID-Hash: 7L3CRSY4KRZPXCABM3W7QMMIIEN63T7F X-MailFrom: jmaloy@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When we receive an ARP request or NDP neigbor solicitation over the tap interface for a host on the local network segment attached to the template interface, we respond with that host's real MAC address. The local host, which is acting as a proxy for the default gateway, is still exempted from this rule. Signed-off-by: Jon Maloy --- v3: - Added helper function to find out if a remote ip address is subject to NAT. This filters out local host addresses which should be presented with the passt/pasta local MAC address 9a:55:9a:55:9a:55 even though it is on the local segment. - Adapted to the change in nl_mac_get() function, so that we now consider only the template interface when checking the ARP/NDP table. --- arp.c | 9 +++++++++ fwd.c | 2 +- fwd.h | 3 ++- inany.c | 15 +++++++++++++++ inany.h | 1 + ndp.c | 9 +++++++++ 6 files changed, 37 insertions(+), 2 deletions(-) diff --git a/arp.c b/arp.c index fc482bb..1952a63 100644 --- a/arp.c +++ b/arp.c @@ -29,6 +29,7 @@ #include "dhcp.h" #include "passt.h" #include "tap.h" +#include "netlink.h" /** * arp() - Check if this is a supported ARP message, reply as needed @@ -40,6 +41,7 @@ int arp(const struct ctx *c, const struct pool *p) { unsigned char swap[4]; + union inany_addr tgt; struct ethhdr *eh; struct arphdr *ah; struct arpmsg *am; @@ -72,6 +74,13 @@ int arp(const struct ctx *c, const struct pool *p) memcpy(am->tha, am->sha, sizeof(am->tha)); memcpy(am->sha, c->our_tap_mac, sizeof(am->sha)); + /* Respond with true MAC address if remote host is on + * the template interface's network segment + */ + inany_from_af(&tgt, AF_INET, am->tip); + if (!inany_nat(c, &tgt)) + nl_mac_get(nl_sock, &tgt, c->ifi4, am->sha); + memcpy(swap, am->tip, sizeof(am->tip)); memcpy(am->tip, am->sip, sizeof(am->tip)); memcpy(am->sip, swap, sizeof(am->sip)); diff --git a/fwd.c b/fwd.c index 250cf56..02ebc9d 100644 --- a/fwd.c +++ b/fwd.c @@ -332,7 +332,7 @@ static bool fwd_guest_accessible(const struct ctx *c, * Only handles translations that depend *only* on the address. Anything * related to specific ports or flows is handled elsewhere. */ -static void nat_outbound(const struct ctx *c, const union inany_addr *addr, +void nat_outbound(const struct ctx *c, const union inany_addr *addr, union inany_addr *translated) { if (inany_equals4(addr, &c->ip4.map_host_loopback)) diff --git a/fwd.h b/fwd.h index 0458a3c..61632f2 100644 --- a/fwd.h +++ b/fwd.h @@ -56,5 +56,6 @@ uint8_t fwd_nat_from_splice(const struct ctx *c, uint8_t proto, const struct flowside *ini, struct flowside *tgt); uint8_t fwd_nat_from_host(const struct ctx *c, uint8_t proto, const struct flowside *ini, struct flowside *tgt); - +void nat_outbound(const struct ctx *c, const union inany_addr *addr, + union inany_addr *translated); #endif /* FWD_H */ diff --git a/inany.c b/inany.c index f5483bf..0ecf10a 100644 --- a/inany.c +++ b/inany.c @@ -16,6 +16,7 @@ #include "ip.h" #include "siphash.h" #include "inany.h" +#include "fwd.h" const union inany_addr inany_loopback4 = INANY_INIT4(IN4ADDR_LOOPBACK_INIT); const union inany_addr inany_any4 = INANY_INIT4(IN4ADDR_ANY_INIT); @@ -56,3 +57,17 @@ int inany_pton(const char *src, union inany_addr *dst) return 0; } + +/** inany_nat - Find if a remote IPv[46] address is subject to NAT + * @c: Execution context + * @addr: IPv[46] address + * + * Return: true if translated, false otherwise + */ +bool inany_nat(const struct ctx *c, const union inany_addr *addr) +{ + union inany_addr addr_nat; + + nat_outbound(c, addr, &addr_nat); + return !inany_equals(addr, &addr_nat); +} diff --git a/inany.h b/inany.h index 7ca5cbd..b2a66b0 100644 --- a/inany.h +++ b/inany.h @@ -278,5 +278,6 @@ static inline void inany_siphash_feed(struct siphash_state *state, const char *inany_ntop(const union inany_addr *src, char *dst, socklen_t size); int inany_pton(const char *src, union inany_addr *dst); +bool inany_nat(const struct ctx *c, const union inany_addr *addr); #endif /* INANY_H */ diff --git a/ndp.c b/ndp.c index 3e15494..2e7f0bc 100644 --- a/ndp.c +++ b/ndp.c @@ -32,6 +32,7 @@ #include "passt.h" #include "tap.h" #include "log.h" +#include "netlink.h" #define RT_LIFETIME 65535 @@ -196,6 +197,7 @@ static void ndp_send(const struct ctx *c, const struct in6_addr *dst, static void ndp_na(const struct ctx *c, const struct in6_addr *dst, const struct in6_addr *addr) { + union inany_addr tgt; struct ndp_na na = { .ih = { .icmp6_type = NA, @@ -215,6 +217,13 @@ static void ndp_na(const struct ctx *c, const struct in6_addr *dst, memcpy(na.target_l2_addr.mac, c->our_tap_mac, ETH_ALEN); + /* Respond with true link-layer address if remote host is on + * the template interface's network segment + */ + inany_from_af(&tgt, AF_INET6, addr); + if (!inany_nat(c, &tgt)) + nl_mac_get(nl_sock, &tgt, c->ifi6, na.target_l2_addr.mac); + ndp_send(c, dst, &na, sizeof(na)); } -- 2.48.1