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=w3/1Fwjs; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 3D29B5A0279 for ; Wed, 06 Aug 2025 08:35:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202508; t=1754462131; bh=3N4j07fDV+tKZ8Cqq+keII3o9xmzqy4iofN4bMm7K8k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=w3/1FwjsM6dHHkucQQ2uFklqmeSYUflkpck6g2Pv5IqSe9llThjQ6lkpPlbsDHKTk ib9oM5YAqL9q7KLE7fivOChIggRbQ3P7byjRpgsz4LVt8hTxHp1PJfTu7hohhrNGvK 1iH2fc7GF9rXV3pAbt8R8AtgJu+itGXtLZfsOHQzmHQ/ph8auObbtsfLFIe+231mxa IQIq5pfWrB2+eIWwRJPWSC33WVeLmQ4yXJoXY8Lc9rhEc7txr0vtGKhK9A1S0BtSDf dtHRjKKQ49sgEi+Gm6FmsTqCN5gPFizb+hk6JR5upSLrv/CgDmqxZa3SiWdzXshEWg +Y4Ku92NakBuA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4bxgXM0qHCz4xck; Wed, 6 Aug 2025 16:35:31 +1000 (AEST) Date: Wed, 6 Aug 2025 16:22:29 +1000 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v8 21/30] packet: rename packet_data() to packet_get() Message-ID: References: <20250805154628.301343-1-lvivier@redhat.com> <20250805154628.301343-22-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1wCyYRWFNhyTAT2x" Content-Disposition: inline In-Reply-To: <20250805154628.301343-22-lvivier@redhat.com> Message-ID-Hash: TOUVKOV3VGW6C5ZSVKK4P2RPB5OQEJTI X-Message-ID-Hash: TOUVKOV3VGW6C5ZSVKK4P2RPB5OQEJTI 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: 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: --1wCyYRWFNhyTAT2x Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 05, 2025 at 05:46:19PM +0200, Laurent Vivier wrote: > As we have removed packet_get(), we can rename packet_data() to packet_ge= t() > as the name is clearer. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- > arp.c | 2 +- > dhcp.c | 2 +- > dhcpv6.c | 2 +- > icmp.c | 2 +- > ndp.c | 2 +- > packet.c | 8 ++++---- > packet.h | 9 ++++----- > tap.c | 6 +++--- > tcp.c | 4 ++-- > udp.c | 4 ++-- > 10 files changed, 20 insertions(+), 21 deletions(-) >=20 > diff --git a/arp.c b/arp.c > index b3ac42082841..8b97df633e70 100644 > --- a/arp.c > +++ b/arp.c > @@ -82,7 +82,7 @@ int arp(const struct ctx *c, const struct pool *p) > const struct arpmsg *am; > struct iov_tail data; > =20 > - if (!packet_data(p, 0, &data)) > + if (!packet_get(p, 0, &data)) > return -1; > =20 > eh =3D IOV_REMOVE_HEADER(&data, eh_storage); > diff --git a/dhcp.c b/dhcp.c > index cf73d4b07767..47317f334945 100644 > --- a/dhcp.c > +++ b/dhcp.c > @@ -317,7 +317,7 @@ int dhcp(const struct ctx *c, const struct pool *p) > unsigned int i; > struct msg m_storage; > =20 > - if (!packet_data(p, 0, &data)) > + if (!packet_get(p, 0, &data)) > return -1; > =20 > eh =3D IOV_REMOVE_HEADER(&data, eh_storage); > diff --git a/dhcpv6.c b/dhcpv6.c > index e93acaf9955e..f54a75c642df 100644 > --- a/dhcpv6.c > +++ b/dhcpv6.c > @@ -562,7 +562,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > const struct udphdr *uh; > size_t mlen, n; > =20 > - if (!packet_data(p, 0, &data)) > + if (!packet_get(p, 0, &data)) > return -1; > =20 > uh =3D IOV_REMOVE_HEADER(&data, uh_storage); > diff --git a/icmp.c b/icmp.c > index fdfc857b5ae8..71c496540310 100644 > --- a/icmp.c > +++ b/icmp.c > @@ -251,7 +251,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif= , sa_family_t af, > (void)saddr; > ASSERT(pif =3D=3D PIF_TAP); > =20 > - if (!packet_data(p, 0, &data)) > + if (!packet_get(p, 0, &data)) > return -1; > =20 > if (af =3D=3D AF_INET) { > diff --git a/ndp.c b/ndp.c > index 5de4e508dc52..ba87a0aaa6e9 100644 > --- a/ndp.c > +++ b/ndp.c > @@ -354,7 +354,7 @@ int ndp(const struct ctx *c, const struct icmp6hdr *i= h, > const struct ndp_ns *ns; > struct iov_tail data; > =20 > - if (!packet_data(p, 0, &data)) > + if (!packet_get(p, 0, &data)) > return -1; > =20 > ns =3D IOV_REMOVE_HEADER(&data, ns_storage); > diff --git a/packet.c b/packet.c > index 5da18bafa576..cbc43c2fc22d 100644 > --- a/packet.c > +++ b/packet.c > @@ -122,7 +122,7 @@ void packet_add_do(struct pool *p, struct iov_tail *d= ata, > } > =20 > /** > - * packet_data_do() - Get data range from packet descriptor from given p= ool > + * packet_get_do() - Get data range from packet descriptor from given po= ol > * @p: Packet pool > * @idx: Index of packet descriptor in pool > * @data: IOV tail to store the address of the data (output) > @@ -132,9 +132,9 @@ void packet_add_do(struct pool *p, struct iov_tail *d= ata, > * Return: false if packet index is invalid, true otherwise. > * If something wrong with @data, don't return at all (assert). > */ > -bool packet_data_do(const struct pool *p, size_t idx, > - struct iov_tail *data, > - const char *func, int line) > +bool packet_get_do(const struct pool *p, size_t idx, > + struct iov_tail *data, > + const char *func, int line) > { > size_t i; > =20 > diff --git a/packet.h b/packet.h > index dab8274fa5c5..7afe80ef3fcf 100644 > --- a/packet.h > +++ b/packet.h > @@ -33,16 +33,15 @@ struct pool { > int vu_packet_check_range(void *buf, const char *ptr, size_t len); > void packet_add_do(struct pool *p, struct iov_tail *data, > const char *func, int line); > -bool packet_data_do(const struct pool *p, const size_t idx, > - struct iov_tail *data, > - const char *func, int line); > +bool packet_get_do(const struct pool *p, const size_t idx, > + struct iov_tail *data, const char *func, int line); > bool pool_full(const struct pool *p); > void pool_flush(struct pool *p); > =20 > #define packet_add(p, data) \ > packet_add_do(p, data, __func__, __LINE__) > -#define packet_data(p, idx, data) \ > - packet_data_do(p, idx, data, __func__, __LINE__) > +#define packet_get(p, idx, data) \ > + packet_get_do(p, idx, data, __func__, __LINE__) > =20 > #define PACKET_POOL_DECL(_name, _size, _buf) \ > struct _name ## _t { \ > diff --git a/tap.c b/tap.c > index 983f39ee8ee8..1d2e6fd802e9 100644 > --- a/tap.c > +++ b/tap.c > @@ -715,7 +715,7 @@ resume: > struct iov_tail data; > struct iphdr *iph; > =20 > - if (!packet_data(in, i, &data)) > + if (!packet_get(in, i, &data)) > continue; > =20 > eh =3D IOV_PEEK_HEADER(&data, eh_storage); > @@ -790,7 +790,7 @@ resume: > =20 > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > - packet_data(in, i, &eh_data); > + packet_get(in, i, &eh_data); > packet_add(pkt, &eh_data); > if (dhcp(c, pkt)) > continue; > @@ -905,7 +905,7 @@ resume: > struct ipv6hdr *ip6h; > uint8_t proto; > =20 > - if (!packet_data(in, i, &data)) > + if (!packet_get(in, i, &data)) > return -1; > =20 > eh =3D IOV_REMOVE_HEADER(&data, eh_storage); > diff --git a/tcp.c b/tcp.c > index e0efc4cacb9b..4ba066fd1cac 100644 > --- a/tcp.c > +++ b/tcp.c > @@ -1657,7 +1657,7 @@ static int tcp_data_from_tap(const struct ctx *c, s= truct tcp_tap_conn *conn, > size_t off, size; > int count; > =20 > - if (!packet_data(p, i, &data)) > + if (!packet_get(p, i, &data)) > return -1; > =20 > th =3D IOV_PEEK_HEADER(&data, th_storage); > @@ -1988,7 +1988,7 @@ int tcp_tap_handler(const struct ctx *c, uint8_t pi= f, sa_family_t af, > =20 > (void)pif; > =20 > - if (!packet_data(p, idx, &data)) > + if (!packet_get(p, idx, &data)) > return 1; > =20 > l4len =3D iov_tail_size(&data); > diff --git a/udp.c b/udp.c > index 3c25f2e0ae97..86585b7e0942 100644 > --- a/udp.c > +++ b/udp.c > @@ -990,7 +990,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, > =20 > ASSERT(!c->no_udp); > =20 > - if (!packet_data(p, idx, &data)) > + if (!packet_get(p, idx, &data)) > return 1; > =20 > uh =3D IOV_PEEK_HEADER(&data, uh_storage); > @@ -1033,7 +1033,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pi= f, > for (i =3D 0, j =3D 0; i < (int)p->count - idx && j < UIO_MAXIOV; i++) { > const struct udphdr *uh_send; > =20 > - if (!packet_data(p, idx + i, &data)) > + if (!packet_get(p, idx + i, &data)) > return p->count - idx; > =20 > uh_send =3D IOV_REMOVE_HEADER(&data, uh_storage); --=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 --1wCyYRWFNhyTAT2x Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmiS9KUACgkQzQJF27ox 2Ge+xg//d2bdWe5qJgecaq9zJHZf2ODNFxCPOg+VuAxGa10bOSWK6hCBiGneW6DK 55wfNTIXqZ2mBei+HeC14OwTbbOdejVmx+NwjmQLjuWoyi2aR2OTT/wT0/KNzMuV ew/fTMo7iWKgKXaStz5DAYiubssKSgydtaBu8meO1/5RzrGeOocjwTV0GoWaJzlJ DRcBPeqtpc5+3aqUHGVSuVdi3H73vlkhqDTJ+p4uwDYJ0g8oHOYNvv0woiIovThv Z1y52JFqbMY7BOcZ34I2CLRMozK8lKLRT8bCtjAX4xuolfIP5fQCHHmw0A2QSeZF 5B33Z52jfMuIAEyCTyE4bWTNvvTjO+r2OwhjsBC6Cs+VO3YsNrVA8kzeEqdpSq3z NL+xNKXI5llvpV2JWQ9uvKRjYrZvbRxPQLXcX+JvsOyvSx5o1YDwdfEidnOapSCm RtPla5ppPB3fFUuq+E7JdelaQQFnqNeqQ8kF20NiG4Vkni+R16iHtIerrQmrOBjJ 5IAivau3fPT/Wc5WGiyYknNqJnXLkbvrMy39iM156Li4xQHbBCp0PT6Z8g82eUNw siPffHjYOXrM2p3x06ngk7+cVfAlX/Xyh0bueQdh6dW+lJn0dbdkk8eaWQNO9Zsd +BEyC4CFHxijTbCyBB8PAnYYl1zkQszlzqTKxc+YU52GY22S4Ak= =fVgv -----END PGP SIGNATURE----- --1wCyYRWFNhyTAT2x--