From patchwork Thu Nov 23 12:19:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31571 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 DA6C91B1BD; Thu, 23 Nov 2017 13:20:19 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30046.outbound.protection.outlook.com [40.107.3.46]) by dpdk.org (Postfix) with ESMTP id D5A787CEF for ; Thu, 23 Nov 2017 13:20:08 +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=ifz2P1wkhhg9dKbSxRVQWUPNGJ4mdGN3OcnYtD9Onts=; b=Zj9tpAmVaNAl94EbcnP3CZeqKMPoRybln0icFqHSkQEp7HS8ntRD5yxzrumuLOm3iBJzbkXOV9uwQ0IlDbyg4Hctcz+mpNsvwnd9GjOBWhZWrUyyNSoFdDrYXaI57hossh+WfmlKLyScThJYdsaS6KMdHOgJyaa0/wWJzwnEgKE= 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:20:07 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:26 +0200 Message-Id: <20171123121941.144335-15-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: 12c66a71-cb43-41c2-96da-08d5326c891d 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:isX1oaA9rPwmFXRTBb94WLQ3Po/xkoFQntP7HbeQCfMCQ1oArNSgUp1puqBoPTm6vJes8eMWLLdNeICrYqxPIhUq/yIxevW8f3s7o0z2cG3YKw0/xaCZbXeBTnWEnbZYlMUrDOqsVUxiqfrHgZsDYAnSvk3dgxx/cR6lVh1Wzvl+Jh2CW7/BNBoL6QFPxe99lXjvSBV8xIPKwfwCi8DG+Q+RTPB6s6sJ8N+83PKiBsJ6Gba73hIaiQ6GNbD1HP1s; 25:ZCzsSpFubE+vdRCgqp96v2GazPFeS3XrRfPMvvm8mkxr+5y/NsLEEI053WUh39SlgWIzkYhV0FsHNEcYOwNfjqdIQNrJyHVrsnby4lpye8Lry9MU/BYMIcERiskc5vJy+Tw2Cua2ioG8BHajEYIhUAKY9Nc51rgsX22Kt7DrA311sW+eeoju0ZVcXM9hmSxnhrcQwwlWyCXjPmpQsiQ+yiWGuHaH/jisid2flxXzU65RgD2aL05G/XQad1cYwWhBOkqH48kpYJY7A7dQ0KriimChWgSLMBUGbChGpT+jML1yxmCnU3u3p/XNhADuH/0AAr6xn175MQgtbdk853Ild3CY+zxcxs2e+7RtduhV3MA=; 31:XLGtQHoGhr7N16GL050qMLX9NKe/C07y/cw/8F44Y1TeMsW4cF6wTM/PaOx928bmohKtcbilf7uAxYPdBuH3Ue7UL8yYG7jV0ONh21lGvmXarnvsxvOf2M5gmHZP8+Ut1eJGZCBXnFf4wdQnDfBY+MPJbOeXWP7lD6dChvP2hDW6ff4MIckTZO7gbln4f8JIHwswoEOs+CzV7a16oviB+QNBHyorQ4NAzeijOf37O2E= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:Z2HVa98Ro2HCv02cbZuClIfbsUJFjEPHjOAb91L+bbb3uZRQBfzWmSyPZICKt/EgkQtqpTqYq5SAEGHZ1PDvAwslR6YZRQsTIU2eD09ikYkB51KzZk1xaob86wBgaUZkgs8KUd+LtGSk4Q70aJDqS2+2ShZjO6pFFpG71zFeyYMtD0TIrOzhpX1l03EjVu+Bo//36EX5zYjVPJNE/6mCPeYDOs2PrZs1s5xA22/Gu3JRzy8v90Odb0GHw7S2xuwif/+yYpmEZt1EStLnFqo3SgDcLMhw+dwM//gLB2mbd0knDbBN0XssNh8CtiNVXfElc6m6gvO73n10+jZhygro4sWSjkWg4gUKmGomTzdJ6B5cWegPZnDGh8BA2A61RReL0elsXrcfaTAoap371ytYRSpwEIKX7fk3VGnOvOu7rZDikmM3l7mtg1A0u4AAJ0+cR36+1JJZfvv5AmvloBfsGJbhmvw6dCAr+JDPd01W2GMqIkgBYRW1Z9zbmcW9bDYz; 4:LDnGU/G7gePGtIJ+FPZIiy1SVY5letUgPnjYukjIxtOJ/TZnh8frpAJ96t6kXS+MWhA5fKn7wtpd8oYkjTuU8AyGLHUF1SkjrqgrFqDN2AOLYQbGyqa2qTr8sV4WkSqvfYU98pt6hQPwElC6RWqyTWzwRIo56uoaoRX25TggzYNtZyTz4YCVNNLSIyF61MkVGeGWhh2qOCdTlJHaX2RnCr601Mv3MjKdECmMHdb6NSN/cMv1uREPilaFCTYFsgMGmLr2+h8C2gUurytrVk3NeA== 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)(15650500001)(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:39phbZKajsQsDHSZrchRbqO1/PCSPhQsUJRymIwI2?= x4dGKp6iJ8oc37sWtXW5IfcSg48sc6wVnXKkLGwMCz7uccjM5YAfO9PC7jMcdnVrCdEQS8KroKBFUwZW6OopRA0ylW/jZqSd2IQ4+Di2TZEvZZlYBUF2+8/LW+FgU5+Jj8EZmbxmd5WnaXQ0ZdQRzmFa1xLvAOESEbWqUXP2tawMYhMq2JeSko3j84j63JHeMo1GcQA2e3fUIs3rfwlcSO27ndMA+CjMEq5QNdv+a9sDaxyLDzO0lUzx9E3HkP7C/YMkfTaE1SD2WL7VXiJEvgAlhiCuJJRxAkCd/tYnoEewtBKBfxPjshOV4XLh7a1w5iedlaCwdAF1Y5+uvYHx6t1Jw6ecWjci+LTf5IJzIJ/0WuMNEzOwvHq5epXe4N87wCi2kpVCj+IcxTqGEq47/sde/jmKGDGGblUIDM4IK702mqQ2yn739cuirOqDk16kf4+xdHZW7rIa4KEL25GV9TOXYvyKpo5C3g/26VreMrZqwNfG1zTiZpMM5CUzHAIbb7663Cgwf4CGbR56UyGpsKnmVMQqg1d44sIisIVjWpLt2fiLTgQur+lBCj9EbSkt/qODRxgahhoKl6L5OWvOBPTFXNnsMJ5ZxeTCOVNK4YzXw6H5NjqzT3Ew6tQIolQsE9ge4hlYe+EBXdCZAxMTwFBiW4CTmMJxbzlinEXR8QttNY4YhilL7no6HRSa+PD4blPZIvrRYg32/z4H1kkT6kLNDQg9iFXBM7tgdAfBkWsSOFiRaERzo0CSsBXDTWC+77QqQ2pHk6M7KfUg02JfALx8O5L2NywpePb3X36KJdWdpt4/p8N7wOfuFiUjg4oK1tbUiSbWMI654viWEto4CF6RSGfLwcg37DAFhZ5Xp8K+T7zya+vXjWXLX4zbhH7Xey9asDfM7LLoLKtCdkKSLT4hoMeRDCO5cN2QGHMPZuUzPH+9I+xiIIk3r6zJ3rBgJwzmHZlMG6tfLrPZEcofgOUjyzTO/DjSuB8PY5EAoiVKI1+9pHWGQhxl9Wn+iLDUYB/coR2Plp9+9omJBJy/uomVoJ1RTA7UywKbbGEgmV193PD6ezLDAKqVMsL/I+7oM4o/LJegEaHXxTDvdTHCpidCAwv75Z7h5+2WrrRWGtplmvRv5uR38BOI3InV3qkvGSPwFa69+Nv/9ZOzHnFCKmqI1cRDdxCUJ0ah7Zxt4ydJA== X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:nDgiVkADLu0vsWPr8zGn4dgxthNnMeLgsNAHlJ8fMPE3wjiWtsY15P+hSPZGhCEpFR87zOunKdP94upSg+pT22zhM4Ze1cX+EbDvBqIfBLC9n+WdwQDgNkANllpWqUSezqWKnHjAkvf/weIVbljcEV/3Jb3j5pQr8A4qWiJLHyDLlAqb/zZwSx4vHQ1yNht4cn7MuGo1+ZGYKBZhxIynuwnQSRywG5uiltAsm4e7mRFKfLsvoOjvYnsLdqthDG4767IqAYPFhZZY39fqcUCYTuYdIpCTYykkiwiIRLI1hn87uJQd37cXhEN9Aph4Rb1bJo6+TrBkQ9F8HaHu4PJN4xyeJyK5iVU4a91GSNwY4vM=; 5:sbDoRCq+5pqMuv4XpHcOL5tAxBnEflYuM1MQpiK3SytLINjn6IQHvKoneYONWszZfgo2PoQECnyFbtg211YfRq+n78Wx/+T0AWVnTQKdAQrgScce22VCvHIlcbfztsYl+WIANeqN9RHQrkYXFikyGHepVtpIxkdQXmPdUd2n4vw=; 24:jyZWIdcKgJhlqIqn857Z2XI5b575Vzi+WzqZM92jhpJfRwzbE0uyAz9RIyqApf9U8rdI+VujTFdjrR2A3dt/QIuXTnpmIABinzFy1e/De3g=; 7:MKcyD8mK0XAhxv8MuThch6PErIhdkvU20F/+jVDjKf4kQLTvUA3+kaMaQkLnTQAJe6sR3Gxi4PK6dqQF+jOIriIYoSs4IqOVe48jcyMlzX21PLT1EkIeraXmPcJsPnrS4P5Uw9alQ1uxj8EV3nQqZclfF1cU9IybD1VDk/d6A7zxJEUq5A2P7vJ3PdqiHfV0j0PPIKyfFVpbksOxjFfGB4vfCWph2xtRj9zlqspU/3VXh2y0yucApgkZxDL8ecHz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:20:07.6380 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12c66a71-cb43-41c2-96da-08d5326c891d 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 24/39] examples/quota_watermark: 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/quota_watermark/qw/init.c | 38 ++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/examples/quota_watermark/qw/init.c b/examples/quota_watermark/qw/init.c index 37b03626d..c26ef3aad 100644 --- a/examples/quota_watermark/qw/init.c +++ b/examples/quota_watermark/qw/init.c @@ -50,14 +50,11 @@ #include "../include/conf.h" -static const struct rte_eth_conf port_conf = { +static struct rte_eth_conf port_conf = { .rxmode = { .split_hdr_size = 0, - .header_split = 0, /**< Header Split disabled */ - .hw_ip_checksum = 0, /**< IP csum offload disabled */ - .hw_vlan_filter = 0, /**< VLAN filtering disabled */ - .jumbo_frame = 0, /**< Jumbo Frame disabled */ - .hw_strip_crc = 1, /**< CRC stripped by hardware */ + .ignore_offload_bitfield = 1, + .offloads = DEV_RX_OFFLOAD_CRC_STRIP, }, .txmode = { .mq_mode = ETH_DCB_NONE, @@ -78,9 +75,29 @@ void configure_eth_port(uint16_t port_id) int ret; uint16_t nb_rxd = RX_DESC_PER_QUEUE; uint16_t nb_txd = TX_DESC_PER_QUEUE; + struct rte_eth_rxconf rxq_conf; + struct rte_eth_txconf txq_conf; + struct rte_eth_dev_info dev_info; rte_eth_dev_stop(port_id); + rte_eth_dev_info_get(port_id, &dev_info); + 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", + port_id, 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", + port_id, port_conf.txmode.offloads, + dev_info.tx_offload_capa); + port_conf.txmode.offloads &= dev_info.tx_offload_capa; + } ret = rte_eth_dev_configure(port_id, 1, 1, &port_conf); if (ret < 0) rte_exit(EXIT_FAILURE, "Cannot configure port %u (error %d)\n", @@ -93,9 +110,11 @@ void configure_eth_port(uint16_t port_id) (unsigned int) port_id, ret); /* Initialize the port's RX queue */ + rxq_conf = dev_info.default_rxconf; + rxq_conf.offloads = port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, rte_eth_dev_socket_id(port_id), - NULL, + &rxq_conf, mbuf_pool); if (ret < 0) rte_exit(EXIT_FAILURE, @@ -103,9 +122,12 @@ void configure_eth_port(uint16_t port_id) (unsigned int) port_id, ret); /* Initialize the port's TX queue */ + txq_conf = dev_info.default_txconf; + txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE; + txq_conf.offloads = port_conf.txmode.offloads; ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd, rte_eth_dev_socket_id(port_id), - NULL); + &txq_conf); if (ret < 0) rte_exit(EXIT_FAILURE, "Failed to setup TX queue on port %u (error %d)\n",