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 A3335A04A3 for ; Fri, 5 Jun 2020 20:28:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4F1B21D58A; Fri, 5 Jun 2020 20:28:04 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id F27FC1D57F for ; Fri, 5 Jun 2020 20:28:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381682; 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=GcEguIBWD3SZz/uuhYFIWQJaZYgujYyGluh+DSJxa2o=; b=HFyXJ9YygYvjacynG/wCXEUriDRRdPYH7omceiRpAyW36iTfRDr7YM3M2ER4iuAVi129sJ P1kDkamtNyaLiijZ6+LAVZXQE3lwQnCnoVCdfFRm5D9RMPNh6E0bUQH4EFoMlB8BnRKYFk Cy8WDK6CdBDeUYPsXacwjCCF/D4Y61I= 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-12-6qHBenPCN4CsTUpo40oV9A-1; Fri, 05 Jun 2020 14:27:59 -0400 X-MC-Unique: 6qHBenPCN4CsTUpo40oV9A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B7CC464; Fri, 5 Jun 2020 18:27:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A04460C47; Fri, 5 Jun 2020 18:27:57 +0000 (UTC) From: Kevin Traynor To: Jeff Guo Cc: Qi Zhang , dpdk stable Date: Fri, 5 Jun 2020 19:25:18 +0100 Message-Id: <20200605182525.22483-81-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix setting L2TAG' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Thanks. Kevin. --- >From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Wed, 20 May 2020 17:44:14 -0400 Subject: [PATCH] net/iavf: fix setting L2TAG [ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ] Base on HW, if a packet is split into multiple segments, the L2TAG should only be valid on the last Rx descriptor. So fix it by setting L2TAG into mbuf when processing the last split packet. Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx") Signed-off-by: Jeff Guo Acked-by: Qi Zhang --- drivers/net/avf/avf_rxtx_vec_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h index 8057b9682d..b97ea5f2b7 100644 --- a/drivers/net/avf/avf_rxtx_vec_common.h +++ b/drivers/net/avf/avf_rxtx_vec_common.h @@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs, /* it's the last packet of the set */ start->hash = end->hash; + start->vlan_tci = end->vlan_tci; start->ol_flags = end->ol_flags; /* we need to strip crc for the whole packet */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:55.237375288 +0100 +++ 0081-net-iavf-fix-setting-L2TAG.patch 2020-06-05 19:20:50.985036837 +0100 @@ -1 +1 @@ -From 2482a99f303873175c5781d3c685eaa9e17cfaf7 Mon Sep 17 00:00:00 2001 +From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/iavf/iavf_rxtx_vec_common.h | 1 + + drivers/net/avf/avf_rxtx_vec_common.h | 1 + @@ -19,5 +20,5 @@ -diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h -index a6ba227584..25bb502de2 100644 ---- a/drivers/net/iavf/iavf_rxtx_vec_common.h -+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h -@@ -34,4 +34,5 @@ reassemble_packets(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_bufs, +diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h +index 8057b9682d..b97ea5f2b7 100644 +--- a/drivers/net/avf/avf_rxtx_vec_common.h ++++ b/drivers/net/avf/avf_rxtx_vec_common.h +@@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,