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 1B35741D52 for ; Thu, 23 Feb 2023 16:08:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16C96432C1; Thu, 23 Feb 2023 16:08:35 +0100 (CET) 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 D8D05432B7 for ; Thu, 23 Feb 2023 16:08:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164912; 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=xApDky6UBbC8iKquTZW5ENYQiD7EhSbtZ+Szv+0QFpE=; b=PKC2XxkmpzAqj5axjWbJabTn97fOM5pWo9ntlUoDgDt2MP3SE5m5377onkha3Zr03UsdyZ 8Tm/H2sEFbBcVQKXUNwzEsNpcI8blAOyVdxzcqoBmSJUB5sdIIN90q9oi73K9BKxttygZR QCU3mh86ce19sVyYNYDxNE+nBnSWhuY= 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-394-5cg2ElBuNVqKFOY-mZtG_w-1; Thu, 23 Feb 2023 10:08:31 -0500 X-MC-Unique: 5cg2ElBuNVqKFOY-mZtG_w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF5E8857A94; Thu, 23 Feb 2023 15:08:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B9EF2166B2B; Thu, 23 Feb 2023 15:08:28 +0000 (UTC) From: Kevin Traynor To: Michal Schmidt Cc: Maxime Coquelin , Wenzhuo Lu , dpdk stable Subject: patch 'net/iavf: fix VLAN offload with AVX2' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:15 +0000 Message-Id: <20230223150631.723699-84-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.4 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/28/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/cc692ab817def9b6b612fb8cb8a2269d4e2c69a9 Thanks. Kevin --- >From cc692ab817def9b6b612fb8cb8a2269d4e2c69a9 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 8 Dec 2022 13:19:16 +0100 Subject: [PATCH] net/iavf: fix VLAN offload with AVX2 [ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ] It has been observed that mbufs of some received VLAN packets had the VLAN tag correctly set in vlan_tci, but ol_flags were missing the VLAN-indicating flags. _mm256_shuffle_epi8 operates as two independent 128-bit operations, not as a single 256-bit operation. To have the RTE_MBUF_F_RX_VLAN* flags reflected in the resulting vlan_flags for all 8 rx descriptors, the input l2tag2_flags_shuf must contain the required pattern in both 128-bit halves. Fixes: 3a1aca384d3a ("net/iavf: fix VLAN tag extraction handling") Signed-off-by: Michal Schmidt Reviewed-by: Maxime Coquelin Acked-by: Wenzhuo Lu --- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c index b915573780..2479c18210 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c +++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c @@ -1075,5 +1075,8 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 0, 0, + RTE_MBUF_F_RX_VLAN | + RTE_MBUF_F_RX_VLAN_STRIPPED, + 0, /* end up 128-bits */ 0, 0, 0, 0, -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.832514728 +0000 +++ 0084-net-iavf-fix-VLAN-offload-with-AVX2.patch 2023-02-23 14:46:23.870236314 +0000 @@ -1 +1 @@ -From eb24917428a1db11d6736e8c076077a47b991f01 Mon Sep 17 00:00:00 2001 +From cc692ab817def9b6b612fb8cb8a2269d4e2c69a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -23 +23,0 @@ - .mailmap | 1 + @@ -25 +25 @@ - 2 files changed, 5 insertions(+), 1 deletion(-) + 1 file changed, 4 insertions(+), 1 deletion(-) @@ -27,10 +26,0 @@ -diff --git a/.mailmap b/.mailmap -index 2cb7f5accb..e111e05bc2 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -895,4 +895,5 @@ Michal Mazurek - Michal Michalik - Michał Mirosław -+Michal Schmidt - Michal Swiatkowski - Michal Wilczynski @@ -38 +28 @@ -index 862f6eb0c0..b4ebac9d34 100644 +index b915573780..2479c18210 100644