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=202502 header.b=khnCtkKD; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 3DF595A0271 for ; Thu, 03 Apr 2025 03:51:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743645057; bh=FnEDL5+iSHsMQWtOGsxOoptTxzDDgY+4gXL082UYpzU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=khnCtkKDBAJW88yRz+nNy2Zhf29pSv96EhFIuBDIt+h/hFV2RXj0oUuPqkGbtPjLT W9bE7xB2/BHzakfmG1TEPtI4fgzHpGNTslOEzZqQSNRm6QoWym+LBBgBE/I0dhBnUV +oqGN0NgSg5iGnd534jPIb1NgUzjz3m3w3xN37uqQ3q3UyQKV3r+jK7/2WOF/O7aG1 cikM5F8FEdEdnZZNrvV/PqcAvhtD6T5NY8748IYQkYFWkQtSa/8fS1lo1OBaZe9TrL xJJh5WJlt0ap3ShHwkJaQp0Xch40Y7wb4zEdbfeww83quxK15SHH2iu7BxzA2Vejks 6akVTi0C+0FnA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZSl7j2qkWz4x8S; Thu, 3 Apr 2025 12:50:57 +1100 (AEDT) Date: Thu, 3 Apr 2025 12:07:57 +1100 From: David Gibson To: Eugenio =?iso-8859-1?Q?P=E9rez?= Subject: Re: [PATCH 1/3] tap: specify the packet pool Message-ID: References: <20250401113809.1765282-1-eperezma@redhat.com> <20250401113809.1765282-2-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nec+hgzWvGmhRJNB" Content-Disposition: inline In-Reply-To: <20250401113809.1765282-2-eperezma@redhat.com> Message-ID-Hash: KNIS7EQPOC7MZNCL2RQVZAQ7E3STDVOF X-Message-ID-Hash: KNIS7EQPOC7MZNCL2RQVZAQ7E3STDVOF 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, jmaloy@redhat.com, sbrivio@redhat.com, lvivier@redhat.com, dgibson@redhat.com 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: --nec+hgzWvGmhRJNB Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 01, 2025 at 01:38:07PM +0200, Eugenio P=E9rez wrote: > In vhost-kernel we need to allocate a storage for rx so kernel can > write the buffers async. We need to tell tap_add_packet where to find > them. >=20 > Signed-off-by: Eugenio P=E9rez As discussed on our call, I don't think we need this. We should be able to re-use pool_tap[46] for vhost-net. > --- > tap.c | 34 ++++++++++++++++++++++++---------- > tap.h | 4 ++-- > vu_common.c | 7 ++++--- > 3 files changed, 30 insertions(+), 15 deletions(-) >=20 > diff --git a/tap.c b/tap.c > index 182a115..ce859ba 100644 > --- a/tap.c > +++ b/tap.c > @@ -1031,10 +1031,16 @@ void tap_flush_pools(void) > * @c: Execution context > * @now: Current timestamp > */ > -void tap_handler(struct ctx *c, const struct timespec *now) > +void tap_handler(struct ctx *c, const struct timespec *now, struct pool = *pool4, > + struct pool *pool6) > { > - tap4_handler(c, pool_tap4, now); > - tap6_handler(c, pool_tap6, now); > + if (!pool4) > + pool4 =3D pool_tap4; > + if (!pool6) > + pool6 =3D pool_tap6; > + > + tap4_handler(c, pool4, now); > + tap6_handler(c, pool6, now); > } > =20 > /** > @@ -1042,11 +1048,19 @@ void tap_handler(struct ctx *c, const struct time= spec *now) > * @c: Execution context > * @l2len: Total L2 packet length > * @p: Packet buffer > + * @pool4 Pool for tap ipv4 packets. If NULL, is pool_tap4 > + * @pool6 Pool for tap ipv6 packets. If NULL, is pool_tap6 > */ > -void tap_add_packet(struct ctx *c, ssize_t l2len, char *p) > +void tap_add_packet(struct ctx *c, ssize_t l2len, char *p, > + struct pool *pool4, struct pool *pool6) > { > const struct ethhdr *eh; > =20 > + if (!pool4) > + pool4 =3D pool_tap4; > + if (!pool6) > + pool6 =3D pool_tap6; > + > pcap(p, l2len); > =20 > eh =3D (struct ethhdr *)p; > @@ -1059,10 +1073,10 @@ void tap_add_packet(struct ctx *c, ssize_t l2len,= char *p) > switch (ntohs(eh->h_proto)) { > case ETH_P_ARP: > case ETH_P_IP: > - packet_add(pool_tap4, l2len, p); > + packet_add(pool4, l2len, p); > break; > case ETH_P_IPV6: > - packet_add(pool_tap6, l2len, p); > + packet_add(pool6, l2len, p); > break; > default: > break; > @@ -1142,7 +1156,7 @@ static void tap_passt_input(struct ctx *c, const st= ruct timespec *now) > p +=3D sizeof(uint32_t); > n -=3D sizeof(uint32_t); > =20 > - tap_add_packet(c, l2len, p); > + tap_add_packet(c, l2len, p, pool_tap4, pool_tap6); > =20 > p +=3D l2len; > n -=3D l2len; > @@ -1151,7 +1165,7 @@ static void tap_passt_input(struct ctx *c, const st= ruct timespec *now) > partial_len =3D n; > partial_frame =3D p; > =20 > - tap_handler(c, now); > + tap_handler(c, now, NULL, NULL); > } > =20 > /** > @@ -1207,10 +1221,10 @@ static void tap_pasta_input(struct ctx *c, const = struct timespec *now) > len > (ssize_t)L2_MAX_LEN_PASTA) > continue; > =20 > - tap_add_packet(c, len, pkt_buf + n); > + tap_add_packet(c, len, pkt_buf + n, pool_tap4, pool_tap6); > } > =20 > - tap_handler(c, now); > + tap_handler(c, now, NULL, NULL); > } > =20 > /** > diff --git a/tap.h b/tap.h > index dd39fd8..0b5ad17 100644 > --- a/tap.h > +++ b/tap.h > @@ -118,7 +118,7 @@ void tap_sock_reset(struct ctx *c); > void tap_sock_update_pool(void *base, size_t size); > void tap_backend_init(struct ctx *c); > void tap_flush_pools(void); > -void tap_handler(struct ctx *c, const struct timespec *now); > -void tap_add_packet(struct ctx *c, ssize_t l2len, char *p); > +void tap_handler(struct ctx *c, const struct timespec *now, struct pool = *pool4, struct pool *pool6); > +void tap_add_packet(struct ctx *c, ssize_t l2len, char *p, struct pool *= pool4, struct pool *pool6); > =20 > #endif /* TAP_H */ > diff --git a/vu_common.c b/vu_common.c > index 686a09b..4fe982f 100644 > --- a/vu_common.c > +++ b/vu_common.c > @@ -191,7 +191,7 @@ static void vu_handle_tx(struct vu_dev *vdev, int ind= ex, > tap_add_packet(vdev->context, > elem[count].out_sg[0].iov_len - hdrlen, > (char *)elem[count].out_sg[0].iov_base + > - hdrlen); > + hdrlen, NULL, NULL); > } else { > /* vnet header can be in a separate iovec */ > if (elem[count].out_num !=3D 2) { > @@ -203,13 +203,14 @@ static void vu_handle_tx(struct vu_dev *vdev, int i= ndex, > } else { > tap_add_packet(vdev->context, > elem[count].out_sg[1].iov_len, > - (char *)elem[count].out_sg[1].iov_base); > + (char *)elem[count].out_sg[1].iov_base, > + NULL, NULL); > } > } > =20 > count++; > } > - tap_handler(vdev->context, now); > + tap_handler(vdev->context, now, NULL, NULL); > =20 > if (count) { > int i; --=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 --nec+hgzWvGmhRJNB Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmft32wACgkQzQJF27ox 2GcSZQ//a5gqmTLIRJh+KWChBJzoL2psel40FtwSJ7RIryk4jTgOZlUTRBvGbSCD rdphXDHHKj9GYu1WMLNpjL5aKpk9n03ErNPho7WtAsskeQLg3Z3mv/XvcUWjdgcs G912uX0/EfeWAf8TLEbVgvqr2CgMszYjA6m1FU7SyYfjByumZ/SUrIJTRrldxoWJ CKzzVGFEdwK4oPRaLDpoOFXXlpAHeZx15/v37MquhXrQWGX4K5vuRTyaMB66BKc3 KnQJCLZe9ETKRjwc/7oVybto7v2YC9epZ40E2OVVZeiHMDRIhKWEovdNA4yWCUq2 RZJi12QiuEwhZeK5gwYHTR5o+KM05aiZ2U9+rZS3koNjtpJ3cLK6T+pk3vthSZzN MY24+8dOGiaaHia+zed+MQYaZn6ElNpLO5evn40wapTocqVWjsGVoKx/3KK4N5VX HZHTTJjqRaFYtyXDoimgmXfPJ2cElUPEiWAJGW4YX94iWjukhCWEf7yxjHpNYlEA sBSy2bDfOMmWddr6zLHqZH4yrO2qdMCLefZYWm2iL/p/sEnDmJNycASJrjogcqw0 j3UaMVnVqOpPnR5Jv8icQW47pX+2GZ9M8yCEqB5hbCcErSNRNFk1kE0mnR+dR/+N AtmRme+N4MZ7M4nUYaDEhppqF9s1yj/BknGIqT8CBjdIhZS1+TI= =cW2i -----END PGP SIGNATURE----- --nec+hgzWvGmhRJNB--