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 4481EA04A3 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 3BAD61D519; Fri, 5 Jun 2020 20:28:04 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 2FFA91D57E for ; Fri, 5 Jun 2020 20:28:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381680; 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=7lx2ARToqkYYkhd8TgoHfpg1P8mthXotZOm2wU36yeA=; b=fC8xs4i2m9CjslR2oSVtuw21sDzpf5wgYP5WW6Hywsqp4k+h4gSgY76Gya2r5+kKUZm4i+ EovgXGMm8r2ZYX4bFO3oFVX5mgybpuFmzJGnFQDjjly4f8/jqNPP8KYJ9h92V+4/aa/OVo IR02k2b3SaL6qb3j6WMkswO6LShtL6A= 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-160-sk876URrMX6Eqkf2jp5-lw-1; Fri, 05 Jun 2020 14:27:58 -0400 X-MC-Unique: sk876URrMX6Eqkf2jp5-lw-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 090F5107ACCA; Fri, 5 Jun 2020 18:27:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26A2760C47; Fri, 5 Jun 2020 18:27:55 +0000 (UTC) From: Kevin Traynor To: Jeff Guo Cc: Qi Zhang , dpdk stable Date: Fri, 5 Jun 2020 19:25:17 +0100 Message-Id: <20200605182525.22483-80-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/i40e: 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/0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d Thanks. Kevin. --- >From 0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d Mon Sep 17 00:00:00 2001 From: Jeff Guo Date: Wed, 20 May 2020 17:25:21 -0400 Subject: [PATCH] net/i40e: fix setting L2TAG [ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ] 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: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver") Signed-off-by: Jeff Guo Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx_vec_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h index 0e6ffa0078..31f73f6054 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_common.h +++ b/drivers/net/i40e/i40e_rxtx_vec_common.h @@ -34,4 +34,5 @@ reassemble_packets(struct i40e_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.189394240 +0100 +++ 0080-net-i40e-fix-setting-L2TAG.patch 2020-06-05 19:20:50.985036837 +0100 @@ -1 +1 @@ -From 61b26a9c5ae569ce5900414a41a42c41d069155c Mon Sep 17 00:00:00 2001 +From 0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org