From patchwork Tue May 19 08:54:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Bilal X-Patchwork-Id: 70416 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8B52BA0093; Tue, 19 May 2020 10:55:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A6841D14E; Tue, 19 May 2020 10:55:15 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 9A6E81C1EB for ; Tue, 19 May 2020 10:55:13 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id v12so14879375wrp.12 for ; Tue, 19 May 2020 01:55:13 -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=zYeLUhIw2vLuEfR0Z1cgrneZsaE5ZayGK5rrzhcN+xI=; b=mmCAxRv5/YLsXbzxKJzj0j0LumLs5ZaQDaktiCuust63jPSB2Lf16t6UNYK/eaqePB +e38Qunvkmf21lud8fLy0R8bZZ+Du5Ifs0HP1LqiwIdBaA2nsqwAMMw1WKRJNAVKUF40 C28vMNM6udp0KLMjLWTu1HMKBai0BTU2CYzXvrPEHPjOV8phNQYN4eEHaM+V+M34CtV3 p3hE4tw5v3l3kDBmYerivinTPAnB9bNOu4t+bmFJ/NbVyGdsyCUVk0i9MEawINkIISb+ 5aAnHM2DpHIiZ2WN6j7OmiOKZNexnsG6WXwiO9XVGYpd6LxBxjd8NRZ+R2E3sw2Ot7PW OqDQ== 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=zYeLUhIw2vLuEfR0Z1cgrneZsaE5ZayGK5rrzhcN+xI=; b=EcNWf0d7NhBf1ijJqs23CX95ortLO+245cGTo/JvhHjgg6YLL07fkfjWHD3FVK6MWl BkEicIWYJh/sQ1PkvDcKpZ23eZq8kC8eNX9q4VCdjesbbw1LFUnFgrEtwiIWprBRyR8D MQ4weOcnOadGc/PM3w3NjlLCQeyJZl3+uMiDkLZwt6xdSczm7i0tld8XP82O+jYYzfoc t7a/uDC47otp/Jd0U8iAalItcGdegMA2GwB0wY5oojkdioHSs2nXRoxTz8NetJRpQ0sa pdhquUfovXT1Fu4trNNvtRlT8k6ILrqLsiGSy7vtlnP4XOtX1Q+3D3X8HZ6Fx213R+T7 2W6g== X-Gm-Message-State: AOAM533PTKWVlYWYu/Q/KVMSrv2oFXYbK50ioZcV0/NG7HCrT/IDjsux 4RSXoQU085iKxHZpWtEAkx3Eaw== X-Google-Smtp-Source: ABdhPJxdWj7AOP2zegfuVzaJiwFZjT+0vaS2x8/JBTLb2RZmVO8IuJS8Cm+SRY/gbAgc4M4wkFe4cg== X-Received: by 2002:adf:efd0:: with SMTP id i16mr23959598wrp.315.1589878513307; Tue, 19 May 2020 01:55:13 -0700 (PDT) Received: from localhost.localdomain ([111.119.188.30]) by smtp.gmail.com with ESMTPSA id i4sm15528630wrv.23.2020.05.19.01.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 01:55:12 -0700 (PDT) From: Muhammad Bilal To: declan.doherty@intel.com, tomasz.kantecki@intel.com, pbhagavatula@marvell.com, skori@marvell.com Cc: dev@dpdk.org, Muhammad Bilal Date: Tue, 19 May 2020 13:54:40 +0500 Message-Id: <20200519085444.4562-1-m.bilal@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH 1/5] examples/l2fwd-event: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Freeing the resources and call rte_eal_cleanup in case of error exit. Signed-off-by: Muhammad Bilal --- examples/l2fwd-event/main.c | 43 ++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c index 9593ef11e..442a664e9 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c @@ -556,13 +556,26 @@ 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"); + } + rte_eal_cleanup(); +} + int main(int argc, char **argv) { struct l2fwd_resources *rsrc; uint16_t nb_ports_available = 0; uint32_t nb_ports_in_mask = 0; - uint16_t port_id, last_port; + uint16_t port_id = 0; + uint16_t last_port; uint32_t nb_mbufs; uint16_t nb_ports; int i, ret; @@ -581,20 +594,26 @@ main(int argc, char **argv) /* parse application arguments (after the EAL ones) */ ret = l2fwd_event_parse_args(argc, argv, rsrc); - if (ret < 0) + if (ret < 0) { + stop_and_close_eth_dev(port_id); rte_panic("Invalid L2FWD arguments\n"); + } printf("MAC updating %s\n", rsrc->mac_updating ? "enabled" : "disabled"); nb_ports = rte_eth_dev_count_avail(); - if (nb_ports == 0) + if (nb_ports == 0) { + stop_and_close_eth_dev(port_id); rte_panic("No Ethernet ports - bye\n"); + } /* check port mask to possible port mask */ - if (rsrc->enabled_port_mask & ~((1 << nb_ports) - 1)) + if (rsrc->enabled_port_mask & ~((1 << nb_ports) - 1)) { + stop_and_close_eth_dev(port_id); rte_panic("Invalid portmask; possible (0x%x)\n", (1 << nb_ports) - 1); + } if (!rsrc->port_pairs) { last_port = 0; @@ -621,8 +640,10 @@ main(int argc, char **argv) rsrc->dst_ports[last_port] = last_port; } } else { - if (check_port_pair_config(rsrc) < 0) + if (check_port_pair_config(rsrc) < 0) { + stop_and_close_eth_dev(port_id); rte_panic("Invalid port pair config\n"); + } } nb_mbufs = RTE_MAX(nb_ports * (RTE_TEST_RX_DESC_DEFAULT + @@ -634,12 +655,16 @@ main(int argc, char **argv) rsrc->pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs, MEMPOOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id()); - if (rsrc->pktmbuf_pool == NULL) + if (rsrc->pktmbuf_pool == NULL) { + stop_and_close_eth_dev(port_id); rte_panic("Cannot init mbuf pool\n"); + } nb_ports_available = l2fwd_event_init_ports(rsrc); - if (!nb_ports_available) + if (!nb_ports_available) { + stop_and_close_eth_dev(port_id); rte_panic("All available ports are disabled. Please set portmask.\n"); + } /* Configure eventdev parameters if required */ if (rsrc->event_mode) @@ -659,9 +684,11 @@ main(int argc, char **argv) continue; ret = rte_eth_dev_start(port_id); - if (ret < 0) + if (ret < 0) { + stop_and_close_eth_dev(port_id); rte_panic("rte_eth_dev_start:err=%d, port=%u\n", ret, port_id); + } } if (rsrc->event_mode)