From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by dpdk.org (Postfix) with ESMTP id 3F0092B9D for ; Wed, 9 Aug 2017 05:47:17 +0200 (CEST) Received: by mail-pg0-f42.google.com with SMTP id y129so22794651pgy.4 for ; Tue, 08 Aug 2017 20:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JeJI/VhXPhGemvgtltvogFcDVEJPrudphuiInP/TJVM=; b=kxCsOlnuMwzOyd8Q/C0xlp/Sn8csx7HFiL96X53EbLIiKwmUmdhtFXBOnuweD+4ha7 dryfPUf2auiV/SuQwJKT/owFP2R881d4MgjBjG/ZLlGD/xnmo3oMmlFPHbj+2SSpefS8 XsInPCjTZwELmFYk1Aj0SUA4OweHKPorWZ2mikE7CONvYMFqA2+oxuGenLMU9KBZfyn1 uKxwnm7KPBcMmEdsJqgSTLaTpohtgZYWiFsRjC9SB2thbn0qnIh/B79PPIXaV1JPcSGS nPcQ9Iov9Gy4/neGmsmRL2PSitr96DE2i26epwh4EiX9OcTo59QppiRhDzQmsXehN3TD YLjg== 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=JeJI/VhXPhGemvgtltvogFcDVEJPrudphuiInP/TJVM=; b=OLyt3bg0wJX6rIH7v9V23nChzBxLWZJk+vXsI2uG0ZoCqjclb8AzMdNZA/MV+eioko GwGosL9PgxsbjPRS/wvzaPjrd6XmqnaoPtb3t5O4T6jxMgUaBUw7YF+TFMDTVYYMK93m YHqZkXmxavxUu8CG69xCU6vXKrcxy+IufzOEjQ7AmA5H54q8b+7bGSV3FWUpw3FamRnr +qOGqom7E71q+k5JGRUpTJ+yLL9QX+nDkNmI04oybnBlrWnIqC+Jy6jorKzRwjLlq3yz gGodBbYkxogNuCpqijacy6i5fILpKm2DeF/Sp7WYp7jMONfBNqEhULy4I2pynQJgJCcr Q7uQ== X-Gm-Message-State: AHYfb5gRe3bE+fBLVkNZ8ngmdBG+i077uGmGXHkHhuUlAUt3JYFhztUA v5dDwuro6d8cCupfchUSiA== X-Received: by 10.98.61.129 with SMTP id x1mr6935374pfj.68.1502250436411; Tue, 08 Aug 2017 20:47:16 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id q3sm5093921pfl.89.2017.08.08.20.47.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 20:47:15 -0700 (PDT) From: Yuanhan Liu To: Herbert Guan Cc: Declan Doherty , dpdk stable , Yuanhan Liu Date: Wed, 9 Aug 2017 11:43:52 +0800 Message-Id: <1502250240-6599-10-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502250240-6599-1-git-send-email-yliu@fridaylinux.org> References: <1502250240-6599-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'test/bonding: fix memory corruptions' has been queued to LTS release 16.11.3 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, 09 Aug 2017 03:47:17 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/17. So please shout if anyone has objections. Thanks. --yliu --- >>From ee9aa553356f323ba57c21995311646c84279724 Mon Sep 17 00:00:00 2001 From: Herbert Guan Date: Mon, 10 Jul 2017 19:13:46 +0800 Subject: [PATCH] test/bonding: fix memory corruptions [ upstream commit 8d3708efece06212bde6b1e10b2251931e1e9961 ] There were double-free problems in some test cases, which will cause a duplicated mbuf will be added into mempool. After double-free, some new allocated mbuf will hold a same address and thus cause the memory corruption. Another minor issue is that in some test cases, allocated mbuf will not be released after test case exits. Hopefully these leaked mbuf will be released by the next test case in its setup phase when stopping the virtual pmd ports, while this do is a memory leak of the exited test case. To fix above 2 issues, this patch will do: 1) Release virtual pmd ports' tx queue in the clean up function remove_slaves_and_stop_bonded_device() of each test cases. 2) Do not release allocated mbufs for test bursts. These mbufs will be released in remove_slaves_and_stop_bonded_device() when test case exits. Fixes: 92073ef961ee ("bond: unit tests") Signed-off-by: Herbert Guan Acked-by: Declan Doherty --- app/test/test_link_bonding.c | 64 +++++++------------------------------------- 1 file changed, 9 insertions(+), 55 deletions(-) diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index 52d2d05..aeb234f 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -221,6 +221,10 @@ static struct rte_eth_txconf tx_conf_default = { }; +static void free_virtualpmd_tx_queue(void); + + + static int configure_ethdev(uint8_t port_id, uint8_t start, uint8_t en_isr) { @@ -684,6 +688,7 @@ static int remove_slaves_and_stop_bonded_device(void) { /* Clean up and remove slaves from bonded device */ + free_virtualpmd_tx_queue(); while (test_params->bonded_slave_count > 0) TEST_ASSERT_SUCCESS(test_remove_slave_from_bonded_device(), "test_remove_slave_from_bonded_device failed"); @@ -1617,9 +1622,6 @@ test_roundrobin_rx_burst_on_single_slave(void) /* free mbufs */ for (i = 0; i < MAX_PKT_BURST; i++) { - if (gen_pkt_burst[i] != NULL) - rte_pktmbuf_free(gen_pkt_burst[i]); - if (rx_pkt_burst[i] != NULL) rte_pktmbuf_free(rx_pkt_burst[i]); } @@ -1966,12 +1968,6 @@ test_roundrobin_verify_slave_link_status_change_behaviour(void) for (i = 0; i < MAX_PKT_BURST; i++) { if (rx_pkt_burst[i] != NULL) rte_pktmbuf_free(rx_pkt_burst[i]); - - if (gen_pkt_burst[1][i] != NULL) - rte_pktmbuf_free(gen_pkt_burst[1][i]); - - if (gen_pkt_burst[3][i] != NULL) - rte_pktmbuf_free(gen_pkt_burst[1][i]); } /* Clean up and remove slaves from bonded device */ @@ -2410,7 +2406,7 @@ test_activebackup_verify_slave_link_status_change_failover(void) uint8_t slaves[RTE_MAX_ETHPORTS]; - int i, j, burst_size, slave_count, primary_port; + int i, burst_size, slave_count, primary_port; burst_size = 21; @@ -2543,16 +2539,6 @@ test_activebackup_verify_slave_link_status_change_failover(void) "(%d) port_stats.opackets not as expected", test_params->slave_port_ids[3]); - /* free mbufs */ - for (i = 0; i < TEST_ACTIVE_BACKUP_RX_BURST_SLAVE_COUNT; i++) { - for (j = 0; j < MAX_PKT_BURST; j++) { - if (pkt_burst[i][j] != NULL) { - rte_pktmbuf_free(pkt_burst[i][j]); - pkt_burst[i][j] = NULL; - } - } - } - /* Clean up and remove slaves from bonded device */ return remove_slaves_and_stop_bonded_device(); } @@ -3314,7 +3300,7 @@ test_balance_verify_slave_link_status_change_behaviour(void) uint8_t slaves[RTE_MAX_ETHPORTS]; - int i, j, burst_size, slave_count; + int i, burst_size, slave_count; memset(pkt_burst, 0, sizeof(pkt_burst)); @@ -3452,16 +3438,6 @@ test_balance_verify_slave_link_status_change_behaviour(void) test_params->bonded_port_id, (int)port_stats.ipackets, burst_size * 3); - /* free mbufs allocate for rx testing */ - for (i = 0; i < TEST_BALANCE_RX_BURST_SLAVE_COUNT; i++) { - for (j = 0; j < MAX_PKT_BURST; j++) { - if (pkt_burst[i][j] != NULL) { - rte_pktmbuf_free(pkt_burst[i][j]); - pkt_burst[i][j] = NULL; - } - } - } - /* Clean up and remove slaves from bonded device */ return remove_slaves_and_stop_bonded_device(); } @@ -3883,7 +3859,7 @@ test_broadcast_verify_slave_link_status_change_behaviour(void) uint8_t slaves[RTE_MAX_ETHPORTS]; - int i, j, burst_size, slave_count; + int i, burst_size, slave_count; memset(pkt_burst, 0, sizeof(pkt_burst)); @@ -3980,16 +3956,6 @@ test_broadcast_verify_slave_link_status_change_behaviour(void) "(%d) port_stats.ipackets not as expected\n", test_params->bonded_port_id); - /* free mbufs allocate for rx testing */ - for (i = 0; i < BROADCAST_LINK_STATUS_NUM_OF_SLAVES; i++) { - for (j = 0; j < MAX_PKT_BURST; j++) { - if (pkt_burst[i][j] != NULL) { - rte_pktmbuf_free(pkt_burst[i][j]); - pkt_burst[i][j] = NULL; - } - } - } - /* Clean up and remove slaves from bonded device */ return remove_slaves_and_stop_bonded_device(); } @@ -4405,7 +4371,7 @@ test_tlb_verify_slave_link_status_change_failover(void) uint8_t slaves[RTE_MAX_ETHPORTS]; - int i, j, burst_size, slave_count, primary_port; + int i, burst_size, slave_count, primary_port; burst_size = 21; @@ -4523,18 +4489,6 @@ test_tlb_verify_slave_link_status_change_failover(void) "(%d) port_stats.ipackets not as expected\n", test_params->bonded_port_id); - /* free mbufs */ - - for (i = 0; i < TEST_ADAPTIVE_TRANSMIT_LOAD_BALANCING_RX_BURST_SLAVE_COUNT; i++) { - for (j = 0; j < MAX_PKT_BURST; j++) { - if (pkt_burst[i][j] != NULL) { - rte_pktmbuf_free(pkt_burst[i][j]); - pkt_burst[i][j] = NULL; - } - } - } - - /* Clean up and remove slaves from bonded device */ return remove_slaves_and_stop_bonded_device(); } -- 2.7.4