From patchwork Sun Feb 4 17:27:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 34927 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 693E11B1CA; Sun, 4 Feb 2018 18:27:27 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50077.outbound.protection.outlook.com [40.107.5.77]) by dpdk.org (Postfix) with ESMTP id 48B251B1BD for ; Sun, 4 Feb 2018 18:27:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TOca5WFr0YAFgVaquBMpuID70sZbPLeP+PeJSfTrqcE=; b=OTKZndOrlplIW+sa71kIm7XZot1h4mVW/bQhanf4xS6M5l+9b0VLy8tjlHYQ/LeIo00VzO3+fIJc/phniuif+Va3MomGJcNa4pXI9FrnP81f44MUR05UKLDF4i7AJ64CxkHi/YO/Ahsns8Kis6OwiQNZl02Ac3uKWuc+9Jj1mRE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM4PR0501MB2657.eurprd05.prod.outlook.com (2603:10a6:200:59::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Sun, 4 Feb 2018 17:27:24 +0000 From: Matan Azrad To: Wenzhuo Lu Cc: dev@dpdk.org Date: Sun, 4 Feb 2018 17:27:05 +0000 Message-Id: <1517765225-11117-2-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517765225-11117-1-git-send-email-matan@mellanox.com> References: <1517765225-11117-1-git-send-email-matan@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: AM0PR0102CA0067.eurprd01.prod.exchangelabs.com (2603:10a6:208::44) To AM4PR0501MB2657.eurprd05.prod.outlook.com (2603:10a6:200:59::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d65df9aa-cb3c-41db-cf0b-08d56bf48ebf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM4PR0501MB2657; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2657; 3:24yK+5YY0Pnl1yozCE2xCDNIqUOVkQGgL8/QE/a6hgB4oxXi7aQ7O9peop3n3vXqDUTrWhdo9C2csvikGeBKPBp4BiEVxjxB6U0vRDJvSQNP1L7IeUiPjYN5BvRmPwxXASpSKcPvwo2/X9cvwleY5UczCKfufKRlCB6L01B8YOCTrlDKECBjrXYKnRGUnvMbLj1+4lrGv8QGgtK9J6uBVxwpBY0iw3JQt5/6eSRzdeUQ2HvdTaNiF8DOF9QFT0ld; 25:pLTqpe7qHAp8U1Qw+yQH7Ie7HnjHgbwdoWCq7gD7mNDhI43k+gTPwIK4vLVekluzS9MJOOkCj+xPdZHjKxWJomo4CXZ56uVHwPeSvQmph+sMpH2H5IRA908jh23LgSWNO/zXfsrBPByCVuv4KT1lI+yxd33jYodQbvWNQMy0RnVVjutZNUY2+lCzAvHidf3C8gDW9Z8zp1r5blCVteC4qTnmJtE8FXwW20/6CvTGMzKXTxv+CIY1SjeOxEUOdTPvD6pMkxPkjioDcaXxkfEtmuzBy0mPwqveF7Umu1xAi/DGFBjayRN/7XSqkROjbh/rQRE/tyscTDP2EeuJTLpvfA==; 31:KYLYB+4m7vpscht4impAckI8+VuxcBDh1E3xqhSMXW3GImsaSkCWz9KUUvKmrnj3nstjBzV6uJIvnYatFPTg+yxiqvR/229sibkFKakmQFcl8w81jxc2RXe01sYKTBTm3aTMAw54OidCEICiROTYXG08UpqBZzi+bOlif2udyBcS69cxasgVXlFV835W2+9R8hMZxc46MP2+6e8QVP0rsQ1Gv7KmuYExvpEMQLGJ9cg= X-MS-TrafficTypeDiagnostic: AM4PR0501MB2657: X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2657; 20:Jh4MAdeIi0wu9PAcnsNO2OUTJpRsbwCISssW9d6E+Le1GRhjyMVrnmlSmg7WTsReo5YpyVnSXfLBxCOVy/nCv37OkBAQMK9XPuP5QP9F2fpe8UOdremMJT7J8XNJcB1tC5SLrzo8IrcsQMNydJTYz6qMNgepmeV79SiqIXXkuGFGHSw1ozaf3qcOQIy5PpvIgpIi4K5h+mY0UPiyyOT7ok0fBNDz7+0r5jDAgox7FdGXA1xQIO1jqbXvqxxJN5vHhQXaOMOegLVsFgTmoyTU1dpX9vpqJmwBbRqHp8rohedBENd4n2ukzywBpjAU+mSbgBDyBuU+LmehXaf3Jaaqb4oPec0MDty36lg3jve+yd2ZubKlV0nEQ6F+G4pSnSCDiTs14gB2Va/pD9tYUdudna1ahuoamKZvDsNUwJs6eak4eEll8RE6HlEKdfgnxj1dC6cjPAfPYiXKULkd3xHaQDQFww/z8iaMviA1gMm9gsk+xLgXoho3dudyFIbxyfCV; 4:DjpuSo4P5+zF0bK1UIZSDBgKC/NHHaVuU4WiqXTDLgr9D+EVB3OEjFmHawXHoqLkc1KiFi8xNUZ9j63xxMSvOwag1gOL9yeeaG6DQ08iniycSOCNH32Z+bzbEWAhREcxDk3Of7RafJHWGoxpcZ4eTRMJL9P6a/c35iHRd3r3++AhNOBq9LPPcWjP/ryu1cm4bYE88Zwu0ar2tTVorJf8vUP/rO0bT0Gm/HjaiT8h8pW0NEmdqIIzdAoeTSgvLOWpDtHT009PXi4zrinoiuwgxQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231101)(2400082)(944501161)(3002001)(6055026)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM4PR0501MB2657; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0501MB2657; X-Forefront-PRVS: 05739BA1B5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39380400002)(39860400002)(199004)(189003)(305945005)(69596002)(7736002)(86362001)(48376002)(33026002)(7696005)(52116002)(25786009)(51416003)(76176011)(386003)(478600001)(3846002)(6116002)(186003)(4326008)(16526019)(26005)(97736004)(2906002)(16586007)(66066001)(105586002)(36756003)(21086003)(47776003)(106356001)(55016002)(6916009)(53936002)(81166006)(8936002)(8676002)(50226002)(81156014)(50466002)(4720700003)(5660300001)(2950100002)(6666003)(316002)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR0501MB2657; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR0501MB2657; 23:PEFC2oQD+kPpVOqHtffcHdCA6i6R9SgUtdRknfy?= sS6XTB5lsVbIfiGfQGCeV8kyoUAJBvpuoswz4wWJgJkjc9DF5vpDQzBaACCjdh+y2Rde59KntY1O0GfgxxN8tpiM53znSO42iKutcMo/gtPHiQJzH4+T6FqdTMqXSEQ3V8nhfQ6VPduENpo8PQhaagepMW82XQM/DIQHl2f+xK67npMjluXKbdTKxb2BVW+NzTDL/nJE0LAPTqPSNrb2nBveRSeEVZZXfEHfaw59bN9G2bvFiX00sGTMY+FsEVrRFcyi4yaVxjESRGh3DFao5GCUH6nqnDUVFxb5IeEGPhgKvLn2RzpWMUf0+6eqHcbKGl9/By4i3r2S6Exfpw4/vmhI2fFhQgPlh9xVP8DRhS/Eg4OSvHU0VN7RZbY9iI1OiOOjwH49Gk5+qw21iF7XcUA+EvE8dhDcwqjHYM7lqq30530D1Sz94tn0sDhQ26w8kiR0RsZMH8UDCk1XXmbTLDLLfEMsAEhX49gcw6SOBiLazPoFVhdMToZxi3cRB8lOiJTGChOKt7BnEchdQ4Wi3uiPwyTciI9WY62arMkU634GD1GTs6Sp03pOvcdpiUhRFPXWLvLoVVJQUz5QRrSPaiyKjzfQYiksUV1ijuvB/XHtE1NbB6WYXRETHCdhHDilgxhMa/7G64mxdrlVKmLmrvoL93TL2opBKeRdenSy+TJ3mbAtgc/PKJN8IRtd0XO6uZo1VvOAnbYcV9GH2HD+g/Qcru9SWZmfK9l1+mgSwfUx/1wCuDJ6/B5pQJ+66sq9fSfYOMQR8EaPKaos/1psFjIpcSNvr2f6TZgyTseSnfHCbAtk4/n+k8knfOneS2TM3NIZj86IRzGs/ySZrttAzeasUoYi8CT/8GT1C8jACj8aG4888Tx6X6YVi8DbSgoSY74mq3mK0TmHZ6VVPOxGuj/L8Jv32nmsGmyG2rNqkwEZVsh21E3nQc4cMpK/UPq8BCL1utNisFebQHrV9lk80ThSxYNYZmbT8YZAUtN3Om4lnxuQBukZbpCgJRaMGM0fBBa6DNFzRdIq3BIUR24tq8QLWEy4HWz/dn4IaR0JLivTaLVL6lTZM7g/GEnFmb3ceG96UqzpSVBFLe8j03+8uLIAlZfcNWUlYh4WSywMCJ5yPRmc3duRqEGJYVrNNJzmOplI= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2657; 6:GwISZ4Dl1k5iW0J4fruoOdaYsemBQxkrp55f8VzqJga+GwIjdJCYBxT0z55bWZy6u4AK613OYuacNEQF2Z0DYkEfG+uprZ8iSlRz1IA5HnkcpLNw98xhgjI3i4g2C/+sbhwp1ZYRRhhaySS+GT1tXStmuY3NgWh5kSR8wZiWdb5T2xpCDYmbCsRjXBlweNkYsR8oZbVm0FF6mlJCoFhlZN27W7BEE+cyFV9zyma6G5E2BgWBc1uOhxPT2rGEqlr21Fm4DqvUW2GA/O2piSnfVdiHQf7gniA8nI3p6AO+oztNZu07w+zDC6Sp0MzyiR8hLCcbV29TFsDhAQVv+TKQG2B5GlXMgknYOWlObyVbq70=; 5:QMwqZEz0sjMNZoDv3On1aKvLHjzr1NHEuvGRA17PJd6iVc5UwktejLVRANCuLWYH5Q9Tf8i256O3RkPOudBRWV5KNeQvUmBSZWBQ3If8oxJi85hZyFEwYawjWvDkECjGnw7GwC5/r+TpWEpEoSwwN2QdcoorYxYo5WqXGwO+Uhk=; 24:bV5nUjiGIUSDHV7Aenr8F6ucCio40lCc/9grGnJhVtFLP0x2zrvAHm3Uk/Vxaac2r4yh2E/FP+rp/THdfm6QUfd0IgAuRO8xM0u48mvPXrU=; 7:WvRg/NpTlglCMf8MCjuuberjMTYZco8fJF4rtOH5dt3u8C8yWkxwwRQWoPszNKJgF7ZE97oa8fkOG1yipksI5dBCUCijl3BH/sIkzZIl6Xuyiyc1TRPOqiWfDXiQtM10IhrFzVpp81Tb6GcNNzZmNCy0cd0pPA5wTtUK0KLbHwvxjpyB9ED6/X7Qsy0ZGFvUbZjMVpCUdeMCWcznkdJrEiK8IzIXDPTSWjwN8eA55qn8q2Fb2hD+vfTa+HiNKBM1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2018 17:27:24.9545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d65df9aa-cb3c-41db-cf0b-08d56bf48ebf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0501MB2657 Subject: [dpdk-dev] [PATCH 2/2] app/testpmd: use dedicated function to get Tx port 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" A new function was added to get a Tx port as a function of the topology mode and the Rx port. Use this function to get the Tx port of simple stream. Signed-off-by: Matan Azrad --- app/test-pmd/config.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 02ab1e3..4bb255c 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1916,19 +1916,6 @@ struct igb_ring_desc_16_bytes { simple_fwd_config_setup(void) { portid_t i; - portid_t j; - portid_t inc = 2; - - if (port_topology == PORT_TOPOLOGY_CHAINED || - port_topology == PORT_TOPOLOGY_LOOP) { - inc = 1; - } else if (nb_fwd_ports % 2) { - printf("\nWarning! Cannot handle an odd number of ports " - "with the current port topology. Configuration " - "must be changed to have an even number of ports, " - "or relaunch application with " - "--port-topology=chained\n\n"); - } cur_fwd_config.nb_fwd_ports = (portid_t) nb_fwd_ports; cur_fwd_config.nb_fwd_streams = @@ -1947,26 +1934,14 @@ struct igb_ring_desc_16_bytes { (lcoreid_t) cur_fwd_config.nb_fwd_ports; setup_fwd_config_of_each_lcore(&cur_fwd_config); - for (i = 0; i < cur_fwd_config.nb_fwd_ports; i = (portid_t) (i + inc)) { - if (port_topology != PORT_TOPOLOGY_LOOP) - j = (portid_t) ((i + 1) % cur_fwd_config.nb_fwd_ports); - else - j = i; + for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { fwd_streams[i]->rx_port = fwd_ports_ids[i]; fwd_streams[i]->rx_queue = 0; - fwd_streams[i]->tx_port = fwd_ports_ids[j]; + fwd_streams[i]->tx_port = + fwd_ports_ids[fwd_topology_tx_port_get(i)]; fwd_streams[i]->tx_queue = 0; fwd_streams[i]->peer_addr = fwd_streams[i]->tx_port; fwd_streams[i]->retry_enabled = retry_enabled; - - if (port_topology == PORT_TOPOLOGY_PAIRED) { - fwd_streams[j]->rx_port = fwd_ports_ids[j]; - fwd_streams[j]->rx_queue = 0; - fwd_streams[j]->tx_port = fwd_ports_ids[i]; - fwd_streams[j]->tx_queue = 0; - fwd_streams[j]->peer_addr = fwd_streams[j]->tx_port; - fwd_streams[j]->retry_enabled = retry_enabled; - } } }