[PATCH 4/6] app/testpmd: factorize fwd engine init
David Marchand
david.marchand at redhat.com
Tue Jan 24 11:47:40 CET 2023
Reduce code duplication by introducing a helper that takes care of
initialising the fs object.
While at it, remove unneeded initialisation of fwd_engine empty fields.
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
app/test-pmd/5tswap.c | 16 +---------------
app/test-pmd/csumonly.c | 16 +---------------
app/test-pmd/flowgen.c | 15 +--------------
app/test-pmd/icmpecho.c | 16 +---------------
app/test-pmd/ieee1588fwd.c | 14 +-------------
app/test-pmd/iofwd.c | 16 +---------------
app/test-pmd/macfwd.c | 16 +---------------
app/test-pmd/macswap.c | 16 +---------------
app/test-pmd/noisy_vnf.c | 14 +-------------
app/test-pmd/shared_rxq_fwd.c | 2 --
app/test-pmd/testpmd.c | 10 ++++++++++
app/test-pmd/testpmd.h | 2 ++
app/test-pmd/txonly.c | 1 -
13 files changed, 21 insertions(+), 133 deletions(-)
diff --git a/app/test-pmd/5tswap.c b/app/test-pmd/5tswap.c
index 0a3a897e7b..7b5f58f4d4 100644
--- a/app/test-pmd/5tswap.c
+++ b/app/test-pmd/5tswap.c
@@ -180,22 +180,8 @@ pkt_burst_5tuple_swap(struct fwd_stream *fs)
return true;
}
-static void
-stream_init_5tuple_swap(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine five_tuple_swap_fwd_engine = {
.fwd_mode_name = "5tswap",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = stream_init_5tuple_swap,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_5tuple_swap,
};
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 07850501f4..f72e2d74c7 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -1201,22 +1201,8 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
return true;
}
-static void
-stream_init_checksum_forward(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine csum_fwd_engine = {
.fwd_mode_name = "csum",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = stream_init_checksum_forward,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_checksum_forward,
};
diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index b3bd4f7c65..6f42019353 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -199,22 +199,9 @@ flowgen_begin(portid_t pi)
return 0;
}
-static void
-flowgen_stream_init(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine flow_gen_engine = {
.fwd_mode_name = "flowgen",
.port_fwd_begin = flowgen_begin,
- .port_fwd_end = NULL,
- .stream_init = flowgen_stream_init,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_flow_gen,
};
diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index 5ef1116141..eba8b99f1e 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -507,22 +507,8 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
return true;
}
-static void
-icmpecho_stream_init(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine icmp_echo_engine = {
.fwd_mode_name = "icmpecho",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = icmpecho_stream_init,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = reply_to_icmp_echo_rqsts,
};
diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c
index dab582cbf7..db7009c678 100644
--- a/app/test-pmd/ieee1588fwd.c
+++ b/app/test-pmd/ieee1588fwd.c
@@ -212,22 +212,10 @@ port_ieee1588_fwd_end(portid_t pi)
rte_eth_timesync_disable(pi);
}
-static void
-port_ieee1588_stream_init(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine ieee1588_fwd_engine = {
.fwd_mode_name = "ieee1588",
.port_fwd_begin = port_ieee1588_fwd_begin,
.port_fwd_end = port_ieee1588_fwd_end,
- .stream_init = port_ieee1588_stream_init,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = ieee1588_packet_fwd,
};
diff --git a/app/test-pmd/iofwd.c b/app/test-pmd/iofwd.c
index 9d0af5f667..12be06fa79 100644
--- a/app/test-pmd/iofwd.c
+++ b/app/test-pmd/iofwd.c
@@ -82,22 +82,8 @@ pkt_burst_io_forward(struct fwd_stream *fs)
return true;
}
-static void
-stream_init_forward(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine io_fwd_engine = {
.fwd_mode_name = "io",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = stream_init_forward,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_io_forward,
};
diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index 3a840247c7..953d9ea089 100644
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -113,22 +113,8 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
return true;
}
-static void
-stream_init_mac_forward(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine mac_fwd_engine = {
.fwd_mode_name = "mac",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = stream_init_mac_forward,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_mac_forward,
};
diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
index 14b3eefffd..062542dc53 100644
--- a/app/test-pmd/macswap.c
+++ b/app/test-pmd/macswap.c
@@ -92,22 +92,8 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
return true;
}
-static void
-stream_init_mac_swap(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine mac_swap_engine = {
.fwd_mode_name = "macswap",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
- .stream_init = stream_init_mac_swap,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_mac_swap,
};
diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index ecea51b603..be35023444 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -279,22 +279,10 @@ noisy_fwd_begin(portid_t pi)
return 0;
}
-static void
-stream_init_noisy_vnf(struct fwd_stream *fs)
-{
- bool rx_stopped, tx_stopped;
-
- rx_stopped = ports[fs->rx_port].rxq[fs->rx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- tx_stopped = ports[fs->tx_port].txq[fs->tx_queue].state ==
- RTE_ETH_QUEUE_STATE_STOPPED;
- fs->disabled = rx_stopped || tx_stopped;
-}
-
struct fwd_engine noisy_vnf_engine = {
.fwd_mode_name = "noisy",
.port_fwd_begin = noisy_fwd_begin,
.port_fwd_end = noisy_fwd_end,
- .stream_init = stream_init_noisy_vnf,
+ .stream_init = common_fwd_stream_init,
.packet_fwd = pkt_burst_noisy_vnf,
};
diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c
index 4902ec407e..67e5494735 100644
--- a/app/test-pmd/shared_rxq_fwd.c
+++ b/app/test-pmd/shared_rxq_fwd.c
@@ -114,8 +114,6 @@ shared_rxq_stream_init(struct fwd_stream *fs)
struct fwd_engine shared_rxq_engine = {
.fwd_mode_name = "shared_rxq",
- .port_fwd_begin = NULL,
- .port_fwd_end = NULL,
.stream_init = shared_rxq_stream_init,
.packet_fwd = shared_rxq_fwd,
};
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index dab67bce5c..d363adbbca 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2343,6 +2343,16 @@ launch_packet_forwarding(lcore_function_t *pkt_fwd_on_lcore)
}
}
+void
+common_fwd_stream_init(struct fwd_stream *fs)
+{
+ bool rx_stopped, tx_stopped;
+
+ rx_stopped = (ports[fs->rx_port].rxq[fs->rx_queue].state == RTE_ETH_QUEUE_STATE_STOPPED);
+ tx_stopped = (ports[fs->tx_port].txq[fs->tx_queue].state == RTE_ETH_QUEUE_STATE_STOPPED);
+ fs->disabled = rx_stopped || tx_stopped;
+}
+
/*
* Launch packet forwarding configuration.
*/
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 5c46844195..5d1a5cde7d 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -390,6 +390,8 @@ struct fwd_engine {
packet_fwd_t packet_fwd; /**< Mandatory. */
};
+void common_fwd_stream_init(struct fwd_stream *fs);
+
#define FLEX_ITEM_MAX_SAMPLES_NUM 16
#define FLEX_ITEM_MAX_LINKS_NUM 16
#define FLEX_MAX_FLOW_PATTERN_LENGTH 64
diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index 63ad5e69bf..b80ab6f5df 100644
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -508,7 +508,6 @@ tx_only_stream_init(struct fwd_stream *fs)
struct fwd_engine tx_only_engine = {
.fwd_mode_name = "txonly",
.port_fwd_begin = tx_only_begin,
- .port_fwd_end = NULL,
.stream_init = tx_only_stream_init,
.packet_fwd = pkt_burst_transmit,
};
--
2.39.1
More information about the dev
mailing list