DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ibtisam Tariq <ibtisam.tariq@emumba.com>
To: declan.doherty@intel.com
Cc: dev@dpdk.org, Ibtisam Tariq <ibtisam.tariq@emumba.com>
Subject: [dpdk-dev] [PATCH 2/2] examples/l2fwd-crypto: Free resources on exit
Date: Wed, 22 Jul 2020 12:50:26 +0000	[thread overview]
Message-ID: <20200722125026.2595-2-ibtisam.tariq@emumba.com> (raw)
In-Reply-To: <20200722125026.2595-1-ibtisam.tariq@emumba.com>

When exiting the application, resources should be cleared.

Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
---
 examples/l2fwd-crypto/main.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 827da9b3e..5b00e2ade 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -18,6 +18,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include <rte_string_fns.h>
 #include <rte_atomic.h>
@@ -47,6 +48,8 @@
 #include <rte_cryptodev_scheduler.h>
 #endif
 
+static volatile bool force_quit;
+
 enum cdev_type {
 	CDEV_TYPE_ANY,
 	CDEV_TYPE_HW,
@@ -838,7 +841,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
 	 * so user can see the crypto information.
 	 */
 	prev_tsc = rte_rdtsc();
-	while (1) {
+	while (!force_quit) {
 
 		cur_tsc = rte_rdtsc();
 
@@ -1738,8 +1741,12 @@ check_all_ports_link_status(uint32_t port_mask)
 	printf("\nChecking link status");
 	fflush(stdout);
 	for (count = 0; count <= MAX_CHECK_TIME; count++) {
+		if (force_quit)
+			return;
 		all_ports_up = 1;
 		RTE_ETH_FOREACH_DEV(portid) {
+			if (force_quit)
+				return;
 			if ((port_mask & (1 << portid)) == 0)
 				continue;
 			memset(&link, 0, sizeof(link));
@@ -2662,6 +2669,16 @@ reserve_key_memory(struct l2fwd_crypto_options *options)
 	options->aad.phys_addr = rte_malloc_virt2iova(options->aad.data);
 }
 
+static void
+signal_handler(int signum)
+{
+	if (signum == SIGINT || signum == SIGTERM) {
+		printf("\n\nSignal %d received, preparing to exit...\n",
+				signum);
+		force_quit = true;
+	}
+}
+
 int
 main(int argc, char **argv)
 {
@@ -2681,6 +2698,10 @@ main(int argc, char **argv)
 	argc -= ret;
 	argv += ret;
 
+	force_quit = false;
+	signal(SIGINT, signal_handler);
+	signal(SIGTERM, signal_handler);
+
 	/* reserve memory for Cipher/Auth key and IV */
 	reserve_key_memory(&options);
 
@@ -2807,6 +2828,14 @@ main(int argc, char **argv)
 		if (rte_eal_wait_lcore(lcore_id) < 0)
 			return -1;
 	}
+	RTE_ETH_FOREACH_DEV(portid) {
+		printf("Closing port %d...", portid);
+		rte_eth_dev_stop(portid);
+		rte_eth_dev_close(portid);
+		printf(" Done\n");
+	}
+	rte_eal_cleanup();
+	printf("Bye...\n");
 
 	return 0;
 }
-- 
2.17.1


  reply	other threads:[~2020-07-22 12:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 12:50 [dpdk-dev] [PATCH 1/2] examples/l2fwd-jobstats: " Ibtisam Tariq
2020-07-22 12:50 ` Ibtisam Tariq [this message]
2020-07-30 21:15   ` [dpdk-dev] [PATCH 2/2] examples/l2fwd-crypto: " Thomas Monjalon
2020-11-22 18:05     ` Thomas Monjalon
2020-11-23 15:44   ` Zhang, Roy Fan

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=20200722125026.2595-2-ibtisam.tariq@emumba.com \
    --to=ibtisam.tariq@emumba.com \
    --cc=declan.doherty@intel.com \
    --cc=dev@dpdk.org \
    /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).