Re: [PATCH 12/24] tap: make tap_update_mac() generic

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 4149 bytes --]

On Thu, Feb 08, 2024 at 06:10:51PM +0100, Stefano Brivio wrote:
> On Tue, 6 Feb 2024 12:49:40 +1100
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > On Fri, Feb 02, 2024 at 03:11:39PM +0100, Laurent Vivier wrote:
> > > Use ethhdr rather than tap_hdr.
> > > 
> > > Signed-off-by: Laurent Vivier <lvivier@redhat.com>  
> > 
> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> > 
> > I'd be happy to see this applied immediately, in advance of the rest
> > of the series.
> 
> Oh, hm, do you need this for something around the flow table? I just
> have one nit below:

Need? No, not really.  I just think it's clearer, independent of the
VU changes.

> 
> > > ---
> > >  tap.c     | 6 +++---
> > >  tap.h     | 2 +-
> > >  tcp_buf.c | 8 ++++----
> > >  udp.c     | 4 ++--
> > >  4 files changed, 10 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/tap.c b/tap.c
> > > index 3ea03f720d6d..29f389057ac1 100644
> > > --- a/tap.c
> > > +++ b/tap.c
> > > @@ -447,13 +447,13 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n)
> > >   * @eth_d:	Ethernet destination address, NULL if unchanged
> > >   * @eth_s:	Ethernet source address, NULL if unchanged
> > >   */
> > > -void tap_update_mac(struct tap_hdr *taph,
> > > +void eth_update_mac(struct ethhdr *eh,
> 
> ...function comment should be updated accordingly.
> 
> > >  		    const unsigned char *eth_d, const unsigned char *eth_s)
> > >  {
> > >  	if (eth_d)
> > > -		memcpy(taph->eh.h_dest, eth_d, sizeof(taph->eh.h_dest));
> > > +		memcpy(eh->h_dest, eth_d, sizeof(eh->h_dest));
> > >  	if (eth_s)
> > > -		memcpy(taph->eh.h_source, eth_s, sizeof(taph->eh.h_source));
> > > +		memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
> > >  }
> > >  
> > >  PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);
> > > diff --git a/tap.h b/tap.h
> > > index 466d91466c3d..437b9aa2b43f 100644
> > > --- a/tap.h
> > > +++ b/tap.h
> > > @@ -74,7 +74,7 @@ void tap_icmp6_send(const struct ctx *c,
> > >  		    const void *in, size_t len);
> > >  int tap_send(const struct ctx *c, const void *data, size_t len);
> > >  size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n);
> > > -void tap_update_mac(struct tap_hdr *taph,
> > > +void eth_update_mac(struct ethhdr *eh,
> > >  		    const unsigned char *eth_d, const unsigned char *eth_s);
> > >  void tap_listen_handler(struct ctx *c, uint32_t events);
> > >  void tap_handler_pasta(struct ctx *c, uint32_t events,
> > > diff --git a/tcp_buf.c b/tcp_buf.c
> > > index d70e7f810e4a..4c1f00c1d1b2 100644
> > > --- a/tcp_buf.c
> > > +++ b/tcp_buf.c
> > > @@ -218,10 +218,10 @@ void tcp_buf_update_l2(const unsigned char *eth_d, const unsigned char *eth_s)
> > >  		struct tcp4_l2_buf_t *b4 = &tcp4_l2_buf[i];
> > >  		struct tcp6_l2_buf_t *b6 = &tcp6_l2_buf[i];
> > >  
> > > -		tap_update_mac(&b4->taph, eth_d, eth_s);
> > > -		tap_update_mac(&b6->taph, eth_d, eth_s);
> > > -		tap_update_mac(&b4f->taph, eth_d, eth_s);
> > > -		tap_update_mac(&b6f->taph, eth_d, eth_s);
> > > +		eth_update_mac(&b4->taph.eh, eth_d, eth_s);
> > > +		eth_update_mac(&b6->taph.eh, eth_d, eth_s);
> > > +		eth_update_mac(&b4f->taph.eh, eth_d, eth_s);
> > > +		eth_update_mac(&b6f->taph.eh, eth_d, eth_s);
> > >  	}
> > >  }
> > >  
> > > diff --git a/udp.c b/udp.c
> > > index 96b4e6ca9a85..db635742319b 100644
> > > --- a/udp.c
> > > +++ b/udp.c
> > > @@ -283,8 +283,8 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s)
> > >  		struct udp4_l2_buf_t *b4 = &udp4_l2_buf[i];
> > >  		struct udp6_l2_buf_t *b6 = &udp6_l2_buf[i];
> > >  
> > > -		tap_update_mac(&b4->taph, eth_d, eth_s);
> > > -		tap_update_mac(&b6->taph, eth_d, eth_s);
> > > +		eth_update_mac(&b4->taph.eh, eth_d, eth_s);
> > > +		eth_update_mac(&b6->taph.eh, eth_d, eth_s);
> > >  	}
> > >  }
> > >    
> > 
> 

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]