examples/rxtx_callbacks: switch TSC to dynamic field

The example used the deprecated mbuf field udata64.
It is moved to a dynamic field in order to allow removal of udata64.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Thomas Monjalon 2020-10-26 05:08:28 +01:00
parent 61bf499d9c
commit eb8258402b
2 changed files with 24 additions and 4 deletions

View File

@ -152,7 +152,7 @@ all packets received:
uint64_t now = rte_rdtsc(); uint64_t now = rte_rdtsc();
for (i = 0; i < nb_pkts; i++) for (i = 0; i < nb_pkts; i++)
pkts[i]->udata64 = now; *tsc_field(pkts[i]) = now;
return nb_pkts; return nb_pkts;
} }
@ -179,7 +179,7 @@ packets prior to transmission:
unsigned i; unsigned i;
for (i = 0; i < nb_pkts; i++) for (i = 0; i < nb_pkts; i++)
cycles += now - pkts[i]->udata64; cycles += now - *tsc_field(pkts[i]);
latency_numbers.total_cycles += cycles; latency_numbers.total_cycles += cycles;
latency_numbers.total_pkts += nb_pkts; latency_numbers.total_pkts += nb_pkts;

View File

@ -10,6 +10,7 @@
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_lcore.h> #include <rte_lcore.h>
#include <rte_mbuf.h> #include <rte_mbuf.h>
#include <rte_mbuf_dyn.h>
#define RX_RING_SIZE 1024 #define RX_RING_SIZE 1024
#define TX_RING_SIZE 1024 #define TX_RING_SIZE 1024
@ -18,6 +19,15 @@
#define MBUF_CACHE_SIZE 250 #define MBUF_CACHE_SIZE 250
#define BURST_SIZE 32 #define BURST_SIZE 32
typedef uint64_t tsc_t;
static int tsc_dynfield_offset = -1;
static inline tsc_t *
tsc_field(struct rte_mbuf *mbuf)
{
return RTE_MBUF_DYNFIELD(mbuf, tsc_dynfield_offset, tsc_t *);
}
static const char usage[] = static const char usage[] =
"%s EAL_ARGS -- [-t]\n"; "%s EAL_ARGS -- [-t]\n";
@ -47,7 +57,7 @@ add_timestamps(uint16_t port __rte_unused, uint16_t qidx __rte_unused,
uint64_t now = rte_rdtsc(); uint64_t now = rte_rdtsc();
for (i = 0; i < nb_pkts; i++) for (i = 0; i < nb_pkts; i++)
pkts[i]->udata64 = now; *tsc_field(pkts[i]) = now;
return nb_pkts; return nb_pkts;
} }
@ -65,7 +75,7 @@ calc_latency(uint16_t port, uint16_t qidx __rte_unused,
rte_eth_read_clock(port, &ticks); rte_eth_read_clock(port, &ticks);
for (i = 0; i < nb_pkts; i++) { for (i = 0; i < nb_pkts; i++) {
cycles += now - pkts[i]->udata64; cycles += now - *tsc_field(pkts[i]);
if (hw_timestamping) if (hw_timestamping)
queue_ticks += ticks - pkts[i]->timestamp; queue_ticks += ticks - pkts[i]->timestamp;
} }
@ -261,6 +271,11 @@ main(int argc, char *argv[])
}; };
int opt, option_index; int opt, option_index;
static const struct rte_mbuf_dynfield tsc_dynfield_desc = {
.name = "example_bbdev_dynfield_tsc",
.size = sizeof(tsc_t),
.align = __alignof__(tsc_t),
};
/* init EAL */ /* init EAL */
int ret = rte_eal_init(argc, argv); int ret = rte_eal_init(argc, argv);
@ -292,6 +307,11 @@ main(int argc, char *argv[])
if (mbuf_pool == NULL) if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n"); rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
tsc_dynfield_offset =
rte_mbuf_dynfield_register(&tsc_dynfield_desc);
if (tsc_dynfield_offset < 0)
rte_exit(EXIT_FAILURE, "Cannot register mbuf field\n");
/* initialize all ports */ /* initialize all ports */
RTE_ETH_FOREACH_DEV(portid) RTE_ETH_FOREACH_DEV(portid)
if (port_init(portid, mbuf_pool) != 0) if (port_init(portid, mbuf_pool) != 0)