git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/spinlock: use compile atomics for lcores sync
[dpdk.git]
/
examples
/
bbdev_app
/
main.c
diff --git
a/examples/bbdev_app/main.c
b/examples/bbdev_app/main.c
index
6a7a03c
..
5251db0
100644
(file)
--- a/
examples/bbdev_app/main.c
+++ b/
examples/bbdev_app/main.c
@@
-8,7
+8,7
@@
#include <stdint.h>
#include <inttypes.h>
#include <sys/types.h>
#include <stdint.h>
#include <inttypes.h>
#include <sys/types.h>
-#include <
sys/
unistd.h>
+#include <unistd.h>
#include <sys/queue.h>
#include <stdarg.h>
#include <ctype.h>
#include <sys/queue.h>
#include <stdarg.h>
#include <ctype.h>
@@
-18,21
+18,22
@@
#include <getopt.h>
#include <signal.h>
#include <getopt.h>
#include <signal.h>
-#include "rte_atomic.h"
-#include "rte_common.h"
-#include "rte_eal.h"
-#include "rte_cycles.h"
-#include "rte_ether.h"
-#include "rte_ethdev.h"
-#include "rte_ip.h"
-#include "rte_lcore.h"
-#include "rte_malloc.h"
-#include "rte_mbuf.h"
-#include "rte_memory.h"
-#include "rte_mempool.h"
-#include "rte_log.h"
-#include "rte_bbdev.h"
-#include "rte_bbdev_op.h"
+#include <rte_atomic.h>
+#include <rte_common.h>
+#include <rte_eal.h>
+#include <rte_cycles.h>
+#include <rte_ether.h>
+#include <rte_ethdev.h>
+#include <rte_ip.h>
+#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>
+#include <rte_bbdev.h>
+#include <rte_bbdev_op.h>
/* LLR values - negative value for '1' bit */
#define LLR_1_BIT 0x81
/* LLR values - negative value for '1' bit */
#define LLR_1_BIT 0x81
@@
-59,6
+60,15
@@
} \
} while (0)
} \
} while (0)
+static int input_dynfield_offset = -1;
+
+static inline struct rte_mbuf **
+mbuf_input(struct rte_mbuf *mbuf)
+{
+ return 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,
static const struct rte_eth_conf port_conf = {
.rxmode = {
.mq_mode = ETH_MQ_RX_NONE,
@@
-294,11
+304,11
@@
pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int nb_to_free)
}
static inline void
}
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) {
{
unsigned int i;
for (i = 0; i < nb_to_free; ++i) {
- struct rte_mbuf *rx_pkt =
mbufs[i]->userdata
;
+ struct rte_mbuf *rx_pkt =
*mbuf_input(mbufs[i])
;
rte_pktmbuf_free(rx_pkt);
rte_pktmbuf_free(mbufs[i]);
}
rte_pktmbuf_free(rx_pkt);
rte_pktmbuf_free(mbufs[i]);
}
@@
-429,7
+439,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];
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 =
*mbuf_input(out)
;
if (memcmp(rte_pktmbuf_mtod_offset(in, uint8_t *,
sizeof(struct rte_ether_hdr)),
if (memcmp(rte_pktmbuf_mtod_offset(in, uint8_t *,
sizeof(struct rte_ether_hdr)),
@@
-731,7
+741,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 */
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];
+
*mbuf_input(enc_out_pkts[i])
= rx_pkts_burst[i];
/* copy ethernet header */
rte_pktmbuf_reset(enc_out_pkts[i]);
/* copy ethernet header */
rte_pktmbuf_reset(enc_out_pkts[i]);
@@
-775,7
+785,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)) {
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);
nb_rx - nb_enq);
rte_bbdev_enc_op_free_bulk(&bbdev_ops_burst[nb_enq],
nb_rx - nb_enq);
@@
-805,7
+815,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)) {
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;
}
nb_deq - nb_sent);
lcore_stats->enc_to_dec_lost_packets += nb_deq - nb_sent;
}
@@
-842,7
+852,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)) {
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;
}
lcore_stats->rx_lost_packets += nb_recv;
return;
}
@@
-871,7
+881,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)) {
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);
nb_recv - nb_enq);
rte_bbdev_dec_op_free_bulk(&bbdev_ops_burst[nb_enq],
nb_recv - nb_enq);
@@
-898,12
+908,12
@@
run_decoding(struct lcore_conf *lcore_conf)
/* Free the RX mbufs after verification */
for (i = 0; i < nb_deq; ++i)
/* Free the RX mbufs after verification */
for (i = 0; i < nb_deq; ++i)
- rte_pktmbuf_free(
recv_pkts_burst[i]->userdata
);
+ rte_pktmbuf_free(
*mbuf_input(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)) {
/* 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;
}
nb_deq - nb_tx);
lcore_stats->tx_lost_packets += nb_deq - nb_tx;
}
@@
-1044,7
+1054,13
@@
main(int argc, char **argv)
struct stats_lcore_params stats_lcore;
struct rte_ring *enc_to_dec_ring;
bool stats_thread_started = false;
struct stats_lcore_params stats_lcore;
struct rte_ring *enc_to_dec_ring;
bool stats_thread_started = false;
- unsigned int master_lcore_id = rte_get_master_lcore();
+ 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(struct rte_mbuf *),
+ .align = __alignof__(struct rte_mbuf *),
+ };
rte_atomic16_init(&global_exit_flag);
rte_atomic16_init(&global_exit_flag);
@@
-1115,6
+1131,12
@@
main(int argc, char **argv)
if (bbdev_mbuf_mempool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create ethdev mbuf mempool\n");
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);
/* initialize ports */
ret = initialize_ports(&app_params, ethdev_mbuf_mempool);
@@
-1147,9
+1169,9
@@
main(int argc, char **argv)
stats_lcore.app_params = &app_params;
stats_lcore.lconf = lcore_conf;
stats_lcore.app_params = &app_params;
stats_lcore.lconf = lcore_conf;
- RTE_LCORE_FOREACH_
SLAVE
(lcore_id) {
+ RTE_LCORE_FOREACH_
WORKER
(lcore_id) {
if (lcore_conf[lcore_id].core_type != 0)
if (lcore_conf[lcore_id].core_type != 0)
- /* launch per-lcore processing loop on
slave
lcores */
+ /* launch per-lcore processing loop on
worker
lcores */
rte_eal_remote_launch(processing_loop,
&lcore_conf[lcore_id], lcore_id);
else if (!stats_thread_started) {
rte_eal_remote_launch(processing_loop,
&lcore_conf[lcore_id], lcore_id);
else if (!stats_thread_started) {
@@
-1161,17
+1183,20
@@
main(int argc, char **argv)
}
if (!stats_thread_started &&
}
if (!stats_thread_started &&
- lcore_conf[ma
ster
_lcore_id].core_type != 0)
+ lcore_conf[ma
in
_lcore_id].core_type != 0)
rte_exit(EXIT_FAILURE,
"Not enough lcores to run the statistics printing loop!");
rte_exit(EXIT_FAILURE,
"Not enough lcores to run the statistics printing loop!");
- else if (lcore_conf[ma
ster
_lcore_id].core_type != 0)
- processing_loop(&lcore_conf[ma
ster
_lcore_id]);
+ else if (lcore_conf[ma
in
_lcore_id].core_type != 0)
+ processing_loop(&lcore_conf[ma
in
_lcore_id]);
else if (!stats_thread_started)
stats_loop(&stats_lcore);
else if (!stats_thread_started)
stats_loop(&stats_lcore);
- RTE_LCORE_FOREACH_
SLAVE
(lcore_id) {
+ RTE_LCORE_FOREACH_
WORKER
(lcore_id) {
ret |= rte_eal_wait_lcore(lcore_id);
}
ret |= rte_eal_wait_lcore(lcore_id);
}
+ /* clean up the EAL */
+ rte_eal_cleanup();
+
return ret;
}
return ret;
}