On Wed, Apr 02, 2025 at 07:23:41PM +0200, Laurent Vivier wrote:
> Use packet_base() and extract headers using IOV_PEEK_HEADER()
> rather than packet_get().

This appears to convert tap4_handler(), but not tap6_handler()?

> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  tap.c | 31 ++++++++++++++++++-------------
>  1 file changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/tap.c b/tap.c
> index 4b54807c4101..bb4e23df226e 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -680,28 +680,33 @@ static int tap4_handler(struct ctx *c, const struct pool *in,
>  	i = 0;
>  resume:
>  	for (seq_count = 0, seq = NULL; i < in->count; i++) {
> -		size_t l2len, l3len, hlen, l4len;
> +		size_t l3len, hlen, l4len;
>  		const struct ethhdr *eh;
>  		const struct udphdr *uh;
>  		struct iov_tail data;
> +		struct ethhdr ehc;
>  		struct iphdr *iph;
> -		const char *l4h;
> +		struct iphdr iphc;
> +		struct udphdr uhc;
>  
> -		packet_get(in, i, 0, 0, &l2len);
> +		if (!packet_base(in, i, &data))
> +			continue;
>  
> -		eh = packet_get(in, i, 0, sizeof(*eh), &l3len);
> +		eh = IOV_PEEK_HEADER(&data, ehc);
>  		if (!eh)
>  			continue;
>  		if (ntohs(eh->h_proto) == ETH_P_ARP) {
>  			PACKET_POOL_P(pkt, 1, in->buf, in->buf_size);
>  
> -			data = IOV_TAIL_FROM_BUF((void *)eh, l2len, 0);
>  			packet_add(pkt, &data);
>  			arp(c, pkt);
>  			continue;
>  		}
>  
> -		iph = packet_get(in, i, sizeof(*eh), sizeof(*iph), NULL);
> +		data.off += sizeof(*eh);

iov_drop()

> +		l3len = iov_tail_size(&data);
> +
> +		iph = IOV_PEEK_HEADER(&data, iphc);
>  		if (!iph)
>  			continue;
>  
> @@ -729,8 +734,8 @@ resume:
>  		if (iph->saddr && c->ip4.addr_seen.s_addr != iph->saddr)
>  			c->ip4.addr_seen.s_addr = iph->saddr;
>  
> -		l4h = packet_get(in, i, sizeof(*eh) + hlen, l4len, NULL);
> -		if (!l4h)
> +		data.off += hlen;

iov_drop().  Or just use IOV_REMOVE_HEADER() above.

> +		if (iov_tail_size(&data) != l4len)
>  			continue;
>  
>  		if (iph->protocol == IPPROTO_ICMP) {
> @@ -741,7 +746,6 @@ resume:
>  
>  			tap_packet_debug(iph, NULL, NULL, 0, NULL, 1);
>  
> -			data = IOV_TAIL_FROM_BUF((void *)l4h, l4len, 0);
>  			packet_add(pkt, &data);
>  			icmp_tap_handler(c, PIF_TAP, AF_INET,
>  					 &iph->saddr, &iph->daddr,
> @@ -749,15 +753,17 @@ resume:
>  			continue;
>  		}
>  
> -		uh = packet_get(in, i, sizeof(*eh) + hlen, sizeof(*uh), NULL);
> +		uh = IOV_PEEK_HEADER(&data, uhc);
>  		if (!uh)
>  			continue;
>  
>  		if (iph->protocol == IPPROTO_UDP) {
> +			struct iov_tail eh_data;
> +
>  			PACKET_POOL_P(pkt, 1, in->buf, in->buf_size);
>  
> -			data = IOV_TAIL_FROM_BUF((void *)eh, l2len, 0);
> -			packet_add(pkt, &data);
> +			packet_base(in, i, &eh_data);
> +			packet_add(pkt, &eh_data);
>  			if (dhcp(c, pkt))
>  				continue;
>  		}
> @@ -806,7 +812,6 @@ resume:
>  #undef L4_SET
>  
>  append:
> -		data = IOV_TAIL_FROM_BUF((void *)l4h, l4len, 0);
>  		packet_add((struct pool *)&seq->p, &data);
>  	}
>  

-- 
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