Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41011/?format=api
{ "id": 41011, "url": "http://patches.dpdk.org/api/patches/41011/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1528821108-12405-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": "<1528821108-12405-2-git-send-email-ophirmu@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1528821108-12405-2-git-send-email-ophirmu@mellanox.com", "date": "2018-06-12T16:31:47", "name": "[v4,1/2] net/tap: calculate checksums of multi segs packets", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9c51aceda3d0441bc0e52ec462b3da07bf17625b", "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/1528821108-12405-2-git-send-email-ophirmu@mellanox.com/mbox/", "series": [ { "id": 97, "url": "http://patches.dpdk.org/api/series/97/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=97", "date": "2018-06-12T16:31:47", "name": "TAP TSO", "version": 4, "mbox": "http://patches.dpdk.org/series/97/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41011/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/41011/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 441F51E9CE;\n\tTue, 12 Jun 2018 18:32:07 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr20064.outbound.protection.outlook.com [40.107.2.64])\n\tby dpdk.org (Postfix) with ESMTP id 3E7A21E9CB\n\tfor <dev@dpdk.org>; Tue, 12 Jun 2018 18:32:06 +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.841.17; Tue, 12 Jun 2018 16:32:02 +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=9MXRO3iseg0+w/km3pHbhw32f0D61DuoHaBiZITj8S8=;\n\tb=MXpCRDhWfr72rNSks30zOLMkBExewqk5R3gCVy3+JHeMDnseKV4BeZBcQPhJ65VIbCbiWYKM17vlRsip/EiAXQesdhegt8ugZeQiCrA4XeOpvxmBtaKKgmc+OF7Tzo1wWMm+riKrsDRJPTCuVtcHgCEWZQ+yUpAysykzGVAsJXo=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=ophirmu@mellanox.com; ", "From": "Ophir Munk <ophirmu@mellanox.com>", "To": "dev@dpdk.org, Pascal Mazon <pascal.mazon@6wind.com>,\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": "Tue, 12 Jun 2018 16:31:47 +0000", "Message-Id": "<1528821108-12405-2-git-send-email-ophirmu@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1528821108-12405-1-git-send-email-ophirmu@mellanox.com>", "References": "<1520629826-23055-2-git-send-email-ophirmu@mellanox.com>\n\t<1528821108-12405-1-git-send-email-ophirmu@mellanox.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "VI1PR08CA0183.eurprd08.prod.outlook.com\n\t(2603:10a6:800:d2::13) To HE1PR0501MB2314.eurprd05.prod.outlook.com\n\t(2603:10a6:3:27::19)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);\n\tSRVR:HE1PR0501MB2314; ", "X-Microsoft-Exchange-Diagnostics": [ "1; HE1PR0501MB2314;\n\t3:3+XO4bqUxH3WCJlgYKBOd0JPp8S/Qb7D3vzxrrgH+jtxdWegYoJnjz4X9wdETM4cHX5wPgn972C7GVWknMWTR5UdkXcw1vKX0sPRH/9rK3pYzcHe0RTL1QrdZHJZG8U8hTEDXu0nof1QRCeqFBiwcg57HC6IgRGvkIyjAgPNoWKmsmjhsfiSEU/E5mQh+nK2Fn5r1ai4uqB0UQKjT+M88H+mU006UdwSmxNcYEOtOSbneQy/70D3QjvNlun4rgJf;\n\t25:QnEtjoXuqE6WV9bLY69ZVIUQyX8P90ErGQT4pne+wFd1piWH8Drx+EqPT5PUxb+JMak8XbwHcxGuMGkolxgcvyA2RkTkss07JRYFwgQACAPHTZp3WnU7yXRu3yopfWBSdfmj3Kdt0Vua+YUNB4Wal4fQhv1eqbh+fCZ1EyN8BBc5DI/yHbnWfj0h7r7DmL/xBt/GkP1WK0TXpoJQUaIohYXBDWiQAl7B/UUlp+EFgxolFqTu+5ZOKgR/NCifPvreBri0PA+0iwpdhVthcW7y4V6Zp27ItqyVAJpsiW3Al/jrMKm+IT78YkTgjoBK2IMwlSpPNZwMjKJzIZxYzBTpWQ==;\n\t31:wMRa92XMVP+lmW6N1m8YinnEztPaSLyg4ICksdKNZpxBuEBHZG3hrtRr1WO+NSbw1PHABXtyueqHAAGAvJ7Bl+ZNK9lPmhEVQX7n/Tax+9egq/GWoUlRwDDLiEvVOQYr7XUEDWSTU0uwkzXH39B4Iq1c+FKobVRXmdmS+z0XwAV0VmY6HIkrHc1SNk1E3W+5QySkK1Qkt5vZmVLMsgv6QaSDUW6lFKrCf7Z2bNRluuc=", "1; HE1PR0501MB2314;\n\t20:weLXagz6kC+rO9Fyzdgca5q648/6ZAnyDsqD2KaUJ9hmd3YZX/7/2tOywuWSOTNeI9bB6wx57anGXXai+xeNIvRYltmWhL3zATAEQZiTZ8+O7DN30+dcTWirOwhUAyrGA0WciHR8Q23GJ9MTqQJl5YzXJytrXMmSefdv6kc/kh5GXEy8Kg4KvaC5qD1YEi9g52xz397l9p75RpJO+oyXilcg52hIPuvrisbcwzWsYwoNx57ZSE1loDOO1ZPQ4flP9m91Z/7iCIE1io4CC3CrJ6J/ELnMYHccfFKgXeqitLJPMyFwBQaYL0rHxKiddYySiuD+E/23YnngpSbA9fzb2uS8JlACuQwqdQQb3uEE7YGhuHhy03A4AiGuoNtJ7enxby0SHgeoWQIyhC3jRP/pahLLmYsN4H8owno89UyZU46gPrYgIJii7fPTZGfCbX7qYXNcKnn6nXxPfGJtEq1MVDKCiCkO7hgUG9gnyn2yz4qJlI/rR+8UkQ0n1ayv0h85;\n\t4:pUSt+iP3NtPXNbc+SG9UyvX+ll5/ArL7wx0DK2EQv5QOM/IGxBUJoXuZFYP8cKacXBotrIWT7PGsk5dej0JekaKeIB1T46mv8rwT1Xsz9RcEPJcTiIA0m93mcDNfFcUZFdXhmkKiSLdclUhdLh6RDzzcinf9+iSbRVGo9GvJZUyCURWjD62oE5CqjC+0t/xz5C+uuAeijtpp0UW0AunanQqOfmSBtzAOm3ODyBgcaEnMDmSdOD+Kfx1Na1j+aoxmVjUoVM5laPU6LFH5N6sWtQ==", "=?us-ascii?Q?1; HE1PR0501MB2314;\n\t23:mMPEVFC4CzPoK9PZDPQIlnp/cxE7MgPRlBCtqdg?=\n\tWlDUhk8zEzgKXywAjvCe8NTvQ9SVqsL8bofawcPW1V9kFRa5omD8hwIMii31zF2P94jlwN5uTRhB23Ewemr3cp3njRyJ4lrPOydDJoF4/DqWl8kKpf97vTxbGrzXBLy6wSl3siSDp+EyUFCrpzajnLt4koz9m6/hN87Ex1ZIJG+TS8Jm63DL7eEQ6PkIz6FMAa2q1WXladFGUHEtwAv6N5BkgpOhHze2BAv3+pBv32SGAhze5O1ZZjNpiRJ4kOX+jCXoh51ao/FfPRyT4wnV7tpk790wABw/ARCzkYyG6gjcy7uxad4/u4DuHhhZ9EfJalJDVJa42eKozULyEmhYyw2hXBiZcHAuvqVvzbg9qthZbssrL2tbpf23bqjgFCXk0Cx8SHmQomTDEZsw9GhpQjsqdi25tezgtayby63V9jFofV0qlIbf/h8N/WUWtAOgZ/qaK88eV0IfiMhGBtlTmuAu6kBqgYKs3QtsGcKOYDpkMOTqAcKqJotPKmZY7PaLFFXFZPG67Wc0F7fsPXoTx+1LkbsS4LLSKWba2vk/lEyIB+QWvnqdrPFaxcVLVXUSu6uTbLA5GiGFC4ihxlroi58msM5SQWHLWUoyw6Xk4kedhTOmlgtqQQXQ67hrNAgS5oVnGOSHMI4HoOU+zHfb/DxNuLhwEU5kE8TSdKZxcZt4bU30L8GcREGIy1DmQsuP5YqrF229Ia7hRYFxSR2cqYFVKNAxex37/Gx8PrgeqX7CxAexV8+S0qHfI0FsM45ioWLmd9LGmAp+W1AaQfufvaIh/t8Y+cN2v7FIJcRNmTUDO2ex1zMnE1MUjpOQf4JYf4hUvcGGzsSI8bt31D82nXLCkWCZAMoXdjTeXH5orOkflzZPUn9k6b6WeZj0AlR75hS6PpSGiMdIJ1b+VV8kMsspyYt3KHcEb50mtavqpaERK5qyY8c8DWOOugJC4E5FI/geF+Zs7cfhAYYoKFzYFsPOlYNgLNgYOtlQ6uw8Eg2so/QqC/Gc2WZ2/eX2sQSbIOGcRCDy/8aD4T8l83sAqgGqZYfVQCpkPz+2nQ0OER8pZ6rhBYH6c7a/2OUwFXEquPhO6GOfrzgyap3ndBjs0P+6HqA0D7nIW71FyTQLsoVgZ7G1fiq4blsT1Ezfw7SUB8W50WhEFuz557bSh93d7VileRx2l2Ch83X/7FOOtNXFqlf1DVaT5mflJKl2oQGEL4IL8D70R6bmw+HDx48vNVwnFAX+bhX3YG3gjUhnsVXsq1xOHGBExMhLlj5UBtIt8s7i+Fiw0sFfBwNFiREyz7OZw", "1; HE1PR0501MB2314;\n\t6:ug+kwLKdgf1ZpuOAylgPhPZvyJTa8G0F+SZFMSwr4kvG3CJIBBtIDONO7afOH5xupUZzO1Op/C8iWKW80niargM29edQLpOU2zigQ1Srkkf6BDY+1KXovbOzosQcCAI26pBbJnAOq3gDfxEWeR1kj2vn0CfRaBKe+R0zzO4OkD/AXeRLBjD09ZQGllGwKBQsby6N7lyoZ3VAqu/vLYltYHgGjXHEmHH0OA5LJ6SKAvXq4X06HWU7EMM2Nc+fZLl+1l+vf2YRYVn9ifklz2vmQwcdJy5NUrfGx7F/CwkbPdu5i3KONWa3qpG1vPUQcCnCyzQLBfaEWduT/7CfdNTkkFgUUzlX05/go4Whdle3lpz8pf8UJs+1TL18t4bCTSWJnqQKabo+Ufmm41HwelsQKeAurCUClGigux7ejxYz8mJzqlCgBELDCy4UOaV0yMoy4aWeD6ETWaTenhoCqra0XA==;\n\t5:/6Exb6I3BhKLPHCQDSe9oDCnQrfxWz5M8lb+9HenAF3kfx1ny1OpLXSWIENaEr3Lw0qe1pGbLWylSmS+1DmoVjmcN6g2wlor0oxLuwH/dHtmKH7Hf1eVOE882dqGDqmrPkQkKrrL1894iXP+VhB+BRmoebwfXS2LabDHCaCVZ3k=;\n\t24:XdTcpgFRcHLtm5iazHq2/7EHCrH3BWKzL+Cd0r5ZI7jYbNRqbbj+dIicTOdju8A30m0KOol5Wkrxb7gjqEngp/FuapMT0BzMZWqGyB/zlEg=", "1; HE1PR0501MB2314;\n\t7:XWaEL8DoDg9vR8fRXx4KNbUFqpke+CAZKX0CGJgR1j4GiUEQfqxvSTJa2FpyM/Yadc0M3tSsXwF0zh80Ma3FHOQ4c1o+w77FF8igie+kmmAvYAvGuT8N4ZJDTmt4ole6CF0J6arQkrNqSWO028em82Ou3NDFCDczKXjgYjY77JZuMBs4jzZ+4BhwDiAZ+OMivwxEpzB5AIWiJ2DRX8vViivSpsTkzEPE7ckuKUwpHq8MJjaUcx1R2WMbwLdxwXgs" ], "X-MS-TrafficTypeDiagnostic": "HE1PR0501MB2314:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<HE1PR0501MB2314EDF829EB3E3AC8D00382D17F0@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)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016);\n\tSRVR:HE1PR0501MB2314; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2314; ", "X-Forefront-PRVS": "07013D7479", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(376002)(366004)(346002)(396003)(39860400002)(39380400002)(199004)(189003)(478600001)(2906002)(33026002)(69596002)(106356001)(16586007)(316002)(48376002)(110136005)(86362001)(105586002)(54906003)(21086003)(66066001)(47776003)(50466002)(6116002)(3846002)(68736007)(446003)(55016002)(186003)(81156014)(107886003)(2616005)(52116002)(956004)(11346002)(7736002)(476003)(76176011)(59450400001)(7696005)(26005)(486006)(51416003)(4720700003)(53936002)(386003)(36756003)(5660300001)(97736004)(8676002)(16526019)(81166006)(8936002)(305945005)(50226002)(25786009)(6666003)(4326008);\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": "JiBdtPX2Y7gvvoZcG6rBiNx4AveDirXq6gKv7sv25lkPxuRl3/Uu9A7/Qkx8mIDrO2B1RFow4FH/kzeNwVQ/su8N7vRJQDXVVqXcan5TPbnta55lvRt1UuPkCUoYtY7cP6zjk86taJrgB8rau3Cd88P5cNFm3XSJ5re/Gyoaj401vP54zrzMi0enQ+inxTj0", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-MS-Office365-Filtering-Correlation-Id": "1ba76217-08f9-4385-b07f-08d5d08207ef", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "12 Jun 2018 16:32:02.8705\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "1ba76217-08f9-4385-b07f-08d5d08207ef", "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 v4 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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/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 | 158 +++++++++++++++++++++++++++++-------------\n 1 file changed, 110 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex df396bf..c19f053 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -415,12 +415,43 @@ 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-\tvoid *l3_hdr = packet + l2_len;\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 \tif (ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4)) {\n \t\tstruct ipv4_hdr *iph = l3_hdr;\n \t\tuint16_t cksum;\n@@ -430,38 +461,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 +496,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 +529,73 @@ 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+\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+\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+\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+\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": [ "v4", "1/2" ] }