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 EDFF4427EF for ; Wed, 22 Mar 2023 11:32:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB27541148; Wed, 22 Mar 2023 11:32:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 544B541148 for ; Wed, 22 Mar 2023 11:32:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481161; 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=WtRTx8Us7YSaOIVatm/Tidd12of8XFBYDwEOP+TaSTA=; b=PBFs8qTQ6wjHoAUgHa9vFzpb10FQoM3NG8/ew08SAmdDTZn7druDQ9CAzTmZmHlNp4Iz1c QVx7qb2kjsIQHSvWk0vzmWs7cIr7XgQLt5ZH35WpJ43o12JDuYU2VIbCJzHCUMrOyj+bwb lDqpxGGHl41m5B9UpVrm5ss1pUMUG0o= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-xrmtXYdQMBOkixNV8vb1vQ-1; Wed, 22 Mar 2023 06:32:40 -0400 X-MC-Unique: xrmtXYdQMBOkixNV8vb1vQ-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 412023C10682; Wed, 22 Mar 2023 10:32:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 657BA492C13; Wed, 22 Mar 2023 10:32:39 +0000 (UTC) From: Kevin Traynor To: Visa Hankala Cc: Wenjun Wu , dpdk stable Subject: patch 'net/e1000: fix saving of stripped VLAN TCI' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:32:02 +0000 Message-Id: <20230322103209.456098-15-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/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/acfff39a6d2e1c3ff1595d00970092adee2b6903 Thanks. Kevin --- >From acfff39a6d2e1c3ff1595d00970092adee2b6903 Mon Sep 17 00:00:00 2001 From: Visa Hankala Date: Sun, 12 Mar 2023 13:44:42 +0000 Subject: [PATCH] net/e1000: fix saving of stripped VLAN TCI [ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ] When receiving a scattered packet, save the stripped VLAN TCI in the first mbuf segment where users expect to find it. Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)") Signed-off-by: Visa Hankala Acked-by: Wenjun Wu --- .mailmap | 1 + drivers/net/e1000/em_rxtx.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index f4568f4984..3337f8a9e6 100644 --- a/.mailmap +++ b/.mailmap @@ -1415,4 +1415,5 @@ Vincent S. Cojot Vipin Varghese Vipul Ashri +Visa Hankala Vishal Kulkarni Vishwas Danivas diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index cea5b490ba..73602313a7 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1031,4 +1031,5 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * - hardware offload data, if any: * - IP checksum flag, + * - VLAN TCI, if any, * - error flags. */ @@ -1040,5 +1041,5 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, /* Only valid if RTE_MBUF_F_RX_VLAN set in pkt_flags */ - rxm->vlan_tci = rte_le_to_cpu_16(rxd.special); + first_seg->vlan_tci = rte_le_to_cpu_16(rxd.special); /* Prefetch data of first segment, if configured to do so. */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.295553752 +0000 +++ 0015-net-e1000-fix-saving-of-stripped-VLAN-TCI.patch 2023-03-22 10:30:07.920866570 +0000 @@ -1 +1 @@ -From 8d57c9fcfcda3122aa38fba08a029ec248eeb52d Mon Sep 17 00:00:00 2001 +From acfff39a6d2e1c3ff1595d00970092adee2b6903 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index c77cdc9ddf..e69e75ca72 100644 +index f4568f4984..3337f8a9e6 100644 @@ -23 +24 @@ -@@ -1418,4 +1418,5 @@ Vincent S. Cojot +@@ -1415,4 +1415,5 @@ Vincent S. Cojot @@ -30 +31 @@ -index d48fd52404..cb5ce2307b 100644 +index cea5b490ba..73602313a7 100644