From patchwork Thu Nov 23 12:19:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31560 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 65D243255; Thu, 23 Nov 2017 13:20:04 +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 3CD492BB1 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=Ro/PHm/jhiK+NhEk+mxH/EXdXVkarIeuCgTPca4E5hs=; b=F5AJCvyrcnuNzjVBr9Yesln3w3112NRXaL34B61BpmgjSGi3qHQ7yCWOYUQ5G+5ilwYk/Lrp118fInPuizC5NKe6RwzvZTo7KSmAjF6iMk7vK4OJb5r7t5FZgTUI3b5sIvquDWkgb4DIObBSyvUWR7rT1L0Tyc3d9IYNa0HNx/k= 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:57 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:15 +0200 Message-Id: <20171123121941.144335-4-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: 7f841275-a1db-485b-a029-08d5326c8314 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:XD/e6Ru7ThZCgoOHHFhd4nyFIWFfaMdQUipbZpTzmnEtUbgek3BrCA0nh1ixf3UxHkoa/CdnQ76V2Jx9uuI0FkktJyrk2E05Uyxha/j3nFKUsy7In027StTLp8FPS9K4STVEqB4UouLBniMgDlTkxT5oLPTv4kL7e9ZMqY4kvZS2lbLwwMXonbw/ws4+P049s78rD5ASPUyNsSMghLdYZVzx5S5Cynr+544Ga+XYHzef1uiCReEuZkgx71f3I4BL; 25:BvZSWGMPS9Kp84UWBggoBrwzmQ6ORj9SzBfWQ08cjNvS0ynnWiuvfnZh7Cjo8xF83lf9EWLCQ86BGHL5yLvCvy5m8+mR+kmktW1OcepcjaaM8GuWLAxqzFNZTBpX1bZInyOrnXkcPqNcVg5Aj+rPxgkUiJpkbvNqBiqVl6+TORoZrxy3HLYqE0Jd5uJmo4ZYnNzbsIB1uGdY1jOA0LMT8OY9IOxmTGPsrhbuIdf8srTKDcOhsm0yGVDFjS7bIlHDu7FSDjeH5MFo6b9fSSsrOdLC9HGO+KoD59GnY+BzYMApsm92mBAi1LECl0xofsSYxNljY2FleG+BWKB/V395419Rn7Pw9Ddpk3rE4tiG2rU=; 31:t1picbPktCJ2kuBkAdJ9D5toaY5YRojW/3/83A9E7dpoqI+B8l3puDl7R2MlP8gF3kM164tDNuqqDFWNjFal2nlSc1MVGmhurWNVhuk4Mx6fqVb7HExro+X0vyGj9RieLOxJq7B8N/qT+Zlo8ymhqDsfPerfO+KA0K3SP3bo2SlHleIWuJQxrmn+Hu1Cpo2AOodJvKL/V5Bdo387Uu8rgFdptroUKKRJNO+PUBMdl9k= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:f8ITt/2FeuCU0/hrvSOrT+77M4qo5QZDtSP2GqfCn4zTKBfEvi9UVOwy4xO6GQsMkePFFi6ZBtmjL4dPEguLTc3Xv2qsITZ6XBnTGqrxuL2v2P2E/wstqx1DqdFPAVDpgGWk/LJCd1KjfYEkD0k9r6MMsS1s0eVgQZwOqyhQiHbk508lFCyL2xHfBWMqCa2CJM/HobLlPG4uCseIPoZXzyndEgnMYH8TTRnn6+/TV49fZX/Tdv/lyBDofdF6SO7PnxWI0cgXLzGcfgfxQK7aDBEvE96q8QskF7sL8QmlGl5qxIMhes7JD5OIyMjRuFY7yelzcv/J/6ZKew0ab7z0cibPObEFCJM6R17JN0fs4iTfoR4pDsNZA2V85hbsm5INlHXUPbZaCjHnt8GVWuwnALXCLm5pAryFcHYdpfpYvy+QRioKMk3wMPZDT8NVozDniRUT9V4OOshxlfoAky4gyeDWwP6tmkNKGxE8hCsbmoQ0Dk2qB3JuGFLOHZDd2UrK; 4:S5j497TjXhcTY4LlNni6BG6BmAIa5QEB0vAngJh+bcevTFNUoC1aYy+KM0K74XB9Q/zxMzn1sP4IVmMsn3B5KSP8+eaKqntQRXAC8tl1GVB4oT0e1vFJ5i7EYErvDgtrE/zZZQASM9l/r6gJty8ymgt8TGU5MQUsEjALaJ+SZHzZIhWRYHJfYOrYCXsS4LtymN+jQIDS1jDWm5VTVW5zUn1+Fm/XbjQks1cWM+AShxvg9xKgUKqMBSiCqbR5pp7ETyX2AvQjghoBKxETNAK6dQ== 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:r6vmd4+yqCkVV4dtwXt2SQAq/q/VawhpdbOgfErCK?= N5/er9MJGd6tUYDyeY5XzT3/oE4pTaDrZElpJbC+fLN7mVOUCW4Vf15Sa2QNrcxI6wvsEeJCUeHXZ6tECxynzrQ0MRxtA7EWTkO0Fd2WVGVnhS6Lbj/ggvLLD2vXljOEEPJMfgOjTe+acvxqf59wneNvl8bUC/+Bzg6J9KUEaB1bJr2xHTM6abwKoljy9HRz3cki3eOdeNaZ8q/DA88SimpVPK9dcaaaUy0jVe0uoSSzq9r4BJbe/nMSbnMeEmfxqsZ5/X+bSdvGy7mJ11RWrheKH5hgseAZWjklTNliTUEYcferGtdb9ZnWv1BxHeSB6JQBHr3Uipgn6iiUKAYzPKcKJqkHAGZFTmcBbogr8ga+3uZt0VEWfujnkvA6HxvhrK0Tiw2AdRaGirasCg2fL+Vimy3EBmTeq3kE+dYyvkCkMf1lb7mSTpuBAW0HKK1PWmLZh0zKnCy2jqRE4dYjE0b/WWCcxoeY7uvEyzu6sFaxg0yYIGLxPC6TcxGjTbZcjzNKP4XOpJMe4yL3NqIJ+jVotz9yUEX252/3BotwCRrf+m4bjjubOQ1YSZK3RgJm9Mb8VJltbls+yDmxb7jsHXs7LrVp6jE/94F7PKDdeRmCpbiomT4kMB8xTJv9K0ugfct95OvqbfE/phED6JezSsmahxoTkAFdQAoFndfRveuI/tw4ersJX4u9HnxwiKWC9frrn9Xx8eoZOKpBCpVmo3zepoHsXnvIN7zULieueo0QdLkk0mKoYR3EMIBG4dMrqtjWCtudXovTMhdlL8s9CUCPTGtZPBLYVBIlKgMj6Gl/aLSupA3rE7dLYEagixbIypw/+BlxM9nyVbZTIzFkBliKuwww3L7YNFbNCNgJs1WcsKzZ6kHGsrsIkX8AHg5GtrYpKS71nP7ZJJuBwt2tRaiswyjRghL0wxxZzHnVq7gUbsxDB2mOEaODe5KG+gvHsdmW1zG7n3V1fFVP/wP2+lZ31eo2vuLpRLTI9pw9K5/ei0EYW1ruNpNXvmZXPhV0+N3Q5iJdEmTfy8r1ymkM2uJSe67MrXAqAloB+dLfFH1zZyGfOGw2YarZplT5QRTdi0oWBgcgf3aLpftG/zqtiBwrOAAKtpoFxfvD4I/A/OA3l6t5YI/UUT31HvvPoYIbgk= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:aq9YOK3AQ5FEBQ/zfXfof5tjVE/3StTMux0WcaEdBzTA+e3tpfmqF5oHEe7zE2KlfdwrVTMCEuhMsRlsZcb8xaair2AhRsq2GWGN9/1z5jpxCqAaCPQh18EAJaPuMdG1a3pqrtXyiuLcfxCUTWR/1n9/v+M+IuXPJFNL0dOF+eVsinH+S1p71vA6a009yAmFYJ6HnH2yBTxyVNZfgZN49KvV+blD5fTS6JyOTvKgHTPI/mlUz1+iJme7WZ6VJkWbiR4tLXyNz12VzWrrd7V7GyNVTgfJqJdkpKjZgt73wqObiwUAm989QPcUW4KbqybScFZoZf0VLkI7OpUiC/M6XVav3D96QiOWsnPhZd/WgU4=; 5:EXV4CbtsaxyVNAXnKiFRZnIhVhjaIZNF1n2r3G1lWrxFpc6DXBf8Ms+bP7KrrKiPYxrcb4060Yw5KA+ZZSm2GB0dNEaClK5PngSCIC9Xf5yqf0H0zUisLU7rBujbdmefvLKK8ygxSdnOs59hb7fo1lYVh3M6w/gZJZi9XzcAqpw=; 24:Xu3/VWzXLwz5AoT08ATrABtIMVzVi+hqC/4ra1ELGB6Ye1ZIQ9SSs8YAG2JwsdUpub0+nAY3I8dW0OKy/eJL9ivDY8zwEeaaLCTK7F6NojA=; 7:JKPUe913SO/tHU6GLbCa5tDqbFZVmAMMDl49IDC17Qn/OLaJSTSp8Q9AhwLRznRpg4+/WRb5z8Mig+MEagM4dNke/tX8ZPqiEdNOQz88OqH3hgbN27c8+6x1EYgvYRgfTVYL7mfD4wkXfB8QqtV9pqKBBlH6ud7HLq0U7gP3AZp2QIJ0Zp0CLNQ0+3cdX7A93QJIdBGDWSOJkIkg6Rg2KDhVNUZl5GxJwxHltI8Z5WjWr6MvB7p+yZwIgv6H7a40 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:19:57.5129 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f841275-a1db-485b-a029-08d5326c8314 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 13/39] examples/ip_pipeline: 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/ip_pipeline/config_parse.c | 13 +++---------- examples/ip_pipeline/init.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/examples/ip_pipeline/config_parse.c b/examples/ip_pipeline/config_parse.c index 3211c6ab7..835541229 100644 --- a/examples/ip_pipeline/config_parse.c +++ b/examples/ip_pipeline/config_parse.c @@ -97,14 +97,8 @@ static const struct app_link_params link_params_default = { .rxmode = { .mq_mode = ETH_MQ_RX_NONE, - .header_split = 0, /* Header split */ - .hw_ip_checksum = 0, /* IP checksum offload */ - .hw_vlan_filter = 0, /* VLAN filtering */ - .hw_vlan_strip = 0, /* VLAN strip */ - .hw_vlan_extend = 0, /* Extended VLAN */ - .jumbo_frame = 0, /* Jumbo frame support */ - .hw_strip_crc = 1, /* CRC strip by HW */ - .enable_scatter = 0, /* Scattered packets RX handler */ + .ignore_offload_bitfield = 1, + .offloads = DEV_RX_OFFLOAD_CRC_STRIP, .max_rx_pkt_len = 9000, /* Jumbo frame max packet len */ .split_hdr_size = 0, /* Header split buffer size */ @@ -158,8 +152,7 @@ static const struct app_pktq_hwq_out_params default_hwq_out_params = { }, .tx_rs_thresh = 0, .tx_free_thresh = 0, - .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS | - ETH_TXQ_FLAGS_NOOFFLOADS, + .txq_flags = ETH_TXQ_FLAGS_IGNORE, .tx_deferred_start = 0, } }; diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c index e56e40482..79a2fbb63 100644 --- a/examples/ip_pipeline/init.c +++ b/examples/ip_pipeline/init.c @@ -876,10 +876,10 @@ app_init_link_frag_ras(struct app_params *app) uint32_t i; if (is_any_swq_frag_or_ras(app)) { - for (i = 0; i < app->n_pktq_hwq_out; i++) { - struct app_pktq_hwq_out_params *p_txq = &app->hwq_out_params[i]; - - p_txq->conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS; + for (i = 0; i < app->n_links; i++) { + struct app_link_params *p_link = &app->link_params[i]; + p_link->conf.txmode.offloads |= + DEV_TX_OFFLOAD_MULTI_SEGS; } } } @@ -962,6 +962,7 @@ app_init_link(struct app_params *app) for (i = 0; i < app->n_links; i++) { struct app_link_params *p_link = &app->link_params[i]; + struct rte_eth_dev_info dev_info; uint32_t link_id, n_hwq_in, n_hwq_out, j; int status; @@ -978,6 +979,25 @@ app_init_link(struct app_params *app) n_hwq_out); /* LINK */ + rte_eth_dev_info_get(p_link->pmd_id, &dev_info); + if ((dev_info.rx_offload_capa & p_link->conf.rxmode.offloads) != + p_link->conf.rxmode.offloads) { + printf("Some Rx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + p_link->pmd_id, p_link->conf.rxmode.offloads, + dev_info.rx_offload_capa); + p_link->conf.rxmode.offloads &= + dev_info.rx_offload_capa; + } + if ((dev_info.tx_offload_capa & p_link->conf.txmode.offloads) != + p_link->conf.txmode.offloads) { + printf("Some Tx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + p_link->pmd_id, p_link->conf.txmode.offloads, + dev_info.tx_offload_capa); + p_link->conf.txmode.offloads &= + dev_info.tx_offload_capa; + } status = rte_eth_dev_configure( p_link->pmd_id, n_hwq_in, @@ -1019,6 +1039,7 @@ app_init_link(struct app_params *app) p_rxq->name, status); + p_rxq->conf.offloads = p_link->conf.rxmode.offloads; status = rte_eth_rx_queue_setup( p_link->pmd_id, rxq_queue_id, @@ -1060,6 +1081,7 @@ app_init_link(struct app_params *app) p_txq->name, status); + p_txq->conf.offloads = p_link->conf.txmode.offloads; status = rte_eth_tx_queue_setup( p_link->pmd_id, txq_queue_id,