Skip to contentSkip to conversation

net/af_packet: fix vlan_insert corruption

PATCH Superseded Stephen Hemminger 3 participants 9 messages Apr 8, 2019 – Jul 4, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/af_packet: fix vlan_insert corruption

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

---
 drivers/net/af_packet/rte_eth_af_packet.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +6 -5
index 99e13fe48a30..24a68c26d665 100644
@@ -200,6 +200,12 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			continue;
 		}
 
+		/* point at the next incoming frame */
+		if ((ppd->tp_status != TP_STATUS_AVAILABLE) &&
+		    (poll(&pfd, 1, -1) < 0))
+			break;
+
+
 		/* insert vlan info if necessary */
 		if (mbuf->ol_flags & PKT_TX_VLAN_PKT) {
 			if (rte_vlan_insert(&mbuf)) {
@@ -208,11 +214,6 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			}
 		}
 
-		/* point at the next incoming frame */
-		if ((ppd->tp_status != TP_STATUS_AVAILABLE) &&
-		    (poll(&pfd, 1, -1) < 0))
-			break;
-
 		/* copy the tx frame data */
 		pbuf = (uint8_t *) ppd + TPACKET2_HDRLEN -
 			sizeof(struct sockaddr_ll);
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 net/af_packet: fix vlan_insert corruption

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

---
v2 - fix unnecessary parenthesis (was in original code)

 drivers/net/af_packet/rte_eth_af_packet.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +5 -5
index 99e13fe48a30..91ceb94ecbaa 100644
@@ -200,6 +200,11 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			continue;
 		}
 
+		/* point at the next incoming frame */
+		if (ppd->tp_status != TP_STATUS_AVAILABLE &&
+		    poll(&pfd, 1, -1) < 0)
+			break;
+
 		/* insert vlan info if necessary */
 		if (mbuf->ol_flags & PKT_TX_VLAN_PKT) {
 			if (rte_vlan_insert(&mbuf)) {
@@ -208,11 +213,6 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			}
 		}
 
-		/* point at the next incoming frame */
-		if ((ppd->tp_status != TP_STATUS_AVAILABLE) &&
-		    (poll(&pfd, 1, -1) < 0))
-			break;
-
 		/* copy the tx frame data */
 		pbuf = (uint8_t *) ppd + TPACKET2_HDRLEN -
 			sizeof(struct sockaddr_ll);
Signature · 1 line
2.17.1
#2 lore raw
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

[1]
https://patches.dpdk.org/patch/51870/

Quoted 38 lines

---
v2 - fix unnecessary parenthesis (was in original code)

 drivers/net/af_packet/rte_eth_af_packet.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +5 -5
index 99e13fe48a30..91ceb94ecbaa 100644
@@ -200,6 +200,11 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			continue;
 		}
 
+		/* point at the next incoming frame */
+		if (ppd->tp_status != TP_STATUS_AVAILABLE &&
+		    poll(&pfd, 1, -1) < 0)
+			break;
+
 		/* insert vlan info if necessary */
 		if (mbuf->ol_flags & PKT_TX_VLAN_PKT) {
 			if (rte_vlan_insert(&mbuf)) {
@@ -208,11 +213,6 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			}
 		}
 
-		/* point at the next incoming frame */
-		if ((ppd->tp_status != TP_STATUS_AVAILABLE) &&
-		    (poll(&pfd, 1, -1) < 0))
-			break;
-
 		/* copy the tx frame data */
 		pbuf = (uint8_t *) ppd + TPACKET2_HDRLEN -
 			sizeof(struct sockaddr_ll);
#3 lore raw
Quoted 6 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

Quoted 8 lines

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

#4 lore raw
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

Quoted 7 lines
Quoted 2 lines

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

Right, existing vlan_insert has same issue on af_packet.

But, should vlan_insert try to duplicate the mbuf when it is shared, does it worth the complexity it brings? And when that support removed this patch won't be needed.
Or perhaps can create a new API, that handles the shared mbuf and name explicitly states it?

btw, 'continue' in our Tx loop is also not good, when the application gets less 'num_tx' because of 'continue' in 'vlan_insert' failure, it will think last packets in the array not sent and will try to free them which will cause double free again.

#5 lore raw
Quoted 24 lines · Ferruh Yigit
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

Quoted 7 lines
Quoted 2 lines

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

Quoted 5 lines

Right, existing vlan_insert has same issue on af_packet.

