From: Alan Elder <alan.elder@microsoft.com>
To: Alan Elder <alan.elder@microsoft.com>,
Ferruh Yigit <ferruh.yigit@amd.com>,
Long Li <longli@microsoft.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Cc: "dev@dpdk.org" <dev@dpdk.org>, stephen <stephen@networkplumber.org>
Subject: [PATCH v6] net/netvsc: fix parsing of VLAN metadata
Date: Fri, 16 Feb 2024 09:43:00 +0000 [thread overview]
Message-ID: <PA4PR83MB0526EA2AD123EA2927F47E10974C2@PA4PR83MB0526.EURPRD83.prod.outlook.com> (raw)
In-Reply-To: <PA4PR83MB0526A094C53E5613C0A669A3974D2@PA4PR83MB0526.EURPRD83.prod.outlook.com>
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")
Cc: sthemmin@microsoft.com
Cc: stable@dpdk.org
Signed-off-by: Alan Elder <alan.elder@microsoft.com>
---
V6:
* Line length can be 100 - un-split lines
v5:
* Move the VLAN parsing macros to rte_ether.h
v4:
* Make consistent with FreeBSD code
---
.mailmap | 1 +
drivers/net/netvsc/hn_rxtx.c | 8 ++++++--
lib/net/rte_ether.h | 14 ++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index de339562f4..08fce0c472 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Alain Leon <xerebz@gmail.com>
Alan Brady <alan.brady@intel.com>
Alan Carew <alan.carew@intel.com>
Alan Dewar <alan.dewar@att.com> <adewar@brocade.com>
+Alan Elder <alan.elder@microsoft.com>
Alan Liu <zaoxingliu@gmail.com>
Alan Winkowski <walan@marvell.com>
Alejandro Lucero <alejandro.lucero@netronome.com>
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) {
diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index ce073ea818..75285bdd12 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -46,6 +46,20 @@ extern "C" {
#define RTE_ETHER_MIN_MTU 68 /**< Minimum MTU for IPv4 packets, see RFC 791. */
+/* VLAN header fields */
+#define RTE_VLAN_DEI_SHIFT 12
+#define RTE_VLAN_PRI_SHIFT 13
+#define RTE_VLAN_PRI_MASK 0xe000 /* Priority Code Point */
+#define RTE_VLAN_DEI_MASK 0x1000 /* Drop Eligible Indicator */
+#define RTE_VLAN_ID_MASK 0x0fff /* VLAN Identifier */
+
+#define RTE_VLAN_TCI_ID(vlan_tci) ((vlan_tci) & RTE_VLAN_ID_MASK)
+#define RTE_VLAN_TCI_PRI(vlan_tci) (((vlan_tci) & RTE_VLAN_PRI_MASK) >> RTE_VLAN_PRI_SHIFT)
+#define RTE_VLAN_TCI_DEI(vlan_tci) (((vlan_tci) & RTE_VLAN_DEI_MASK) >> RTE_VLAN_DEI_SHIFT)
+#define RTE_VLAN_TCI_MAKE(id, pri, dei) ((id) | \
+ ((pri) << RTE_VLAN_PRI_SHIFT) | \
+ ((dei) << RTE_VLAN_DEI_SHIFT))
+
/**
* Ethernet address:
* A universally administered address is uniquely assigned to a device by its
--
2.25.1
next prev parent reply other threads:[~2024-02-16 9:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-08 15:09 [PATCH v3] " Alan Elder
2024-02-09 1:18 ` Long Li
2024-02-09 15:50 ` [PATCH v4] " Alan Elder
2024-02-14 22:17 ` Long Li
2024-02-15 11:46 ` Ferruh Yigit
2024-02-15 18:12 ` [PATCH v5] " Alan Elder
2024-02-15 18:25 ` Stephen Hemminger
2024-02-16 9:43 ` Alan Elder [this message]
2024-02-16 11:39 ` [PATCH v6] " Ferruh Yigit
2024-02-19 9:31 ` [PATCH v7 0/2] " Alan Elder
2024-02-19 9:31 ` [PATCH v7 1/2] lib/net: " Alan Elder
2024-02-19 11:12 ` Ferruh Yigit
2024-02-19 11:14 ` Ferruh Yigit
2024-02-19 9:31 ` [PATCH v7 2/2] net/netvsc: " Alan Elder
2024-02-19 11:12 ` Ferruh Yigit
2024-02-19 9:34 ` [EXTERNAL] Re: [PATCH v6] " Alan Elder
2024-02-16 11:33 ` [PATCH v5] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=PA4PR83MB0526EA2AD123EA2927F47E10974C2@PA4PR83MB0526.EURPRD83.prod.outlook.com \
--to=alan.elder@microsoft.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=longli@microsoft.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).