From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A045A034C for ; Fri, 25 Feb 2022 18:16:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44C40410FD; Fri, 25 Feb 2022 18:16:44 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 2657D410FD for ; Fri, 25 Feb 2022 18:16:43 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E54643FCAB for ; Fri, 25 Feb 2022 17:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809402; bh=HbcubD26nv9lVgDiTMfKQ+MXFZxS6d/NIQ7UbMFsTjU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=It7UjT2MaiSgkYTGNe7tHpszOB0YKfLnu6hKWeDPailL56FFhe4P1DqGivw8a5S5c KlBnOHaZstU7PpI/WhGQ1fkrkI3gnZRHkg8vh30CoaamW0jPpM2VyOgtD9zzboZQLt iKQfhglU1BQ6Ucysz10A9rN5x1ROe4y9GglbEthXrl6Lqy47eW3+tmq1eghbL9rB8U 4/9KE5lit5qQVR542KZ1W9LkBBMvKW7WNjC9yeVDE7uXMxid0bT3pWbT1BYmLeEp+6 4MWZkIcCAnlDxDEeLXHeSwLSk250+x+lae5/EzDTimecMiPJQKu+jhbTwa/2wcAEry cJm0IEt2dmcRg== Received: by mail-wm1-f72.google.com with SMTP id 187-20020a1c19c4000000b0037cc0d56524so1843904wmz.2 for ; Fri, 25 Feb 2022 09:16:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HbcubD26nv9lVgDiTMfKQ+MXFZxS6d/NIQ7UbMFsTjU=; b=kj5gmzygQSpPz9WKyzlG1dWPnS47j6sLKCKlHs+Mstg8Dw/0I9yNfpiGk9YT99oR9H VFqhqMvlm+r8HSQNZ2uqGtOiNe9WZNbYnugNUQE9oRkKqf5GKcVFaIPyYTRzIbTs+E8g kUTtWilNmWqqIgnl2/z7WwRTqD89RjAHGq/YZSiZ6GjHjbF2142h2Bv83P1UX89Ve2yi hEk/8WrChFhYX810+3/4Xed68RuZJXkrH9Kbs47a7MN1WhcQDFPw4gxvLgyrUWFNoXm7 L3ecsSwfrLeA7gan2IjkaYUygK2zVFiVXDmSmdJlQ2Ni2d326JaxXvTMmKVNIhT700Yk 4R7g== X-Gm-Message-State: AOAM530xf7Pm/isPOcRk72YBsv4HRvjsyEZ1tTMQUT0zVZtZu43ICymL X1J96DAxMvPrHzT5znL5B67KZ15dtS1lgbwE+3c5mBZE8yidmzMY3zhPW7wdOrKwqqE1QjP0b3A yvJbR+gApWMeyY3xIYXLSNVry X-Received: by 2002:a5d:47cc:0:b0:1e8:50e2:94cd with SMTP id o12-20020a5d47cc000000b001e850e294cdmr6827622wrc.34.1645809402167; Fri, 25 Feb 2022 09:16:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8m2+ckls5sYsBXswXnGLQGQMSGhED7n15ug8etiGxmiMKFmSDx5Z/wQ8t6wwev8vrdFjskA== X-Received: by 2002:a5d:47cc:0:b0:1e8:50e2:94cd with SMTP id o12-20020a5d47cc000000b001e850e294cdmr6827612wrc.34.1645809401919; Fri, 25 Feb 2022 09:16:41 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c154c00b0037df2e5d8c9sm3533984wmg.27.2022.02.25.09.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:41 -0800 (PST) From: christian.ehrhardt@canonical.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix maximum packet headers size for TSO' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:09 +0100 Message-Id: <20220225171550.3499040-16-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6edb22f2d81bb8318dd25b9fcd2aaeeecc92863c Thanks. Christian Ehrhardt --- >From 6edb22f2d81bb8318dd25b9fcd2aaeeecc92863c Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 13 Jan 2022 16:32:29 +0200 Subject: [PATCH] net/mlx5: fix maximum packet headers size for TSO [ upstream commit 9701034faab0f84ba42e1f5343afda5464b11ca3 ] The maximum packet headers size for TSO is calculated as a sum of Ethernet, VLAN, IPv6 and TCP headers (plus inner headers). The rationale behind choosing IPv6 and TCP is their headers are bigger than IPv4 and UDP respectively, giving us the maximum possible headers size. But it is not true for L3 headers. IPv4 header size (20 bytes) is smaller than IPv6 header size (40 bytes) only in the default case. There are up to 10 optional header fields called Options in case IHL > 5. This means that the maximum size of the IPv4 header is 60 bytes. Choosing the wrong maximum packets headers size causes inability to transmit multi-segment TSO packets with IPv4 Options present. PMD check that it is possible to inline all the packet headers and the packet headers size exceeds the expected maximum size. The maximum packet headers size was set to 192 bytes before, but its value has been reduced during Tx path refactor activity. Restore the proper maximum packet headers size for TSO. Fixes: 50724e1bba76 ("net/mlx5: update Tx definitions") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 2836099b75..b1c72714bf 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -70,7 +70,7 @@ #define MLX5_MAX_XSTATS 32 /* Maximum Packet headers size (L2+L3+L4) for TSO. */ -#define MLX5_MAX_TSO_HEADER (128u + 34u) +#define MLX5_MAX_TSO_HEADER 192U /* Inline data size required by NICs. */ #define MLX5_INLINE_HSIZE_NONE 0 -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.918270261 +0100 +++ 0016-net-mlx5-fix-maximum-packet-headers-size-for-TSO.patch 2022-02-25 16:58:44.216990391 +0100 @@ -1 +1 @@ -From 9701034faab0f84ba42e1f5343afda5464b11ca3 Mon Sep 17 00:00:00 2001 +From 6edb22f2d81bb8318dd25b9fcd2aaeeecc92863c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9701034faab0f84ba42e1f5343afda5464b11ca3 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index 36b384fa08..2d48fde010 100644 +index 2836099b75..b1c72714bf 100644 @@ -37 +38 @@ -@@ -50,7 +50,7 @@ +@@ -70,7 +70,7 @@