From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 81BF6A0679 for ; Mon, 29 Apr 2019 16:56:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8CB916833; Mon, 29 Apr 2019 16:56:43 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id EF0A55F51 for ; Mon, 29 Apr 2019 16:56:41 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 07:56:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,409,1549958400"; d="scan'208";a="165938340" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.33]) ([10.237.221.33]) by fmsmga002.fm.intel.com with ESMTP; 29 Apr 2019 07:56:38 -0700 To: kkanas@marvell.com, dev@dpdk.org Cc: declan.doherty@intel.com, Chas Williams References: <20190426223029.23677-1-kkanas@marvell.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: <124dad47-edb3-843c-e83d-359d408f050c@intel.com> Date: Mon, 29 Apr 2019 15:56:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190426223029.23677-1-kkanas@marvell.com> Content-Type: text/plain; charset="UTF-8" Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH] net/bonding: fix test bonding MAC assignment 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" Message-ID: <20190429145637.hxAoY_OcPevFlorTyQEGbfyswRyN7wGbWCj86ceoyMs@z> On 4/26/2019 11:30 PM, kkanas@marvell.com wrote: > From: Krzysztof Kanas > > Fix test_set_bonded_port_initialization_mac_assignment so that it works > after 're run' test_link_bonding. > > Fixes: f2ef6f21ee2e ("bond: fix mac assignment to slaves") > Cc: declan.doherty@intel.com > > Signed-off-by: Krzysztof Kanas cc'ed maintainer, Chas. > --- > app/test/test_link_bonding.c | 53 +++++++++++++++++++++--------------- > 1 file changed, 31 insertions(+), 22 deletions(-) > > diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c > index 0fe1d78eb0f5..c00ec6c445bd 100644 > --- a/app/test/test_link_bonding.c > +++ b/app/test/test_link_bonding.c > @@ -201,6 +201,7 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t en_isr) > } > > static int slaves_initialized; > +static int mac_slaves_initialized; > > static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; > static pthread_cond_t cvar = PTHREAD_COND_INITIALIZER; > @@ -873,10 +874,11 @@ test_set_explicit_bonded_mac(void) > static int > test_set_bonded_port_initialization_mac_assignment(void) > { > - int i, slave_count, bonded_port_id; > + int i, slave_count; > > uint16_t slaves[RTE_MAX_ETHPORTS]; > - int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT]; > + static int bonded_port_id = -1; > + static int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT]; > > struct ether_addr slave_mac_addr, bonded_mac_addr, read_mac_addr; > > @@ -887,42 +889,49 @@ test_set_bonded_port_initialization_mac_assignment(void) > /* > * 1. a - Create / configure bonded / slave ethdevs > */ > - bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test", > - BONDING_MODE_ACTIVE_BACKUP, rte_socket_id()); > - TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device"); > + if (bonded_port_id == -1) { > + bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test", > + BONDING_MODE_ACTIVE_BACKUP, rte_socket_id()); > + TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device"); > > - TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0), > - "Failed to configure bonded ethdev"); > + TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0), > + "Failed to configure bonded ethdev"); > + } > > - for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) { > - char pmd_name[RTE_ETH_NAME_MAX_LEN]; > + if (!mac_slaves_initialized) { > > - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = i + 100; > + for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) { > + char pmd_name[RTE_ETH_NAME_MAX_LEN]; > > - snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "eth_slave_%d", i); > + slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = i + 100; > > - slave_port_ids[i] = virtual_ethdev_create(pmd_name, > - &slave_mac_addr, rte_socket_id(), 1); > + snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, > + "eth_slave_%d", i); > > - TEST_ASSERT(slave_port_ids[i] >= 0, > - "Failed to create slave ethdev %s", pmd_name); > + slave_port_ids[i] = virtual_ethdev_create(pmd_name, > + &slave_mac_addr, rte_socket_id(), 1); > > - TEST_ASSERT_SUCCESS(configure_ethdev(slave_port_ids[i], 1, 0), > - "Failed to configure virtual ethdev %s", > - pmd_name); > - } > + TEST_ASSERT(slave_port_ids[i] >= 0, > + "Failed to create slave ethdev %s", > + pmd_name); > > + TEST_ASSERT_SUCCESS(configure_ethdev( > + slave_port_ids[i], 1, 0), > + "Failed to configure virtual ethdev %s", > + pmd_name); > + } > > + mac_slaves_initialized = 1; > + } > /* > - * 2. Add slave ethdevs to bonded device > - */ > + * 2. Add slave ethdevs to bonded device > + */ > for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) { > TEST_ASSERT_SUCCESS(rte_eth_bond_slave_add(bonded_port_id, > slave_port_ids[i]), > "Failed to add slave (%d) to bonded port (%d).", > slave_port_ids[i], bonded_port_id); > } > - > slave_count = rte_eth_bond_slaves_get(bonded_port_id, slaves, > RTE_MAX_ETHPORTS); > TEST_ASSERT_EQUAL(BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT, slave_count, >