From patchwork Thu Nov 23 12:19:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31562 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 3EA777CBA; Thu, 23 Nov 2017 13:20:07 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30077.outbound.protection.outlook.com [40.107.3.77]) by dpdk.org (Postfix) with ESMTP id 7B34F2BAC for ; Thu, 23 Nov 2017 13:20:00 +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=JwrypRsds0dILp8d17cdBUvakaMMXByI4mBh41N1dbQ=; b=KEBui+BUVXgzqy13r2dPfpmtYMSXH3eyLG1lpIz48GtH8SL6/2VX/+K1mNQc5kQrux5Fz+AOEd9ZsUsTKaUi3YZpUDT/7KUGHvHKlJvfdwJcZJa6fSqnpEFwEMQNf58kb9insPuQAlHVoxRGdf3lZXkxKxKpeS96PKc1119aaEM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (82.166.227.17) by DB6PR05MB3142.eurprd05.prod.outlook.com (2603:10a6:6:1a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Thu, 23 Nov 2017 12:19:59 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:17 +0200 Message-Id: <20171123121941.144335-6-shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171123121941.144335-1-shahafs@mellanox.com> References: <20171123121941.144335-1-shahafs@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [82.166.227.17] X-ClientProxiedBy: HE1PR0402CA0044.eurprd04.prod.outlook.com (2603:10a6:7:7c::33) To DB6PR05MB3142.eurprd05.prod.outlook.com (2603:10a6:6:1a::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f8e5b994-5bc7-4b74-6cc0-08d5326c8424 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600025)(4604075)(2017052603199); SRVR:DB6PR05MB3142; X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 3:wHXN/kze/S4QbyLUcdnDXs+9gIlpgz32smkpV4AXZg+BtfY8DygKrciLE0wHaj1JODUlArFJK0ucFoQuXcAgDMUqknF1kx8guhilPx0HBJxrdD7g16LkaWTGSAiM/zAo+qHnzNJsnfU9kUUCFLUXIn+wwv05asc1Ny427ZHPzXXLH6XeCaMNdS7WPGFt20ULBkdyhfEdPyRJhViE7CrT2Ssk24cY5/3QYOJBxR6LSkRiS8a1SRGMbMi3H9QkcIsS; 25:by+saNXUCMphASVwcRmNUD47Jp7SbRKcv9lA6zCuvOcKoHfs/HlUU4SbVvtilIYb0hZyNx3Ow0TEcjCV74xO2lwRnszZz4JvEY+Z4OE36nMpYS4JTuPdMvdEm+UQ1SWL8hDFmCQ0jH+6vh3Z+1nd/84/XwcDT++24Z+Y8/wlSIlNhE2kzzJNRLV0+NA1hriClNuZRo3HgDLiybay7+l63L1rOJjP6WCp3AI59PuGCNmwKWS5lZwV3NilR8SyR6y0TE6as3WMmqPfWQLviIR3I7NTcgbHEfBjsqvPnwTdRMhNdu2mKcmUV42/H4Nvi3vvViTWluLV+28S6jioHaFs3w==; 31:CLwZPoA5TedzgiZ/PQH5VZmdDGh1lh5UlzGpQ0i9O2iUXwe3FXeLiHiap24Q0Nk9AQS4oUPvWXS1a2O0fZOCQ0lSQHOBU1J97sIcJHWYQKKA2jgdjOpAYU9diwTwzGdMDSZiWu6hpmiTJ/CyzNOqQLArWRl7W9cRLxpUzZAOOnqAu1gXvJPpoEi4P5RIVAZKhie7KxUUfbkySrDoBjQLXtxFZqS45JVIx0HQ8+pwukk= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:Haa0pyBg3qf7dswUXz23PlKv2vlp6yrfigsVyicKBBn5EqnVfUDFgXd2DUVxlCk5RoVT5M/jMpKs1WX8OlvViU8LqlZnlUGs8udLfGGzK3yxn+1LguospnnrWExwpJ+MZ9KlCYR4tRcQs5hwllzd+h9gnWbChHwDM53ZfAeIyZ+DPK+T5YAmO568ente8vXLrqyKRxLJ8/Iw2oHjWNYFwDwgPaM1QRrJU5NhD1fxBKBfVMr2y0Fh4b98TlwMRGNZXggMGexYicqIH82rJEa6z/270/JfHCwum9bSfKEzLg7k9xw1Ylzg255s6Db0ajPRcGNTVo0I9WpGvfdR4eBvst12yE4gvBaTefYU/tBNr/iKBkVHWSoaHYm19aqFG634xIrtEZ8QkV4wMdnqKsQ0yD6yTp8wzeY7gSnblLEUgYqCzT3LiFRqcxRwwX+qDXP9DTWh+YpsN9MzDEhllcIKvlvJocyvsXkinzqFG05cWy512NzFAcPfnSWWb69Xudt5; 4:sOF7214dHQD8d4IUBhHmlZ0NWL/hr+RrttmIbQjDaXzNSw5zUXh63biD8mGmjSkuEOaCurwTFC+m8fhgvtXWrsWlshiT9Daw7zFFe6RdTGDTryRxewFWtnl0PzA+PZgItS6+wyEoh7qWDGmkN4ynk4xN7hxHBt91LI9ybhLNDFtBqsTdZNFBGPlpy/MIT4Tq1IZOwDf9x+Dj4P9pzuzMygNvQlpyoglXzRygNWTD6OKREPQBXZFSTDyaJQoz5KuJqX1684YTj/0DcAcKI9J0+w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3231022)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB6PR05MB3142; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB6PR05MB3142; X-Forefront-PRVS: 05009853EF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(366004)(346002)(376002)(39860400002)(199003)(189002)(50466002)(16586007)(101416001)(5660300001)(478600001)(6116002)(47776003)(69596002)(6666003)(3846002)(33026002)(97736004)(52116002)(8936002)(36756003)(16526018)(76176999)(55016002)(5003940100001)(50226002)(48376002)(50986999)(33646002)(6916009)(81166006)(53936002)(81156014)(8676002)(21086003)(1076002)(305945005)(68736007)(86362001)(2906002)(189998001)(105586002)(2361001)(25786009)(66066001)(7736002)(106356001)(2950100002)(316002)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR05MB3142; 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; DB6PR05MB3142; 23:BrnPGdpcxKXeBD2EEncrZmHUodrtW6bB1hpMS2HFL?= oAHVWK7Dly2f35s5ys62byAXnGrxU6WRSKUAuurRfsERw43NEcVFmjhKLb0eWyo32NZSMlFfAjjBU9T32FmVxl/g7i5XXCGE8dqvMB2RQ1KXoCAVEjswEHVOrVkvLJnr4xtg2rC+WdZmdq1zsdFZOr/n0dYIwgSJdPNUFmKR21GmDFWO0x/2oJ13QAEmi4ira/UF5E0wfdEYa6fBeq3X/nKPEWOxNrKZH2uyvVQVYdAIYGIvRGM1hpJ8KfAfo2SGzJqAce1q2HuvZ8knOkCsuHfaORiW8zRfZch2A7sua2DFn8mmAhCPk5EDf1BBGEISL06zryB+ki9sv2Wqm0am3o+uBrY7mur1speKyc/DLHwPDO6V70hdU7OtMZ8xq0rX9X/PLjZGRPb6jPtrzmJX3HaEj6LvThjoy8hijACi5hS5+KZkxKKsrkalMT8Dga3H/NDai11Ge+4BRgAl1hzrU+XsuzFTSu0i2ooFEIF4FdZ75A3kjw2ul1SQ9O55/gK/nel8aiLPZZ+qe2o9I5ltdABe+gXL8EGseBv7VXWLMKQ+nB+jQX910Lv4wPvKRQFTwHpIIQCYuK4eJ0o3HyVnewWYtRPTLopt2MGIbE9h3XCJxl0+ZoVrHr+jkIn/unZavjpJeRVhKhbEr8aTmvsCgy8IiFCQRO826lvV1/XlYLrtgEE6JSs8DaYnGz962/MErCfOJhv9UNcUkdgzPwmbztMCNGWuq6j+xjHH7w2kwc0KVMMDaqX92IqDVsout45Kca9dKxsqmPTMQholpkdzorEYFPJ5OPTM2aBT6RU7dOX8AIZSNvePZ/OErrjB4ZiTZc9Xzok3C/BOOUe/kB9zYbwZ3sF8tyC8QQFcWCSlLa2op0aypiThMG/lRl06zllTlI58aNvfsirEjKgcC5prygjAKH3IfHL5fThbrTObTBjJ2Nw8zFYKsmwb4ziArZcakLT48gm4TLD9Fcarh2f6R/gF9PCsUBOCifu/0ra5OqKEUyZSa+dYwiKgSWRXYfFnJvNpiPizHwGc7FMVuZxNn4kQ1/bMe65wQBi9eEf3QItSjE9P6JW7ytT9YUG/5JAhwHtK8oG/SZGc8ZGUWv5B9QptaC5BysMTJC1qkB77tejQmxUxJs/Gm8eBsONu3B3kWs= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:RSO1WeLvqpkSHfRGJFH/LoK/egcAEXvR9hDnwIP1y+jlI8ov14its3ln1i6xqM5HzfLMNrQQFdipJxbb65yWIDX/dfJQ/sH9gNWxmJIJS/2zv0ZPxiZI2/0xsRt0vt18TrscXAkKPOJkUIp7OArr9NraSeJWqknmXAfrS/8HDtLs5dQl+wNwOcHyxmgn6GIY57+YinmB/ui4gdBkfxketg2i1UngZtcoRkBcl05E2b6Q7tw2oRlMbYN/IJhbsqUtftTOndgu8sBFzwdDvHN/Kk2rdMGtYRZTy9jn5kETvDMPdoeFfBmt0KLNO4swk3FDxxsJbSVvG+hf5fAlMP7vUAkKHL0QxuhIYSNOhLY/Qag=; 5:QsOlUYmxyS/48n7LI+wjX04rJM267Jw/a9qx4rFubX+hKa2BGculpACEVPWKiJt5GHlbSH/FylB5+lAdCK8wAM2F5ByakdPFEyy+r8ZDa44aIadJCHvykkgj5z3n+zW3wJecEWOb1RWc6LNOpwpKfvd6uMH+/Z71+0eRf+6wQSQ=; 24:1LM+DY1pbDk80SiJC7x9qdHcMNduVqGmpG5AHVaYoG/0pvn+pa7tpIHfub3/89gSPZqrgGKBJEMmJmqBn+hbrJD0cKDaAlzx8KTj3UZ/VFo=; 7:ee/KrwDzN5VOptSfTG+DT0b6IVRB4wSaBaEK6UFnl+TEvWKP4V941DagwLDuQhwb5wUDjeMpjX+CteIqpiLf3CCPef+yELCrj2h/5gmMi3MFi1QhPaw09PhO7BzSoEpyV2ffP0XrYjKkkLnJVJ+XTLKYVCxEmeB9ZolFkN6XlaalcGT9ipzxx77CuSp8BbNIBfCANKwio4tkwhMvp7A9KmmqD000RKmvp654XL8z4m3zTJZh5Yb8tUTm9bu64REu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:19:59.2942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8e5b994-5bc7-4b74-6cc0-08d5326c8424 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR05MB3142 Subject: [dpdk-dev] [PATCH 15/39] examples/ipsec-secgw: convert to new ethdev offloads API 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" Ethdev offloads API has changed since: commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API") commit cba7f53b717d ("ethdev: introduce Tx queue offloads API") This commit support the new API. Signed-off-by: Shahaf Shuler --- examples/ipsec-secgw/ipsec-secgw.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index c98454a90..6e538a1ab 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -217,6 +217,8 @@ static struct rte_eth_conf port_conf = { }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, + .offloads = (DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_MULTI_SEGS), }, }; @@ -1394,6 +1396,22 @@ port_init(uint16_t portid) if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SECURITY) port_conf.txmode.offloads |= DEV_TX_OFFLOAD_SECURITY; + if ((dev_info.rx_offload_capa & port_conf.rxmode.offloads) != + port_conf.rxmode.offloads) { + printf("Some Rx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + portid, port_conf.rxmode.offloads, + dev_info.rx_offload_capa); + port_conf.rxmode.offloads &= dev_info.rx_offload_capa; + } + if ((dev_info.tx_offload_capa & port_conf.txmode.offloads) != + port_conf.txmode.offloads) { + printf("Some Tx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + portid, port_conf.txmode.offloads, + dev_info.tx_offload_capa); + port_conf.txmode.offloads &= dev_info.tx_offload_capa; + } ret = rte_eth_dev_configure(portid, nb_rx_queue, nb_tx_queue, &port_conf); if (ret < 0) @@ -1420,7 +1438,8 @@ port_init(uint16_t portid) printf("Setup txq=%u,%d,%d\n", lcore_id, tx_queueid, socket_id); txconf = &dev_info.default_txconf; - txconf->txq_flags = 0; + txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE; + txconf->offloads = port_conf.txmode.offloads; ret = rte_eth_tx_queue_setup(portid, tx_queueid, nb_txd, socket_id, txconf); @@ -1434,6 +1453,8 @@ port_init(uint16_t portid) /* init RX queues */ for (queue = 0; queue < qconf->nb_rx_queue; ++queue) { + struct rte_eth_rxconf rxq_conf; + if (portid != qconf->rx_queue_list[queue].port_id) continue; @@ -1442,8 +1463,10 @@ port_init(uint16_t portid) printf("Setup rxq=%d,%d,%d\n", portid, rx_queueid, socket_id); + rxq_conf = dev_info.default_rxconf; + rxq_conf.offloads = port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(portid, rx_queueid, - nb_rxd, socket_id, NULL, + nb_rxd, socket_id, &rxq_conf, socket_ctx[socket_id].mbuf_pool); if (ret < 0) rte_exit(EXIT_FAILURE,