Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41814/?format=api
{ "id": 41814, "url": "http://patchwork.dpdk.org/api/patches/41814/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1530181779-19716-1-git-send-email-motih@mellanox.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1530181779-19716-1-git-send-email-motih@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1530181779-19716-1-git-send-email-motih@mellanox.com", "date": "2018-06-28T10:29:39", "name": "net/mlx4: support hardware TSO", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2d2ca50372a2e5d2fda2f1074f81365597031b9e", "submitter": { "id": 748, "url": "http://patchwork.dpdk.org/api/people/748/?format=api", "name": "Moti Haimovsky", "email": "motih@mellanox.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1530181779-19716-1-git-send-email-motih@mellanox.com/mbox/", "series": [ { "id": 287, "url": "http://patchwork.dpdk.org/api/series/287/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=287", "date": "2018-06-28T10:29:39", "name": "net/mlx4: support hardware TSO", "version": 1, "mbox": "http://patchwork.dpdk.org/series/287/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/41814/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/41814/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7A9B75A44;\n\tThu, 28 Jun 2018 12:30:09 +0200 (CEST)", "from EUR01-HE1-obe.outbound.protection.outlook.com\n\t(mail-he1eur01on0061.outbound.protection.outlook.com [104.47.0.61])\n\tby dpdk.org (Postfix) with ESMTP id 621E558C4\n\tfor <dev@dpdk.org>; Thu, 28 Jun 2018 12:30:08 +0200 (CEST)", "from localhost.localdomain (37.142.13.130) by\n\tDB7PR05MB4444.eurprd05.prod.outlook.com (2603:10a6:5:1b::21) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.884.23; Thu, 28 Jun 2018 10:30:05 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n\ts=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=5qVf6KIOz3zs5zsBcpUGItTJnCx0x8ts7I3Mk4mcm8g=;\n\tb=YpymkyCdhbJVatBFVBMMpDs5xlbjB4VEoxsVMj7EDHXi7Iv+wtylCFgQMuZhl2pGSq0Qt7H62XFAMvewqP0RSXXX2MpIkBbK5nJibNEKoQqN0SW6pKOijKkJhTN7g7FskX86m/kamJY945vv30r+Lfq3FfAzIOdQfJFvpkrsiCs=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=motih@mellanox.com; ", "From": "Moti Haimovsky <motih@mellanox.com>", "To": "adrien.mazarguil@6wind.com,\n\tmatan@mellanox.com", "Cc": "dev@dpdk.org,\n\tMoti Haimovsky <motih@mellanox.com>", "Date": "Thu, 28 Jun 2018 13:29:39 +0300", "Message-Id": "<1530181779-19716-1-git-send-email-motih@mellanox.com>", "X-Mailer": "git-send-email 1.7.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "HE1PR02CA0085.eurprd02.prod.outlook.com\n\t(2603:10a6:7:29::14) To DB7PR05MB4444.eurprd05.prod.outlook.com\n\t(2603:10a6:5:1b::21)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "a8d55632-b06c-438d-cdd7-08d5dce21e00", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020);\n\tSRVR:DB7PR05MB4444; ", "X-Microsoft-Exchange-Diagnostics": [ "1; DB7PR05MB4444;\n\t3:sAiZ2g9p2XeDMut5Eydag03sNGvKu/DMxNOOUs77YUVax7neecJuCyKnV8PSY3dpWV+7baWcIUDFmf5ilofO6wpGy28UYDzseLsEkib2s94wH44qVzKZx/hqVemRPTI8SAVRntWFnDkeJ8Z+ON1fNElIvFHQIxj4maSouaNJBgmxAy6ZFjPChEXbuDn1TvYlNAn+ZtL0yb86Y7WyBCXNg2Aj5N92eaJAMY/fXl8yIVDsn0urhdd/8Ox1M3Z5r7Yn;\n\t25:gsqDKzikOY2XpnLX4XHy0s2W7YwX9raKZPlTy4uPLHCINgxDyki71Altg4eZtGQ+i5nVouyj+vvYuCjuWpThceFSXx3QuKizMnFM20Ud+0ehY5tYVUgF97Tk/wg8R7gBfMCqijF5FyLTpQrU5ycmWrzLWatIFRYM4plOzo5Bd/HUZzm4u1MkOoyEluN+CztraHNowjtC8MQt6J4zXagPiQNe31sUB/SdYFYGB0t/lN41pPqqLPmlzwgIIJhGh5o2SKJuSz0MsLM4xz1Jm/7FN0b3HX8jz4FTAp48tJtQDCR0o7iM7Vy6tepwWAc+V4TaAhc/dxbYoGH9vwgB0LtK9w==;\n\t31:PglpGiPPEC6kTTaDUNsoFGNyVrFnICiPfvFbEdOaZmpYsZ+d+D/LAM/MKQ2JN8LG6nb9u9D/umAYT9SfaFgPa6W6m59DyArwLtnGdMke8R8JKKqZa2dBt8Fi8wguwQtCSyCgUUnIESTtTzpomTdvH+9ICewz6KNlYaAKZGTIVdkHXKPLt389WOQMuqE9I1WXHTaXZUfCCTBFmXaJaX9a1/c5tIw8+sN92FH7JLPjvhM=", "1; DB7PR05MB4444;\n\t20:DIeM0afKbapSN77UDcAn2d5fFpE0OjuJ17rgpDfP3bE73/7QICLjiozL2/QQgYJgmQazkU0B2CXcCHHlmapys8+6xBTRgA5NpqeH5kKX5fegmteN72Vox9Rn6BDbTVR5E89H/8gJIN2kEBTbg/zFsJb26XHLpNMU+GXdE6dPMOGDK60JJExwEgwCX0i1aX20aoi9WrrFYeOg6nX077MOX8hiKTIDSD1E8FICneTxGRiZ9HbkKTtFD4zxfV7bnsP/edb7AsIXoiO8ZdNtEuJPhVtNZ1IRQP9os12S+0BAEnkdW7ocCaapDNoECnae6HmS7n52caVqeoNPJI6SEPKDGg4Iscuo+sGTsn20zoc2g3vCsQyzJ56wPD9plkQWp8ZkfKvAL58KIpt6kXHBdp7G5OBut9Deea0R9EdARB+TFzKLsES0a+8SlnOQHytR8Kh+Jww63eKGVouaM/GbrMyuTaslSB4ZHuxoiNZ0bQAUhyJh8m4Espn038Tn40+tpJKE;\n\t4:DQenstQqnN+hsZ0U51yjYAid5RgtFDSICDxvsxz0GigZga+ZADu6Vq9V/1vgrnYmxJmlIv9aS2PGj1Zv3jvpsZjhPErLCVI4oLZJDCrmT2384vA7XB5tBcYkReHlsqiYyrVNenPo8xnfQj5Qilqw+jTefPMBuIAF2g216uo0boklrUvYN8Qirrku3FZ0xrp3hJKTohlXKz6HF7NPv3O3FHUTxa/DgPE+q+fnd3WecOib813FPTDMyRPsl3Dek5lbkn9jWexngwhOatDAmEVedg==", "=?us-ascii?Q?1; DB7PR05MB4444;\n\t23:mAXmpxiukra9KUVmgUXBsRVcnEVp240uLT/MhOuvE?=\n\tQykzTo1gRa+XWKwCM2pAU1mCjCXDa1WJ6I1+QICNglTML9a6NDcbGcwfwdAz98ffLldzz5/neukgVbLAo7exrjcL7fPob9oAzSPU8iHZqSGGBJ49a+QF/rMhUTfrBLyIMHAI0GTb/cH5O8A6zLNOCvVZ9XTiceMo2BQzfl0hMVu4IvjAXrd4rrfzaegxHtUzLQe1nO6sTzOdVnCsVV8Cq6RQbJClmrh7hKtNN0wAnglbRcv/8M5uEyJDOf1rE0vF+chaB7hMem3xobfxxsdv9AQggVFPH0/BDFaKLtRuJc/vxqcGJvfBYCqDaaRX9bzxUoyf8v2oqaZ8vryV7KSO6630Y3wT0ljzB6j6EWQ9Y5grA0sVazlx30biiDewSZR+TtdGViORon0854ENf7SiYoMz8bgNqnoqwIYuvbbCTZQa3K/AX+hsbXA56MCHwW77Ehpdmh8oASrpyV9O/aZ7mNpLUsEuOqyBZHlR3ROYyMeXFficOgb4NSdsde2zq2vRBYApjS+DFBmFhVzvnNW7afLWJo7AMm9TRwf8c1Z2+ecwMCx2LhfNzIT8D8rw7jvxMXQr08Vqs8kZx207IQb9eMlp5M6a4n4evNRdNe6e28l/LnGb4JPab6344QTFkenq/IJ+ZfTQ/F0twJge4mtoewV6Cp3Pl4cNCe5k/5AZCVdmukAX7ZiUWSGxt9y7NeqZL9/T9L2odU4k0fxHSU+qlUL02dLjtFn3XJaWP70KgI4dIoGevsy5IfH3nxlCBK5bg41Z2AU0ZMBCtvTou8Ip2EFujtRZVZsVBGk61AG5WIuIpPiKs//3NjcWPGlILa83FiZUvtqipAg9bBEdvSmwXRhEzJ3DsWLQ48YXqJylPgwD6MU5D0fZEnwYZttYsxIGdIoLiBLpQTwwDKamoBK7BANxB9gimfC+kPHl2CGbro342L5siTVsU5YMDG6R886i+UmL/jg1DVX5JSBRhp0wyjMQzb83Rylk7anvXLNCHWRK0rskC/Uy7/rdVFptxGye5DXYbs13WRVk2tIixN/KPUCwJd8wcnVWMuqb3FrTKHcVEj1nW95qzR3ad1e7bKtmA6s4DXOZ4yyGp2ZfEa3OuQCm4WNc+HZlsx7osqIqDbMsZfQBYZMJonxwDxXeqjN5Zk=", "1; DB7PR05MB4444;\n\t6:vidMTMzLzGiFPm8fFDRhLe2dS2DXSF+rM1pnqrz9/oWZXh0R8h8BOQ6WFX2RFlAc2Fgcxg0WOOCB30baoCUP9BJg7HG7cf0831UJ2yI8NbQnS4ICo6VZsOxmpc6wG6+9ALq0K3f0/YTt3H0k6Lh13IhRD1KgnLPd1MQumVSpd/jjA9zVFxQnKzobSdJz0YlkTBOf1kS8OyEIhPa43aIX2qZOzOdHi12IGpH/oVIvoyOIdaPJ2jLoK8RnkiEo4lmhmM31ozR6sSdMq2DKeC2gbgYsZd7h7NguoRwBdqioY8cZAZ+Rk6FM6jIz0IIgQ5tHXDRZ5V4Cc3W1qFfdhlDnQhrY7AvetlmVpSBst5LvnoqfJy1Cfk8+aguKDI7o4vyQOS/tj5Idsy1TK1i+IYC6vtjtMnywDKd/1QRZOgAXdfECPjYe9obpcg75w837cydzLBtR6X7ExpBwcpok411vog==;\n\t5:M1a3U9xoxwiaLzl4zxeu0FTCbu4BtvIjpHLsU6g+laM1ZjxAxu4fPOu+2zeBD0VFNXYpifo5JzBIZomSIqlMheq6ANskB1c12th/1SmMrLaILWcj0rblopdy2RmUAX3lmsMOEPcgog3wmGr0/wy9y8SXOg5Eaktl0P4EqKfM5cg=;\n\t24:cb+jNAXb1VKY1jd8+jSV+bWTvh1NnqH7AidAwK5Bzna8ULmEWUhRluFz0wwAE7ylYWm0DhFK9iAHRqeYJqBAR+ibfccoLIu58JWywE3i650=", "1; DB7PR05MB4444;\n\t7:IqB2Z54hGOeQ1Xx0zn/SxCBgfN8u7gAIM5JeRylQp5y9W21QbTvdY5czNLNcXXQKvv8WwWvGUGJnprXxRMt0+SGJJdw5+uGKprD/vvGLiE2sasUeF7aPyaWtBt0TDZwUyYtaRHfh8lIRkJfcMg9XX+cNFZO8mVTd7MjLbIyES/Ay5AxqyLgVNW1IcIlc1S+4wj+qku9vB1X4ovwSK8tC2tcCzzAePE8d+SHf4cZEu1Ncv+UGLJV5CbjiGKxeAqN5" ], "X-MS-TrafficTypeDiagnostic": "DB7PR05MB4444:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<DB7PR05MB44446D1EECE1B5A4FA6D4138D24F0@DB7PR05MB4444.eurprd05.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-MS-Exchange-SenderADCheck": "1", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011)(7699016);\n\tSRVR:DB7PR05MB4444; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4444; ", "X-Forefront-PRVS": "0717E25089", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(6069001)(39860400002)(136003)(396003)(346002)(366004)(376002)(189003)(199004)(5660300001)(81166006)(476003)(386003)(50466002)(16586007)(47776003)(486006)(48376002)(186003)(6506007)(478600001)(86362001)(956004)(316002)(107886003)(81156014)(68736007)(4326008)(6512007)(305945005)(6666003)(8676002)(66066001)(2616005)(25786009)(7736002)(26005)(53936002)(6636002)(2906002)(52116002)(106356001)(36756003)(3846002)(51416003)(97736004)(105586002)(1857600001)(6116002)(16526019)(50226002)(8936002)(14444005)(6486002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4444; H:localhost.localdomain;\n\tFPR:; \n\tSPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; ", "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "UUPQ/KG4h1cPj/Gmg6sJ+6I5BDsIg/g6a6KQ/JyKB70zjbx5NckgdUol2ttMSYwFwErRPP+FdbJdUs+sSrNgGpyXzwURKRCgnAJtdIT3MMyccindSygs5y4DmMnKl0tukQvs3/GnctYdWjmRZVqNXV3ugBWnZ6EaqbUy0kqXlGA7py5gjBsD5s/y191R1fu7EXdtQhUxwIA+vnr3sf8VI02B1/LSL40VhNqrKVdRbmrJjGnmS7WsnmQi9jUS9WXGE5ZXVgrPCCFzm6+ipiSn5p6DpukoDiei2Vt5zd7kxX95UNsXe8LD8IY+OkgoCEfLN0+UQqRdvzMhhmteKuwCbBJMYaiNy/JH52oFyqolErs=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Jun 2018 10:30:05.5631\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "a8d55632-b06c-438d-cdd7-08d5dce21e00", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DB7PR05MB4444", "Subject": "[dpdk-dev] [PATCH] net/mlx4: support hardware TSO", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Implement support for hardware TSO.\n\nSigned-off-by: Moti Haimovsky <motih@mellanox.com>\n---\n doc/guides/nics/features/mlx4.ini | 1 +\n doc/guides/nics/mlx4.rst | 3 +\n drivers/net/mlx4/mlx4.c | 16 ++\n drivers/net/mlx4/mlx4.h | 5 +\n drivers/net/mlx4/mlx4_prm.h | 12 ++\n drivers/net/mlx4/mlx4_rxtx.c | 368 +++++++++++++++++++++++++++++++++++++-\n drivers/net/mlx4/mlx4_rxtx.h | 2 +-\n drivers/net/mlx4/mlx4_txq.c | 8 +-\n 8 files changed, 411 insertions(+), 4 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/mlx4.ini b/doc/guides/nics/features/mlx4.ini\nindex f6efd21..98a3f61 100644\n--- a/doc/guides/nics/features/mlx4.ini\n+++ b/doc/guides/nics/features/mlx4.ini\n@@ -13,6 +13,7 @@ Queue start/stop = Y\n MTU update = Y\n Jumbo frame = Y\n Scattered Rx = Y\n+TSO = Y\n Promiscuous mode = Y\n Allmulticast mode = Y\n Unicast MAC filter = Y\ndiff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst\nindex 491106a..12adaeb 100644\n--- a/doc/guides/nics/mlx4.rst\n+++ b/doc/guides/nics/mlx4.rst\n@@ -142,6 +142,9 @@ Limitations\n The ability to enable/disable CRC stripping requires OFED version\n 4.3-1.5.0.0 and above or rdma-core version v18 and above.\n \n+- TSO (Transmit Segmentation Offload) is supported in OFED version\n+ 4.4 and above or in rdma-core version v18 and above.\n+\n Prerequisites\n -------------\n \ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex d151a90..61b7844 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -519,6 +519,8 @@ struct mlx4_conf {\n \t\t.ports.present = 0,\n \t};\n \tunsigned int vf;\n+\tstruct rte_mbuf mbuf;\n+\tuint64_t size_test = UINT_MAX;\n \tint i;\n \n \t(void)pci_drv;\n@@ -677,6 +679,20 @@ struct mlx4_conf {\n \t\t\t\t\tIBV_RAW_PACKET_CAP_SCATTER_FCS);\n \t\tDEBUG(\"FCS stripping toggling is %ssupported\",\n \t\t priv->hw_fcs_strip ? \"\" : \"not \");\n+\t\t/*\n+\t\t * No TSO SIZE is defined in DPDK, need to figure it out\n+\t\t * in order to see if we can support it.\n+\t\t */\n+\t\tmbuf.tso_segsz = size_test;\n+\t\tpriv->tso =\n+\t\t\t((device_attr_ex.tso_caps.max_tso >= mbuf.tso_segsz) &&\n+\t\t\t (device_attr_ex.tso_caps.supported_qpts &\n+\t\t\t (1 << IBV_QPT_RAW_PACKET)));\n+\t\tif (priv->tso)\n+\t\t\tpriv->tso_max_payload_sz =\n+\t\t\t\t\tdevice_attr_ex.tso_caps.max_tso;\n+\t\tDEBUG(\"TSO is %ssupported\",\n+\t\t priv->tso ? \"\" : \"not \");\n \t\t/* Configure the first MAC address by default. */\n \t\terr = mlx4_get_mac(priv, &mac.addr_bytes);\n \t\tif (err) {\ndiff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h\nindex 300cb4d..742d741 100644\n--- a/drivers/net/mlx4/mlx4.h\n+++ b/drivers/net/mlx4/mlx4.h\n@@ -47,6 +47,9 @@\n /** Interrupt alarm timeout value in microseconds. */\n #define MLX4_INTR_ALARM_TIMEOUT 100000\n \n+/* Maximum Packet headers size (L2+L3+L4) for TSO. */\n+#define MLX4_MAX_TSO_HEADER 192 // TODO: find the real value\n+\n /** Port parameter. */\n #define MLX4_PMD_PORT_KVARG \"port\"\n \n@@ -90,6 +93,8 @@ struct priv {\n \tuint32_t hw_csum:1; /**< Checksum offload is supported. */\n \tuint32_t hw_csum_l2tun:1; /**< Checksum support for L2 tunnels. */\n \tuint32_t hw_fcs_strip:1; /**< FCS stripping toggling is supported. */\n+\tuint32_t tso:1; /**< Transmit segmentation offload is supported */\n+\tuint32_t tso_max_payload_sz; /* Max TSO payload size being supported */\n \tuint64_t hw_rss_sup; /**< Supported RSS hash fields (Verbs format). */\n \tstruct rte_intr_handle intr_handle; /**< Port interrupt handle. */\n \tstruct mlx4_drop *drop; /**< Shared resources for drop flow rules. */\ndiff --git a/drivers/net/mlx4/mlx4_prm.h b/drivers/net/mlx4/mlx4_prm.h\nindex e15a3c1..915796b 100644\n--- a/drivers/net/mlx4/mlx4_prm.h\n+++ b/drivers/net/mlx4/mlx4_prm.h\n@@ -40,6 +40,7 @@\n /* Work queue element (WQE) flags. */\n #define MLX4_WQE_CTRL_IIP_HDR_CSUM (1 << 28)\n #define MLX4_WQE_CTRL_IL4_HDR_CSUM (1 << 27)\n+#define MLX4_WQE_CTRL_RR (1 << 6)\n \n /* CQE checksum flags. */\n enum {\n@@ -97,6 +98,17 @@ struct mlx4_cq {\n \tint arm_sn; /**< Rx event counter. */\n };\n \n+/*\n+ * WQE LSO segment structure.\n+ * Defined here as backward compatibility for rdma-core v17 and below.\n+ * Similar definition is found in infiniband/mlx4dv.h in rdma-core v18\n+ * and above.\n+ */\n+struct mlx4_wqe_lso_seg_ {\n+\t__be32 mss_hdr_size;\n+\t__be32 header[0];\n+};\n+\n /**\n * Retrieve a CQE entry from a CQ.\n *\ndiff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c\nindex a92da66..c9cea49 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.c\n+++ b/drivers/net/mlx4/mlx4_rxtx.c\n@@ -38,10 +38,25 @@\n * DWORD (32 byte) of a TXBB.\n */\n struct pv {\n-\tvolatile struct mlx4_wqe_data_seg *dseg;\n+\tunion {\n+\t\tvolatile struct mlx4_wqe_data_seg *dseg;\n+\t\tvolatile uint32_t *dst;\n+\t};\n \tuint32_t val;\n };\n \n+/** A helper struct for TSO packet handling. */\n+struct tso_info {\n+\t/* Total size of the WQE including padding */\n+\tuint32_t wqe_size;\n+\t/* size of TSO header to prepend to each packet to send */\n+\tuint16_t tso_header_sz;\n+\t/* Total size of the TSO entry in the WQE. */\n+\tuint16_t wqe_tso_seg_size;\n+\t/* Raw WQE size in units of 16 Bytes and without padding. */\n+\tuint8_t fence_size;\n+};\n+\n /** A table to translate Rx completion flags to packet type. */\n uint32_t mlx4_ptype_table[0x100] __rte_cache_aligned = {\n \t/*\n@@ -377,6 +392,345 @@ struct pv {\n }\n \n /**\n+ * Obtain and calculate TSO information needed for assembling a TSO WQE.\n+ *\n+ * @param buf\n+ * Pointer to the first packet mbuf.\n+ * @param txq\n+ * Pointer to Tx queue structure.\n+ * @param tinfo\n+ * Pointer to a structure to fill the info with.\n+ *\n+ * @return\n+ * 0 on success, negative value upon error.\n+ */\n+static inline int\n+mlx4_tx_burst_tso_get_params(struct rte_mbuf *buf,\n+\t\t\t struct txq *txq,\n+\t\t\t struct tso_info *tinfo)\n+{\n+\tstruct mlx4_sq *sq = &txq->msq;\n+\tconst uint8_t tunneled = txq->priv->hw_csum_l2tun &&\n+\t\t\t\t (buf->ol_flags & PKT_TX_TUNNEL_MASK);\n+\n+\ttinfo->tso_header_sz = buf->l2_len + buf->l3_len + buf->l4_len;\n+\tif (tunneled)\n+\t\ttinfo->tso_header_sz += buf->outer_l2_len + buf->outer_l3_len;\n+\tif (unlikely(buf->tso_segsz == 0 || tinfo->tso_header_sz == 0)) {\n+\t\tDEBUG(\"%p: Invalid TSO parameters\", (void *)txq);\n+\t\treturn -EINVAL;\n+\t}\n+\t/* First segment must contain all TSO headers. */\n+\tif (unlikely(tinfo->tso_header_sz > MLX4_MAX_TSO_HEADER) ||\n+\t\t tinfo->tso_header_sz > buf->data_len) {\n+\t\tDEBUG(\"%p: Invalid TSO header length\", (void *)txq);\n+\t\treturn -EINVAL;\n+\t}\n+\t/*\n+\t * Calculate the WQE TSO segment size\n+\t * Note:\n+\t * 1. An LSO segment must be padded such that the subsequent data\n+\t * segment is 16-byte aligned.\n+\t * 2. The start address of the TSO segment is always 16 Bytes aligned.\n+\t */\n+\ttinfo->wqe_tso_seg_size = RTE_ALIGN(sizeof(struct mlx4_wqe_lso_seg_) +\n+\t\t\t\t\t tinfo->tso_header_sz,\n+\t\t\t\t\t sizeof(struct mlx4_wqe_data_seg));\n+\ttinfo->fence_size = ((sizeof(struct mlx4_wqe_ctrl_seg) +\n+\t\t\t tinfo->wqe_tso_seg_size) >> MLX4_SEG_SHIFT) +\n+\t\t\t buf->nb_segs;\n+\ttinfo->wqe_size =\n+\t\tRTE_ALIGN((uint32_t)(tinfo->fence_size << MLX4_SEG_SHIFT),\n+\t\t\t MLX4_TXBB_SIZE);\n+\t/* Validate WQE size and WQE space in the send queue. */\n+\tif (sq->remain_size < tinfo->wqe_size ||\n+\t tinfo->wqe_size > MLX4_MAX_WQE_SIZE)\n+\t\treturn -ENOMEM;\n+\treturn 0;\n+}\n+\n+/**\n+ * Fill the TSO WQE data segments with info on buffers to transmit .\n+ *\n+ * @param buf\n+ * Pointer to the first packet mbuf.\n+ * @param txq\n+ * Pointer to Tx queue structure.\n+ * @param tinfo\n+ * Pointer to TSO info to use.\n+ * @param dseg\n+ * Pointer to the first data segment in the TSO WQE.\n+ * @param pv\n+ * Pointer to a stash area for saving the first 32bit word of each TXBB\n+ * used for the TSO WQE.\n+ * @param pv_counter\n+ * Current location in the stash.\n+ *\n+ * @return\n+ * 0 on success, negative value upon error.\n+ */\n+static inline int\n+mlx4_tx_burst_fill_tso_segs(struct rte_mbuf *buf,\n+\t\t\t struct txq *txq,\n+\t\t\t const struct tso_info *tinfo,\n+\t\t\t volatile struct mlx4_wqe_data_seg *dseg,\n+\t\t\t struct pv *pv, int *pv_counter)\n+{\n+\tuint32_t lkey;\n+\tint nb_segs = buf->nb_segs;\n+\tint nb_segs_txbb;\n+\tstruct mlx4_sq *sq = &txq->msq;\n+\tstruct rte_mbuf *sbuf = buf;\n+\tuint16_t sb_of = tinfo->tso_header_sz;\n+\tuint16_t data_len;\n+\n+\twhile (nb_segs > 0) {\n+\t\t/* Wrap dseg if it points at the end of the queue. */\n+\t\tif ((volatile uint8_t *)dseg >= sq->eob)\n+\t\t\tdseg = (volatile struct mlx4_wqe_data_seg *)\n+\t\t\t\t\t(volatile uint8_t *)dseg - sq->size;\n+\t\t/* how many dseg entries do we have in the current TXBB ? */\n+\t\tnb_segs_txbb =\n+\t\t\t(MLX4_TXBB_SIZE / sizeof(struct mlx4_wqe_data_seg)) -\n+\t\t\t((uintptr_t)dseg & (MLX4_TXBB_SIZE - 1)) /\n+\t\t\tsizeof(struct mlx4_wqe_data_seg);\n+\t\tswitch (nb_segs_txbb) {\n+\t\tcase 4:\n+\t\t\t/* Memory region key for this memory pool. */\n+\t\t\tlkey = mlx4_tx_mb2mr(txq, sbuf);\n+\t\t\tif (unlikely(lkey == (uint32_t)-1))\n+\t\t\t\tgoto lkey_err;\n+\t\t\tdseg->addr = rte_cpu_to_be_64(\n+\t\t\t\t\trte_pktmbuf_mtod_offset(sbuf,\n+\t\t\t\t\t\t\t\tuintptr_t,\n+\t\t\t\t\t\t\t\tsb_of));\n+\t\t\tdseg->lkey = lkey;\n+\t\t\t/*\n+\t\t\t * This data segment starts at the beginning of a new\n+\t\t\t * TXBB, so we need to postpone its byte_count writing\n+\t\t\t * for later.\n+\t\t\t */\n+\t\t\tpv[*pv_counter].dseg = dseg;\n+\t\t\t/*\n+\t\t\t * Zero length segment is treated as inline segment\n+\t\t\t * with zero data.\n+\t\t\t */\n+\t\t\tdata_len = sbuf->data_len - sb_of;\n+\t\t\tpv[(*pv_counter)++].val =\n+\t\t\t\trte_cpu_to_be_32(data_len ? data_len :\n+\t\t\t\t\t\t\t 0x80000000);\n+\t\t\tsb_of = 0;\n+\t\t\tsbuf = sbuf->next;\n+\t\t\tdseg++;\n+\t\t\tif (--nb_segs == 0)\n+\t\t\t\tbreak;\n+\t\t\t/* fallthrough */\n+\t\tcase 3:\n+\t\t\tlkey = mlx4_tx_mb2mr(txq, sbuf);\n+\t\t\tif (unlikely(lkey == (uint32_t)-1))\n+\t\t\t\tgoto lkey_err;\n+\t\t\tdata_len = sbuf->data_len - sb_of;\n+\t\t\tmlx4_fill_tx_data_seg(\n+\t\t\t\t dseg, lkey,\n+\t\t\t\t rte_pktmbuf_mtod_offset(sbuf,\n+\t\t\t\t\t\t\t uintptr_t,\n+\t\t\t\t\t\t\t sb_of),\n+\t\t\t\t rte_cpu_to_be_32(data_len ? data_len :\n+\t\t\t\t\t\t\t\t 0x80000000));\n+\t\t\tsb_of = 0;\n+\t\t\tsbuf = sbuf->next;\n+\t\t\tdseg++;\n+\t\t\tif (--nb_segs == 0)\n+\t\t\t\tbreak;\n+\t\t\t/* fallthrough */\n+\t\tcase 2:\n+\t\t\tlkey = mlx4_tx_mb2mr(txq, sbuf);\n+\t\t\tif (unlikely(lkey == (uint32_t)-1))\n+\t\t\t\tgoto lkey_err;\n+\t\t\tdata_len = sbuf->data_len - sb_of;\n+\t\t\tmlx4_fill_tx_data_seg(\n+\t\t\t\t dseg, lkey,\n+\t\t\t\t rte_pktmbuf_mtod_offset(sbuf,\n+\t\t\t\t\t\t\t uintptr_t,\n+\t\t\t\t\t\t\t sb_of),\n+\t\t\t\t rte_cpu_to_be_32(data_len ? data_len :\n+\t\t\t\t\t\t\t\t 0x80000000));\n+\t\t\tsb_of = 0;\n+\t\t\tsbuf = sbuf->next;\n+\t\t\tdseg++;\n+\t\t\tif (--nb_segs == 0)\n+\t\t\t\tbreak;\n+\t\t\t/* fallthrough */\n+\t\tcase 1:\n+\t\t\tlkey = mlx4_tx_mb2mr(txq, sbuf);\n+\t\t\tif (unlikely(lkey == (uint32_t)-1))\n+\t\t\t\tgoto lkey_err;\n+\t\t\tdata_len = sbuf->data_len - sb_of;\n+\t\t\tmlx4_fill_tx_data_seg(\n+\t\t\t\t dseg, lkey,\n+\t\t\t\t rte_pktmbuf_mtod_offset(sbuf,\n+\t\t\t\t\t\t\t uintptr_t,\n+\t\t\t\t\t\t\t sb_of),\n+\t\t\t\t rte_cpu_to_be_32(data_len ? data_len :\n+\t\t\t\t\t\t\t\t 0x80000000));\n+\t\t\tsb_of = 0;\n+\t\t\tsbuf = sbuf->next;\n+\t\t\tdseg++;\n+\t\t\t--nb_segs;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\t/* Should never happen */\n+\t\t\tERROR(\"%p: invalid number of txbb data segments %d\",\n+\t\t\t (void *)txq, nb_segs_txbb);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\treturn 0;\n+lkey_err:\n+\tDEBUG(\"%p: unable to get MP <-> MR association\",\n+\t (void *)txq);\n+\treturn -EFAULT;\n+}\n+\n+/**\n+ * Fill the packet's l2, l3 and l4 headers to the WQE.\n+ * This will be used as the header for each TSO segment that is transmitted.\n+ *\n+ * @param buf\n+ * Pointer to the first packet mbuf.\n+ * @param txq\n+ * Pointer to Tx queue structure.\n+ * @param tinfo\n+ * Pointer to TSO info to use.\n+ * @param tseg\n+ * Pointer to the TSO header field in the TSO WQE.\n+ * @param pv\n+ * Pointer to a stash area for saving the first 32bit word of each TXBB\n+ * used for the TSO WQE.\n+ * @param pv_counter\n+ * Current location in the stash.\n+ *\n+ * @return\n+ * 0 on success, negative value upon error.\n+ */\n+static inline int\n+mlx4_tx_burst_fill_tso_hdr(struct rte_mbuf *buf,\n+\t\t\t struct txq *txq,\n+\t\t\t const struct tso_info *tinfo,\n+\t\t\t volatile struct mlx4_wqe_lso_seg_ *tseg,\n+\t\t\t struct pv *pv, int *pv_counter)\n+{\n+\tstruct mlx4_sq *sq = &txq->msq;\n+\tint remain_sz = tinfo->tso_header_sz;\n+\tchar *from = rte_pktmbuf_mtod(buf, char *);\n+\tuint16_t txbb_avail_space;\n+\tint copy_sz;\n+\t/* Union to overcome volatile constraints when copying TSO header. */\n+\tunion {\n+\t\tvolatile uint8_t *vto;\n+\t\tuint8_t *to;\n+\t} thdr = { .vto = (volatile uint8_t *)tseg->header, };\n+\n+\t/*\n+\t * TSO data always starts at offset 20 from the beginning of the TXBB\n+\t * (16 byte ctrl + 4byte TSO desc). Since each TXBB is 64Byte aligned\n+\t * we can write the first 44 TSO header bytes without worry for TxQ\n+\t * wrapping or overwriting the first TXBB 32bit word.\n+\t */\n+\ttxbb_avail_space = MLX4_TXBB_SIZE -\n+\t\t\t (sizeof(struct mlx4_wqe_ctrl_seg) +\n+\t\t\t sizeof(struct mlx4_wqe_lso_seg_));\n+\tcopy_sz = RTE_MIN(txbb_avail_space, remain_sz);\n+\trte_memcpy(thdr.to, from, copy_sz);\n+\tremain_sz -= copy_sz;\n+\twhile (remain_sz > 0) {\n+\t\tfrom += copy_sz;\n+\t\tthdr.to += copy_sz;\n+\t\t/* Start of TXBB need to check for TxQ wrap. */\n+\t\tif (thdr.to >= sq->eob)\n+\t\t\tthdr.vto = sq->buf;\n+\t\t/* New TXBB, stash the first 32bits for later use. */\n+\t\tpv[*pv_counter].dst = (volatile uint32_t *)thdr.vto;\n+\t\tpv[(*pv_counter)++].val = *((uint32_t *)from);\n+\t\tfrom += sizeof(uint32_t);\n+\t\tthdr.to += sizeof(uint32_t);\n+\t\tremain_sz -= sizeof(uint32_t);\n+\t\tif (remain_sz <= 0)\n+\t\t\tbreak;\n+\t\t/* Now copy the rest */\n+\t\ttxbb_avail_space = MLX4_TXBB_SIZE - sizeof(uint32_t);\n+\t\tcopy_sz = RTE_MIN(txbb_avail_space, remain_sz);\n+\t\trte_memcpy(thdr.to, from, copy_sz);\n+\t\tremain_sz -= copy_sz;\n+\t}\n+\t/* TODO: handle PID and IPID ? */\n+\ttseg->mss_hdr_size = rte_cpu_to_be_32((buf->tso_segsz << 16) |\n+\t\t\t\t\t tinfo->tso_header_sz);\n+\treturn 0;\n+}\n+\n+/**\n+ * Write data segments and header for TSO uni/multi segment packet.\n+ *\n+ * @param buf\n+ * Pointer to the first packet mbuf.\n+ * @param txq\n+ * Pointer to Tx queue structure.\n+ * @param ctrl\n+ * Pointer to the WQE control segment.\n+ *\n+ * @return\n+ * Pointer to the next WQE control segment on success, NULL otherwise.\n+ */\n+static volatile struct mlx4_wqe_ctrl_seg *\n+mlx4_tx_burst_tso(struct rte_mbuf *buf, struct txq *txq,\n+\t\t volatile struct mlx4_wqe_ctrl_seg *ctrl)\n+{\n+\tvolatile struct mlx4_wqe_data_seg *dseg;\n+\tvolatile struct mlx4_wqe_lso_seg_ *tseg =\n+\t\t(volatile struct mlx4_wqe_lso_seg_ *)(ctrl + 1);\n+\tstruct mlx4_sq *sq = &txq->msq;\n+\tstruct tso_info tinfo;\n+\tstruct pv *pv = (struct pv *)txq->bounce_buf;\n+\tint pv_counter = 0;\n+\tint ret;\n+\n+\tret = mlx4_tx_burst_tso_get_params(buf, txq, &tinfo);\n+\tif (ret)\n+\t\tgoto error;\n+\tret = mlx4_tx_burst_fill_tso_hdr(buf, txq, &tinfo,\n+\t\t\t\t\t tseg, pv, &pv_counter);\n+\tif (ret)\n+\t\tgoto error;\n+\t/* Calculate data segment location */\n+\tdseg = (volatile struct mlx4_wqe_data_seg *)\n+\t\t\t\t((uintptr_t)tseg + tinfo.wqe_tso_seg_size);\n+\tif ((uintptr_t)dseg >= (uintptr_t)sq->eob)\n+\t\tdseg = (volatile struct mlx4_wqe_data_seg *)\n+\t\t\t\t\t((uintptr_t)dseg - sq->size);\n+\tret = mlx4_tx_burst_fill_tso_segs(buf, txq, &tinfo,\n+\t\t\t\t\t dseg, pv, &pv_counter);\n+\tif (ret)\n+\t\tgoto error;\n+\t/* Write the first DWORD of each TXBB save earlier. */\n+\tif (pv_counter) {\n+\t\t/* Need a barrier here before writing the first TXBB word. */\n+\t\trte_io_wmb();\n+\t\tfor (--pv_counter; pv_counter >= 0; pv_counter--)\n+\t\t\t*pv[pv_counter].dst = pv[pv_counter].val;\n+\t}\n+\tctrl->fence_size = tinfo.fence_size;\n+\tsq->remain_size -= tinfo.wqe_size;\n+\t/* Align next WQE address to the next TXBB. */\n+\treturn (volatile struct mlx4_wqe_ctrl_seg *)\n+\t\t((volatile uint8_t *)ctrl + tinfo.wqe_size);\n+error:\n+\ttxq->stats.odropped++;\n+\trte_errno = ret;\n+\treturn NULL;\n+}\n+\n+/**\n * Write data segments of multi-segment packet.\n *\n * @param buf\n@@ -569,6 +923,7 @@ struct pv {\n \t\t\tuint16_t flags16[2];\n \t\t} srcrb;\n \t\tuint32_t lkey;\n+\t\tbool tso = txq->priv->tso && (buf->ol_flags & PKT_TX_TCP_SEG);\n \n \t\t/* Clean up old buffer. */\n \t\tif (likely(elt->buf != NULL)) {\n@@ -587,7 +942,16 @@ struct pv {\n \t\t\t} while (tmp != NULL);\n \t\t}\n \t\tRTE_MBUF_PREFETCH_TO_FREE(elt_next->buf);\n-\t\tif (buf->nb_segs == 1) {\n+\t\tif (tso) {\n+\t\t\t/* Change opcode to TSO */\n+\t\t\towner_opcode &= ~MLX4_OPCODE_CONFIG_CMD;\n+\t\t\towner_opcode |= MLX4_OPCODE_LSO | MLX4_WQE_CTRL_RR;\n+\t\t\tctrl_next = mlx4_tx_burst_tso(buf, txq, ctrl);\n+\t\t\tif (!ctrl_next) {\n+\t\t\t\telt->buf = NULL;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t} else if (buf->nb_segs == 1) {\n \t\t\t/* Validate WQE space in the send queue. */\n \t\t\tif (sq->remain_size < MLX4_TXBB_SIZE) {\n \t\t\t\telt->buf = NULL;\ndiff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h\nindex 4c025e3..ffa8abf 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.h\n+++ b/drivers/net/mlx4/mlx4_rxtx.h\n@@ -90,7 +90,7 @@ struct mlx4_txq_stats {\n \tunsigned int idx; /**< Mapping index. */\n \tuint64_t opackets; /**< Total of successfully sent packets. */\n \tuint64_t obytes; /**< Total of successfully sent bytes. */\n-\tuint64_t odropped; /**< Total of packets not sent when Tx ring full. */\n+\tuint64_t odropped; /**< Total number of packets failed to transmit. */\n };\n \n /** Tx queue descriptor. */\ndiff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c\nindex 6edaadb..9aa7440 100644\n--- a/drivers/net/mlx4/mlx4_txq.c\n+++ b/drivers/net/mlx4/mlx4_txq.c\n@@ -116,8 +116,14 @@\n \t\t\t DEV_TX_OFFLOAD_UDP_CKSUM |\n \t\t\t DEV_TX_OFFLOAD_TCP_CKSUM);\n \t}\n-\tif (priv->hw_csum_l2tun)\n+\tif (priv->tso)\n+\t\toffloads |= DEV_TX_OFFLOAD_TCP_TSO;\n+\tif (priv->hw_csum_l2tun) {\n \t\toffloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;\n+\t\tif (priv->tso)\n+\t\t\toffloads |= (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |\n+\t\t\t\t DEV_TX_OFFLOAD_GRE_TNL_TSO);\n+\t}\n \treturn offloads;\n }\n \n", "prefixes": [] }