Skip to contentSkip to conversation

net/e1000: fix saving of stripped VLAN TCI

PATCH Applied Visa Hankala 3 participants 3 messages Mar 12, 2023 – Mar 13, 2023 Network drivers

lore
Share & tools
lore

Visa Hankala

author
#0 lore raw

PATCH 1/1 net/e1000: fix saving of stripped VLAN TCI

When receiving a scattered packet, save the stripped VLAN TCI in the first mbuf segment where users expect to find it.

Signed-off-by Visa Hankala <[email protected]>
drivers/net/e1000/em_rxtx.c +2 -1
index d48fd52404..cb5ce2307b 100644
@@ -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 +
#1 lore raw

Hi,

Quoted 9 lines

-----Original Message-----
From: Visa Hankala <[email protected]>
Sent: Sunday, March 12, 2023 9:45 PM
To: [email protected]
Cc: Su, Simei <[email protected]>; Wu, Wenjun1 <[email protected]>
Subject: [PATCH] net/e1000: fix saving of stripped VLAN TCI

When receiving a scattered packet, save the stripped VLAN TCI in the first mbuf segment where users expect to find it.

Missing fix tag here.

Quoted 25 lines
Signed-off-by Visa Hankala <[email protected]>
drivers/net/e1000/em_rxtx.c +1 -0
index d48fd52404..cb5ce2307b 100644
@@ -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.
 		 */
drivers/net/e1000/em_rxtx.c +1 -1
 		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);

drivers/net/e1000/em_rxtx.c eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, · line 1046

Quoted 2 lines
drivers/net/e1000/em_rxtx.c +0 -0
 		/* Prefetch data of first segment, if configured to do so. */
 		rte_packet_prefetch((char *)first_seg->buf_addr +

Regards,
Wenjun

Applied
#2 lore raw
Quoted 18 lines

-----Original Message-----
From: Wu, Wenjun1 <[email protected]>
Sent: Monday, March 13, 2023 9:39 AM
To: Visa Hankala <[email protected]>; [email protected]
Cc: Su, Simei <[email protected]>
Subject: RE: [PATCH] net/e1000: fix saving of stripped VLAN TCI

Hi,

Quoted 7 lines

-----Original Message-----
From: Visa Hankala <[email protected]>
Sent: Sunday, March 12, 2023 9:45 PM
To: [email protected]
Cc: Su, Simei <[email protected]>; Wu, Wenjun1 <[email protected]>
Subject: [PATCH] net/e1000: fix saving of stripped VLAN TCI

Quoted 4 lines
Quoted 2 lines

When receiving a scattered packet, save the stripped VLAN TCI in the first mbuf segment where users expect to find it.

Missing fix tag here.

Added

Fixes 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")
Cc [email protected]
Quoted 3 lines
Quoted 3 lines
Signed-off-by Visa Hankala <[email protected]>

Offline confirmed with Wenjun, Wu, agreed to add
Acked-y: Wenjun Wu <[email protected]>

Applied to dpdk-next-net-intel.

Thanks
Qi