From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202508 header.b=I5oQ+yR3; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id C63DA5A027C for ; Thu, 21 Aug 2025 04:03:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202508; t=1755741833; bh=8Nog02fSWN5cogiB46JdM3/E5KfdVNDhFBRi1lkD9xU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=I5oQ+yR3rtc8UlnIQ8c+I7OvvEZoh21fsA58GATzUGCuFYog3ssHtPtdeSd+QWlMv fPC+AiZCUQDvMnIYuZ9MHztL3UK4ZmO89OzUqzTCLz/nCvo1UUUaBowzZ/yOtso7cA HbTREZDU+/gPvaBTp3GdNsqyI+perDulv98stCkwqhn6+hSZROg1NUle0uqnuF/5yx giD2THDdLqiuudn6L0RSEACkq/2f6eKPHXUDYYYA6PnJO9JgTmbvGlRhhlrEKeuGCe adXPusi0h62dbckxeWvfZhjbg3qlQgzNznM32yV4NO1H/cLBOB5deEuHYf+/u4RzCd YcpSIyuGABMcQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4c6mp121glz4xPd; Thu, 21 Aug 2025 12:03:53 +1000 (AEST) Date: Thu, 21 Aug 2025 11:37:50 +1000 From: David Gibson To: Jon Maloy Subject: Re: [PATCH v4 5/9] tcp: forward external source MAC address through tap interface Message-ID: References: <20250820031005.2725591-1-jmaloy@redhat.com> <20250820031005.2725591-6-jmaloy@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DuUJ+h+T0frWW5MW" Content-Disposition: inline In-Reply-To: <20250820031005.2725591-6-jmaloy@redhat.com> Message-ID-Hash: QZKW4GZGVZFULTOQKW2GE5TTNBHT3HZY X-Message-ID-Hash: QZKW4GZGVZFULTOQKW2GE5TTNBHT3HZY X-MailFrom: dgibson@gandalf.ozlabs.org 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 CC: sbrivio@redhat.com, dgibson@redhat.com, passt-dev@passt.top 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: --DuUJ+h+T0frWW5MW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 19, 2025 at 11:10:01PM -0400, Jon Maloy wrote: > We forward the incoming mac address through the tap interface when > receiving incoming packets from network local hosts. Packets from > the own host are excepted from this rule, and are still forwarded > with the default PASST/PASTA MAC address as source. >=20 > This is a part of the solution to bug > https://bugs.passt.top/show_bug.cgi?id=3D120 >=20 > Signed-off-by: Jon Maloy Reviewed-by: David Gibson > --- > passt.c | 7 +++---- > passt.h | 3 +-- > pasta.c | 2 +- > tap.c | 2 +- > tcp.c | 5 ++++- > tcp.h | 2 +- > tcp_buf.c | 29 ++++++++++++----------------- > tcp_internal.h | 2 +- > tcp_vu.c | 5 ++--- > udp.c | 1 - > 10 files changed, 26 insertions(+), 32 deletions(-) >=20 > diff --git a/passt.c b/passt.c > index 477a01f..746c9ff 100644 > --- a/passt.c > +++ b/passt.c > @@ -149,11 +149,10 @@ static void timer_init(struct ctx *c, const struct = timespec *now) > /** > * proto_update_l2_buf() - Update scatter-gather L2 buffers in protocol = handlers > * @eth_d: Ethernet destination address, NULL if unchanged > - * @eth_s: Ethernet source address, NULL if unchanged > */ > -void proto_update_l2_buf(const unsigned char *eth_d, const unsigned char= *eth_s) > +void proto_update_l2_buf(const unsigned char *eth_d) > { > - tcp_update_l2_buf(eth_d, eth_s); > + tcp_update_l2_buf(eth_d); > udp_update_l2_buf(eth_d); > } > =20 > @@ -255,7 +254,7 @@ int main(int argc, char **argv) > if ((!c.no_udp && udp_init(&c)) || (!c.no_tcp && tcp_init(&c))) > _exit(EXIT_FAILURE); > =20 > - proto_update_l2_buf(c.guest_mac, c.our_tap_mac); > + proto_update_l2_buf(c.guest_mac); > =20 > if (c.ifi4 && !c.no_dhcp) > dhcp_init(); > diff --git a/passt.h b/passt.h > index 4cfd6eb..2c5b3e1 100644 > --- a/passt.h > +++ b/passt.h > @@ -324,7 +324,6 @@ struct ctx { > bool migrate_exit; > }; > =20 > -void proto_update_l2_buf(const unsigned char *eth_d, > - const unsigned char *eth_s); > +void proto_update_l2_buf(const unsigned char *eth_d); > =20 > #endif /* PASST_H */ > diff --git a/pasta.c b/pasta.c > index c207692..f251331 100644 > --- a/pasta.c > +++ b/pasta.c > @@ -409,7 +409,7 @@ void pasta_ns_conf(struct ctx *c) > } > } > =20 > - proto_update_l2_buf(c->guest_mac, NULL); > + proto_update_l2_buf(c->guest_mac); > } > =20 > /** > diff --git a/tap.c b/tap.c > index 6db5d88..a5de8b7 100644 > --- a/tap.c > +++ b/tap.c > @@ -1085,7 +1085,7 @@ void tap_add_packet(struct ctx *c, ssize_t l2len, c= har *p, > =20 > if (memcmp(c->guest_mac, eh->h_source, ETH_ALEN)) { > memcpy(c->guest_mac, eh->h_source, ETH_ALEN); > - proto_update_l2_buf(c->guest_mac, NULL); > + proto_update_l2_buf(c->guest_mac); > } > =20 > switch (ntohs(eh->h_proto)) { > diff --git a/tcp.c b/tcp.c > index 957b498..1dd2e24 100644 > --- a/tcp.c > +++ b/tcp.c > @@ -920,7 +920,7 @@ static void tcp_fill_header(struct tcphdr *th, > * @no_tcp_csum: Do not set TCP checksum > */ > void tcp_fill_headers(const struct tcp_tap_conn *conn, > - struct tap_hdr *taph, > + struct tap_hdr *taph, struct ethhdr *eh, > struct iphdr *ip4h, struct ipv6hdr *ip6h, > struct tcphdr *th, struct iov_tail *payload, > const uint16_t *ip4_check, uint32_t seq, bool no_tcp_csum) > @@ -952,6 +952,7 @@ void tcp_fill_headers(const struct tcp_tap_conn *conn, > psum =3D proto_ipv4_header_psum(l4len, IPPROTO_TCP, > *src4, *dst4); > } > + eh->h_proto =3D htons_constant(ETH_P_IP); > } > =20 > if (ip6h) { > @@ -972,7 +973,9 @@ void tcp_fill_headers(const struct tcp_tap_conn *conn, > &ip6h->saddr, > &ip6h->daddr); > } > + eh->h_proto =3D htons_constant(ETH_P_IPV6); > } > + eth_update_mac(eh, NULL, conn->f.tap_omac); > =20 > tcp_fill_header(th, conn, seq); > =20 > diff --git a/tcp.h b/tcp.h > index 234a803..c1b8385 100644 > --- a/tcp.h > +++ b/tcp.h > @@ -24,7 +24,7 @@ int tcp_init(struct ctx *c); > void tcp_timer(struct ctx *c, const struct timespec *now); > void tcp_defer_handler(struct ctx *c); > =20 > -void tcp_update_l2_buf(const unsigned char *eth_d, const unsigned char *= eth_s); > +void tcp_update_l2_buf(const unsigned char *eth_d); > =20 > extern bool peek_offset_cap; > =20 > diff --git a/tcp_buf.c b/tcp_buf.c > index d1fca67..dac5788 100644 > --- a/tcp_buf.c > +++ b/tcp_buf.c > @@ -40,8 +40,7 @@ > /* Static buffers */ > =20 > /* Ethernet header for IPv4 and IPv6 frames */ > -static struct ethhdr tcp4_eth_src; > -static struct ethhdr tcp6_eth_src; > +static struct ethhdr tcp_eth_hdr[TCP_FRAMES_MEM]; > =20 > static struct tap_hdr tcp_payload_tap_hdr[TCP_FRAMES_MEM]; > =20 > @@ -67,12 +66,13 @@ static struct iovec tcp_l2_iov[TCP_FRAMES_MEM][TCP_NU= M_IOVS]; > /** > * tcp_update_l2_buf() - Update Ethernet header buffers with addresses > * @eth_d: Ethernet destination address, NULL if unchanged > - * @eth_s: Ethernet source address, NULL if unchanged > */ > -void tcp_update_l2_buf(const unsigned char *eth_d, const unsigned char *= eth_s) > +void tcp_update_l2_buf(const unsigned char *eth_d) > { > - eth_update_mac(&tcp4_eth_src, eth_d, eth_s); > - eth_update_mac(&tcp6_eth_src, eth_d, eth_s); > + int i; > + > + for (i =3D 0; i < TCP_FRAMES_MEM; i++) > + eth_update_mac(&tcp_eth_hdr[i], eth_d, NULL); > } > =20 > /** > @@ -85,9 +85,6 @@ void tcp_sock_iov_init(const struct ctx *c) > struct iphdr iph =3D L2_BUF_IP4_INIT(IPPROTO_TCP); > int i; > =20 > - tcp6_eth_src.h_proto =3D htons_constant(ETH_P_IPV6); > - tcp4_eth_src.h_proto =3D htons_constant(ETH_P_IP); > - > for (i =3D 0; i < ARRAY_SIZE(tcp_payload); i++) { > tcp6_payload_ip[i] =3D ip6; > tcp4_payload_ip[i] =3D iph; > @@ -164,6 +161,7 @@ static void tcp_l2_buf_fill_headers(const struct tcp_= tap_conn *conn, > struct tap_hdr *taph =3D iov[TCP_IOV_TAP].iov_base; > const struct flowside *tapside =3D TAPFLOW(conn); > const struct in_addr *a4 =3D inany_v4(&tapside->oaddr); > + struct ethhdr *eh =3D iov[TCP_IOV_ETH].iov_base; > struct ipv6hdr *ip6h =3D NULL; > struct iphdr *ip4h =3D NULL; > =20 > @@ -172,7 +170,7 @@ static void tcp_l2_buf_fill_headers(const struct tcp_= tap_conn *conn, > else > ip6h =3D iov[TCP_IOV_IP].iov_base; > =20 > - tcp_fill_headers(conn, taph, ip4h, ip6h, th, &tail, > + tcp_fill_headers(conn, taph, eh, ip4h, ip6h, th, &tail, > check, seq, no_tcp_csum); > } > =20 > @@ -194,14 +192,12 @@ int tcp_buf_send_flag(const struct ctx *c, struct t= cp_tap_conn *conn, int flags) > int ret; > =20 > iov =3D tcp_l2_iov[tcp_payload_used]; > - if (CONN_V4(conn)) { > + if (CONN_V4(conn)) > iov[TCP_IOV_IP] =3D IOV_OF_LVALUE(tcp4_payload_ip[tcp_payload_used]); > - iov[TCP_IOV_ETH].iov_base =3D &tcp4_eth_src; > - } else { > + else > iov[TCP_IOV_IP] =3D IOV_OF_LVALUE(tcp6_payload_ip[tcp_payload_used]); > - iov[TCP_IOV_ETH].iov_base =3D &tcp6_eth_src; > - } > =20 > + iov[TCP_IOV_ETH] =3D IOV_OF_LVALUE(tcp_eth_hdr[tcp_payload_used]); > payload =3D iov[TCP_IOV_PAYLOAD].iov_base; > seq =3D conn->seq_to_tap; > ret =3D tcp_prepare_flags(c, conn, flags, &payload->th, > @@ -259,11 +255,10 @@ static void tcp_data_to_tap(const struct ctx *c, st= ruct tcp_tap_conn *conn, > check =3D &iph->check; > } > iov[TCP_IOV_IP] =3D IOV_OF_LVALUE(tcp4_payload_ip[tcp_payload_used]); > - iov[TCP_IOV_ETH].iov_base =3D &tcp4_eth_src; > } else if (CONN_V6(conn)) { > iov[TCP_IOV_IP] =3D IOV_OF_LVALUE(tcp6_payload_ip[tcp_payload_used]); > - iov[TCP_IOV_ETH].iov_base =3D &tcp6_eth_src; > } > + iov[TCP_IOV_ETH].iov_base =3D &tcp_eth_hdr[tcp_payload_used]; > payload =3D iov[TCP_IOV_PAYLOAD].iov_base; > payload->th.th_off =3D sizeof(struct tcphdr) / 4; > payload->th.th_x2 =3D 0; > diff --git a/tcp_internal.h b/tcp_internal.h > index 36c6533..6c2d1ef 100644 > --- a/tcp_internal.h > +++ b/tcp_internal.h > @@ -167,7 +167,7 @@ void tcp_rst_do(const struct ctx *c, struct tcp_tap_c= onn *conn); > struct tcp_info_linux; > =20 > void tcp_fill_headers(const struct tcp_tap_conn *conn, > - struct tap_hdr *taph, > + struct tap_hdr *taph, struct ethhdr *eh, > struct iphdr *ip4h, struct ipv6hdr *ip6h, > struct tcphdr *th, struct iov_tail *payload, > const uint16_t *ip4_check, uint32_t seq, bool no_tcp_csum); > diff --git a/tcp_vu.c b/tcp_vu.c > index cb39bc2..a895d6c 100644 > --- a/tcp_vu.c > +++ b/tcp_vu.c > @@ -135,7 +135,7 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_= tap_conn *conn, int flags) > flags_elem[0].in_sg[0].iov_len =3D hdrlen + optlen; > payload =3D IOV_TAIL(flags_elem[0].in_sg, 1, hdrlen); > =20 > - tcp_fill_headers(conn, NULL, ip4h, ip6h, th, &payload, > + tcp_fill_headers(conn, NULL, eh, ip4h, ip6h, th, &payload, > NULL, seq, !*c->pcap); > =20 > if (*c->pcap) { > @@ -315,7 +315,6 @@ static void tcp_vu_prepare(const struct ctx *c, struc= t tcp_tap_conn *conn, > eh =3D vu_eth(base); > =20 > memcpy(eh->h_dest, c->guest_mac, sizeof(eh->h_dest)); > - memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source)); > =20 > /* initialize header */ > =20 > @@ -339,7 +338,7 @@ static void tcp_vu_prepare(const struct ctx *c, struc= t tcp_tap_conn *conn, > th->ack =3D 1; > th->psh =3D push; > =20 > - tcp_fill_headers(conn, NULL, ip4h, ip6h, th, &payload, > + tcp_fill_headers(conn, NULL, eh, ip4h, ip6h, th, &payload, > *check, conn->seq_to_tap, no_tcp_csum); > if (ip4h) > *check =3D &ip4h->check; > diff --git a/udp.c b/udp.c > index 35e3603..30937dd 100644 > --- a/udp.c > +++ b/udp.c > @@ -207,7 +207,6 @@ void udp_portmap_clear(void) > /** > * udp_update_l2_buf() - Update L2 buffers with Ethernet and IPv4 addres= ses > * @eth_d: Ethernet destination address, NULL if unchanged > - * @eth_s: Ethernet source address, NULL if unchanged > */ > void udp_update_l2_buf(const unsigned char *eth_d) > { --=20 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 --DuUJ+h+T0frWW5MW Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmimeG0ACgkQzQJF27ox 2GdzWA/+OpeoPEOhcJfvHxC5QKz7rlkNlJI2YWyDBnWK8RThxmJppRh8VCkx4X2t faagvez28P7yoAZTA3WG2mZldqL1Yj2dJ7hl3J/33P6WPDdsDeYH8uzJeXpb4ki/ iGCv7hvI55ic0AXyLRF+1gshz/PCOaSjv+Rvd+c/9bkjXdfNq7fVPMKYtEUW1GIG egYjAMQCzUvAJwascZ4OZfw19mEMH1QjPXLAl+rSkRzAdzDGO+mAVPZ84WA+4Gnb p57eDG2ekyQRN4Y/In4uQUVU9eUpqM2QzrzsM3kyrG9cYPmRjGbhUCuD8VMUlfZL VPI+5tqfGYrWkd01Jo8XPJDmPC2UBnRN6QPxv86Tck8rLQQ3iPWeBtaANsoFTqxE GahdHpxBSmeZvQMzH8eX+yhvDslHFLAqkdMIG3ZYtWKcF7Xp5rl3ZKG4f6i4AAjH nZ52M77S2NN4McenzIpRkO9KmOYH96S+luZxgYnOtiwzJ2KMPbg5gAGxMyyGqrMd 19u6JuSBwqKdrp82NtGtJBDC4vLyRw1QPbSmmf9fsV7oT/95ULYAzwwM15VzdAOq /MPoka6pEuen6ZR95zthrP2G+HcvFmJkpgaQ2TdK080liPnkvd0Fti8I0DR2gWf2 RTf8Ilj5wDeebcMJ45xnnHC5S+h1CauQAYCHOppyf7Sc/K1dH7E= =UILw -----END PGP SIGNATURE----- --DuUJ+h+T0frWW5MW--