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 01FC742ECF for ; Thu, 20 Jul 2023 17:35:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2E3A42C4D; Thu, 20 Jul 2023 17:35:20 +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 E37BE400D6 for ; Thu, 20 Jul 2023 17:35:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867319; 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=0/KF1hOt/y/SGn4BBfIVqD0viWK0mujsbU85dl8rLL8=; b=Jx96o8NZg0AgDTjqt5l+wFxZo9Z22BsiJyOdVDRz5/o5Vc5cQQPKQGRTeIU4gJtAAUpecL Sr3aD61pT7hXXOKpno6EWezcvfe/c+/k9jNM5p7WKMNYsNSD9l86wayh+fJKgZF36NNqmd ZvMFnI4vgY9TFGeN7F6iSuf704OzMPY= 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-240-fQOm483GMaWYcjqz2Q27cw-1; Thu, 20 Jul 2023 11:23:21 -0400 X-MC-Unique: fQOm483GMaWYcjqz2Q27cw-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 99D8C88D543; Thu, 20 Jul 2023 15:22:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2D2F492C13; Thu, 20 Jul 2023 15:22:28 +0000 (UTC) From: Kevin Traynor To: Michal Schmidt Cc: Wenzhuo Lu , dpdk stable Subject: patch 'net/iavf: fix VLAN offload with AVX512' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:49 +0100 Message-ID: <20230720151942.262154-98-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/820df28cf67b7947d73ed60eae19230093ec1d8d Thanks. Kevin --- >From 820df28cf67b7947d73ed60eae19230093ec1d8d Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 27 Mar 2023 12:07:50 +0200 Subject: [PATCH] net/iavf: fix VLAN offload with AVX512 [ upstream commit 32aa88de4dd03b24afeb83195ffe6141b253f7c4 ] 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. This fix is for the AVX512 Rx path. The same bug in AVX2 was fixed by commit eb24917428a1 ("net/iavf: fix VLAN offload with AVX2"). Fixes: 4b64ccb328c9 ("net/iavf: fix VLAN extraction in AVX512 path") Signed-off-by: Michal Schmidt Acked-by: Wenzhuo Lu --- drivers/net/iavf/iavf_rxtx_vec_avx512.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/iavf/iavf_rxtx_vec_avx512.c index b93e717946..9876c715e5 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c +++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c @@ -1339,5 +1339,8 @@ _iavf_recv_raw_pkts_vec_avx512_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.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:06.991008060 +0100 +++ 0098-net-iavf-fix-VLAN-offload-with-AVX512.patch 2023-07-20 16:17:55.031752019 +0100 @@ -1 +1 @@ -From 32aa88de4dd03b24afeb83195ffe6141b253f7c4 Mon Sep 17 00:00:00 2001 +From 820df28cf67b7947d73ed60eae19230093ec1d8d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 32aa88de4dd03b24afeb83195ffe6141b253f7c4 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 4fe9b97278..bd2788121b 100644 +index b93e717946..9876c715e5 100644 @@ -32 +33 @@ -@@ -1215,5 +1215,8 @@ _iavf_recv_raw_pkts_vec_avx512_flex_rxd(struct iavf_rx_queue *rxq, +@@ -1339,5 +1339,8 @@ _iavf_recv_raw_pkts_vec_avx512_flex_rxd(struct iavf_rx_queue *rxq,