From: Ronan Randles <ronan.randles@intel.com>
To: dev@dpdk.org
Cc: harry.van.haaren@intel.com, Ronan Randles <ronan.randles@intel.com>
Subject: [PATCH 11/12] examples/generator: link status check added
Date: Tue, 14 Dec 2021 14:12:41 +0000 [thread overview]
Message-ID: <20211214141242.3383831-12-ronan.randles@intel.com> (raw)
In-Reply-To: <20211214141242.3383831-1-ronan.randles@intel.com>
This commit brings in a link status check so that the generator will
only start sending packets once there is something on the other end of
the link.
Signed-off-by: Ronan Randles <ronan.randles@intel.com>
---
examples/generator/main.c | 70 +++++++++++++++++++++++++++++++++++++--
1 file changed, 67 insertions(+), 3 deletions(-)
diff --git a/examples/generator/main.c b/examples/generator/main.c
index 2525d34b6e..f11110e528 100644
--- a/examples/generator/main.c
+++ b/examples/generator/main.c
@@ -27,9 +27,13 @@ static const struct rte_eth_conf port_conf_default = {
.rxmode = {
.max_lro_pkt_size = RTE_ETHER_MAX_LEN,
},
+ .intr_conf = {
+ .lsc = 1, /**< lsc interrupt */
+ },
};
static volatile int done;
+static volatile int link_status[RTE_MAX_ETHPORTS];
static struct rte_mempool *mbuf_pool;
struct rte_gen *gen;
@@ -58,6 +62,30 @@ static struct telemetry_userdata telemetry_userdata;
static void handle_sigint(int sig);
+static int
+link_status_change_cb(uint16_t port_id, enum rte_eth_event_type type,
+ void *param, void *ret_param)
+{
+ if (unlikely(port_id >= RTE_DIM(link_status)))
+ rte_panic("got LSC interrupt for unknown port id\n");
+
+ RTE_SET_USED(type);
+ RTE_SET_USED(param);
+ RTE_SET_USED(ret_param);
+
+ struct rte_eth_link link;
+ int ret = rte_eth_link_get_nowait(port_id, &link);
+ if (ret < 0) {
+ printf("Failed link get on port %d: %s\n",
+ port_id, rte_strerror(-ret));
+ return ret;
+ }
+
+ printf("Link status change port %i\n", port_id);
+ link_status[port_id] = link.link_status;
+ return 0;
+}
+
/* Initializes a given port using global settings and with the RX buffers
* coming from the mbuf_pool passed as a parameter.
*/
@@ -101,6 +129,9 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
printf("Not enough threads available\n");
return -1;
}
+ /* Register the LinkStatusChange callback */
+ rte_eth_dev_callback_register(port, RTE_ETH_EVENT_INTR_LSC,
+ link_status_change_cb, NULL);
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
@@ -140,6 +171,16 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
if (retval != 0)
return retval;
+ struct rte_eth_link link;
+ int ret = rte_eth_link_get_nowait(port, &link);
+ if (ret < 0) {
+ printf("Failed link get on port %d: %s\n", port,
+ rte_strerror(-ret));
+ return ret;
+ }
+
+ link_status[port] = link.link_status;
+
return 0;
}
@@ -166,12 +207,26 @@ lcore_producer(void *arg)
uint64_t tsc_hz = rte_get_tsc_hz();
uint64_t last_tsc_reading = 0;
uint64_t last_tx_total = 0;
+ uint16_t nb_tx = 0;
+
+ /* Ensure all available ports are up before generating packets */
+ uint16_t nb_eth_ports = rte_eth_dev_count_avail();
+ uint16_t nb_links_up = 0;
+ while (!done && nb_links_up < nb_eth_ports) {
+ if (link_status[nb_links_up])
+ nb_links_up++;
+
+ rte_delay_us_block(100);
+ }
+ if (!done)
+ printf("Generating packets...\n");
/* Run until the application is quit or killed. */
while (!done) {
+
struct rte_mbuf *bufs[BURST_SIZE];
- uint16_t nb_tx = 0;
/* Receive packets from gen and then tx them over port */
+
RTE_ETH_FOREACH_DEV(port) {
int nb_generated = rte_gen_rx_burst(gen, bufs,
BURST_SIZE);
@@ -219,8 +274,19 @@ lcore_consumer(void *arg)
"polling thread.\n\tPerformance will "
"not be optimal.\n", port);
+ /* Ensure all available ports are up before generating packets */
+ uint16_t nb_eth_ports = rte_eth_dev_count_avail();
+ uint16_t nb_links_up = 0;
+ while (!done && nb_links_up < nb_eth_ports) {
+ if (link_status[nb_links_up])
+ nb_links_up++;
+
+ rte_delay_us_block(100);
+ }
+
/* Run until the application is quit or killed. */
while (!done) {
+
struct rte_mbuf *bufs[BURST_SIZE];
/* Receive packets over port and then tx them to gen library
@@ -257,8 +323,6 @@ tele_gen_packet(const char *cmd, const char *params, struct rte_tel_data *d)
{
RTE_SET_USED(cmd);
RTE_SET_USED(params);
- RTE_SET_USED(d);
-
rte_tel_data_string(d, "Ether()/IP()");
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2021-12-14 14:13 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 14:12 [PATCH 00/12] add packet generator library and example app Ronan Randles
2021-12-14 14:12 ` [PATCH 01/12] net: add string to IPv4 parse function Ronan Randles
2021-12-14 17:31 ` Morten Brørup
2021-12-15 9:27 ` Bruce Richardson
2021-12-15 9:35 ` Morten Brørup
2021-12-15 10:11 ` Bruce Richardson
2022-01-19 14:20 ` Thomas Monjalon
2021-12-14 14:12 ` [PATCH 02/12] net: add function to pretty print IPv4 Ronan Randles
2021-12-14 16:08 ` Stephen Hemminger
2021-12-14 17:42 ` Morten Brørup
2021-12-14 17:31 ` Morten Brørup
2021-12-15 1:06 ` Ananyev, Konstantin
2021-12-15 3:20 ` Stephen Hemminger
2021-12-15 7:23 ` Morten Brørup
2021-12-15 13:06 ` Ananyev, Konstantin
2022-01-19 14:24 ` Thomas Monjalon
2022-01-19 14:41 ` Van Haaren, Harry
2021-12-14 14:12 ` [PATCH 03/12] gen: add files for initial traffic generation library Ronan Randles
2021-12-14 14:12 ` [PATCH 04/12] gen: add basic Rx and Tx routines and tests Ronan Randles
2021-12-14 14:12 ` [PATCH 05/12] gen: add raw packet data API " Ronan Randles
2021-12-15 12:40 ` Jerin Jacob
2021-12-17 11:40 ` Van Haaren, Harry
2021-12-17 16:19 ` Thomas Monjalon
2021-12-20 10:21 ` Van Haaren, Harry
2022-01-19 14:56 ` Thomas Monjalon
2022-01-20 10:21 ` Van Haaren, Harry
2022-01-21 10:45 ` Van Haaren, Harry
2021-12-20 13:21 ` Jerin Jacob
2022-01-21 14:20 ` Xueming(Steven) Li
2021-12-14 14:12 ` [PATCH 06/12] gen: add parsing infrastructure and Ether protocol Ronan Randles
2021-12-14 14:12 ` [PATCH 07/12] gen: add gen IP parsing Ronan Randles
2021-12-14 14:12 ` [PATCH 08/12] examples/generator: import code from basicfwd.c Ronan Randles
2021-12-14 14:12 ` [PATCH 09/12] examples/generator: enable gen library for traffic gen Ronan Randles
2021-12-14 14:12 ` [PATCH 10/12] examples/generator: telemetry support Ronan Randles
2021-12-14 14:12 ` Ronan Randles [this message]
2021-12-14 14:12 ` [PATCH 12/12] examples/generator: line rate limiting Ronan Randles
2021-12-14 16:10 ` Stephen Hemminger
2021-12-14 14:57 ` [PATCH 00/12] add packet generator library and example app Bruce Richardson
2021-12-14 15:59 ` Randles, Ronan
2022-01-12 16:18 ` Morten Brørup
2021-12-15 12:31 ` Jerin Jacob
2021-12-15 14:07 ` Bruce Richardson
2022-01-21 10:31 ` [PATCH v2 00/15] " Ronan Randles
2022-01-21 10:31 ` [PATCH v2 01/15] net: add string to IPv4 parse function Ronan Randles
2022-01-21 10:31 ` [PATCH v2 02/15] net: add function to pretty print IPv4 Ronan Randles
2022-01-21 16:20 ` Stephen Hemminger
2022-01-21 10:31 ` [PATCH v2 03/15] gen: add files for initial traffic generation library Ronan Randles
2022-01-21 10:31 ` [PATCH v2 04/15] gen: add basic Rx and Tx routines and tests Ronan Randles
2022-01-21 10:31 ` [PATCH v2 05/15] gen: add raw packet data API " Ronan Randles
2022-01-21 10:31 ` [PATCH v2 06/15] gen: add parsing infrastructure and Ether protocol Ronan Randles
2022-01-21 10:31 ` [PATCH v2 07/15] gen: add gen IP parsing Ronan Randles
2022-01-21 10:31 ` [PATCH v2 08/15] examples/generator: import code from basicfwd.c Ronan Randles
2022-01-21 10:31 ` [PATCH v2 09/15] examples/generator: enable gen library for traffic gen Ronan Randles
2022-01-21 10:31 ` [PATCH v2 10/15] examples/generator: telemetry support Ronan Randles
2022-01-21 10:31 ` [PATCH v2 11/15] examples/generator: link status check added Ronan Randles
2022-01-21 10:31 ` [PATCH v2 12/15] examples/generator: line rate limiting Ronan Randles
2022-01-21 10:31 ` [PATCH v2 13/15] gen: add UDP support Ronan Randles
2022-01-21 10:31 ` [PATCH v2 14/15] net/vxlan: instance flag endianness refactored Ronan Randles
2022-01-21 10:31 ` [PATCH v2 15/15] gen: add VXLAN support Ronan Randles
2022-01-21 14:44 ` [PATCH 00/12] add packet generator library and example app Xueming(Steven) Li
2022-01-21 15:24 ` Van Haaren, Harry
2022-01-24 10:48 ` Ananyev, Konstantin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211214141242.3383831-12-ronan.randles@intel.com \
--to=ronan.randles@intel.com \
--cc=dev@dpdk.org \
--cc=harry.van.haaren@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).