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 4961343C60 for ; Thu, 7 Mar 2024 02:37:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41BCC42F15; Thu, 7 Mar 2024 02:37:00 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id C3B6842EE3 for ; Thu, 7 Mar 2024 02:36:58 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-412e68b8594so2989735e9.1 for ; Wed, 06 Mar 2024 17:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775418; x=1710380218; darn=dpdk.org; 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=eyB/Pai9iAKNcYMMem+eGeg9+tEJoDo/5uSXBZpG7NQ=; b=NQHJ4YGFu8UHu2dooR1lOpF1nhvrMuY8K/dJ6qVXL5ZmEhXLF2Gvl6Hgx/AwteygZJ K6G3ELfGWVe3Q5vmQDX0zYFEmXmvYgkYwWYlDUI7xS4NTUO2vp1HL9w8ZHEH44fCHe1e eYGE3x4h+92993k5G/8A5GKvChVkWnz/IfKtA6MMoP7T+BJRtJWe7lZRdFNh+4wHzi1F vCYWtjxi37050X5x1PqYmo0eY0ozzyNB+beMZ01O3T24xE9yyXjNrECc9h+4unSECBTp a6xEebfLzrCduv/PUfBlxr1njesoa7skogEKfMJ3hsoIsP7RU68SEn4SbjUSd2WzLohO 5vzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775418; x=1710380218; 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=eyB/Pai9iAKNcYMMem+eGeg9+tEJoDo/5uSXBZpG7NQ=; b=aAXIil6YDPQoCS62oKONadYRlbB79XiJjFMq76B4nfxb4KlVueJ7DAQ1HrU4aFBaHo +5F4F5mtWaBUOl6coKNSo0xpXTfMywC2c3+/nI+LtEuIBcppRo3HM5DrePS5O/TS6sEB 8i9606pXB1tSgiPxOeJ32yz36nf/N9S9HhZWlmOG7DhBIwrvkuSilOMjHPIZJJ9nzTkM i0PIjyohQU4u+wjmm+I+Fk9Cp7pQ4l/+dyj+QsrWg1aVz4/SjzMpb29/10UKa1Bz38bg ABrzD6v+FKSPKlJyUC5rh8srvT6PQQ8/Sdc3ZcuVgktRNjb8m+BV/3UKqktgPj1E2FSZ E3Og== X-Forwarded-Encrypted: i=1; AJvYcCXAzE764oNjIlx0jzrZyXHQa512jKp0l7VhXpguXkjfYaGbv26FVRmZdpl8t3lzgcW6sGrjAiLWoKZnRKuxpn4= X-Gm-Message-State: AOJu0Yzp0ZmvOnf8DqW51REwjYrSS6KJlHLllrODu+Ay5TCa42zu0p6q 7s8mPbFjhJt4K+vacn1KXi9xjjsH0wLXOYk48WZc6IzdPhpXk196 X-Google-Smtp-Source: AGHT+IGWr2WF5LWNWjE5lal/Vz8ETwNkqnzmkiiqAGx7kfTD7zZmEXEaaObcQnFxl4tTgSeBFxmZww== X-Received: by 2002:a05:600c:1d1c:b0:412:ea4c:dc4b with SMTP id l28-20020a05600c1d1c00b00412ea4cdc4bmr5253976wms.6.1709775418462; Wed, 06 Mar 2024 17:36:58 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c4fc900b00412f02bff2csm855458wmq.37.2024.03.06.17.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:57 -0800 (PST) From: luca.boccassi@gmail.com To: Alan Elder Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/netvsc: fix VLAN metadata parsing' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:41 +0000 Message-Id: <20240307013159.1735343-84-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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 22.11.5 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/09/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a254412faf34f120f418adebda45251262034212 Thanks. Luca Boccassi --- >From a254412faf34f120f418adebda45251262034212 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 [ 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 bc6f60c64a..6496979f28 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:41.872835544 +0000 +++ 0084-net-netvsc-fix-VLAN-metadata-parsing.patch 2024-03-07 01:05:34.950943242 +0000 @@ -1 +1 @@ -From f7654c8c13f46ab537e8220ea4d6b4911f9f0fd5 Mon Sep 17 00:00:00 2001 +From a254412faf34f120f418adebda45251262034212 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f7654c8c13f46ab537e8220ea4d6b4911f9f0fd5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e4f5015aa3..9bf1ec5509 100644 +index bc6f60c64a..6496979f28 100644