From patchwork Thu Nov 23 12:19:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31567 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 B9E3D1B19C; Thu, 23 Nov 2017 13:20:14 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30065.outbound.protection.outlook.com [40.107.3.65]) by dpdk.org (Postfix) with ESMTP id D9D4D374C for ; Thu, 23 Nov 2017 13:20:04 +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=BMfjkle3uyHwqzNQi1eS06fW2+4W2dRXjUTEPI/zqbI=; b=aSBSIuvyVIq9Wg4FdSqqjOo6H0fAwN1U/dXzpJ2Q+d9GGszZa9xo2XEfA1fKVOuuEsiI4H8XQcM6q4w5XQliOCKw8Q5fsnlRuOO1MwKvxoxTQ+i0G5uManAOOOZHHGKywn5ugHnwt4dCvc3q0R+kFfGCnY+BUYvYlWQlzj3yliw= 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:03 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:22 +0200 Message-Id: <20171123121941.144335-11-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: f29eff90-c189-4883-ec2b-08d5326c86cb 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:xY825dT8loLHj18mQ+WnUjUkKuFQRDLidyTrPRIwvl3RvM1iuUeZx/DRY4kAxAznYo3qSo/TsniC3YXb9zJoJe5o2VzI3iKd+upynMXtLsXGJSKolpi2nxQQNpGDfYjDh0a2+0Anor4CS/WEpvdikrlU+Wd4l+ZqpTqrJGJARP95xVSpmYr/iJUcgE913faYkjXxvSaxJw2+uF6c7fFkBx1f6RWdg6RCzUElEmOeo/OjNhRjdnzEr0oIuMsu+/30; 25:FZvpEHAjkdpXlvbSlE9k0hHdMFPHuM4ErQnVH5tBW2xhjFwi9x8oQmgghnw9JQGgLM3/ZaTKPhI63sS+5oP6Uta4deEc8+ybZprnWbuiYEDQ+BYOVhO4Y0urV9SVHzV19GgoOQ6FLNV3WcqHxjRkSYTm8j+8azXZ5eyb6PaR3lVlO5zDIrW/F5o+5Ohp3BLkKJWJj0hcuBAW8h3XV6Dm9zX+DczD/I+gHz5Mb9pWCR0NWpAFSiUt7wFrnhuWenGgVRanYX9P4VAsmWGs94KMwL9BrhJ0SKZNKGrIyLfiBoStJucFJ3TVlPXn5vPMYxQzw604NvWcGLfFUhZCO7m/x2aSSQrQao4iUfiHID3X4dU=; 31:Fn/kv0dleQQn4JmQ5uvD7bI7nr/ZSPkykQbdTLAgtjduoTcVntHL/qgf0YITD7fiVHsuXVXgZviP1pczzM3734nytnSLzxXnWfPIwAzRV3zqv9MiD+KLoMai8kiR44bSg6QsdEtmuKTo9tAqcufCH8S/LedybCdq5CjZEAOsFGedX9ij2NIDXIpfqXGzCDzmPumDBJU8Kz0fbQArEwS22fwS8D8ayAbhiIQQH11nRf4= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:T5DtlXHASVchRf63myEIhhGVTJxgNx5N0pU+1h2BI5t2048zI6M1APannh3bESgRm/QiTBhx11QG4ncs7jM9pNdzgZDikBkbLskZsvKtepNzI68NI9JOtvpz7eruvT5gCR4nqKAqQl2T7J0AqveB6ZA/FNY00A80XHkt2+5EvBxUzDJu9dFMAXRw17CkPlwOGgRPlmRtZBiCfbHek8rBGaw4vwIojCNoXL38g8D/E3A2m6mT6yKRpPCwkmYDJ4ROCSuViDoHYW30je1ZpqgVY9Nm1Rx1NkGKRZ4GuPS3pmAKB9cj8Ld+87dQBatnBNj2WN0J5Snc6zkyglVutYKpg9IkW6CwnMWqFeiMfRCY8Mp6QR59DxqswuZngyuoH7RJ0c30g+/FoRkPIRB4o5wX5UlPJHnso2RAgAD4f+xD8qbdALnNuYgsl6yFiiW2VrSMBjOtJ6Mq5dwSXSaIlB178ZhcKKcAKrmahdkrkgKIS3+UWBXDeAOn0vI8FBg9TEEK; 4:KdTZXZCjTNaa+MAAez2rZsfLdcvm3SIaEMyj/QuGLyjTNkkSduo2MLTi84IVRku4UBDKNWfmZt5dscyGaSimIaODG6tVKFPxEIodVpyfJkDL3DajbGdTZesbWP+x4rI8joPQ30efTsyTlsqYwNk9AaZ41NlFz/K1ivhP5ZLEjZ318kIWsf6ey1BSA6N3VuJqlTw1hUQldQ2ek4JqyJEiHF2Kwa8lVZQYaeyDsl7BCx24ccMATetAaFpjh6L2/Tycm20wibD+Jou4ffG885EokA== 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:IWNNUCc5nCLx6Kv81h5p3Fa8yMTQM4P3iXoNKTYI1?= and1Q+nQ8+RBMISb2DbpgOVArKOf5SmX+zz/1w1Xqr2pEoljtJ7isMpF253OPw/zwmGX5o23rKtL2d4frVEZB5St46PWJPPFmrsnmQEZTmROAtOnXqrnOx0AImGBrL/fX1cbYsHSE4dTz2qz9t+4VIYrWawffYxjOTplz+OSdBWHbgv4vj0sEc53Pf4xXv6DQ96OP+AHDRwEhcZVABJKkTCIa5HSri2Z1xoYcxbUz/BK4X8H98tf4rOiw4pYadPkt85HBvdlGdJgKUATX7EXrmFbZOCrAjFMYon18lj+aCVHwRiIyRzx1T30IRSlK4z9CexgyFjTMQO6I3FuC7aAVPV+VqyChFZQjAvtb8mIGLAfGDhIXxN9SJFVwekiqF1+A40UqWPpOihZQizH2P1YzOy86bpKnLQyRkkqVh7H/NLspSXa0/x1VVsNwNRa3keysZzsk0xx/QARQsBJz0N7MbrScEfvR7FAciDxTEjzrA5YR0ZdwJcVeh+H1A3phxQHi2tcnwn3zLoxyGXdYWr8ZJES2h0oOhW46W1hKghIxt8R/mraDypBiqiileNf3BkefWvy5GFYjH+DxSYBFBENxYz1ewB5A8uEv5FCi54GWA/8RXlmS/pq5iJ5UDv0ybelPKeRr0hJ0hlKxAsnuLx3/7w9Y2IR0Hw0Ni3JmlkdIocYKhtRkaFFgBtsR1Nh2/9LnJpVocuX4izAq1+SbvJzdtuEksuEY0rG4Z4JL3itERKlnygnuUZwFv/SFspc+NBNbr4vl0haOr40mXB4I2imyGPly6M4bsx5/xmjCrbgIjkjbc5mGZwpw16CdezCGsK+kQpnxzLOxxdvAS/tTH7t6xJAnLqN92X9nFhs8LjgCsVajBq12AD/lKNv2z+lJhajR+hHiIute8/TFwJPrcSzGAJvMvUWEFCdRgyz0wP5LsWitfI6XvzEncCOeh/urwydrGnmLWsnKYzcVT6nANaGWjCvrtlBExSPvSbeVJm5Hwmk9V1k3d8ofwv+AxHOvJz1Kt5YSvMypuKyFcvRkbvpYPc/rT/mUDT04HFsjbLP563abD/O5hhxdVUFAb2bn8sC0FbM2TB2hvx9Ignbqhft5LZB56+V1wIHAh/0G72d/N7cJ2+chWIavJtOPKXmVLol2Q= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:PrKhff4RSspjE8xfQN7qU+JaVFHQKUAKPJ0wXhgbZpLN00GVlgdbYtrrfpVGUqNnoBz5PNX/SxEAE0NKm8gwWHyvIuyJENnc1p142vPb7uSDJkyXATrn+zdXZ/dCJ600SktIR2KHi/+orOHyF2wqAkg1lALrZEa1xTgVbnTM+QkpB2rfniCa70T6rLAjFrsgu4z6CBOFjY1knStwerA6IlDsI+GDLA/DRo9FFA8iu/48ErTRXcFbt8XWXVLCf1mfDOFosUZQjLMczAH0pFNPLaveWDJVHhWUFCAmltUJjnt7QjrjjzbxiKrIeX7RnG3lnBt0wK+z6y+3jEgnr4PpdkWly//CMvtzfEZ25Dl1EGo=; 5:wTnLSL+Z88VhhK34TcK5rVJM4T/9mGvcRN31r/OOt00zJR5pTn9bYqbM+HnSKfSzo+77Yj1BxN3B8QBK45xF/eo33Uu9pM4kyZmPyPuemJ0bF5QIOsAd+xEVenwWLF7zC61KeuNLmzHFhJ4B1dedM4dyDzeHXVjWUEkeMRyCrgc=; 24:hJErY7xdnf9WY20bvhFJNFH2iIAHv88xSd2CRAc/GMfo+qQ+BuRW+wgybWEd15+sW+MaHQSDMeB3rbDTAwPZqHBmdLLo85atxLeRvlH8+1s=; 7:+pHIKBTg31R9vfVjR20S6lpYtfGirVdQD3ZOttAPpQmGW7knaM5LoCcqQnf3uzaKOgnmN6Gda1X+eMAlN6vEygC6Q6ymdk9sLQ6/sTkxgOYyqRjiFgoqpYQ7ab2FZAGm7zVL+D6Keecp+cNg46oj9FHUEAuNEthJ9y/jfilvdzt0FgwLNHjHSXNMaOjJ0gd+I/tQ8XOtJPpmrEgP1EdqB5Tz8mjNWMPsa7j+jjV94YeM7o3yo6E5FuvPJuXQ6RcB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:20:03.7473 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f29eff90-c189-4883-ec2b-08d5326c86cb 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 20/39] examples/netmap_compat: 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/netmap_compat/bridge/bridge.c | 7 ++---- examples/netmap_compat/lib/compat_netmap.c | 29 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/examples/netmap_compat/bridge/bridge.c b/examples/netmap_compat/bridge/bridge.c index 2f2b6baaa..33c38d3cc 100644 --- a/examples/netmap_compat/bridge/bridge.c +++ b/examples/netmap_compat/bridge/bridge.c @@ -55,11 +55,8 @@ struct rte_eth_conf eth_conf = { .rxmode = { .split_hdr_size = 0, - .header_split = 0, - .hw_ip_checksum = 0, - .hw_vlan_filter = 0, - .jumbo_frame = 0, - .hw_strip_crc = 1, + .ignore_offload_bitfield = 1, + .offloads = DEV_RX_OFFLOAD_CRC_STRIP, }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, diff --git a/examples/netmap_compat/lib/compat_netmap.c b/examples/netmap_compat/lib/compat_netmap.c index 12b3fcbe0..80a4d90eb 100644 --- a/examples/netmap_compat/lib/compat_netmap.c +++ b/examples/netmap_compat/lib/compat_netmap.c @@ -690,6 +690,9 @@ rte_netmap_init_port(uint16_t portid, const struct rte_netmap_port_conf *conf) int32_t ret; uint16_t i; uint16_t rx_slots, tx_slots; + struct rte_eth_rxconf rxq_conf; + struct rte_eth_txconf txq_conf; + struct rte_eth_dev_info dev_info; if (conf == NULL || portid >= RTE_DIM(ports) || @@ -710,6 +713,23 @@ rte_netmap_init_port(uint16_t portid, const struct rte_netmap_port_conf *conf) return -EINVAL; } + rte_eth_dev_info_get(portid, &dev_info); + if ((dev_info.rx_offload_capa & conf->eth_conf->rxmode.offloads) != + conf->eth_conf->rxmode.offloads) { + printf("Some Rx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + portid, conf->eth_conf->rxmode.offloads, + dev_info.rx_offload_capa); + conf->eth_conf->rxmode.offloads &= dev_info.rx_offload_capa; + } + if ((dev_info.tx_offload_capa & conf->eth_conf->txmode.offloads) != + conf->eth_conf->txmode.offloads) { + printf("Some Tx offloads are not supported " + "by port %d: requested 0x%lx supported 0x%lx\n", + portid, conf->eth_conf->txmode.offloads, + dev_info.tx_offload_capa); + conf->eth_conf->txmode.offloads &= dev_info.tx_offload_capa; + } ret = rte_eth_dev_configure(portid, conf->nr_rx_rings, conf->nr_tx_rings, conf->eth_conf); @@ -727,9 +747,14 @@ rte_netmap_init_port(uint16_t portid, const struct rte_netmap_port_conf *conf) return ret; } + rxq_conf = dev_info.default_rxconf; + rxq_conf.offloads = conf->eth_conf->rxmode.offloads; + txq_conf = dev_info.default_txconf; + txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE; + txq_conf.offloads = conf->eth_conf->txmode.offloads; for (i = 0; i < conf->nr_tx_rings; i++) { ret = rte_eth_tx_queue_setup(portid, i, tx_slots, - conf->socket_id, NULL); + conf->socket_id, &txq_conf); if (ret < 0) { RTE_LOG(ERR, USER1, @@ -739,7 +764,7 @@ rte_netmap_init_port(uint16_t portid, const struct rte_netmap_port_conf *conf) } ret = rte_eth_rx_queue_setup(portid, i, rx_slots, - conf->socket_id, NULL, conf->pool); + conf->socket_id, &rxq_conf, conf->pool); if (ret < 0) { RTE_LOG(ERR, USER1,