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 0445842ECF for ; Thu, 20 Jul 2023 17:24:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1D9542D4D; Thu, 20 Jul 2023 17:24:03 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1590D400D6 for ; Thu, 20 Jul 2023 17:24:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkSCRs9dnc4NdqyXR6NIRF7dT7OWykkhgLpkrHPUifs=; b=E6uq3lLx6ETRxV8FyjuMJfHWg+vxb+0jKwY7hHfkjPl6qAljE+juIWKkwotXk4857jESv1 8RjBUUvhTCCAw2v0kE/tr7u3ghCvdcMClHXhlnWRbo2q57qvV3Oqlkd5P2KpQd6iV+Vufw Bx2Ghi0+hOGgm0kkk8C2ln+JQbKY5Hk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-68-4QDh7ie4OryfIK5k9trIug-1; Thu, 20 Jul 2023 11:23:41 -0400 X-MC-Unique: 4QDh7ie4OryfIK5k9trIug-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1EEE88D572; Thu, 20 Jul 2023 15:23:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0FCF492C13; Thu, 20 Jul 2023 15:23:12 +0000 (UTC) From: Kevin Traynor To: Wenzhuo Lu Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN insertion in vector path' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:20 +0100 Message-ID: <20230720151942.262154-129-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e4403410381ecebe27be2b355bd32d33a5632e19 Thanks. Kevin --- >From e4403410381ecebe27be2b355bd32d33a5632e19 Mon Sep 17 00:00:00 2001 From: Wenzhuo Lu Date: Mon, 3 Jul 2023 10:22:00 +0800 Subject: [PATCH] net/iavf: fix VLAN insertion in vector path [ upstream commit efe1b63775e8369b867f411d7bf8f61e97bd446b ] As the VLAN insertion is partially supported in vector path, the behavior is different in scalar and vector path. For a VLAN packet, if using scalar path, the new VLAN tag will be inserted after the original VLAN tag. If using vector path, the new VLAN tag is inserted before the original VLAN tag. To avoid any misleading, disable VLAN insertion in vector path. Fixes: 059f18ae2aec ("net/iavf: add offload path for Tx AVX512") Signed-off-by: Wenzhuo Lu Acked-by: Qi Zhang --- doc/guides/nics/features/iavf.ini | 2 +- drivers/net/iavf/iavf_rxtx.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini index c6694a1a94..3860f283d5 100644 --- a/doc/guides/nics/features/iavf.ini +++ b/doc/guides/nics/features/iavf.ini @@ -22,5 +22,5 @@ RSS reta update = Y VLAN filter = Y CRC offload = Y -VLAN offload = Y +VLAN offload = P L3 checksum offload = P L4 checksum offload = P diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index ebf362e0ba..db665a6468 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -28,4 +28,6 @@ #define IAVF_TX_NO_VECTOR_FLAGS ( \ + RTE_ETH_TX_OFFLOAD_VLAN_INSERT | \ + RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_MULTI_SEGS | \ RTE_ETH_TX_OFFLOAD_TCP_TSO | \ @@ -33,6 +35,4 @@ #define IAVF_TX_VECTOR_OFFLOAD ( \ - RTE_ETH_TX_OFFLOAD_VLAN_INSERT | \ - RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | \ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.439882701 +0100 +++ 0129-net-iavf-fix-VLAN-insertion-in-vector-path.patch 2023-07-20 16:17:55.188752660 +0100 @@ -1 +1 @@ -From efe1b63775e8369b867f411d7bf8f61e97bd446b Mon Sep 17 00:00:00 2001 +From e4403410381ecebe27be2b355bd32d33a5632e19 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efe1b63775e8369b867f411d7bf8f61e97bd446b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index fbb5b7df32..55a02165a0 100644 +index c6694a1a94..3860f283d5 100644 @@ -27 +28 @@ -@@ -25,5 +25,5 @@ RSS reta update = Y +@@ -22,5 +22,5 @@ RSS reta update = Y @@ -32,2 +33,2 @@ - L3 checksum offload = Y - L4 checksum offload = Y + L3 checksum offload = P + L4 checksum offload = P @@ -35 +36 @@ -index 2bf2e3252a..8d4a77271a 100644 +index ebf362e0ba..db665a6468 100644