From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1BBF25A76 for ; Fri, 20 Mar 2015 07:52:31 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 19 Mar 2015 23:52:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,435,1422950400"; d="scan'208";a="682961660" Received: from kmsmsx151.gar.corp.intel.com ([172.21.73.86]) by fmsmga001.fm.intel.com with ESMTP; 19 Mar 2015 23:52:29 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by KMSMSX151.gar.corp.intel.com (172.21.73.86) with Microsoft SMTP Server (TLS) id 14.3.224.2; Fri, 20 Mar 2015 14:50:13 +0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.149]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.36]) with mapi id 14.03.0224.002; Fri, 20 Mar 2015 14:50:10 +0800 From: "Jiajia, SunX" To: "Wodkowski, PawelX" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] ixgbe: fix buffer overrun bug in non-bulk alloc mode setup Thread-Index: AQHQYl+cQdVX0AhQ2kW79wQXkgxEQZ0k7p3g Date: Fri, 20 Mar 2015 06:50:10 +0000 Message-ID: References: <1426781356-13999-1-git-send-email-pawelx.wodkowski@intel.com> In-Reply-To: <1426781356-13999-1-git-send-email-pawelx.wodkowski@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-cr-hashedpuzzle: dZI= sho= 3lU= AANA AGy5 ALhm AgD8 BWC9 B/MR CFqY CffL CizA Cw3B D/R3 F12R HwEh; 1; ZABlAHYAQABkAHAAZABrAC4AbwByAGcA; Sosha1_v1; 7; {D9E59C1E-7846-49BF-B77D-3D26D971EDA9}; cwB1AG4AeAAuAGoAaQBhAGoAaQBhAEAAaQBuAHQAZQBsAC4AYwBvAG0A; Fri, 20 Mar 2015 06:50:08 GMT; UgBFADoAIABbAGQAcABkAGsALQBkAGUAdgBdACAAWwBQAEEAVABDAEgAXQAgAGkAeABnAGIAZQA6ACAAZgBpAHgAIABiAHUAZgBmAGUAcgAgAG8AdgBlAHIAcgB1AG4AIABiAHUAZwAgAGkAbgAgAG4AbwBuAC0AYgB1AGwAawAgAGEAbABsAG8AYwAJAG0AbwBkAGUAIABzAGUAdAB1AHAA x-cr-puzzleid: {D9E59C1E-7846-49BF-B77D-3D26D971EDA9} x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] ixgbe: fix buffer overrun bug in non-bulk alloc mode setup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2015 06:52:33 -0000 Tested-by: Jiajia, SunX - Tested Commit: fe4810a01e57645ad92577d628f562791408ce21 - OS: Fedora20 3.11.10-301.fc20.x86_64 - GCC: gcc version 4.8.3 - CPU: Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz - NIC: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection [80= 86:10fb] - Target x86_64-native-linuxapp-gcc - Total 22 cases, 22 passed, 0 failed TOPO: * Connections ports between tester/ixia and DUT - TESTER(Or IXIA)-------DUT - portA------------------port0 - portB------------------port1 - portC------------------port2 - portD------------------port3 Test Setup#1 for Functional test =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D Tester has 4 ports(portA--portD), and DUT has 4 ports(port0--port3), then c= onnect portA to port0, portB to port1, portC to port2, portD to port3.=20 - Case: Basic bonding--Create bonded devices and slaves Description:=20 Use Setup#1. Create bonded device and add some ports as salve of bonded device, Then removed slaves or added slaves or change the bonding prima= ry slave Or change bonding mode and so on. Expected test result: Verify the basic functions are normal. - Case: Basic bonding--MAC Address Test Description:=20 Use Setup#1. Create bonded device and add some ports as slaves of bonded device, Check that the changes of the bonded device and slave MAC Expected test result: Verify the behavior of bonded device and slave according to the= mode. - Case: Basic bonding--Device Promiscuous Mode Test Description:=20 Use Setup#1. Create bonded device and add some ports as slaves of bonded device, Set promiscuous mode on or off, then send packets to the bonded= device Or slaves. Expected test result: Verify the RX/TX status of bonded device and slaves according t= o the mode. - Case: Mode 0(Round Robin) TX/RX test Description:=20 Use Setup#1. Create bonded device with mode 0 and add 3 ports as slaves of bonded devi= ce, Forward packets between bonded device and unbounded device, sta= rt to forward, And send packets to unbound device or slaves. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 0. - Case: Mode 0(Round Robin) Bring one slave link down Description:=20 Use Setup#1. Create bonded device with mode 0 and add 3 ports as slaves of bonded devi= ce, Forward packets between bonded device and unbounded device, sta= rt to forward, Bring the link on either port 0, 1 or 2 down. And send packets = to unbound=20 device or slaves. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 0. - Case: Mode 0(Round Robin) Bring all slave links down Description:=20 Use Setup#1. Create bonded device with mode 0 and add 3 ports as slaves of bonded devi= ce, Forward packets between bonded device and unbounded device, sta= rt to forward, Bring the links down on all bonded ports. And send packets to u= nbound=20 device or slaves. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 0. - Case: Mode 1(Active Backup) TX/RX Test Description:=20 Use Setup#1. Create bonded device with mode 1 and add 3 ports as slaves of bonded devi= ce, Forward packets between bonded device and unbounded device, sta= rt to forward, And send packets to unbound device or slaves. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 1. - Case: Mode 1(Active Backup) Change active slave, RX/TX test Description:=20 Use Setup#1. Continuing from previous test case.Change the active slave port from port= 0=20 to port1.Verify that the bonded device's MAC has changed to sla= ve1's MAC. testpmd> set bonding primary 1 4=20 Repeat the transmission and reception(TX/RX) test verify that da= ta is now=20 transmitted and received through the new active slave and no lon= ger through port0 Expected test result: Verify the RX/TX status of bonded device and slaves in mode 1. - Case: Mode 1(Active Backup) Link up/down active eth dev Description:=20 Use Setup#1. Bring link between port A and port0 down. If tester is ixia, can= use=20 IxExplorer to set the "Simulate Cable Disconnect" at the port pr= operty. =20 Verify that the active slave has been changed from port0. Repeat= the=20 transmission and reception test verify that data is now transmit= ted and received through the new active slave and no longer through port= 0 Bring port0 to link down at the remote end.Verify the active sla= ve has been changed from port0. send 100 packets to port3. testpmd> show port stats 4----(Verify port3 have 100 rx packets,= meanwhile port4 have 100 tx packets,the current primary port have 100 tx pa= ckets,and port0 doesn`t have any packet) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 1.= =20 - Case: Mode 1(Active Backup) Bring all slave links down Description:=20 Use Setup#1. Bring all slave ports of bonded port down. Verify that bonded callback for link down is called and no acti= ve slaves.=20 Verify that data cannot be sent or received through bonded port= . Send 100 packets=20 to port3 and verify that bonded port can't TX 100 packets. Bring port 0-2 to link down at the remote end. Verify port4 has= been link down and has no active slave. Send 100 rx packets to port3.=20 testpmd> show port stats 4----(Verify port3 have 100 rx packets,me= anwhile=20 port4 doesn`t have any packet) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 1. - Case: Mode 2(Balance XOR) TX Load Balance test Description:=20 Use Setup#1. Bonded port will activate each slave eth dev based on the follo= wing hash function: ((dst_mac XOR src_mac) % (number of slave ports)) Send 300 packets from IXIA port D to non-bonded port(port3),and= verify these packets=20 will be forwarded to bonded device. The bonded device will tran= simit these packets to all slaves. Verify that each slave receive correct number of packets accord= ing to the policy. The total number of packets which received by slave should be equal as 300 packe= ts.=20 Create 3 streams in the IXIA,which streams source MAC are 00:00= :03:00:0F:00, 00:00:03:00:0F:01,00:00:03:00:0F:02 respectively (make sure gen= erate different value by the policy ((dst_mac XOR src_mac) % (number of slave ports)) ) = and dest MAC all is=20 90:E2:BA:4A:54:80(this value should been your unbonded port add= ress). Respectively send 100 packets to port3 by the 3 streams. testpmd> show port stats all----(Verify port3 have 300 rx packe= ts, port4 have 300 tx packets,and port 0-2 have 100 tx packets resp= ectively) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 2. - Case: Mode 2(Balance XOR) TX Load Balance Link down Description:=20 Use Setup#1. ring link down of one slave. Send 300 packets from non-bonded port(port3), and verify these= =20 packets will be forwarded to bonded device.=20 Verify that each active slave receive correct number of packets (according to the mode policy), and the down slave will not rec= eive packets. Link down slave 0 at the remote end.Create 3 streams in the IXIA like cas= e13. Then respectively send 100 packets to port3 by the 3 streams. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 2. - Case: Mode 2(Balance XOR) Bring all slave links down Description:=20 Use Setup#1. Bring all slave links down. Verify that bonded callback for link down is called. Verify no packet can be sent. Bring all slaves to link down at the remote end.Create=20 3 streams in the IXIA like case13.Then respectively send 100 packets=20 to port3 by the 3 streams. testpmd> show port info 4----(Verify bonding port has been linked down) testpmd> show port stats all----(Verify port3 have 300 rx packets= ,meanwhile port 0,1,2 and 4 don`t have any packet) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 2. - Case: Mode 2(Balance XOR) Layer 3+4 forwarding =09 Description:=20 Use Setup#1. Use "xmit_hash_policy()" to change to this forwarding mode Create a stream of traffic which will exercise all slave ports using the = transmit policy=20 ((SRC_PORT XOR DST_PORT) XOR ((SRC_IP XOR DST_IP) AND 0xffff) % # of = Slaves Transmit data through bonded device, verify TX packet count for each slav= e port is as expected Create 3 streams on a port which is mapped with unbonded port 3 at the IX= IA end. And set different IP by the transmit policy.Then send 100 packets on= each stream. testpmd> show port stats all----(Verify port3 have 300 rx packet= s, meanwhile port4 have 300 rx packets, port 0-2 have 100 tx packets respe= ctively) Add Vlan tag in the previouse 3 streams. Everthing else remains the same.= =20 Then send 100 packets on each stream. Verify the packet statics is the sa= me as above. =20 testpmd> show port stats all----(Verify port3 =20 have 300 rx packets,meanwhile port4 have 300 rx packets,port 0-2 have 100= tx packets respecitvely) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 2. - Case: Mode 2(Balance XOR) RX test Description:=20 Use Setup#1. Send 100 packets to each bonded slaves(port0,1,2) Verify that each slave receives 100 packets and the bonded device receive= a total 300 packets. Verify that the bonded device forwards 300 packets to the non-bonded port= (port4). Send 100 packets to port0,1,2 respectively. testpmd> show port stats all----(Verify port0,1,2 have 100 tx packets= respectively=20 and port4 have 300 rx packets,and port3 have 300 tx packets) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 2. - Case: Mode 3(Broadcast) TX/RX Test Description:=20 Use Setup#1. Add ports 0-2 as slave devices to the bonded port 4. Make all slaves to be active slaves on bonded device.=20 RX: Send a packet stream(100 packets) from port A on the traffi= c generator to be forwarded through the bonded port4 to port3. Verify the sum of the packets transmitted from the traffic generator portA is equal the total received packets on port0, port4 and portD(T= raffic generator). testpmd> show port stats all---(Verify port0 receive 100 pac= kets,=20 and port4 receive 100 packets, and port3 transmit 100 packets) TX: Send a packet stream(100 packets) from portD on the traffic = generator=20 to be forwarded through port3 to the bonded port4. Verify th= e sum of=20 the packets(100packets) transmitted from the traffic generat= or port is equal the total=20 received packets on port4, portA and transmitted to port0. =20 testpmd> show port stats all---(Verify port3 RX 100 packets,=20 and port0,1,2 TX 100 packets,port4 has 300 TX packets) Expected test result: Verify the RX/TX status of bonded device and slaves in mode 3. - Case: Mode 3(Broadcast) Bring one slave link down Description:=20 Use Setup#1. Bring one slave port link down. Send 100 packets through portD to port3, then port3 forwards to bondede device(port4), verify that the bonded= device=20 and other slaves TX the correct number of packets(100 packets for each po= rt). Expected test result: Verify the RX/TX status of bonded device and slaves in mode 3. - Case: Mode 3(Broadcast) Bring all slave links down Description:=20 Use Setup#1. Bring all slave ports of bonded port down Verify that bonded callback for link down is called Verify that data cannot be sent or received through bonded port. Expected test result: Verify the RX/TX status of bonded device and slaves in mode 3. - Case: Mode 5(Transmit load balance) basic test =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D Use Setup#1 Create bonded device. Add first slave - port 0. Verify default bonded devic= e has default mode 5.=20 Verify bonded device MAC address is that of primary slave. Add another slav= es port 1 and 2 to=20 the bonded device. Verify that their MAC are different. Bring the primary slave down. Verify if bonding interface reconfigured itse= lf. The next port=20 (in this scenario port 1) should became a primary one but the MAC should no= t be changed - should=20 still be the MAC of port 0. Bring a slave of bonding device down. Verify if bonding interface reconfigu= red itself. Bring the portA, portB and portC down. Verify the bonded device will link d= own. Set bonded device promiscuous mode to be off. Verify only the promiscuous s= tate of primary=20 interface will be off. - Case: Mode 5(Transmit load balance) TX/RX test=20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D Use Setup#1 Create a bonded device(port4 in this scenario). Add port 0-2 as slaves of b= onding port4. Make=20 packets to transmit between port3 and port4. Then start to forward streams. TX: Prepare a packet stream which will send packets in 5 minutes. Send this= stream from portD=20 to port3. Verify that port3 will receive all packets---no missed packets an= d no error packets.=20 Port 0-2 transmitting packets will be represented as packet0, packet1 and p= acket2 respectively=20 and their average packets will be represented as mean. Then verify port 0-= 2 will meet the situation: mean =3D (packet0 + packet1 + packet2)/3, packet0, packet1 and packet2 will= be higher than 90% of mean=20 and lower than 110% of mean. Then the test of port0, port1 and port2 balanc= ing are finished positive. RX: A continuation of TX testing setup. Prepare 3 packet streams and each s= tream has 100 packets. Respectively, send these streams from portA, portB and portC. Verify only = the primary slave port0 will=20 receive 100 packets, and port3 will transmit 100 packets. - Case: Mode 5(Transmit load balance) Bring one slave link down =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D Use Setup#1 Create a bonded device(port4 in this scenario). Add port0, port1 and port2 = as slaves of bonding port4. Make packets to transmit between port3 and port4. Then start to forward st= reams. TX: Prepare a packet stream which will send packets in 5 minutes. Bringing = port0 link down in the remote=20 end. Send this stream from portD to port3. After the time of 5 minutes is o= ut, verify that port3 will receive all packets---no missed packets and no error packets. Port 1-2 transmittin= g packets will be represented as=20 packet1 and packet2 respectively and their average packets will be represen= ted as mean. Then verify port1 and=20 port2 will meet the situation: mean =3D (packet1 + packet2)/2, packet1 and packet2 will be higher than 90%= of mean and lower than 110% of mean.=20 Then the test of port1 and port2 balancing are finished positive. RX: Prepare 3 packet streams and each stream has 100 packets. Respectively,= send these streams from portA, portB=20 and portC. Verify the primary port(port0 this scenario) will receive 100 pa= ckets, and port1 and port2 will receive nothing, and port3 will transmit 100 packets. - Case: Mode 5(Transmit load balance) Bring all slaves link down=20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D Use Setup#1 First, set the same setup as case 30. Second, bring all slaves link down. TX: Prepare 1 packet stream which will have 300 packets. Send this stream f= rom portD to port3. Verify port0,=20 port1 and port2 will transmit nothing. RX: Prepare 3 packet streams and each stream has 100 packets. Respectively,= send these streams from portA, portB and portC. Verify port0, port1 and port2 will receive nothing. > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Pawel Wodkowski > Sent: Friday, March 20, 2015 12:09 AM > To: dev@dpdk.org > Cc: Wodkowski, PawelX > Subject: [dpdk-dev] [PATCH] ixgbe: fix buffer overrun bug in non-bulk > alloc mode setup >=20 > From: Pawel Wodkowski >=20 > When bulk alloc is enabled at compile time but preconditions for > it are not met at runtime the ixgbe_reset_rx_queue() function > overrides rxq->sw_ring not allocated elements. >=20 > Fixes: 01fa1d6 ("ixgbe: unify Rx setup") > Signed-off-by: Pawel Wodkowski > --- > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index 42f0aa5..dddc12f 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -2111,8 +2111,8 @@ ixgbe_reset_rx_queue(struct ixgbe_hw *hw, struct > ixgbe_rx_queue *rxq) > * entries is always allocated > */ > memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf)); > - for (i =3D 0; i < RTE_PMD_IXGBE_RX_MAX_BURST; ++i) { > - rxq->sw_ring[rxq->nb_rx_desc + i].mbuf =3D &rxq->fake_mbuf; > + for (i =3D rxq->nb_rx_desc; i < len; ++i) { > + rxq->sw_ring[i].mbuf =3D &rxq->fake_mbuf; > } >=20 > rxq->rx_nb_avail =3D 0; > -- > 1.9.1