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 D9D01A054A for ; Tue, 25 Oct 2022 17:09:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D721E42C51; Tue, 25 Oct 2022 17:09:08 +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 31C1A42C1D for ; Tue, 25 Oct 2022 17:09:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710545; 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=hwF2wKPn4GKaRZHFOxJbvckqh/YD+QiXNpG7XNcBL3I=; b=fcUkE8YQn8m2njix6iV5F4h4oc74pVdyjnq8ZtN+fBXzWk5PcCBOXPyBPDzt+jrPvv62gh kVHNXSwoP0pvbEJssQ/WSwIxMJZoB1Yc1yAblFaMMvp1ByLinc42TTNh1HwVg5+nkTSxaa TPE1xELu2hqb7048My14tPwUjXYE+sk= 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-554-6za0ETMVN064hNsxU2Im8g-1; Tue, 25 Oct 2022 11:09:04 -0400 X-MC-Unique: 6za0ETMVN064hNsxU2Im8g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0FD7586F12C; Tue, 25 Oct 2022 15:09:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2869B4B400F; Tue, 25 Oct 2022 15:08:59 +0000 (UTC) From: Kevin Traynor To: Yiding Zhou Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN insertion' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:39 +0100 Message-Id: <20221025150734.142189-44-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/fe9ea3690179932d417a0b107767ac1177db498d Thanks. Kevin --- >From fe9ea3690179932d417a0b107767ac1177db498d Mon Sep 17 00:00:00 2001 From: Yiding Zhou Date: Fri, 12 Aug 2022 10:08:21 +0800 Subject: [PATCH] net/iavf: fix VLAN insertion [ upstream commit 0d58caa7d6d1f68babe434bb4b98ef323170ae3c ] When the driver tells the VF to insert VLAN tag using the L2TAG2 field, vector Tx path does not use Tx context descriptor and would cause VLAN tag inserted into the wrong location. This commit is to fix issue by using normal Tx path to handle L2TAG2 case. Fixes: 3aa957338503 ("net/iavf: fix VLAN insert") Signed-off-by: Yiding Zhou Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx_vec_common.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h index 1fd37b74c1..9266b8a708 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_common.h +++ b/drivers/net/iavf/iavf_rxtx_vec_common.h @@ -251,4 +251,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq) return -1; + if (txq->vlan_flag == IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2) + return -1; + if (txq->offloads & IAVF_TX_VECTOR_OFFLOAD) return IAVF_VECTOR_OFFLOAD_PATH; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.535239421 +0100 +++ 0044-net-iavf-fix-VLAN-insertion.patch 2022-10-25 14:18:58.408798080 +0100 @@ -1 +1 @@ -From 0d58caa7d6d1f68babe434bb4b98ef323170ae3c Mon Sep 17 00:00:00 2001 +From fe9ea3690179932d417a0b107767ac1177db498d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0d58caa7d6d1f68babe434bb4b98ef323170ae3c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index a59cb2ceee..4ab22c6b2b 100644 +index 1fd37b74c1..9266b8a708 100644 @@ -25 +26 @@ -@@ -254,4 +254,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq) +@@ -251,4 +251,7 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq)