From patchwork Thu Nov 23 12:19:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 31572 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 AF56A1B1F0; Thu, 23 Nov 2017 13:20:24 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30057.outbound.protection.outlook.com [40.107.3.57]) by dpdk.org (Postfix) with ESMTP id ACD2D7D52 for ; Thu, 23 Nov 2017 13:20:09 +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=QGmG2UOhWIa3GdaKRS7sAudKdsz89WPhydZM+RvW7fo=; b=kZyDEcLZISjVOLtRNOfQ2y42mv5E4W4XvdjQKlrDXDYAc5H3QlLpJZQsp58bb8+bXGOiPG3nVqKyxzPlmspeLlK3KLmvaqm/32w5W3PTDKyu4GynGrRIqqu5zpJlh7LMdxAZXGxJJIQM8FiqXY76t5vYjbwBS5fN8V/OVeE7px8= 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:08 +0000 From: Shahaf Shuler To: dev@dpdk.org Date: Thu, 23 Nov 2017 14:19:27 +0200 Message-Id: <20171123121941.144335-16-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: 3cc1136e-0ead-43bd-a425-08d5326c89ac 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:Bp5s7dJzwucnRI/G6vpKBPS+q4J5SqvssjeCotuZH8gtlMv1GO7s22lUqeZGjuwCfJV4lI1/uUWvOKaUDsav0FTTJmAPTlRPPK1pPwv82+Pafk+Ej2+q3zzY3UdJxcQiJ4YzcUoNO9eE0grgUA8xeNqf1LSnnHVYZ54cgIr1A9zGd9a+Io4O7Zf6xOV28cdew6+NEpIF8H7aQ3Kd1KgmdT6xPegT3iZhdFXc/YC043DJHJChbe0SJqyq9ofGjfCu; 25:JDNhfMGDhRfEoDmxqchGSgifKRUjQcfiSVKJPwbvJh79VYXafzv1/9VJM+BTlG/dYdzMt2RCJoW6D/4jQEnk/TW506CTqMTsvBGoMdDIk/WGkfE8T4tFv8CqZXHJ7yTIzgSGvDC14CPfm+PnKh3krgTZQjX7D4bjpzzBR0uRND05kIgqkf+YXQsBqI4Fv11FU2+HD48S6Qm4oziHhBfj5T7SXsU8HFLncoi0kZAxh/AXH0WgP2rKfHtVgqWREB8hYrkZhYOfPAuDIvrE2XLEgpUwFGbLUAYuaxIArk9j4hEnNA+r1imH2+QPUYxft/LKUQHTvElfz5RhdyR+6CmQAqM+6Ig3NkI5O/DQbfvvrZU=; 31:P9lcjoWnuO3hpZyzSYGUon2baClqIbPCYsnnYSRrP4dHRIC38tv7+KSq+Z/u+wY3NbzZeKNmYeJiXf77h5FlQCwhnk4u+3VkBJGfk+6C0+8W6mbTEYvKd/6i3v0jhjm2avTIlatBcUjJrWi4y3vC7LI/dtqKqvG/zHojTkERpixEl7k1nj9VnGqv0cjJzjqChlFdO1E0bo3C9c+IFamQpp5RKcznWh4NEzJ2lhrPnzQ= X-MS-TrafficTypeDiagnostic: DB6PR05MB3142: X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 20:jr25MT0LIHP8iTcxnm4B3aUYSmYnyrsTIUrgCZPddV3spieB4r/1x2CmNU2tEGsnenKdaiDsXTRoh1qAx5lYpJVdwhs13DSR5kF7+eBdZVUkOXiTyE5k/mlAWcL8bmh0HRGceKR+qo1S/U4jsJ8TkbU8HvgFIB7bn4z8cHSiUD7Der4zM4tK/eGC1JsXO/keZMkZweIzq8+GtDfCvNbLhnJkjFfiTkwVJyndUVBYQ4vq6B7uQcrCpovLlNwiN51dGmFSBDniFI5gJwDFmspGHn9LcKIQ2CVZKMdvVMwJRvGI2vHVjYjlTIZ9yxbd3qucuSjL1c0ZCi6v5JnK++kCixHaibpfXJy3X1pQ1G1siQo4Jwh0Zj0kV8uPqE0gp+KmOFhNjksk75CTJH445g3js5/u9CrR5U/08Gy0o8YKuSgDKRue4cRKrKCijMADoXmzRG5BMmP4AjS3Ba4qt/JzjXQqib/VHidB8h0bNsVFjAziXxGekbigzbKXvJhcFKR8; 4:GXRyMmy3pCSzI92oneU9Wi32lyM7C3o+C2/EcxSrDwCQorY0QvjunkenUZNdaWMvLKyMjhzrXa1QHn5jSUZByPPOOUKXaoF9IR3f7pcIwybXjFO3NLJY0a+o7pJQkv0GGNmVCHKsq8RFLBOKvPXB57BCXQEp5iNCgSYirkLhcEVezLCJdSkzY5WYQWdUTi+PmhR6jdnyanw/h/jblKhBZ28jHPbq2hOiZbnZ0QRoZyUkWt5Z2EunHHezf1+ZfXrUjvJReZlYEGea308P+L/n6A== 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:h1a42IUaoMQJmxLxUJm1EjaD6CBdth2RBuxT4KS5T?= CW4XXTTd6OHdrC3l8QvOUufXuX8I+jprXiAe2ZcRVBZidWgJVSjMjweomyzbgUu/U9wfHc7MSwZ0s26zXmSkiEws1IWUsibZrDnERnGSM0TSLAI1sONix8tzFLjGsLyY/EPDcafW7f/oMPMqTgQ3UuLq48rcyG54x/hz5sKjiJ/pnCHEaBf10gtUYaCM+8jlRWlAD/mh0Wwk4zEUKfyG96YfTrdAqU/ppdCPXr2/JPmQBKSGrCO7JPHzV2IKj9FtaOgqT87nuhKSd/SdnTWpmf4wajtonjb/mYbqlEM2JnU8Ou4dNYK0o7lXniQw4pwTVwXgImgZqX+M4DwSATsDfGBivJSrIL42Mb/dKx7I4jsK8hU8DvUWg3tde55UhAHnu9yXRLrtczGHqVSo8yrby6Ye6M5RST1n5YLOdzW39Z+pWdptWCK49/EVqTYCNhmc7bnK02skLAmMzLRqLfDsounXaW0EZfn+3xqXFi9bLIdxMJGlQeVphaA7XfNcXIGYFWpT5hOs1bdvhjCf5v3ectEJO6kcs6YMj3Cw8w+aiI5N3xveMW614vFoGFZNS6kOT3Dp/e5h9eXtBhihMWxdsmoaJ9noVYB1R0gAvJB2vnY6UhcfTxoo6vJHjIaq7X9ynLX2B4e94zrDQ+b3kZk0Y80/dhcvIlNbdiKhNBalGfDwa9iyD4T7wjV7lpVWOKD3a0HqmDYUYCiBqm35B60+TUabmOGBUdXV8EIawwhPPn7lQpHkhePI95PCBR7fWY3qPH4TIJ78H4mycBsjjGPzJjedruPBnnnu4+CELNUpfEc7/4xaxb0ShvEO5MfpCh4kCM6DR7fEy+RH+OyPlLbdiCCaEl1O5r4FIw4KUXPo2i7Is5ZLO1NCfsRf20YfSk67cXQQKO8CW3wwaCWpqTqtUQVbBwy/6kWF3416lHlTaaYaaP3/ArE6+O0k2Ji1Z7puFVlBG8Z+Vk/hB4RfT/Giz6g9tWfP/nBKYRB+RMorq/qL5MOEBz2JC6lpz+gupkBGwLz05xHkSwxAZG4gKyRLFWjplHO+uVednGZwEviAyaqJq+AdHYHZZ9AbuOx1fQper1kCABY0GeT/EvEVyY1W5RHd+wgrVX0AtNUpi2yEWqadNnLCVgXYLY4aqwZKmSCyAw= X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3142; 6:ywh+dII9PamU/G+rmOW1vRUUlwO8o59cLYShFjs4ZltAoG2xdvAriCSfxnwIdUkdOfZBHgLXzwAa1TeDFIIZgLOVJ/t28TNttdIbn85SbaYT9nCU+GjH1v/YMh0fQlgIjoNdP3Dpa2k0pM25LF5NmIhhSC1mgHzyG67ljjyodEXFYcAdqD7VrcubrCrql37U+X/gXoevId/25mVu5/LT+NDowHzG/NlLaZyoimF874boggEgObjbqZhg2NYuqDXogTBP2pNRa3TJ9RVz20b6s3XZpnoTblV6E/2fsWk99Ax8hDXp0mN7UkCXxEhPWIIj9qPwW0XqMvVAmZWilJ88YuSgPbdyAfFE/pih3uscnUc=; 5:KDLQiDHSnq1XpxFl34eaCXKVWF5GDvQnsApaYbGSbOCPLGVLXa8Si/allR/FuQusugOBCw/vFkPUYqi9a10eL7mHCLTOSL9FOrZ5UjURAX5r196OFL0bEjYJfTMmJQ4h7+gRIDwEsuXBeO9aE761+9JpiRJ9xy0zMyNbsd4Tl8k=; 24:PyAry+ak4Tqn/1zJkDRMZic4wziOusU0FgDd7XgvfxsPBBj7690gdRDJGA5LJTg8llZ4UZAtAapn62tv+rJVZG+rIr0VfkmolZLsrGZZkTg=; 7:YKh1IQVDXNM62gQ+EhEW+RqlqQ9CUMw/MfQzZc+UcKrIybwIKD03JeMBiXTjFAP34nCm/9fEbfWVm9YBFjOzA50DWG0Fu3u6B3xL1HVFV+Uw0mlL7AC4/kEz+eykgxz0g4XYavQLkO5ueZpa2+1L5FBibPwJJnZEqDbi72RrPc+HmYchfMPk/5TjsuLiuVsUJVUfq/Bq/mbpWhVY8ekrrAcRoICdepeTYb2wlK6bkYbT0Im92BPVLlU+djcO6Xl7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2017 12:20:08.5599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cc1136e-0ead-43bd-a425-08d5326c89ac 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 25/39] examples/tep_termination: 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/tep_termination/vxlan_setup.c | 37 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index 1ad4ca3cd..0a955dc06 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -95,17 +95,22 @@ uint8_t tep_filter_type[] = {RTE_TUNNEL_FILTER_IMAC_TENID, RTE_TUNNEL_FILTER_OMAC_TENID_IMAC,}; /* Options for configuring ethernet port */ -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 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_MQ_TX_NONE, + .offloads = (DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM | + DEV_TX_OFFLOAD_SCTP_CKSUM | + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | + DEV_TX_OFFLOAD_TCP_TSO | + DEV_TX_OFFLOAD_MULTI_SEGS | + DEV_TX_OFFLOAD_VXLAN_TNL_TSO), }, }; @@ -154,7 +159,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) rxconf = &dev_info.default_rxconf; txconf = &dev_info.default_txconf; - txconf->txq_flags = 0; + txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE; if (port >= rte_eth_dev_count()) return -1; @@ -162,6 +167,22 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) rx_rings = nb_devices; /* Configure ethernet device. */ + 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, 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, port_conf.txmode.offloads, + dev_info.tx_offload_capa); + port_conf.txmode.offloads &= dev_info.tx_offload_capa; + } retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf); if (retval != 0) return retval; @@ -172,6 +193,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) return retval; /* Setup the queues. */ + rxconf->offloads = port_conf.rxmode.offloads; for (q = 0; q < rx_rings; q++) { retval = rte_eth_rx_queue_setup(port, q, rx_ring_size, rte_eth_dev_socket_id(port), @@ -180,6 +202,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) if (retval < 0) return retval; } + txconf->offloads = port_conf.txmode.offloads; for (q = 0; q < tx_rings; q++) { retval = rte_eth_tx_queue_setup(port, q, tx_ring_size, rte_eth_dev_socket_id(port),