From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 8F7F5A00C5;
	Mon, 11 May 2020 13:33:36 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id DDC891BFDC;
	Mon, 11 May 2020 13:33:35 +0200 (CEST)
Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com
 [209.85.167.65]) by dpdk.org (Postfix) with ESMTP id ACBC31BFDB
 for <dev@dpdk.org>; Mon, 11 May 2020 13:33:34 +0200 (CEST)
Received: by mail-lf1-f65.google.com with SMTP id d22so1154030lfm.11
 for <dev@dpdk.org>; Mon, 11 May 2020 04:33:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=emumba-com.20150623.gappssmtp.com; s=20150623;
 h=from:to:cc:subject:date:message-id;
 bh=omECRmEkmkWBfSEtmUDZvJcI/eYqu7HX254Nftmdzyk=;
 b=al9bKitbOfGDf1s07VDkOUaYPzXnnnBHwmVzjEDDUgJcVimTx2x10zoWuMR9V99BSq
 72uOLPQrBOj5+uZXgz5ilxpXV1fDz+D+KiLbEP2bzIGVVysorrMqpA7iqB1IvtGHBKV6
 6/zu84UQdLcBL1GaJNLpTHPA6ZcPyastyRVqtOvNeNLeyPPQ/xMM/N6AYvu1A2cxLNP6
 0BjxFxWoKH/177E+KERoPkEB8eDgttofdUqd58dmewFeWvvXXwcXTDS7RL4g3Gihdsq4
 QbeV6myZsEt+M0xohU05oPk9Fjl3hD2u8bL7ImtSbuw7E9qaXJXaPAnCEQTP7YSoKewi
 Y9rg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id;
 bh=omECRmEkmkWBfSEtmUDZvJcI/eYqu7HX254Nftmdzyk=;
 b=Li+jHkU/up+YDnYfNfXjcZ7p0RzxbOH91/uCHzME+x2Yzvv7NJZuDqx1PEbwxBFU8G
 hU8imtfd+QJsufQWkjFq2pXyBo1V89LzjGul9ZWWl+z3DSCpFu1Bdm5xFkiZjbTzIiNC
 B/ZdJMZa5a/Ha5NGjFmNtRwEVSV7lS1LKVVUq+WoLeBlDNNm7BQBrH0lpWaZ2PjB+ogC
 pChnAGsUscGHUyfC1pIE23IKiRR5Zj3CDHY9SF37s5WG+sm4+/qCEoR9Nmm5nEPjn2z9
 HfJdUE/IBfiqTOCDffmeAv4tO2+ggszAPPoqEO/X+47c9sY16OlKvqu6EoWMB3RYZfCd
 WE9A==
X-Gm-Message-State: AOAM532ZCyc4WTWTqV1CtQG9Bbo5bZEPcus38+vkdk2opqNaIEU0BRBs
 OlShufbRuIHGz2K22kXa6eQD4w==
X-Google-Smtp-Source: ABdhPJwX8eQDZxnSZuofTLEEdrbZEq1yKy/c+yD+wOUG+N16ZPuvh8/xbjhoInNbhci4T6XH6ZWetA==
X-Received: by 2002:ac2:4d91:: with SMTP id g17mr10798333lfe.162.1589196814005; 
 Mon, 11 May 2020 04:33:34 -0700 (PDT)
Received: from localhost.localdomain ([111.119.188.31])
 by smtp.gmail.com with ESMTPSA id e16sm11930323lfc.63.2020.05.11.04.33.27
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 11 May 2020 04:33:33 -0700 (PDT)
From: Muhammad Bilal <m.bilal@emumba.com>
To: bruce.richardson@intel.com
Cc: dev@dpdk.org, Muhammad Bilal <m.bilal@emumba.com>, stable@dpdk.org,
 vipin.varghese@intel.com, jgrajcia@cisco.com
Date: Mon, 11 May 2020 16:28:31 +0500
Message-Id: <20200511112831.25549-1-m.bilal@emumba.com>
X-Mailer: git-send-email 2.17.1
Subject: [dpdk-dev] [PATCH] examples/l2fwd/main.c: free resources in case of
	error
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Bugzilla ID: 437
Cc: dev@dpdk.org
Cc: stable@dpdk.org
Cc: bruce.richardson@intel.com
Cc: vipin.varghese@intel.com
Cc: jgrajcia@cisco.com
Signed-off-by: Muhammad Bilal <m.bilal@emumba.com>
---
 examples/l2fwd/main.c | 72 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 88ddfe589..dbaa457e2 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -517,6 +517,17 @@ signal_handler(int signum)
 	}
 }
 
