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 C5F2142800 for ; Wed, 22 Mar 2023 01:42:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C258642BC9; Wed, 22 Mar 2023 01:42:31 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id E831140E09 for ; Wed, 22 Mar 2023 01:42:30 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id t15so15424617wrz.7 for ; Tue, 21 Mar 2023 17:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XUPY6XN9IUbCfRZscTyKXwnLrgQprJp32Zkph3p260I=; b=Ei0SkgTOPb7ZmzCRzxrs9cR4kry872JJ0nIFZnItzHaGSzRVlWWJV3MW3x2XhYvtmf Fyj68jWVuQYsXbKbKqOLDezMGaXuy3cIyUoVRcAU2GTX/AichjUBSsGlz6rNWrsYgVxa D5v6B2yXZPmCTutTS3xC2ITmJMF8tGRUQXQR5DurYkigCm/8gIQnbl4ZmR73ptLKEr1I KL9nc9NKtfHt3iFk4aynPrBEsG3u35++snIORHuJGz6wXqZGoQcoQoQYHNbJKnb8ZIXI dLaJKZHGY9wI84aLkQIvN3GgGIKj9U8I3uoP9X/tlG8uhCVMq6T0VrnzVyLd7g7mS3db +iiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XUPY6XN9IUbCfRZscTyKXwnLrgQprJp32Zkph3p260I=; b=hQIVdzP02D+uQnmz2JiISQP8BkF2RvaaUhdaT421VMNqDygMJrDpeSiCQzVGacvlm9 hEBPLCqgg5S3F872qY+qL1I9d3FUekdeMJWpS5sDji7DKcvFoGlMln9S9UsgnxDZGmIU 1SJAWHFI/ruH5HssnQaOECmQR1krA3WIwy6mtRStS4VCS2Xf7XHbPBY6GlGdxjyBwrIw WGKUX+tbq9PX4OKEwd/CoHUNfew6HKbYXx+C/yrgum8qtsX/bNuq0cliPjqGZktEH2KS 95y7e1CCyI648LkpQnZs5+s7CGIFwNyKORpW000vqX2gBG6qYzmv5HVCT/aOY3sF7X1Y hSiw== X-Gm-Message-State: AO0yUKVeHW4hWE+HX9Tfek4cABCReghjSIWvv6Sf+pSJst21YnrA3P1A qSGUJNmjyTqdN4Da0XswMhI= X-Google-Smtp-Source: AK7set/oQ5T4IZa0lJrB5gpd32C2pLQmXWM+1yiJRzayHVc7mOao6zqdP+z6hdNCcZpH8N4xS6a7SA== X-Received: by 2002:adf:e84d:0:b0:2d6:adfe:cea5 with SMTP id d13-20020adfe84d000000b002d6adfecea5mr3885612wrn.68.1679445750706; Tue, 21 Mar 2023 17:42:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id o6-20020adfeac6000000b002c71a32394dsm12541888wrn.64.2023.03.21.17.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Visa Hankala Cc: Wenjun Wu , dpdk stable Subject: patch 'net/e1000: fix saving of stripped VLAN TCI' has been queued to stable release 20.11.8 Date: Wed, 22 Mar 2023 00:41:48 +0000 Message-Id: <20230322004155.2333903-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 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/23/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3ab75a1082837cc52f640990aa25551be9f7d54b Thanks. Luca Boccassi --- >From 3ab75a1082837cc52f640990aa25551be9f7d54b 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 --- drivers/net/e1000/em_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index b86cc43e2c..cb5d749d46 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1031,6 +1031,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * - RX port identifier, * - hardware offload data, if any: * - IP checksum flag, + * - VLAN TCI, if any, * - error flags. */ first_seg->port = rxq->port_id; @@ -1040,7 +1041,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rx_desc_error_to_pkt_flags(rxd.errors); /* Only valid if PKT_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. */ rte_packet_prefetch((char *)first_seg->buf_addr + -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.530530518 +0000 +++ 0012-net-e1000-fix-saving-of-stripped-VLAN-TCI.patch 2023-03-21 21:56:37.068806966 +0000 @@ -1 +1 @@ -From 8d57c9fcfcda3122aa38fba08a029ec248eeb52d Mon Sep 17 00:00:00 2001 +From 3ab75a1082837cc52f640990aa25551be9f7d54b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +15,0 @@ - .mailmap | 1 + @@ -17 +17 @@ - 2 files changed, 3 insertions(+), 1 deletion(-) + 1 file changed, 2 insertions(+), 1 deletion(-) @@ -19,12 +18,0 @@ -diff --git a/.mailmap b/.mailmap -index c77cdc9ddf..e69e75ca72 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1417,6 +1417,7 @@ Vincent Li - Vincent S. Cojot - Vipin Varghese - Vipul Ashri -+Visa Hankala - Vishal Kulkarni - Vishwas Danivas - Vitaliy Mysak @@ -32 +20 @@ -index d48fd52404..cb5ce2307b 100644 +index b86cc43e2c..cb5d749d46 100644 @@ -35 +23 @@ -@@ -1030,6 +1030,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1031,6 +1031,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -43 +31 @@ -@@ -1039,7 +1040,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1040,7 +1041,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -46 +34 @@ - /* Only valid if RTE_MBUF_F_RX_VLAN set in pkt_flags */ + /* Only valid if PKT_RX_VLAN set in pkt_flags */