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 3268743B7D for ; Tue, 5 Mar 2024 10:58:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D23242E4F; Tue, 5 Mar 2024 10:58:16 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2065.outbound.protection.outlook.com [40.107.220.65]) by mails.dpdk.org (Postfix) with ESMTP id 7EFC74014F for ; Tue, 5 Mar 2024 10:58:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OjY2qr9Je0doBihPvkklgxxUVSDJS2en/PNilizb9/4Fji2vM4WECEkBMqZ84U+5ZCS11bwWLeE/61+/n3zICSTj4yIMvKK3UDEVvYxh3hSe1cC0rNCUJ1GzJ9hW38N7z7XMdFyKydI27zhAx6Is/WZNdbPdbiIzJO7pmNfaYJCNno5OIhh4t2zlXtX043M0yO8bwqzawH6uLzOu12puxA3+vVGd2CJE9xtLqVuE1DXInUHj834KvSlwVhAUUnLX7eriwyqf18pYpCRyOIqHvaGftkTKajVskZTduKd/VVfioMgSLex2apZN27bKvyNWCT9aW+972qAKnWMfp0OZrw== 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=wdm0jNc15ItyAGdEVYxdWxi6rRN0oCZWBTdfaxK8gFE=; b=cF4GTIENGxdcyU+kPJ7fe8bQfW9wv4yNhwv4WD6kNVeETiVim36NbDyQByuIJrXLY1ulS1z9zn4ni1qqwYWi09ne3H/wdra7c9YMEmldhU0dNCl1RM/igOebaCZaahmO5bSD0wghPJeLW7ImJJmmRwcWYl9b8AZKJm/bzxQHK0yBpFn/eLvb7cgk5dHh3dGAnS61g7+wO6/g/yZys0Lc6ejs5bsfAyZjdHVm5sxvmNeSRvs9zKloWJpF/X4QS59dW4S/G6u8BYc6/aOeY/9/p27m5KeZBVxf//TB9uOq4uJIFzz/6vjTkIEq0IQzmstaJMhUjajfeDEZcEXXoXeBlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.com 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 (0) 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=wdm0jNc15ItyAGdEVYxdWxi6rRN0oCZWBTdfaxK8gFE=; b=A+QB73Q8yOf5TDBDbdJ2GAZ4yB3Lhamnu63rVRtfTsMpOveA7l53cAzBQWXIltz0gquDdQ0jyzfh7X/wF1sFr37EixGHIrYcDmkWTR0jwnQGePSOyVtJGo7ymqcV1httD5HQO8e+tR5IPCnclqeXeom7nJiZa7Zf8IGSybpcj84urp4x+yA3u8UJ6I6Y9iPCqKcNIGUuhWAVuwA4ScT4r+dNPLOu3+lAV8jn+OSe9uRkB0ARE0Qj00fE5IT/QXPBB7/XhjOXSJx6fBEraqXvpD29CI1EdMyuiYlTnw1n49mrnXRO8y7PlKvH2KXGLks2CGHHfq5P+KDrsYU1pcVkWw== Received: from DM6PR02CA0164.namprd02.prod.outlook.com (2603:10b6:5:332::31) by CY8PR12MB9034.namprd12.prod.outlook.com (2603:10b6:930:76::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:58:11 +0000 Received: from CY4PEPF0000EDD1.namprd03.prod.outlook.com (2603:10b6:5:332:cafe::8e) by DM6PR02CA0164.outlook.office365.com (2603:10b6:5:332::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:58:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EDD1.mail.protection.outlook.com (10.167.241.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:58:11 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:58:02 -0800 Received: from nvidia.com (10.126.231.35) 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.1258.12; Tue, 5 Mar 2024 01:58:01 -0800 From: Xueming Li To: Alan Elder CC: Ferruh Yigit , dpdk stable Subject: patch 'net/netvsc: fix VLAN metadata parsing' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:33 +0800 Message-ID: <20240305094757.439387-113-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD1:EE_|CY8PR12MB9034:EE_ X-MS-Office365-Filtering-Correlation-Id: 40ee0c9b-62c6-422f-9829-08dc3cfac489 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rm6DTNsWnALw4upt5XW2s0ENiWTy/ATy47FDa1/cnxqSI2nY/B4qV/Yr4/tmJahTDsCGboyiPiT8xTsiGverZ3H6sD1bF1xpEgbhnSue5Nqq7ADru6/Y0kntKOQ3Qkhzsb/i367AEiYU28tcve5frI2Xa0xtDRjFqj76Iim4BOuYT+FLBGlSrBeNyc4F4ef6nWNoRcGh9O2eB2RjNCxEuDv8EDbiI6DuR2yDrIKznmFSb48GnYdg85rSNeAgoB2gav977EyczSOKDCUNc/Rbf2Zt20lXzyzO4c+X/7qEV3okrGcGo3XIMYVDpaBAn2ka4xyvRjbUk68ocedafjFpd0A0eY0QKtzZPbyNks2U/W9TlL/v4wtZnlcwqEmGTYFipHwBxcvoZrpaimEK/TT9pmbSLpd1Lvxbvn4RgPGjWQK5o+Wb6s71AUGMT0+900RtoGqfnh+QEdgdjUFBba4nyzmAW+GacETvsLeAei02pbZljJeTbJrqmgai/gfE46WwkCAvA9wyfs9YcIiREKuPYWDg1b653cjk77nSXtFlOfPUjXmbqmVm88YNBYvl3bEr6N4u7O4i8NZmyaQxLe7Ak538FUy7ojCl17GRQwPibjqbpAQ68rOYdebhghi+cpwy5io2Yv5DpSrkiXF6wqAAnCJXR9akjmgFfOOPSiXQ9gXBfeCOq5q9TlPWtmKTJLMZe+IVI8ythHKYFaunI5sClzG4ZaS8FBsWQ1Lq88wnakvnuoiyuu2zVjZ2ebv+Uvjy X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:58:11.5672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40ee0c9b-62c6-422f-9829-08dc3cfac489 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB9034 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 23.11.1 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/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c3ccbda492b50510574f90c9a08f26871bc55912 Thanks. Xueming Li --- >From c3ccbda492b50510574f90c9a08f26871bc55912 Mon Sep 17 00:00:00 2001 From: Alan Elder Date: Mon, 19 Feb 2024 09:31:39 +0000 Subject: [PATCH] net/netvsc: fix VLAN metadata parsing Cc: Xueming Li [ upstream commit f7654c8c13f46ab537e8220ea4d6b4911f9f0fd5 ] The previous code incorrectly parsed the VLAN ID and priority. If the 16-bits of VLAN ID and priority/CFI on the wire was 0123456789ABCDEF the code parsed it as 456789ABCDEF3012. There were macros defined to handle this conversion but they were not used. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Alan Elder Acked-by: Ferruh Yigit --- drivers/net/netvsc/hn_rxtx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index e4f5015aa3..9bf1ec5509 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -612,7 +612,9 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, RTE_PTYPE_L4_MASK); if (info->vlan_info != HN_NDIS_VLAN_INFO_INVALID) { - m->vlan_tci = info->vlan_info; + m->vlan_tci = RTE_VLAN_TCI_MAKE(NDIS_VLAN_INFO_ID(info->vlan_info), + NDIS_VLAN_INFO_PRI(info->vlan_info), + NDIS_VLAN_INFO_CFI(info->vlan_info)); m->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED | RTE_MBUF_F_RX_VLAN; /* NDIS always strips tag, put it back if necessary */ @@ -1332,7 +1334,9 @@ static void hn_encap(struct rndis_packet_msg *pkt, if (m->ol_flags & RTE_MBUF_F_TX_VLAN) { pi_data = hn_rndis_pktinfo_append(pkt, NDIS_VLAN_INFO_SIZE, NDIS_PKTINFO_TYPE_VLAN); - *pi_data = m->vlan_tci; + *pi_data = NDIS_VLAN_INFO_MAKE(RTE_VLAN_TCI_ID(m->vlan_tci), + RTE_VLAN_TCI_PRI(m->vlan_tci), + RTE_VLAN_TCI_DEI(m->vlan_tci)); } if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.332632311 +0800 +++ 0112-net-netvsc-fix-VLAN-metadata-parsing.patch 2024-03-05 17:39:30.903566497 +0800 @@ -1 +1 @@ -From f7654c8c13f46ab537e8220ea4d6b4911f9f0fd5 Mon Sep 17 00:00:00 2001 +From c3ccbda492b50510574f90c9a08f26871bc55912 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f7654c8c13f46ab537e8220ea4d6b4911f9f0fd5 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org