From patchwork Thu Nov 23 12:19:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31563 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 8F4F87D34; Thu, 23 Nov 2017 13:20:09 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30040.outbound.protection.outlook.com [40.107.3.40]) by dpdk.org (Postfix) with ESMTP id 6A7D420F for ; Thu, 23 Nov 2017 13:20:01 +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=q1GJ0MQc6T/2dzaQxFqcNIcoyz+CGYuwKOgwCOIIBaM=; b=s5CyE8mujM9zcVgaUIWCifpJA2YvHq9nlmDUUdqEQ8evPqplWQ4S3HSGKe8roUm0Pzo6BaY79FPye2e44EvxiCJskcXl2SHE2OGa7fveMLYyS0le6+CyzozSlDV1yprjJgaulaitGOmqajd5ke4TxLv68k5lgMgkiqcuarwiSO8= 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:00 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:18 +0200 Message-Id: <20171123121941.144335-7-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: 04a80559-47d8-4840-530b-08d5326c84ac 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:PFcqiPpR49x8VWkXSRxB97FDLdIc7840mutNY3NxuqBBw5Wq3vJNEGUtwvLXCNwhJuQEyTXhJTQhmZ+2VtPx3WzEDw2gddPnhMGt8ggJyby6noBCdSJ8II5fo2CqyylsPxCVqcTsb18ylRV/fjOcGwKcVRdC1ShXyCiqzzmpqJKzEJe7Odu3hxJt0fAfp5XojJdJxEF917RTmIiv0AQrE8njQhx9knWL6Hm7mvqlyA3mmmNwV0N8elNc4UbU76CB; 25:qPoOSqjm+mNChvEYrtJqd4QBnNgfRDtIjrZSuZjeYC+hERTo7iEHIxFN9AXrDgHjBydTVls7SaH89jYrq8zbUvsRC2AXuPRaajwgZexOlj0+2ws+mdHVU1B034CrVxeXgk7+6di40fKhfZSuanEbAz4v0oDZm6QIHmXqHEVcHMbcxRC18VSWBALcdlkYJ7mborXRW29jIHdbAu2/874uwjYaQmpfaoC7rHO1hkIoIv9lXKNctQMSEDb6UV6mVU3qMmuk2AjAsyTMyuAH4JoEUMZ52h8/ifrpPb6FGBj2+SIBDVYhax+DufOs18DbFFU6FYibPdmmf4nHicthBd36YbCHIfMacH+Gh5MqymgKqMo=; 31:QgX68rVbFSYcRmPN9XJqflqRojMuuphKuV9ES15HRtbNK0+bl26XZNTgPSaUvqWGwUR7tZ8gm01TdF/mJ67kpX7Bl1JtUStYoDlhZKTdX6d+MHVzX/8fsUXiSuFiuyYUz3IplP5RX2315B9xRiR6yBc1uSrZKcHx1iZDuWOHHleDHYp6O7AIq5y/guI1zR++fvSY/q36/65tXrKK+YASgq9WkSA0qwbQ+ln2rOLQtiw= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:2T8WUyRZ9aRI7gac+CPk3+oRw4/kzMBV+qZZFaNfcftUH0MY3Xm/Zju6/vRrTZfgnT8c5+ebGkgUxeiEMT3REj6IkHATpxmQ2Jw5CII1txibPuC8rv6wwJIzirG02PP0vLNeCx9D5BEH07vZhT1crZG5JTeqwQr3wct6eto3MrglRj9RYWN9GIXxGcWg3eGFr7XDcuYxLuNYF2qaajOeeTaoZc0RlQ0U5c0plcRJcLcpn9O9DUwLSWwVYE7+YORVO/tQhkLvZQp4Vgva6KYY/Sgw8eGSNdPHcSY5SgUlhBzaZ5sY83IF17GZyzYaYZdScpRpKDotQzHxfJxv65ni45eRvtsWuaj0FFHyCvDWt9DzKfWU/aPxRuwO/C6FktgRwO/TcXckeccJoiZdQ3H/C+SDXaSbII4fVM5JXb5+Mjo2okPVBgNMxqKDja6z8oj5UQRPxxEwiwFMRnK8lN+IlCsdJ898jrEDdURrvd4T8YynxOXWeQJjn5+E6gUdycKA; 4:jWw+5s7Tc8b5cPGWQw8aEfSkSuLXXWSceaLhAbkRCfskbmL94mTvRWetZaLWuTLbL3fXvDcv9u7dsdI8CvWV6R76P9WBeFa4IwjHr+gdnuXc4Pb3ahjBWorrJ3nTmuH8T+ZA1oOK0CwOwkSelexrBqQt8J86jmlalHqbWzzj/4H+/WsohSXIoNMTYgWPbZppMZF4DcKWTEtOrPHyyLm/8oZ0cEd9uG9G/iHN41v02gtE86k0vkd8xhE32AvVUBM9Ed8BEfiZ/GK/8ra5YMNE5w== 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:je1Icm5YCvoqb6m1Dxtb3sSaRI7RV/cRpy5EK+XVd?= 9seLeQCfMmCMxB9VWxOzQUlP2H9dQLzHCFlBOn7ic+vxmURq+jEerU9WsNfrqUq8emQxfo+Mxcanl2sYRMGdWWoqajeDQ/GZWDdY++fAFyXmLnrcMsNV7k7wUrjs/ZdW0ZZL9pbt/xuhOqruYxe8dlCfqDHYSjV9x57UsPqCcgPvjAuCqGdCzArzjbi4gEWhrVtF8oVdDb8kXeMVEscOtC5Znifqi6Xv5eO1PAQ0vQa89tBxKdHB6uEaoRcZDO9F5boKvNYW4ulCOzVsyYu4AYeght8Z/sWlacWZ3rfvIGrB6yFvJLRvuG4jdH4uMBv7/HkC4QmPiNxlR6yHW9HMqUe4sjL591fpmo+R1brdntGjmcOWjO1OST4GCjzo7H5bWu9zBzXzzrkX851NEbUNxd/qdHORMYtA5Mzx79WMGczbRwqrsZLXEcyVw/6E1JHxtg61XeZU26voUqCqPggADXyeJwuTS4xnxEs7ehM2oDkdyoIelHrzesXDbB6vYcj0ecQfMhZR88gq9M5tOJX3zuvMKnmj7ud79noEfn0lOBdgLORmqoArl/jCSqSc2QQpWHOFlC0j3w2aVJeYWDw0LM6gMCqNvc7dfgkgwEdT6LcEfm+3aU7bZQ7br82j4jm7p7pMYA/iUxD7K/+MVgaA7wnYFXQeGyLLBAfTMSmXnNhJEmR2tvPPpBFKskGk3jriXaxXMq0Rotef3iXc1hi/2w+HY4TeJDykrmyooAhZlBAnvr2XtbnyBXUI6tgULyRQ8zwEYzfdTm1ktYzMxwmSm4RLqNuE7jQ2SK2LMBB9pl4hVIl8wri1caQc3PxNZrxC/X/Fm/GL/Lj3XDA0jVCLFQ7A7fbHJ8aZg0oBBEA+ItyXVjZYlx93vQEhANaTlGIUHupbEsCywkhUP4O547RG8h9PjceF/Rns/J7q7WH06A20QC+pH5RR5Q3OAo0FQnWo5LTUnvMY9IitA5w/spmp9Keb2hWOTpXj0x1yx6LZn1m+8fkI0k2/bGyN7KpLHFi4B7oczq4pP9942baEM6Siaij5agdzcHRpUlBGOI3YQNGisOT/hRAmS9h9BkfSiIMOIlTilWocr7/J0pHnDTw8IV48NZHyTF8U+XP/AsGb0Xk+550VrW5XPQoS6pq9ajyoxk= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:MsdS8qKpHNooChwH94yoOIP1AONI94KzqGbDM/aS8lkmqARLN9CXy3EmqYuGPvER8knImz4Q2KCJTLDdCwAm0UZn2kRUQo8JifTFXj5amnY3fbgzsubsaFQjhZl4Yh8MpCCluMhxtulDIfG4IxoV7oTT30rCX84BvtUwbqfUJFodZeZs8KmmRFJDSflkjfRYaYl5mTfZGABzN42M9Qie6uNBjNM5pxiMz+Bt+d6gHustL0LieMFlg+HOdAzHKKvEOhKv36osPzZAY8yVfin8mJuHOVmKU4rkITGHxOExthJvqpwadVh5jtM/u0ulY/ha1EtmXq7YmRtw10V1H0cjwvW4McXSr61Iq9WEcPU50no=; 5:bFLcIyuQKptZ/cwrveu8xAFaFKpdiq/4d99IQKCU6VsCMGHO1gs+BxghtFK4Zsrpdnght+VjhpOrHjRyVOE5+6+w1KW0WPrX0s9cl1+wQUZPU6aE3pBA0h1e4zXfbZS2X9H/rROMiAOsVT6vRyrOxWulwNGra9p1NgR2MC07Ppo=; 24:Vp0PU/E9IR4RMWjlAt4laEoi451pXG34ff9yRX+MfcPLWbfViGwRBg5vR9zJRwFfojZ2fD8ll6RBiWt+DrJGYcCz8VMyw3eJK8XEa+6O6z8=; 7:j9LCOtuKHwYDMRY15Gfha56ufE1ZaF9PHuX+Eh2JQXbXVF7rpD7i0P4KXjnodm0eAzovbziKRw0tRjrHYZT2NKjhnwv6L0cinkP+HWlN9us+Ua0lm0qoVgywzUsHlEpsslK/PzDY4fnKmM09lFempYWNcH4SA81bWCAe+BVGEqMP0rANCsheRSnVpJf56U1w3dOSl2XQoT60hOXSupOfjmaTo4JJKzmjzGCpaIjQ5OShFe7B1WnGehnxMvjrnm09 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:20:00.1848 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04a80559-47d8-4840-530b-08d5326c84ac 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 16/39] examples/ipv4_multicast: 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/ipv4_multicast/main.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index 1c5851654..1b8ad3e4e 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -138,14 +138,13 @@ static struct rte_eth_conf port_conf = { .rxmode = { .max_rx_pkt_len = JUMBO_FRAME_MAX_SIZE, .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 = 1, /**< Jumbo Frame Support enabled */ - .hw_strip_crc = 1, /**< CRC stripped by hardware */ + .ignore_offload_bitfield = 1, + .offloads = (DEV_RX_OFFLOAD_JUMBO_FRAME | + DEV_RX_OFFLOAD_CRC_STRIP), }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, + .offloads = DEV_TX_OFFLOAD_MULTI_SEGS, }, }; @@ -714,6 +713,8 @@ main(int argc, char **argv) /* initialize all ports */ for (portid = 0; portid < nb_ports; portid++) { + struct rte_eth_rxconf rxq_conf; + /* skip ports that are not enabled */ if ((enabled_port_mask & (1 << portid)) == 0) { printf("Skipping disabled port %d\n", portid); @@ -748,6 +749,23 @@ main(int argc, char **argv) n_tx_queue = nb_lcores; if (n_tx_queue > MAX_TX_QUEUE_PER_PORT) n_tx_queue = MAX_TX_QUEUE_PER_PORT; + + 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, (uint16_t)n_tx_queue, &port_conf); if (ret < 0) @@ -769,9 +787,11 @@ main(int argc, char **argv) queueid = 0; printf("rxq=%hu ", queueid); fflush(stdout); + rxq_conf = dev_info.default_rxconf; + rxq_conf.offloads = port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd, rte_eth_dev_socket_id(portid), - NULL, + &rxq_conf, packet_pool); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, port=%d\n", @@ -787,7 +807,8 @@ main(int argc, char **argv) fflush(stdout); 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, queueid, nb_txd, rte_lcore_to_socket_id(lcore_id), txconf); if (ret < 0)