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 65CA6428F8 for ; Sun, 9 Apr 2023 17:35:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F58241149; Sun, 9 Apr 2023 17:35:49 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) by mails.dpdk.org (Postfix) with ESMTP id 876D040A80 for ; Sun, 9 Apr 2023 17:35:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNXC+efQ96OfrvMImB6BicN0zwFNUeVy1xw888HKUE4cyYAUB/7QZBTVlah5ROovMpMjpaYwlinkFqD2ISwLe1Cw+BFhw6ls4TC2XrVTlxfcK3+7ycZ1JT5TZZadwiaWV2awqRUj+05QDE/tYIh+eZdVfM4koiadR324yrEXkhTOxSV7qll5MfcZklAu3lY/pQ+VASLsB/sIb/8Wkf61YbVeNj7CA+r779h0zMEYUrtrTjztInivzWHKokOoI9q9Ib6p6dyQmFkL/vHqktnOnkGRi0WLeybWcL4gsqlVG0qSPcSgcQWcRHyjYI4B8vxoYtjG+p1fVPLXw9wRTqo1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v5EVFaeD6xC9/MVixJNngr7+KMXirdjK5u1aKtFA034=; b=RLCMV5aRTkBKwbW3TkpZOUrn7epKAdrTJbLGrMYOr+Uk23D/TqL6yJRiIe24XL0on3fy4S14auW6RCAgv2BD5mP561akPVRPvsYQep4vUZvpLdKF/6RIRHZSurzCpVCnLz2/Y7Npny4oUorEl9X0Yz2cw53RRio0jMByL6OPauZ23HN+1RBxlOjIeYjsIB3AfKV+FiGrf/QJ/wLI/CIi1KSe/mR7E/2yYlkKZECUCDRzkeSbjO4YtVcf+16Ok4o6nHenKZEwNgkPh1d262ZXDmfmKdCpHbv9YMPGwy2IgJ5wP4S/BFAVfjQGkhPQNS9azmt8r9ghYrNoOO7+JD2n/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=hankala.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v5EVFaeD6xC9/MVixJNngr7+KMXirdjK5u1aKtFA034=; b=PGChMw5EfErJFhbxYTDq6wYQM2cADlL8rdD2/6i1uNf/WuNH0K52vw3UzV+xt6zxAFR4wgNuuUVCICpJ43ZOlZ2bGYlfPEp67yFPqn6SlDeyzdXet1iaMwWEEGbS1uQXwf7JV1Kmc60z4xqvlMEALK30D6lyGcCbP5+po8HYis9cxIn6QsGL4qxj+QQEBRtVv82tNiE5KGlM0Az32TMeKDYNtaqLJvVHQrOvvK+mX8LfX2u+MQqMRU7AcPGdQUDbZzgnRw52vjwuKQ6MO8H9PARrdRjtXZs6akV3rwu1B9BlpYUm1Er+gXl9IIFQjZS+LYKpk9CGrbd34mSos1H4hA== Received: from MW4PR03CA0172.namprd03.prod.outlook.com (2603:10b6:303:8d::27) by SJ2PR12MB7865.namprd12.prod.outlook.com (2603:10b6:a03:4cc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:35:45 +0000 Received: from CO1NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8d:cafe::71) by MW4PR03CA0172.outlook.office365.com (2603:10b6:303:8d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:35:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT006.mail.protection.outlook.com (10.13.174.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.21 via Frontend Transport; Sun, 9 Apr 2023 15:35:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:35:35 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:35:33 -0700 From: Xueming Li To: Visa Hankala CC: Wenjun Wu , dpdk stable Subject: patch 'net/e1000: fix saving of stripped VLAN TCI' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:03 +0800 Message-ID: <20230409152529.5308-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT006:EE_|SJ2PR12MB7865:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dba81b9-af12-4975-0a09-08db39101612 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j64kZ9MsTJbQxIdIhndjF76oYa9XLz8jW5j+58R16wuAFaYfUoZBDAJY/obp1JxWGhoEPzeZpG5bDvhhqY95adWxdBbhlz09Zg6FNVzQONxiPqeFkQGhPNieAuRW7sbL96xbMzXyPCy9TjSCmT82M5d6X/AFLJnT4MgFiddC3wBxQLlDOMf0HhnxI+CbGbHcjmpWs8ucn6x9s9rBcGau2cTrrSz1VcxSPe04mCkF0tzYzyZ1OccXYb/wMDg/U9DVTUjvxERoAAVyseKV/E43Ai8KRYF/W5Z1gScdk4BHPrT2sTWj4PTX1Ys7nf5kGKpnupxZJNDZ9gSF1eZSxxnRokY/HwlNgnN67JqGQfdaDocHlhW/rRiuG0tt+h0awU2XYvhjiDYdrIm09HtqH9T9dR4WKZFLk4DwSI6tFBoWpChQNqcZEuLOEtKSm+PZFamRVm0nYc4X7u82TkILUA3Wmx6YGnxVQvbvrti33pCW+GyP5Qj87WyLylYDTA0KrHgbz/td9BFXiw7t7sOptxd4ZHIHJDmmHM9KroW6LTwQ/V0COaznudX/mWOaQTObK00te9/u0an6Q3mNlTPJMgr5GlpROd8A86JfvouXVN0uzxSgfIZO3VQZuL7AzkLOI67AatoKn400gqZeuSSFx8joQEl9HOKTriWWOGJcEA2grPEzp8AfFFp5QB3/JmFrnXpy5cHeeBHSaf3Qx1EwJ+SvN/qJ0FyyZIW950A9V48fxmHwimzNtHw4IvmVJVvpHqsb5FsFInK+0XNW3kKXM4SUnnKhKt1D8wVa0OX4P/fupfyD551KpZ6ByNbWZZp2m1wyllGU4K9o8I7AKx3OjY6G/w== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(39860400002)(376002)(346002)(451199021)(36840700001)(40470700004)(46966006)(53546011)(70586007)(70206006)(86362001)(26005)(1076003)(316002)(6916009)(4326008)(6286002)(186003)(40460700003)(16526019)(36756003)(6666004)(966005)(7696005)(54906003)(82310400005)(40480700001)(55016003)(478600001)(36860700001)(8676002)(8936002)(2616005)(5660300002)(356005)(41300700001)(7636003)(47076005)(2906002)(83380400001)(336012)(426003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:35:45.4660 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dba81b9-af12-4975-0a09-08db39101612 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7865 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/8cc24b8aabb11b05b3844657bb94b0d515da8c6b Thanks. Xueming Li --- >From 8cc24b8aabb11b05b3844657bb94b0d515da8c6b 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 Cc: Xueming Li [ 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 cfdaeaf6a4..039d487d6d 100644 --- a/.mailmap +++ b/.mailmap @@ -1405,6 +1405,7 @@ Vincent Li Vincent S. Cojot Vipin Varghese Vipul Ashri +Visa Hankala Vishal Kulkarni Vishwas Danivas Vitaliy Mysak diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index d48fd52404..cb5ce2307b 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1030,6 +1030,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; @@ -1039,7 +1040,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 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. */ rte_packet_prefetch((char *)first_seg->buf_addr + -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.721174700 +0800 +++ 0115-net-e1000-fix-saving-of-stripped-VLAN-TCI.patch 2023-04-09 21:45:38.769042200 +0800 @@ -1 +1 @@ -From 8d57c9fcfcda3122aa38fba08a029ec248eeb52d Mon Sep 17 00:00:00 2001 +From 8cc24b8aabb11b05b3844657bb94b0d515da8c6b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8d57c9fcfcda3122aa38fba08a029ec248eeb52d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index c77cdc9ddf..e69e75ca72 100644 +index cfdaeaf6a4..039d487d6d 100644 @@ -23 +25 @@ -@@ -1417,6 +1417,7 @@ Vincent Li +@@ -1405,6 +1405,7 @@ Vincent Li