From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id EEB6EA04B5;
Mon, 26 Oct 2020 06:25:56 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id E818B58F9;
Mon, 26 Oct 2020 06:21:59 +0100 (CET)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by dpdk.org (Postfix) with ESMTP id A68324C95
for <dev@dpdk.org>; Mon, 26 Oct 2020 06:21:50 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 4ECE15C0117;
Mon, 26 Oct 2020 01:21:49 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute2.internal (MEProxy); Mon, 26 Oct 2020 01:21:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm2; bh=rZHAhENmemB6r
T2x8eGin0WUfq0o9t2UQ5tTlDoaDRQ=; b=hizclBSc5eZ2k6mbycFrldIRYchG5
CIBcDa+OGu2AzJwTW3IyAxTWGNPqR7PiiXpH6ld/xl622CvMX59OTl//0bgN4mm3
+D6K9e6bFHWkVv50FUkkt7lxalj+zoIOI57SMDARRAahHMBaVcE+7NBdsRCGOYnU
I0DSpriziZg0Vp6mBH2UZ3L9VbLI0wHFWkKzVxF2xLQIk5c9yIwMfUWlOk4/WjtS
uBblQIkFCGf4/ZJboL9BROEH7bkDQQv29rJ//hevI/IBQEkOpJPPJi/pJdGQkwL9
kL3pWKCia0C5ZXDxkp6y4yxuHGD0uix3CK43qiY2S9zsr5k9eDplI74Wg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm1; bh=rZHAhENmemB6rT2x8eGin0WUfq0o9t2UQ5tTlDoaDRQ=; b=Ssx9r1+u
JSAX/Ek2ZRm3Wzwdvg7vnmtc0oomfEOXrt3lzWaJU4IM5RPIEb2XKtOXljGX6RIa
vN1pH7jl5FyCs+x2z4luwftL4mHZCHnly6IsRAL32tqgsyGyfA5ojWw1AFB4J1au
z5Zg2T6xD/9gRqwz9mHu1rBtc21F8R6ge91eGezeqYG3K062Q5CQMng7G5wIdmQ+
J5iXeHHB9piW/svA2Gq98MYc8wv1tHXmeLsoPB2/MGgumaN+LfLsD+9H/im+gPzK
I7MSS4NFBbUxFjKdtCNdMd1A20A0PJtQloEcnvU1n85WiuqAPAcptesbCPHPZrbp
PKiQGDmuFdZy7A==
X-ME-Sender: <xms:7VyWX8PyYAdA3DLlk9PDeY3uyv6RDAVYt35grBUsz5iYKyDmfzpHHQ>
<xme:7VyWXy-rHGz0EyA5h3eDbE_eQnmzFuPFl6R-wz9X3IVAKE_0wEH_jhxIzpg6OaaW-
g4WJebKupoxNGPv-Q>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeehgdekgecutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs
ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf
frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu
tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih
iivgepleenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho
nhdrnhgvth
X-ME-Proxy: <xmx:7VyWXzR1tVJYEd0Jeye_sNlb_naJZgh4rdZ23T6WYtnIGeaXUFe6MQ>
<xmx:7VyWX0sLY6dv4eoRpTY7g-IhpTHKz6lbgd68_uXQl7Si6d_SoUwysg>
<xmx:7VyWX0f1uPDIBFPR1VaJOxyU-EIAl9CG7yhNstM6qYnAEtzHo2tE7A>
<xmx:7VyWX5GKIV0wSEbDyG90Feo8mrZ7Iw8ksC2TfKRt7yxqWPXePrZpbg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 4FF5F3064682;
Mon, 26 Oct 2020 01:21:48 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, david.marchand@redhat.com,
bruce.richardson@intel.com, olivier.matz@6wind.com,
andrew.rybchenko@oktetlabs.ru, akhil.goyal@nxp.com,
Nicolas Chautru <nicolas.chautru@intel.com>
Date: Mon, 26 Oct 2020 06:21:03 +0100
Message-Id: <20201026052105.1561859-14-thomas@monjalon.net>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <20201026052105.1561859-1-thomas@monjalon.net>
References: <20201026052105.1561859-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 13/15] examples/bbdev: switch to dynamic mbuf
field
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The example used the deprecated mbuf field udata64 as input mbuf pointer.
It is moved to a dynamic field in order to allow removal of udata64.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
examples/bbdev_app/main.c | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index e512c807cd..7a06f9c7d6 100644
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -28,6 +28,7 @@
#include <rte_lcore.h>
#include <rte_malloc.h>
#include <rte_mbuf.h>
+#include <rte_mbuf_dyn.h>
#include <rte_memory.h>
#include <rte_mempool.h>
#include <rte_log.h>
@@ -59,6 +60,10 @@
} \
} while (0)
+static int input_dynfield_offset;
+#define INPUT_FIELD(mbuf) \
+ (*RTE_MBUF_DYNFIELD(mbuf, input_dynfield_offset, struct rte_mbuf **))
+
static const struct rte_eth_conf port_conf = {
.rxmode = {
.mq_mode = ETH_MQ_RX_NONE,
@@ -294,11 +299,11 @@ pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int nb_to_free)
}
static inline void
-pktmbuf_userdata_free_bulk(struct rte_mbuf **mbufs, unsigned int nb_to_free)
+pktmbuf_input_free_bulk(struct rte_mbuf **mbufs, unsigned int nb_to_free)
{
unsigned int i;
for (i = 0; i < nb_to_free; ++i) {
- struct rte_mbuf *rx_pkt = mbufs[i]->userdata;
+ struct rte_mbuf *rx_pkt = INPUT_FIELD(mbufs[i]);
rte_pktmbuf_free(rx_pkt);
rte_pktmbuf_free(mbufs[i]);
}
@@ -429,7 +434,7 @@ verify_data(struct rte_mbuf **mbufs, uint16_t num_pkts)
uint16_t i;
for (i = 0; i < num_pkts; ++i) {
struct rte_mbuf *out = mbufs[i];
- struct rte_mbuf *in = out->userdata;
+ struct rte_mbuf *in = INPUT_FIELD(out);
if (memcmp(rte_pktmbuf_mtod_offset(in, uint8_t *,
sizeof(struct rte_ether_hdr)),
@@ -731,7 +736,7 @@ run_encoding(struct lcore_conf *lcore_conf)
rte_pktmbuf_data_len(rx_pkts_burst[i]) -
sizeof(struct rte_ether_hdr);
/* save input mbuf pointer for later comparison */
- enc_out_pkts[i]->userdata = rx_pkts_burst[i];
+ INPUT_FIELD(enc_out_pkts[i]) = rx_pkts_burst[i];
/* copy ethernet header */
rte_pktmbuf_reset(enc_out_pkts[i]);
@@ -775,7 +780,7 @@ run_encoding(struct lcore_conf *lcore_conf)
nb_enq = rte_bbdev_enqueue_enc_ops(bbdev_id, enc_queue_id,
bbdev_ops_burst, nb_rx);
if (unlikely(nb_enq < nb_rx)) {
- pktmbuf_userdata_free_bulk(&enc_out_pkts[nb_enq],
+ pktmbuf_input_free_bulk(&enc_out_pkts[nb_enq],
nb_rx - nb_enq);
rte_bbdev_enc_op_free_bulk(&bbdev_ops_burst[nb_enq],
nb_rx - nb_enq);
@@ -805,7 +810,7 @@ run_encoding(struct lcore_conf *lcore_conf)
nb_sent = rte_ring_enqueue_burst(enc_to_dec_ring, (void **)enc_out_pkts,
nb_deq, NULL);
if (unlikely(nb_sent < nb_deq)) {
- pktmbuf_userdata_free_bulk(&enc_out_pkts[nb_sent],
+ pktmbuf_input_free_bulk(&enc_out_pkts[nb_sent],
nb_deq - nb_sent);
lcore_stats->enc_to_dec_lost_packets += nb_deq - nb_sent;
}
@@ -842,7 +847,7 @@ run_decoding(struct lcore_conf *lcore_conf)
if (unlikely(rte_bbdev_dec_op_alloc_bulk(bbdev_op_pool, bbdev_ops_burst,
nb_recv) != 0)) {
- pktmbuf_userdata_free_bulk(recv_pkts_burst, nb_recv);
+ pktmbuf_input_free_bulk(recv_pkts_burst, nb_recv);
lcore_stats->rx_lost_packets += nb_recv;
return;
}
@@ -871,7 +876,7 @@ run_decoding(struct lcore_conf *lcore_conf)
nb_enq = rte_bbdev_enqueue_dec_ops(bbdev_id, bbdev_queue_id,
bbdev_ops_burst, nb_recv);
if (unlikely(nb_enq < nb_recv)) {
- pktmbuf_userdata_free_bulk(&recv_pkts_burst[nb_enq],
+ pktmbuf_input_free_bulk(&recv_pkts_burst[nb_enq],
nb_recv - nb_enq);
rte_bbdev_dec_op_free_bulk(&bbdev_ops_burst[nb_enq],
nb_recv - nb_enq);
@@ -898,12 +903,12 @@ run_decoding(struct lcore_conf *lcore_conf)
/* Free the RX mbufs after verification */
for (i = 0; i < nb_deq; ++i)
- rte_pktmbuf_free(recv_pkts_burst[i]->userdata);
+ rte_pktmbuf_free(INPUT_FIELD(recv_pkts_burst[i]));
/* Transmit the packets */
nb_tx = rte_eth_tx_burst(port_id, tx_queue_id, recv_pkts_burst, nb_deq);
if (unlikely(nb_tx < nb_deq)) {
- pktmbuf_userdata_free_bulk(&recv_pkts_burst[nb_tx],
+ pktmbuf_input_free_bulk(&recv_pkts_burst[nb_tx],
nb_deq - nb_tx);
lcore_stats->tx_lost_packets += nb_deq - nb_tx;
}
@@ -1046,6 +1051,12 @@ main(int argc, char **argv)
bool stats_thread_started = false;
unsigned int main_lcore_id = rte_get_main_lcore();
+ static const struct rte_mbuf_dynfield input_dynfield_desc = {
+ .name = "example_bbdev_dynfield_input",
+ .size = sizeof(void *),
+ .align = __alignof__(void *),
+ };
+
rte_atomic16_init(&global_exit_flag);
sigret = signal(SIGTERM, signal_handler);
@@ -1115,6 +1126,12 @@ main(int argc, char **argv)
if (bbdev_mbuf_mempool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create ethdev mbuf mempool\n");
+ /* register mbuf field to store input pointer */
+ input_dynfield_offset =
+ rte_mbuf_dynfield_register(&input_dynfield_desc);
+ if (input_dynfield_offset < 0)
+ rte_exit(EXIT_FAILURE, "Cannot register mbuf field\n");
+
/* initialize ports */
ret = initialize_ports(&app_params, ethdev_mbuf_mempool);
--
2.28.0