From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 074341B73A for ; Wed, 7 Feb 2018 17:48:05 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id v31so1744487wrc.11 for ; Wed, 07 Feb 2018 08:48:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6x8scthu8/pf3HODUUCxyHYr6MeqCB/sV6y9W+zymjw=; b=rTSsIss1eXJbyTNSe9THoaTtXW8Lwl/ISieRuHKqXLWYsJoVItJ+M1BfqhZ4rLsKKi Ad3LXwXTK1FUmFND2DjG2L9Z+Aj2rDTi/x1geljOj2Yn5djdxkEf9GqAIgD403rW+gB0 DQubJcHcX1SRyFFhJI/iwC/V2RxSIohhRsrXhhvTTLiMxakmT6MUVLZOkbS74e6tO2sT mXr77rfay4jQZFZ57S+Bu4xcrnwX663ipupgfHDSWIVYBVIir23lfKnBplmumizc+1VR 98NZsZVxsp9gp422DD35ttswgw5MCDsCqGPSS1TRA6LDcN4J93t95yDooa+475GHhNnG 5TzQ== 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:in-reply-to :references; bh=6x8scthu8/pf3HODUUCxyHYr6MeqCB/sV6y9W+zymjw=; b=hbwCNkEQfGqSJIj+0AAMJJoGddq+vWBf98/J9HwqcC3832nZk2UN9U/IXNLYLpiFoi CLs0ccyGQ4A/K3X3VnPdpxVbrRFMG0P1QYDZI3nzoP4FFqhVDlEdti6x3icjN+VoT8OP 30q4NaoOXSUh435M9M+3oF1XQm7wjm7RQl5DZNyXf+RMLFZcCTw5ABftTjwFx72ymAmo DLf7D/iaR+QqDZ/7C+qWLGsKHCpgZpucyGHFLkHx2VbrEqY5yYJbi8+K4E/Wvi+ihUnn C95TRr4fZrf+NvLftIR+2rd8tMyfzOp2lMFuGv++e1yBtzLoTdTKsgYXlih6jBDzINPx 7F2g== X-Gm-Message-State: APf1xPBmzNBP8kRavfdgy6My+Pn6V/Nzw+sp1BkAebFtd8H3lW5sFBTs 6z+JvLLTRpRBg0RJJhmEJ69YVwFZ4PY= X-Google-Smtp-Source: AH8x2256uFEyrY5o33muYxKPFlsRn8NvIfgbYTS2AektDvBxeWAVnafNv3V1Chkc/gZpz3fPVjusAA== X-Received: by 10.223.185.34 with SMTP id k31mr5767049wrf.245.1518022084737; Wed, 07 Feb 2018 08:48:04 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id 78sm2928769wmm.22.2018.02.07.08.48.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2018 08:48:04 -0800 (PST) From: luca.boccassi@gmail.com To: Anatoly Burakov Cc: Cristian Dumitrescu , dpdk stable Date: Wed, 7 Feb 2018 16:47:03 +0000 Message-Id: <20180207164705.29052-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180207164705.29052-1-luca.boccassi@gmail.com> References: <20180126131332.15346-62-luca.boccassi@gmail.com> <20180207164705.29052-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'test/table: fix memory leak' has been queued to LTS release 16.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Feb 2018 16:48:05 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/09/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From b0545730b56159064b6bba5a17c2d7d98452a646 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 6 Feb 2018 13:35:41 +0000 Subject: [PATCH] test/table: fix memory leak [ upstream commit c1d30e443b624f8281b08ae7651feaf4b5ba1a09 ] Always deallocate allocated resources after the test is done. Fixes: 5205954791cb ("app/test: packet framework unit tests") Signed-off-by: Anatoly Burakov Acked-by: Cristian Dumitrescu --- app/test/test_table.c | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/app/test/test_table.c b/app/test/test_table.c index 1faa0a6d8..31eac117c 100644 --- a/app/test/test_table.c +++ b/app/test/test_table.c @@ -82,6 +82,14 @@ uint64_t pipeline_test_hash(void *key, return signature; } +static void +app_free_resources(void) { + int i; + for (i = 0; i < N_PORTS; i++) + rte_ring_free(rings_rx[i]); + rte_mempool_free(pool); +} + static void app_init_mbuf_pools(void) { @@ -141,18 +149,20 @@ app_init_rings(void) static int test_table(void) { - int status, failures; + int status, ret; unsigned i; - failures = 0; + ret = TEST_SUCCESS; app_init_rings(); app_init_mbuf_pools(); printf("\n\n\n\n************Pipeline tests************\n"); - if (test_table_pipeline() < 0) - return -1; + if (test_table_pipeline() < 0) { + ret = TEST_FAILED; + goto end; + } printf("\n\n\n\n************Port tests************\n"); for (i = 0; i < n_port_tests; i++) { @@ -160,8 +170,8 @@ test_table(void) if (status < 0) { printf("\nPort test number %d failed (%d).\n", i, status); - failures++; - return -1; + ret = TEST_FAILED; + goto end; } } @@ -171,8 +181,8 @@ test_table(void) if (status < 0) { printf("\nTable test number %d failed (%d).\n", i, status); - failures++; - return -1; + ret = TEST_FAILED; + goto end; } } @@ -182,21 +192,23 @@ test_table(void) if (status < 0) { printf("\nCombined table test number %d failed with " "reason number %d.\n", i, status); - failures++; - return -1; + ret = TEST_FAILED; + goto end; } } - if (failures) - return -1; - #ifdef RTE_LIBRTE_ACL printf("\n\n\n\n************ACL tests************\n"); - if (test_table_acl() < 0) - return -1; + if (test_table_acl() < 0) { + ret = TEST_FAILED; + goto end; + } #endif - return 0; +end: + app_free_resources(); + + return ret; } REGISTER_TEST_COMMAND(table_autotest, test_table); -- 2.14.2