+static void
+stop_and_close_eth_dev(uint16_t portid)
+{
+	RTE_ETH_FOREACH_DEV(portid) {
+		printf("Closing port %d...", portid);
+		rte_eth_dev_stop(portid);
+		rte_eth_dev_close(portid);
+		printf(" Done\n");
+	}
+}
+
 int
 main(int argc, char **argv)
 {
@@ -543,8 +554,10 @@ main(int argc, char **argv)
 
 	/* parse application arguments (after the EAL ones) */
 	ret = l2fwd_parse_args(argc, argv);
-	if (ret < 0)
+	if (ret < 0) {
+		stop_and_close_eth_dev(portid);
 		rte_exit(EXIT_FAILURE, "Invalid L2FWD arguments\n");
+	}
 
 	printf("MAC updating %s\n", mac_updating ? "enabled" : "disabled");
 
@@ -552,13 +565,17 @@ main(int argc, char **argv)
 	timer_period *= rte_get_timer_hz();
 
 	nb_ports = rte_eth_dev_count_avail();
-	if (nb_ports == 0)
+	if (nb_ports == 0) {
+		stop_and_close_eth_dev(portid);
 		rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
+	}
 
 	/* check port mask to possible port mask */
-	if (l2fwd_enabled_port_mask & ~((1 << nb_ports) - 1))
+	if (l2fwd_enabled_port_mask & ~((1 << nb_ports) - 1)) {
+		stop_and_close_eth_dev(portid);
 		rte_exit(EXIT_FAILURE, "Invalid portmask; possible (0x%x)\n",
 			(1 << nb_ports) - 1);
+	}
 
 	/* reset l2fwd_dst_ports */
 	for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
@@ -601,8 +618,10 @@ main(int argc, char **argv)
 		       lcore_queue_conf[rx_lcore_id].n_rx_port ==
 		       l2fwd_rx_queue_per_lcore) {
 			rx_lcore_id++;
-			if (rx_lcore_id >= RTE_MAX_LCORE)
+			if (rx_lcore_id >= RTE_MAX_LCORE) {
+				stop_and_close_eth_dev(portid);
 				rte_exit(EXIT_FAILURE, "Not enough cores\n");
+			}
 		}
 
 		if (qconf != &lcore_queue_conf[rx_lcore_id]) {
@@ -623,8 +642,10 @@ main(int argc, char **argv)
 	l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs,
 		MEMPOOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
 		rte_socket_id());
-	if (l2fwd_pktmbuf_pool == NULL)
+	if (l2fwd_pktmbuf_pool == NULL) {
+		stop_and_close_eth_dev(portid);
 		rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
+	}
 
 	/* Initialise each port */
 	RTE_ETH_FOREACH_DEV(portid) {
@@ -645,32 +666,40 @@ main(int argc, char **argv)
 		fflush(stdout);
 
 		ret = rte_eth_dev_info_get(portid, &dev_info);
-		if (ret != 0)
+		if (ret != 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE,
 				"Error during getting device (port %u) info: %s\n",
 				portid, strerror(-ret));
+		}
 
 		if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
 			local_port_conf.txmode.offloads |=
 				DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 		ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
 				  ret, portid);
+		}
 
 		ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd,
 						       &nb_txd);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE,
 				 "Cannot adjust number of descriptors: err=%d, port=%u\n",
 				 ret, portid);
+		}
 
 		ret = rte_eth_macaddr_get(portid,
 					  &l2fwd_ports_eth_addr[portid]);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE,
 				 "Cannot get MAC address: err=%d, port=%u\n",
 				 ret, portid);
+		}
 
 		/* init one RX queue */
 		fflush(stdout);
@@ -680,9 +709,11 @@ main(int argc, char **argv)
 					     rte_eth_dev_socket_id(portid),
 					     &rxq_conf,
 					     l2fwd_pktmbuf_pool);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
 				  ret, portid);
+		}
 
 		/* init one TX queue on each port */
 		fflush(stdout);
@@ -691,27 +722,33 @@ main(int argc, char **argv)
 		ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
 				rte_eth_dev_socket_id(portid),
 				&txq_conf);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
 				ret, portid);
+		}
 
 		/* Initialize TX buffers */
 		tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
 				RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
 				rte_eth_dev_socket_id(portid));
-		if (tx_buffer[portid] == NULL)
+		if (tx_buffer[portid] == NULL) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
 					portid);
+		}
 
 		rte_eth_tx_buffer_init(tx_buffer[portid], MAX_PKT_BURST);
 
 		ret = rte_eth_tx_buffer_set_err_callback(tx_buffer[portid],
 				rte_eth_tx_buffer_count_callback,
 				&port_statistics[portid].dropped);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE,
 			"Cannot set error callback for tx buffer on port %u\n",
 				 portid);
+		}
 
 		ret = rte_eth_dev_set_ptypes(portid, RTE_PTYPE_UNKNOWN, NULL,
 					     0);
@@ -720,17 +757,21 @@ main(int argc, char **argv)
 					portid);
 		/* Start device */
 		ret = rte_eth_dev_start(portid);
-		if (ret < 0)
+		if (ret < 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n",
 				  ret, portid);
+		}
 
 		printf("done: \n");
 
 		ret = rte_eth_promiscuous_enable(portid);
-		if (ret != 0)
+		if (ret != 0) {
+			stop_and_close_eth_dev(portid);
 			rte_exit(EXIT_FAILURE,
 				 "rte_eth_promiscuous_enable:err=%s, port=%u\n",
 				 rte_strerror(-ret), portid);
+		}
 
 		printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
 				portid,
@@ -746,6 +787,7 @@ main(int argc, char **argv)
 	}
 
 	if (!nb_ports_available) {
+		stop_and_close_eth_dev(portid);
 		rte_exit(EXIT_FAILURE,
 			"All available ports are disabled. Please set portmask.\n");
 	}
-- 
2.17.1