From patchwork Thu Nov 23 12:19:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31570 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 52EF8223; Thu, 23 Nov 2017 13:20:18 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30069.outbound.protection.outlook.com [40.107.3.69]) by dpdk.org (Postfix) with ESMTP id E552E58CE for ; Thu, 23 Nov 2017 13:20:07 +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=JJqbCzbm4DPTKRHh2BsQ2ZiPlwzOYmFcLXgVvVv90RI=; b=FMGFO6A5610WZGzysV0zsMgGmxS0NqpIKGoP+CS4AL6nmeQOIy0vxL4kzapAttsecyjdpF3Bx2I7N/BHLNZ3v4K99+5mUTdLXDmPazzTw1Az8OscqXgsLT6VkFwaAV1ap/MSdUKEl8ilYquOOzklVKSPyO26ZLg4cExCvNCO2nI= 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:06 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:25 +0200 Message-Id: <20171123121941.144335-14-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: 7e2819af-f903-4648-4e2d-08d5326c8893 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:JfjbFKRU3nAjbAAqPkU85wuM4/XzsBsXbRYn5uX2VGBaIecLQt72H0RvFWnDjEsvFA9rP+YxcTp4SCIVIw7Zt7BNSH1uOdt2hy/lG1lfgwAZPE6gXDqYXmu8kiqbA8Yi/QWHMI759eQNSxT1GxxQuFuMqQn6iGZ2Ev0l+99SoXVRZNtizGuLcNquixmc0yh/X0QHqJ8nZQ44Hmav8vYnMuWP64YBGiqkitTJEefbJSeLb442ls7q/ILxZuIfriuB; 25:3UN+fF86v4LgJfoRtLjmRDiqtdZ55uISrla/RzKhebjL607NknY01FXod9vxXhlb2xjlVhLTnXoReP/e+hqN5Q1Ez+xBynPZPhK2k1Ox+1m7nFPKhnzXx+fayEQJ3dIwVSMnsmSx3Fp2TNVBy0pp/NM61URfCDFfua5uxZYmLGA7vOYDGNUP6l5QnAFfQENpadF8j9RkgypJJbZJpIRC5pIJUO67h/3j/MlmjjOL6ptP0Lewkj1+TbASq638jYFhjDn0MweZ1oL2e0+lEUXL9OrtwAiKuJeFDbHM2WSlG0Sdo//hHaM4TdVl0wOZ1fDKGpEthgu/C8qQ5+ZrH4RIHw==; 31:8SmxIBsJSybt/Xy6U1VRoeBQBJU95qsGikW82uM/eai63PEg+0fntFgdyDW1hWFi7B0X+7coDzb71dHgkf9LFhN2iUKTRnGf37DBNJIShKYcM4SgeO//NaffOUbJsKgsth5Ndq9mmWMCTYmpHGtwr9M0hZiV2DxEJ0C9IcEIQIzPUk/GYwzRBXvCopHIXPv8hbOU7KdZ57K1B1qI/rT1vUxe5L+pkzhlwiq22pIVM7c= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:AJIgOCyBQdy2wm2rxAmiGGwH66fPFClqlci6r7OmKIy4RGrRUk9exHEPpQe6nlPLNkOnSGw8JvK1jp+1YItoJmaNnOQUG4BkP1cTDLJMi9f0BGGSELga4xwq41hM6gHirrNwmxktrhXovUn9OB31HROORs8oE0XPM+OF/c7EaOpwBN1cgqmsdDNeJCX3HfWR9FqCApafitneJmrvnjsLahfM0Bq4PsGBvF5EOKfuW9Rpn641DQgup6VWVBlePMxWOY2IJg7iJajNAzV4ay8Ej5AVFqpx/z5XgxW9Tacg4gGHfQVpU0dJRWQjM0b+J10p60XH3NU0Z91Itsve2+0eStqc+wd9h3oO4nRb1csSC4DPTNH+L75ewrTPHPN6kmnI9pZOzSvAZvxnrOPGdeMZ4uDfrwI0p4S1dmQqpdsJMTnmERbEsz1BiySLkUR/ZDWmlZ14tvf5BjYUq7ScR+rjQOd+jGRwwMVvAXqFD8noqF8leUxzFVXlFwHJ/4axKK8w; 4:yRxnHfxUqMvJlzoEswA3GLfX/BxI7ee78vVxV48kE8hRaOHjXb01nWAGldUmqLptC7JXub/TLt59lKvGE5RtyTJVAXAAuwR1pez0BYALLRjdDSut9JRO2jdIPPU8Syz9NgQDakx/ej2hyqo2gqjfUkyc0724tFjOnRjeiUV80cz5pPOmFOyVQpl7yz9oi5JO1dlwNVgNDLljiiAg1k6q7Dqh+4RZbIZz2HuSqhkCJZ6EQuTt8edIzqM17wuOXZhsXmw/IvW1guFhSaeJx55qfw== 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:It07MeaKPg7O9F4wz9n8gbaGpyJYOklnJ8OZx0CGc?= O4idqG2y2W9TKxdSJk7V7g7JKTDG/PKNldVFxj73LjV6F5soLgk/KO30rryeVLovXMNsVVFwt3JwI6fnL1xeAVHgV8UrsOWL6o7fFRdqqCK0KeaqHFIghmd/1wtVsPCPMQmgwNpdMfH0KqVnaKl1OLDUgszW8cvnU7Cd0vmU/VF8tBsEtyH6IyH5S/2u3y1ShfMqPRd+D5fnCRIaA1uiVxYC7GP0SRWbG4OAsYYYpx8rqybODkfpJaY+B5Ad5wcFPqZoAVbL/ojgsK7OjHniGbqXSwWjTYJPT85bwAq8wkPhegQEIXFjtm4XSbrYE2eJABXqznbOoxf1sIkyWz049RGm9khxP8plXQVOQh8DRoh1EzmjOHeFQ2Ic8oniVpIOClvc3zFcDdIWOROn/Q3eioJQNgD3oD8LrI6clqFQd7i4yo5QOwGCCRl6e84CQ/19R6tp0SnNvfp1fxsCLP5vPK15WAcTu5GTn1Dv8Af10F5LqsCKEvetw4ewJdtUS7T0G4/sNOLIU8MPxDfuMdW1EFN+JAnfzeYu7x3TLpUpz6tzucFZY3Jd6HEzKzzk+n2uffkx6B5smFJl3Nj/bcw7+x29/Vh1pXlr5YXniWZ22aOBd7fx5yMuXjPmX9wfNSLkEGsJbJbFh/aZvMKADBOj2VgpINcnkQQE7ObcZXWC1iyRulfKFIodB6IH+simAsV4ijmB9isMSSaIUUkxew1ftuv0Z9WAlf4PNJVMA0IrgY0Isr8Gb5hbyOaEGWlARjv4nWXuycxqOY7xhBbEDL8r3MPLRXOTL3CkEHpDnsYJQxD+0SN48O6pbqNu7GK9npdoChpDwqQlymI+pNXBt6jAXVkAJv5JDgjyjR4sD4KyITyKMWVDSh2zaSAdEB3FRIZASwWCHbWMkpwbcXjEPfMb3AkxjnpqbEvhQNfkzpl0kMO++uBnV/4HzfBqHNjGc9pV5fHkHDbjdAb5r4B0rTNlVylwEQAO7BFKEWCw4K6d2EAjzVA9cF4/CxblP2isGjb7AWvDiasuaE3NL/A21YwFHXj+UxVWS9eTnhnswWkYAyGflzy/fyyp+bWUyjPRi9BBo/lXelpCzKTGmTHwRLgh1sqpHWMpFEV2QprjXOZN1TEQqW3o1ZzYzfARpfpzHl0pWk= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:Tsj4atk9jmx1Ax9/kB3kCD9tnwtude7Z2g+MBF8nagG2b3CMohWcRyaAN8TFff+Y5q21TczRm1FP+HsnTyl4fVsynwle/uCo9lXveUx1dOLAe3Nz88z9OJJNpFCYfXrd3XIfDGdePnXprXdclV2Tj3hwE0ZSCYOXFN/r1yYpIS5d1GXdTYUC1jxGo4HaPI2cVtZ5PY4xO4OXyKtwFn5JEwRRyOsWMk6DWkCa/j14HnAzT+CCzjbXX9JjNRl4grnevzYdVfujaIOHOoeo+aJYHY1vDD9Hapy6tTCH3rWu22ZvlLp9u5ZhYvdH8mf2wZ79chKS253h48VnB71e4uMO78ayKsKKvG6Ptqp2N0ZFBYE=; 5:qfMSbBnzEgUnRApvHRke5fMK67mA/bopklSAtIGvA+AGP8jprIZD7WV6XGqvQtzh9Ns0erWK31Oibsgnd2ExTgsGKEBU6bYsPBdeEAAZEWuTI2T/fiXkb462jdMUEz1r9MZ/JD59185vVmVvHpUN9i/Q5EsKrRLELC32/enMGNE=; 24:6XZvZk4rljDa2OcY/yuKh5ACcKCYoGTkDiD7McT7DVd4OYUEc/OUEuw5fLp+StOK8wTSCaQxEpDz8uytWFnk/ZSejpH9ZDE2znir/vQ9NB8=; 7:UJHLuhe7cuG0XKR9Q/z/LrVSxtivwn0f3AIEtWP509i+NkQ4Jvmw7QS8c8Iystfm1OT8tP/3uzov5r3AHOa6X9qIfckWdvA2qlIEMog6yWPfE6gXXveTZmYD9ailyud87zhWEExkb50liweoNrKi+KfeTjt/5lxvNgR+WmzRWrc0iuyfyNsG50PRJsOKyD4846TNkVL1WCTwP+E/8MHK8vsKlxa5PwBdhXIIgMZHq+w62++mdYHrSoec4cypKJNo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:20:06.7161 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e2819af-f903-4648-4e2d-08d5326c8893 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 23/39] examples/qos_sched: 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/qos_sched/init.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c index 038f0427d..803ce54d7 100644 --- a/examples/qos_sched/init.c +++ b/examples/qos_sched/init.c @@ -84,15 +84,12 @@ const char *cfg_profile = NULL; int mp_size = NB_MBUF; struct flow_conf qos_conf[MAX_DATA_STREAMS]; -static const struct rte_eth_conf port_conf = { +static struct rte_eth_conf port_conf = { .rxmode = { .max_rx_pkt_len = ETHER_MAX_LEN, .split_hdr_size = 0, - .header_split = 0, /**< Header Split disabled */ - .hw_ip_checksum = 0, /**< IP checksum offload disabled */ - .hw_vlan_filter = 0, /**< VLAN filtering disabled */ - .jumbo_frame = 0, /**< Jumbo Frame Support 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, @@ -104,6 +101,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) { int ret; struct rte_eth_link link; + struct rte_eth_dev_info dev_info; struct rte_eth_rxconf rx_conf; struct rte_eth_txconf tx_conf; uint16_t rx_size; @@ -125,12 +123,29 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) tx_conf.tx_thresh.wthresh = tx_thresh.wthresh; tx_conf.tx_free_thresh = 0; tx_conf.tx_rs_thresh = 0; - tx_conf.txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS | ETH_TXQ_FLAGS_NOOFFLOADS; tx_conf.tx_deferred_start = 0; + tx_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE; /* init port */ RTE_LOG(INFO, APP, "Initializing port %"PRIu16"... ", portid); fflush(stdout); + rte_eth_dev_info_get(portid, &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", + 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, 1, 1, &port_conf); if (ret < 0) rte_exit(EXIT_FAILURE, @@ -149,6 +164,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) /* init one RX queue */ fflush(stdout); + rx_conf.offloads = port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(portid, 0, (uint16_t)ring_conf.rx_size, rte_eth_dev_socket_id(portid), &rx_conf, mp); if (ret < 0) @@ -158,6 +174,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) /* init one TX queue */ fflush(stdout); + tx_conf.offloads = port_conf.txmode.offloads; ret = rte_eth_tx_queue_setup(portid, 0, (uint16_t)ring_conf.tx_size, rte_eth_dev_socket_id(portid), &tx_conf); if (ret < 0)