Skip to contentSkip to conversation

net: broadcom: bcm4908_enet: update TX stats after actual transmission

PATCH Applied Rafał Miłecki 3 participants 4 messages Oct 27, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: broadcom: bcm4908_enet: update TX stats after actual transmission

From: Rafał Miłecki <[email protected]>

Queueing packets doesn't guarantee their transmission. Update TX stats after hardware confirms consuming submitted data.

This also fixes a possible race and NULL dereference. bcm4908_enet_start_xmit() could try to access skb after freeing it in the bcm4908_enet_poll_tx().

---
This fixes a potential NULL dereference. It was never seen in real usage though. I'm not sure if it makes this net-next or net material.

---
 drivers/net/ethernet/broadcom/bcm4908_enet.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bcm4908_enet.c +8 -4
index ca8c86ee44c0..b0aac0bcb060 100644
@@ -571,8 +571,6 @@ static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_devic
 
 	if (++ring->write_idx == ring->length - 1)
 		ring->write_idx = 0;
-	enet->netdev->stats.tx_bytes += skb->len;
-	enet->netdev->stats.tx_packets++;
 
 	return NETDEV_TX_OK;
 }
@@ -654,6 +652,7 @@ static int bcm4908_enet_poll_tx(struct napi_struct *napi, int weight)
 	struct bcm4908_enet_dma_ring_bd *buf_desc;
 	struct bcm4908_enet_dma_ring_slot *slot;
 	struct device *dev = enet->dev;
+	unsigned int bytes = 0;
 	int handled = 0;
 
 	while (handled < weight && tx_ring->read_idx != tx_ring->write_idx) {
@@ -664,12 +663,17 @@ static int bcm4908_enet_poll_tx(struct napi_struct *napi, int weight)
 
 		dma_unmap_single(dev, slot->dma_addr, slot->len, DMA_TO_DEVICE);
 		dev_kfree_skb(slot->skb);
-		if (++tx_ring->read_idx == tx_ring->length)
-			tx_ring->read_idx = 0;
 
 		handled++;
+		bytes += slot->len;
+
+		if (++tx_ring->read_idx == tx_ring->length)
+			tx_ring->read_idx = 0;
 	}
 
+	enet->netdev->stats.tx_packets += handled;
+	enet->netdev->stats.tx_bytes += bytes;
+
 	if (handled < weight) {
 		napi_complete_done(napi, handled);
 		bcm4908_enet_dma_ring_intrs_on(enet, tx_ring);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

Queueing packets doesn't guarantee their transmission. Update TX stats after hardware confirms consuming submitted data.

This also fixes a possible race and NULL dereference. bcm4908_enet_start_xmit() could try to access skb after freeing it in the bcm4908_enet_poll_tx().

To me this is 'net' material since it fixes a potential issue, but let's see what the netdev maintainers prefer.

Signature · 1 line
Florian
#2 lore raw
Quoted 10 lines · Florian Fainelli
Quoted 9 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

Queueing packets doesn't guarantee their transmission. Update TX stats after hardware confirms consuming submitted data.

This also fixes a possible race and NULL dereference. bcm4908_enet_start_xmit() could try to access skb after freeing it in the bcm4908_enet_poll_tx().

Quoted 6 lines
Quoted 2 lines

To me this is 'net' material since it fixes a potential issue, but let's see what the netdev maintainers prefer.

Thanks. In that case it may be also worth adding:

Fixes 4feffeadbcb2e ("net: broadcom: bcm4908enet: add BCM4908 controller driver")
#3 lore raw
In reply to Rafał Miłecki
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Thu, 27 Oct 2022 13:24:30 +0200 you wrote:

From: Rafał Miłecki <[email protected]>

Queueing packets doesn't guarantee their transmission. Update TX stats after hardware confirms consuming submitted data.

This also fixes a possible race and NULL dereference. bcm4908_enet_start_xmit() could try to access skb after freeing it in the bcm4908_enet_poll_tx().

[...]

Here is the summary with links:
- net: broadcom: bcm4908_enet: update TX stats after actual transmission

    https://git.kernel.org/netdev/net/c/ef3556ee16c6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html