But, should vlan_insert try to duplicate the mbuf when it is shared, does it worth the complexity it brings? And when that support removed this patch won't be needed.

I don't think vlan insert or other mbuf manipulation APIs should be checking for shared state or not - that's the job of the app. We could have cases where the user does want to modify a shared mbuf.

Regards,
/Bruce

#6 lore raw
Quoted 31 lines · On Tue, 16 Apr 2019 10:42:13 +0100 Bruce Richardson…
Quoted 24 lines · Ferruh Yigit
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

Quoted 7 lines
Quoted 2 lines

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

Quoted 5 lines

Right, existing vlan_insert has same issue on af_packet.

But, should vlan_insert try to duplicate the mbuf when it is shared, does it worth the complexity it brings? And when that support removed this patch won't be needed.

Quoted 6 lines

I don't think vlan insert or other mbuf manipulation APIs should be checking for shared state or not - that's the job of the app. We could have cases where the user does want to modify a shared mbuf.

Regards,
/Bruce

The vlan_insert code is called on transmit, and there are lots of cases where a transmit mbuf might be shared (like TCP stack). And in that case inserting the vlan must be non-destructive to the original mbuf.

Whether you want to push the problem to the driver or do it in the library, it is still a problem.

#7 lore raw
Quoted 41 lines · Stephen Hemminger
Quoted 31 lines · On Tue, 16 Apr 2019 10:42:13 +0100 Bruce Richardson…
Quoted 24 lines · Ferruh Yigit
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

Quoted 7 lines
Quoted 2 lines

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

Quoted 5 lines

Right, existing vlan_insert has same issue on af_packet.

But, should vlan_insert try to duplicate the mbuf when it is shared, does it worth the complexity it brings? And when that support removed this patch won't be needed.

Quoted 6 lines

I don't think vlan insert or other mbuf manipulation APIs should be checking for shared state or not - that's the job of the app. We could have cases where the user does want to modify a shared mbuf.

Regards,
/Bruce

Quoted 6 lines

The vlan_insert code is called on transmit, and there are lots of cases where a transmit mbuf might be shared (like TCP stack). And in that case inserting the vlan must be non-destructive to the original mbuf.

Whether you want to push the problem to the driver or do it in the library, it is still a problem.

Yes, I agree it's a problem. I'd prefer see it done in the driver than in the library, since it's higher in the SW stack and has more context information as to what is safe or not.

/Bruce.

#8 lore raw
Quoted 46 lines · Bruce Richardson
Quoted 45 lines · Stephen Hemminger
Quoted 31 lines · On Tue, 16 Apr 2019 10:42:13 +0100 Bruce Richardson…
Quoted 24 lines · Ferruh Yigit
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Fri, 12 Apr 2019 17:28:17 +0100 Ferruh Yigit <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

If the af_packet transmit is sending a VLAN packet, and the transmit path to the kernel os full, then it would mismanage the outgoing mbuf. The original mbuf would end up being freed twice, once by AF_PACKET PMD and once by caller.

This comment is valid with your new patch [1] that updates 'rte_vlan_insert()' to duplicate the mbuf, right?

That patch looks like won't make the release, so I suggest this one wait that patch, although this is harmless on its own, commit log is misleading.

Quoted 7 lines
Quoted 2 lines

[1]
https://patches.dpdk.org/patch/51870/

It was always true, even with existing vlan_insert. Existing vlan_insert has issues if it ever creates a clone packet. Existing vlan_insert can duplicate mbuf through clone

Quoted 5 lines

Right, existing vlan_insert has same issue on af_packet.

But, should vlan_insert try to duplicate the mbuf when it is shared, does it worth the complexity it brings? And when that support removed this patch won't be needed.

Quoted 6 lines

I don't think vlan insert or other mbuf manipulation APIs should be checking for shared state or not - that's the job of the app. We could have cases where the user does want to modify a shared mbuf.

Regards,
/Bruce

The vlan_insert code is called on transmit, and there are lots of cases where a transmit mbuf might be shared (like TCP stack). And in that case inserting the vlan must be non-destructive to the original mbuf.

Quoted 6 lines
Quoted 2 lines

Whether you want to push the problem to the driver or do it in the library, it is still a problem.

Yes, I agree it's a problem. I'd prefer see it done in the driver than in the library, since it's higher in the SW stack and has more context information as to what is safe or not.

The patch not more needed with current rte_vlan_insert()