From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E6D6EA0542 for ; Fri, 7 Feb 2020 16:13:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DE9CC1C11E; Fri, 7 Feb 2020 16:13:52 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 804EF1C130 for ; Fri, 7 Feb 2020 16:13:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088431; 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=l37SAylf/td14xsTAA4bDW92uXBiLxxhFeZgEudxSvo=; b=D6u7xg1Y362L/++BM4pv25EFDrNWZTHg1iqUdPGyoGpFN+U7zwgxfo3caZustQRYP8r3Oc OS5LxHNpNdTOiZ69MGMzHgT4TYCEquoM4SspAFycre0r6W1eW+gzfsYxikA+mHv9ztrpar MA3DhGHwuo7jq8zaLzjeBJZey8cEQQU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-pT0eMBhJPteQH7Di4Cffcg-1; Fri, 07 Feb 2020 10:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB9978024D2; Fri, 7 Feb 2020 15:13:33 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id D72381001B0B; Fri, 7 Feb 2020 15:13:31 +0000 (UTC) From: Kevin Traynor To: Lu Qiuwen Cc: Xiao Wang , dpdk stable Date: Fri, 7 Feb 2020 15:12:26 +0000 Message-Id: <20200207151248.29804-14-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: pT0eMBhJPteQH7Di4Cffcg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/fm10k: fix descriptor VLAN field filling in Tx' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 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/13/20. 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 rebasi= ng (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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4165ec90d635d041a9= beaaa12954285a4011838f Thanks. Kevin. --- >From 4165ec90d635d041a9beaaa12954285a4011838f Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Thu, 5 Dec 2019 21:30:08 +0800 Subject: [PATCH] net/fm10k: fix descriptor VLAN field filling in Tx [ upstream commit 6aab203435040461f585fe9423e3dbdc0729c9fc ] The VLAN field in the descriptor is not filled when ol_flags has no VLAN flag. When the caller sends some packets with VLAN tags, but other packets do not have VLAN tags, the behavior of the program cannot be determined. Fixes: 4b61d3bfa941 ("fm10k: add receive and tranmit") Signed-off-by: Lu Qiuwen Acked-by: Xiao Wang --- drivers/net/fm10k/fm10k_rxtx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.= c index cd5231c9fb..ec201f0665 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -585,4 +585,6 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q= , struct rte_mbuf *mb) =09if (mb->ol_flags & PKT_TX_VLAN_PKT) =09=09q->hw_ring[q->next_free].vlan =3D mb->vlan_tci; +=09else +=09=09q->hw_ring[q->next_free].vlan =3D 0; =20 =09q->sw_ring[q->next_free] =3D mb; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.256107568 +0000 +++ 0014-net-fm10k-fix-descriptor-VLAN-field-filling-in-Tx.patch=092020-02-= 07 15:08:17.502063109 +0000 @@ -1 +1 @@ -From 6aab203435040461f585fe9423e3dbdc0729c9fc Mon Sep 17 00:00:00 2001 +From 4165ec90d635d041a9beaaa12954285a4011838f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6aab203435040461f585fe9423e3dbdc0729c9fc ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5c31121839..4accaa2cd6 100644 +index cd5231c9fb..ec201f0665 100644 @@ -24 +25 @@ -@@ -612,4 +612,6 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *= q, struct rte_mbuf *mb) +@@ -585,4 +585,6 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *= q, struct rte_mbuf *mb)