Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41430/?format=api
{ "id": 41430, "url": "http://patches.dpdk.org/api/patches/41430/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1529795861-1361-2-git-send-email-ophirmu@mellanox.com/", "project": { "id": 1, "url": "http://patches.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": "<1529795861-1361-2-git-send-email-ophirmu@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1529795861-1361-2-git-send-email-ophirmu@mellanox.com", "date": "2018-06-23T23:17:40", "name": "[v5,1/2] net/tap: calculate checksums of multi segs packets", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "27df33d9f3b61323e9ac551595335c8db186cb83", "submitter": { "id": 793, "url": "http://patches.dpdk.org/api/people/793/?format=api", "name": "Ophir Munk", "email": "ophirmu@mellanox.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1529795861-1361-2-git-send-email-ophirmu@mellanox.com/mbox/", "series": [ { "id": 215, "url": "http://patches.dpdk.org/api/series/215/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=215", "date": "2018-06-23T23:17:40", "name": "TAP TSO", "version": 5, "mbox": "http://patches.dpdk.org/series/215/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41430/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/41430/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 F3B4F1BB42;\n\tSun, 24 Jun 2018 01:18:00 +0200 (CEST)", "from EUR01-HE1-obe.outbound.protection.outlook.com\n\t(mail-he1eur01on0082.outbound.protection.outlook.com [104.47.0.82])\n\tby dpdk.org (Postfix) with ESMTP id 79DE11BB3E\n\tfor <dev@dpdk.org>; Sun, 24 Jun 2018 01:17:59 +0200 (CEST)", "from mellanox.com (37.142.13.130) by\n\tHE1PR0501MB2314.eurprd05.prod.outlook.com (2603:10a6:3:27::19) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.884.23; Sat, 23 Jun 2018 23:17:56 +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=RTvTTMhy8ihwxJ/LuKRHUiH3Ibn4SrpJ8s1MXNz03qQ=;\n\tb=KYBAWnCedyldlNEfdN9RBIsubiqrWTvHbb/1lvXzT+njB3JGggptgu9kHD1KjtsXxHdr+D6wck27n6DmUSf74RebWdIT25zGHEuMs3436uJvammcCUF4uVbAkJCE23FeTEr+8wmXf77QJVvzrJoE1d728RkegtWKyLTnTbiNkTQ=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=ophirmu@mellanox.com; ", "From": "Ophir Munk <ophirmu@mellanox.com>", "To": "dev@dpdk.org,\n\tKeith Wiles <keith.wiles@intel.com>", "Cc": "Thomas Monjalon <thomas@monjalon.net>, Olga Shern <olgas@mellanox.com>, \n\tOphir Munk <ophirmu@mellanox.com>", "Date": "Sat, 23 Jun 2018 23:17:40 +0000", "Message-Id": "<1529795861-1361-2-git-send-email-ophirmu@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1529795861-1361-1-git-send-email-ophirmu@mellanox.com>", "References": "<1528821108-12405-3-git-send-email-ophirmu@mellanox.com>\n\t<1529795861-1361-1-git-send-email-ophirmu@mellanox.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "VI1PR0901CA0090.eurprd09.prod.outlook.com\n\t(2603:10a6:800:7e::16) To HE1PR0501MB2314.eurprd05.prod.outlook.com\n\t(2603:10a6:3:27::19)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "3570cae4-1903-48a2-c756-08d5d95f8e41", "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:HE1PR0501MB2314; ", "X-Microsoft-Exchange-Diagnostics": [ "1; HE1PR0501MB2314;\n\t3:OdBz+2fkGh596TlXaSGxWLLRCmGkXw+ER3/F3vuU5HjIyjQNBSkHWhmXo5dwAYq9b/mvOIVOLx94qTTPCdR8vSPqJGP6dy0wIunN2ze5P2EEjXO0Jcwmy8oJ8AtOSP0tUQWQLYIedfBh94Q5ityYhCJmPi3UfwoKpwcfLseCQUTfU5JO9V7bRkPmPC8gaLQSbqc7tlVcc+9osGYu9shiReuJr2ZD25CBJ8aCF7qIav3ho6CNf9m4w6AlLudO/FBn;\n\t25:MXzcCiEFpzIqCgWfzL0KDc4dp1xpTXdgT0UxT7ax6fx7J/JbAK8/COoo10vSoko6QsZRkrYKyUKOgvlkDTTzAtkKiwHXIyKIKq6srVk2j9Q9odhl1kCw3JYUSJAMINydN7Wl7MDYB4bTH7XqmpJENhbfpwpx5+8TEGVZ8Py1b7NnW2y0tDgLMrtdW8aO4s25vLg6liRMn5gW6EVU0UQ6NTlhDS/VyFa0W6VeSuEKo/u2DGHGuePHi8R/fsNWuwCxFY81HWOOZdYhDrXWmLCAK/6xOR32fNzyoORZis7ld+j4sXB8XjMgbQgSKRLOhufaGHv0doByP+NFAIHm9mA/Jw==;\n\t31:6uafbfOU6P3tghHZca+L+usKXG/kuA4ygHqEn3f5RbdPTUPWsN3OpUpgOZSZ676qOjjrd5/uKju70XRW6evYlXCrwqJOMkgp+fxLbTOTLQmbsaeTRXE1wiYYPQCn+P6nnjRxhjilhRa8syZwIxrlGWjSDFx7wrv/tH/ANUnem+OmskoVIuIwXybRJtizZgA1diQWwgM7heonobPZrOOt8zZQjl/27BrMm5LiJhYMXHs=", "1; HE1PR0501MB2314;\n\t20:VdPBq/I/2maOMe8WNKFuVC6CZZMuGQBFEVaRuBCsqIcpOWLnkAS1/zACPaBzVIHWn3F0Dcy/HYMK6TZeSZi2/PwAoq6eITtuxluQFpLI97KumM4DkyTJGEgTZ2pBtCD5d/yR+VMcXj7RDOTrt69/5PWwrtC5P1WVmkb+kfrSAvpvWfEkTmCQkRjsCFpLBX6wk0K+tnGqf/oabXlvwoyf+XVLF+OeaTV8SfFwiGYLuZO2+JBaebhBEPgymh+HpwMR5PndsRHVARfd7I0UqL3S3V4tNW/av2qCL1rNCEn3HcxCousDMohkbAJdgwlUdu2KX47QcakXTWo+yx8/BvD3RNLa6ILVGmSRRCn0cnmzX7lkATR5MKZA+qlo1TIAx6WznV4wYDSZp+k3m+8CN17zPqhIlZnu4ZTxf05LNkc+LxHKO/Wxv1cYfLdgP0QpMFF+pAy0282LxXKyAaKOgIQJAED3ev/z3bw1fk2riCvgPTO1QZ5t+d7jothSEcViibXl;\n\t4:xl1sR9vdJwH61Exx7s2oIRiKWUEXffZflIayngh/srlQsNp6LhqPveU9lBe+IfBD920754mBt15CU55HIjfRcwRQH/ZlWVqTSrfWCBQQoWyqEekFcwUGChwVyOfUwmGmFGy1065I/nPbD/ntkGL2JUwlebamcHAkPoGWew25nRZkcjDs+tEdbKrDn88sbTktB+RyfFeneQV5A63oqVJskg3s3qZkwUfDg4wBKZ9XXStAr00vpFmlVmXycBW9qzVDSBP9wW0116knS+xkMiXxvA==", "=?us-ascii?Q?1; HE1PR0501MB2314;\n\t23:XjeC/aaqJudYaAi6JcgEGmZViHEl3SxnewdIwy4?=\n\tW/4735VV0wuYstQw0zaFh8MmKTqGYVcYY1xSN1GrLYuh+CjXAB/fmijcKPfMplMRWWs8eOpzrsfrUWouIkSIS/Xd0U9MrQbCYcQ3fWAAuJ6DOEX0UJ5YcbCToJCisJutVGVxnAKd4DbjBQZCCE/1Zehbpi7cuPNxIeVXrLdSBy0XdnidPlYst7iWon2By5MK29Wf88aFrwqqSV/akpvKP6sCbLhC0kVR9t6gqOpzr5svnOiyPsHW/V6Zw0vglJmEK2sduWr0QuOWD3QPY04VETSmKLoeQJ97/ivCj/M42q169iOKMhx1wm6U5UvMXJ8H1mBae+LXmm/0OXE4i+9Jrroxkv/eN6LTDV8y0FU4aokvleumb0fVolwv49Uq2vIuOPTfBhdGelcit9P3yt57IMAW9a+QcOirXvUc6bUTzMMpIgICYERTpEMkU8+ZvL1FgwfSb9JD15/eDwhhZJxfLvQtDDaK6snSnueviLjbEWldCBP2guFa0tmr9QBJFFy0FaM4d3xiAOVMopH/gw9Yaw5rrIwn8lZ2e94AytUCZb1AgWjMGZYHDR6YT33ovHP1M1l8aVmMe2NM+oubak3QuG/456ltxspvC7wOlZZkxIU5WJHGe5rfNOYu/s2bm7nJdDDXUT1yTFulKx+d56ql7IZVEvNs2pc0N6rMa1yjIGwLpM8zokwPv4Hpskce0V3UDM3malFr/wr46dc3AU/BYKhPX4HaKZAcdab81bn6m3IBdGpjTkZIQcd/Kx3QTaUsOAynueaaRfKnYbVCjkGuPxSPN6DiX3oIjTgvpJ4n5a14TMrc+wKx/OdUYdCfZi1GAW2kgZBrLI+h6RoD/Za2fvN3weymVXKElAOGB4ymmrKGVoS4Sx6XgPaVKuetNrbk96eEjjZBeg2+U/C3frimoIqGB0SLI/JSbOWLV0B0ZaABZ/6wY7UUxHDyVv1sIr0U1nUXFH5vztfPs5ur6ppoc+xClPUuy3HkISpSoxHOes5Kj+0PBklZVT+rglA0F6OjGXBgDZD//E4aZsNGtOH93wu0SAoZCO8v2TJ3yZc46XJAwUOMPDSm9nGgfSaGgCiTpS7T0wGwrJvhZYBra92vt8pNG8Nih2s5sYGkzeBWM2Rz4+m3g2jrjC93w0IIYvm6oNXVUjLNkNbwoNopw1NEN+Tqdh053t69/O5makflBaAjGGkwn1tfHfx2H9W+/rf6UnKdcFzOrc8Zqw5rzarbXmW4MhqqIw0pyfGKjT5AGHJw+BV9E5LG44Cft8Rxjyuc2LIs=", "1; HE1PR0501MB2314;\n\t6:yxf7IXv85obs0Znkp/PYCAv6A7jDjb8eFL2dFVuVJasn8ladQZCBtRaJUzhLBX0/HNqIMcgpdaVKP0xXP8sxndDvJVZtpQOpomQPAVUlFSPjsRxRFbZhoJbr9JF0dJAhk0N+GrN9/uMYCaoOwpij25yJ2hlhbkwVpjLAw0F+M7Z80aR8lNbRfPH94iKZqRtCGNv06ZaHHPe2RJQZ/jd+uiXpCdwzzrCf7t+WuvIXRH+7z6vyjUjBWZfUcT+xuD6SkB26jLEHiNubgjL7sEr2Y+ykEHOuHsn6ctUclQe4G3QVi6NPF/QOhWPeohfNe2iVKiadqule6RBstMm/5gCDq29NAJ3kxgG3EQmrOECg69ox7K8JcsYg3CrJdeVaEf+E7EZT23N8nftrph7zy75P4jlCrYSGoKId5UZ6faZgfKXSElgiTz3eszj2yBAkN3jL8tv+TspWKvx8kR9yUksJYg==;\n\t5:mEcIPpsOQzfQrsrZYvwKMK53ZBT0AEZ/nf1x4j4fWItsafTbIDB/jBFOY8QJU+SAW73cQG/tPI5Lx1qsJyAL2vimLH+Xqrt25bYZxHP9sjjmS6YYm7JUbxujD+6bHuUmEc7suOQg4jEDEPuMoaxkmLmniFNZBD5OjsU/8OL4i9o=;\n\t24:9MnMQUHXrEcxTLTf2yBAL4N7OLyyz9qtgsJeZaS7wp3AUi86qrrfvsRshzpKawJv55mQ8gy2+eSrG99LeK73MAAmjzei5ILetHmhuBasjNU=", "1; HE1PR0501MB2314;\n\t7:lBaJjkalWmK+RBrN52Su2+xjVwHxYs/18e1OQBpuXnkGzHSUR3WMTxOq1z96oQQ+FF8+QUpqNdvf2Gzz8a2rJvbLZHW14r8NIMg9HS0z6w8vy9cnkq6x78lUGd4zf/2OXJsJUv6c+Aem0O83ccULKHMJ2SmlUQd3kXhQKY/+R8vFZaYbUmGzjDLJi3ITdTxy5VccZveWe3Vjtai3NAFC45MgVNK3Mt08xCVwAcSeyAaY9oEBSVaZM0Lz2vn+9i5P" ], "X-MS-TrafficTypeDiagnostic": "HE1PR0501MB2314:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<HE1PR0501MB2314C5C5585AE061A35E6499D1740@HE1PR0501MB2314.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)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016);\n\tSRVR:HE1PR0501MB2314; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2314; ", "X-Forefront-PRVS": "07126E493C", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(366004)(396003)(39860400002)(346002)(39380400002)(376002)(199004)(189003)(26005)(86362001)(7696005)(16526019)(51416003)(7736002)(52116002)(55016002)(6666003)(2906002)(107886003)(4326008)(8936002)(4720700003)(16586007)(21086003)(186003)(36756003)(69596002)(3846002)(6116002)(59450400001)(76176011)(386003)(66066001)(47776003)(5660300001)(106356001)(316002)(105586002)(6916009)(53936002)(956004)(476003)(68736007)(48376002)(446003)(486006)(54906003)(50466002)(8676002)(81156014)(2616005)(81166006)(478600001)(11346002)(50226002)(25786009)(305945005)(33026002)(97736004);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2314; H:mellanox.com; FPR:;\n\tSPF:None; \n\tLANG:en; PTR:InfoNoRecords; A:1; MX:1; ", "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "F7Rd+1E3WdRgIOELqnvcyJgty8AbDdzPF+k5YcPxvLFd3rUQS58rurxLox/KjfGBGfpiOEyGTu6+CmB10kNC8oFGYfrPFigokZ/+qdRkEd63pG+NZS+emvdn/PX3WmlSWw5yLNLazkbJoBuQVE5kpB3iJYEP1xyu/s5PigkP+HucurqjWcHJvMuuuEMwDbkcIkoMQFAUhYFP3Ja4l1fen6WBw2VkM3/b/vgP2clExIGzwXFVxAksDZepDjUFfn3YHysCPWnHuEmYd+K4zUqX/Ybk7hKDwsh/IQR5d8Wz1nZxO4A2xcOJxV+DR5kWx6OyTcBk9eg/hjOmv5sJzGqMj2Lq0l41efrwjrOFqKW6rNQ=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "23 Jun 2018 23:17:56.4480\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "3570cae4-1903-48a2-c756-08d5d95f8e41", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "HE1PR0501MB2314", "Subject": "[dpdk-dev] [PATCH v5 1/2] net/tap: calculate checksums of multi\n\tsegs packets", "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": "Prior to this commit IP/UDP/TCP checksum offload calculations\nwere skipped in case of a multi segments packet.\nThis commit enables TAP checksum calculations for multi segments\npackets.\nThe only restriction is that the first segment must contain\nheaders of layers 3 (IP) and 4 (UDP or TCP)\n\nReviewed-by: Raslan Darawsheh <rasland@mellanox.com>\nSigned-off-by: Ophir Munk <ophirmu@mellanox.com>\n---\n drivers/net/tap/rte_eth_tap.c | 161 ++++++++++++++++++++++++++++++------------\n 1 file changed, 114 insertions(+), 47 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex df396bf..8903646 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -415,9 +415,41 @@ tap_tx_offload_get_queue_capa(void)\n \t DEV_TX_OFFLOAD_TCP_CKSUM;\n }\n \n+/* Finalize l4 checksum calculation */\n static void\n-tap_tx_offload(char *packet, uint64_t ol_flags, unsigned int l2_len,\n-\t unsigned int l3_len)\n+tap_tx_l4_cksum(uint16_t *l4_cksum, uint16_t l4_phdr_cksum,\n+\t\tuint32_t l4_raw_cksum)\n+{\n+\tif (l4_cksum) {\n+\t\tuint32_t cksum;\n+\n+\t\tcksum = __rte_raw_cksum_reduce(l4_raw_cksum);\n+\t\tcksum += l4_phdr_cksum;\n+\n+\t\tcksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);\n+\t\tcksum = (~cksum) & 0xffff;\n+\t\tif (cksum == 0)\n+\t\t\tcksum = 0xffff;\n+\t\t*l4_cksum = cksum;\n+\t}\n+}\n+\n+/* Accumaulate L4 raw checksums */\n+static void\n+tap_tx_l4_add_rcksum(char *l4_data, unsigned int l4_len, uint16_t *l4_cksum,\n+\t\t\tuint32_t *l4_raw_cksum)\n+{\n+\tif (l4_cksum == NULL)\n+\t\treturn;\n+\n+\t*l4_raw_cksum = __rte_raw_cksum(l4_data, l4_len, *l4_raw_cksum);\n+}\n+\n+/* L3 and L4 pseudo headers checksum offloads */\n+static void\n+tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len,\n+\t\tunsigned int l3_len, unsigned int l4_len, uint16_t **l4_cksum,\n+\t\tuint16_t *l4_phdr_cksum, uint32_t *l4_raw_cksum)\n {\n \tvoid *l3_hdr = packet + l2_len;\n \n@@ -430,38 +462,21 @@ tap_tx_offload(char *packet, uint64_t ol_flags, unsigned int l2_len,\n \t\tiph->hdr_checksum = (cksum == 0xffff) ? cksum : ~cksum;\n \t}\n \tif (ol_flags & PKT_TX_L4_MASK) {\n-\t\tuint16_t l4_len;\n-\t\tuint32_t cksum;\n-\t\tuint16_t *l4_cksum;\n \t\tvoid *l4_hdr;\n \n \t\tl4_hdr = packet + l2_len + l3_len;\n \t\tif ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM)\n-\t\t\tl4_cksum = &((struct udp_hdr *)l4_hdr)->dgram_cksum;\n+\t\t\t*l4_cksum = &((struct udp_hdr *)l4_hdr)->dgram_cksum;\n \t\telse if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM)\n-\t\t\tl4_cksum = &((struct tcp_hdr *)l4_hdr)->cksum;\n+\t\t\t*l4_cksum = &((struct tcp_hdr *)l4_hdr)->cksum;\n \t\telse\n \t\t\treturn;\n-\t\t*l4_cksum = 0;\n-\t\tif (ol_flags & PKT_TX_IPV4) {\n-\t\t\tstruct ipv4_hdr *iph = l3_hdr;\n-\n-\t\t\tl4_len = rte_be_to_cpu_16(iph->total_length) - l3_len;\n-\t\t\tcksum = rte_ipv4_phdr_cksum(l3_hdr, 0);\n-\t\t} else {\n-\t\t\tstruct ipv6_hdr *ip6h = l3_hdr;\n-\n-\t\t\t/* payload_len does not include ext headers */\n-\t\t\tl4_len = rte_be_to_cpu_16(ip6h->payload_len) -\n-\t\t\t\tl3_len + sizeof(struct ipv6_hdr);\n-\t\t\tcksum = rte_ipv6_phdr_cksum(l3_hdr, 0);\n-\t\t}\n-\t\tcksum += rte_raw_cksum(l4_hdr, l4_len);\n-\t\tcksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);\n-\t\tcksum = (~cksum) & 0xffff;\n-\t\tif (cksum == 0)\n-\t\t\tcksum = 0xffff;\n-\t\t*l4_cksum = cksum;\n+\t\t**l4_cksum = 0;\n+\t\tif (ol_flags & PKT_TX_IPV4)\n+\t\t\t*l4_phdr_cksum = rte_ipv4_phdr_cksum(l3_hdr, 0);\n+\t\telse\n+\t\t\t*l4_phdr_cksum = rte_ipv6_phdr_cksum(l3_hdr, 0);\n+\t\t*l4_raw_cksum = __rte_raw_cksum(l4_hdr, l4_len, 0);\n \t}\n }\n \n@@ -482,17 +497,27 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tmax_size = *txq->mtu + (ETHER_HDR_LEN + ETHER_CRC_LEN + 4);\n \tfor (i = 0; i < nb_pkts; i++) {\n \t\tstruct rte_mbuf *mbuf = bufs[num_tx];\n-\t\tstruct iovec iovecs[mbuf->nb_segs + 1];\n+\t\tstruct iovec iovecs[mbuf->nb_segs + 2];\n \t\tstruct tun_pi pi = { .flags = 0, .proto = 0x00 };\n \t\tstruct rte_mbuf *seg = mbuf;\n \t\tchar m_copy[mbuf->data_len];\n+\t\tint proto;\n \t\tint n;\n \t\tint j;\n+\t\tint k; /* first index in iovecs for copying segments */\n+\t\tuint16_t l234_hlen; /* length of layers 2,3,4 headers */\n+\t\tuint16_t seg_len; /* length of first segment */\n+\t\tuint16_t nb_segs;\n+\t\tuint16_t *l4_cksum; /* l4 checksum (pseudo header + payload) */\n+\t\tuint32_t l4_raw_cksum = 0; /* TCP/UDP payload raw checksum */\n+\t\tuint16_t l4_phdr_cksum = 0; /* TCP/UDP pseudo header checksum */\n+\t\tuint16_t is_cksum = 0; /* in case cksum should be offloaded */\n \n \t\t/* stats.errs will be incremented */\n \t\tif (rte_pktmbuf_pkt_len(mbuf) > max_size)\n \t\t\tbreak;\n \n+\t\tl4_cksum = NULL;\n \t\tif (txq->type == ETH_TUNTAP_TYPE_TUN) {\n \t\t\t/*\n \t\t\t * TUN and TAP are created with IFF_NO_PI disabled.\n@@ -505,35 +530,77 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t * is 4 or 6, then protocol field is updated.\n \t\t\t */\n \t\t\tchar *buff_data = rte_pktmbuf_mtod(seg, void *);\n-\t\t\tj = (*buff_data & 0xf0);\n-\t\t\tpi.proto = (j == 0x40) ? rte_cpu_to_be_16(ETHER_TYPE_IPv4) :\n-\t\t\t\t(j == 0x60) ? rte_cpu_to_be_16(ETHER_TYPE_IPv6) : 0x00;\n+\t\t\tproto = (*buff_data & 0xf0);\n+\t\t\tpi.proto = (proto == 0x40) ?\n+\t\t\t\trte_cpu_to_be_16(ETHER_TYPE_IPv4) :\n+\t\t\t\t((proto == 0x60) ?\n+\t\t\t\t\trte_cpu_to_be_16(ETHER_TYPE_IPv6) :\n+\t\t\t\t\t0x00);\n \t\t}\n \n-\t\tiovecs[0].iov_base = π\n-\t\tiovecs[0].iov_len = sizeof(pi);\n-\t\tfor (j = 1; j <= mbuf->nb_segs; j++) {\n-\t\t\tiovecs[j].iov_len = rte_pktmbuf_data_len(seg);\n-\t\t\tiovecs[j].iov_base =\n-\t\t\t\trte_pktmbuf_mtod(seg, void *);\n-\t\t\tseg = seg->next;\n-\t\t}\n+\t\tk = 0;\n+\t\tiovecs[k].iov_base = π\n+\t\tiovecs[k].iov_len = sizeof(pi);\n+\t\tk++;\n+\n+\t\tnb_segs = mbuf->nb_segs;\n \t\tif (txq->csum &&\n \t\t ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) ||\n \t\t (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM ||\n \t\t (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) {\n-\t\t\t/* Support only packets with all data in the same seg */\n-\t\t\tif (mbuf->nb_segs > 1)\n+\t\t\tis_cksum = 1;\n+\n+\t\t\t/* Support only packets with at least layer 4\n+\t\t\t * header included in the first segment\n+\t\t\t */\n+\t\t\tseg_len = rte_pktmbuf_data_len(mbuf);\n+\t\t\tl234_hlen = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;\n+\t\t\tif (seg_len < l234_hlen)\n \t\t\t\tbreak;\n-\t\t\t/* To change checksums, work on a copy of data. */\n+\n+\t\t\t/* To change checksums, work on a\n+\t\t\t * copy of l2, l3 l4 headers.\n+\t\t\t */\n \t\t\trte_memcpy(m_copy, rte_pktmbuf_mtod(mbuf, void *),\n-\t\t\t\t rte_pktmbuf_data_len(mbuf));\n-\t\t\ttap_tx_offload(m_copy, mbuf->ol_flags,\n-\t\t\t\t mbuf->l2_len, mbuf->l3_len);\n-\t\t\tiovecs[1].iov_base = m_copy;\n+\t\t\t\t\tl234_hlen);\n+\t\t\ttap_tx_l3_cksum(m_copy, mbuf->ol_flags,\n+\t\t\t\t mbuf->l2_len, mbuf->l3_len, mbuf->l4_len,\n+\t\t\t\t &l4_cksum, &l4_phdr_cksum,\n+\t\t\t\t &l4_raw_cksum);\n+\t\t\tiovecs[k].iov_base = m_copy;\n+\t\t\tiovecs[k].iov_len = l234_hlen;\n+\t\t\tk++;\n+\n+\t\t\t/* Update next iovecs[] beyond l2, l3, l4 headers */\n+\t\t\tif (seg_len > l234_hlen) {\n+\t\t\t\tiovecs[k].iov_len = seg_len - l234_hlen;\n+\t\t\t\tiovecs[k].iov_base =\n+\t\t\t\t\trte_pktmbuf_mtod(seg, char *) +\n+\t\t\t\t\t\tl234_hlen;\n+\t\t\t\ttap_tx_l4_add_rcksum(iovecs[k].iov_base,\n+\t\t\t\t\tiovecs[k].iov_len, l4_cksum,\n+\t\t\t\t\t&l4_raw_cksum);\n+\t\t\t\tk++;\n+\t\t\t\tnb_segs++;\n+\t\t\t}\n+\t\t\tseg = seg->next;\n+\t\t}\n+\n+\t\tfor (j = k; j <= nb_segs; j++) {\n+\t\t\tiovecs[j].iov_len = rte_pktmbuf_data_len(seg);\n+\t\t\tiovecs[j].iov_base = rte_pktmbuf_mtod(seg, void *);\n+\t\t\tif (is_cksum)\n+\t\t\t\ttap_tx_l4_add_rcksum(iovecs[j].iov_base,\n+\t\t\t\t\tiovecs[j].iov_len, l4_cksum,\n+\t\t\t\t\t&l4_raw_cksum);\n+\t\t\tseg = seg->next;\n \t\t}\n+\n+\t\tif (is_cksum)\n+\t\t\ttap_tx_l4_cksum(l4_cksum, l4_phdr_cksum, l4_raw_cksum);\n+\n \t\t/* copy the tx frame data */\n-\t\tn = writev(txq->fd, iovecs, mbuf->nb_segs + 1);\n+\t\tn = writev(txq->fd, iovecs, j);\n \t\tif (n <= 0)\n \t\t\tbreak;\n \n", "prefixes": [ "v5", "1/2" ] }