Skip to contentSkip to conversation

net: sh_eth: fix skb_over_panic happen

PATCH Superseded Shimoda, Yoshihiro 2 participants 3 messages Feb 7, 2012

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: sh_eth: fix skb_over_panic happen

When this GETHER controller received a large frame (about 1800 bytes or more), skb_over_panic() happened. This is because the previous driver set the RFLR to 0x1000 (4096 bytes) and the skb allocate size is smaller than 4096 bytes. So, the controller accepted such a frame.

The controller can discard a large frame by the RFLR setting. So, the patch modifies the value of RFLR to mtu + ETH_HLEN + ETH_FCS_LEN.

---
 drivers/net/ethernet/renesas/sh_eth.c |    2 +-
 drivers/net/ethernet/renesas/sh_eth.h |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
drivers/net/ethernet/renesas/sh_eth.c +1 -1
index 813d41c..9e899b0 100644
@@ -817,7 +817,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
 		sh_eth_write(ndev, 0, TRIMD);
 
 	/* Recv frame limit set register */
-	sh_eth_write(ndev, RFLR_VALUE, RFLR);
+	sh_eth_write(ndev, ndev->mtu + ETH_HLEN + ETH_FCS_LEN, RFLR);
 
 	sh_eth_write(ndev, sh_eth_read(ndev, EESR), EESR);
 	sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
drivers/net/ethernet/renesas/sh_eth.h +0 -3
index 47877b1..cdbd844 100644
@@ -575,9 +575,6 @@ enum RPADIR_BIT {
 	RPADIR_PADR = 0x0003f,
 };
 
-/* RFLR */
-#define RFLR_VALUE 0x1000
-
 /* FDR */
 #define DEFAULT_FDR_INIT	0x00000707
 
Signature · 1 line
1.7.1
#1 lore raw
Quoted 20 lines · Yoshihiro

When this GETHER controller received a large frame (about 1800 bytes or more), skb_over_panic() happened. This is because the previous driver set the RFLR to 0x1000 (4096 bytes) and the skb allocate size is smaller than 4096 bytes. So, the controller accepted such a frame.

The controller can discard a large frame by the RFLR setting. So, the patch modifies the value of RFLR to mtu + ETH_HLEN + ETH_FCS_LEN.

---
 drivers/net/ethernet/renesas/sh_eth.c |    2 +-
 drivers/net/ethernet/renesas/sh_eth.h |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
drivers/net/ethernet/renesas/sh_eth.c +0 -0
index 813d41c..9e899b0 100644

drivers/net/ethernet/renesas/sh_eth.c static int sh_eth_dev_init(struct net_device *ndev) · line 821

Quoted 6 lines
drivers/net/ethernet/renesas/sh_eth.c +1 -1
@@ -817,7 +817,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
 		sh_eth_write(ndev, 0, TRIMD);
 
 	/* Recv frame limit set register */
-	sh_eth_write(ndev, RFLR_VALUE, RFLR);
+	sh_eth_write(ndev, ndev->mtu + ETH_HLEN + ETH_FCS_LEN, RFLR);
 

No VLAN_HDR ?

#2 lore raw

Hi Eric,

Quoted 1 line · Eric Dumazet

Le mardi 07 février 2012 à 15:54 +0900, Shimoda, Yoshihiro a écrit :

[ snip ]

Quoted 7 lines
Quoted 7 lines
drivers/net/ethernet/renesas/sh_eth.c +0 -0
index 813d41c..9e899b0 100644
@@ -817,7 +817,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
 		sh_eth_write(ndev, 0, TRIMD);
 
Quoted 7 lines

drivers/net/ethernet/renesas/sh_eth.c static int sh_eth_dev_init(struct net_device *ndev) · line 821

Quoted 4 lines
drivers/net/ethernet/renesas/sh_eth.c +1 -1
 	/* Recv frame limit set register */
-	sh_eth_write(ndev, RFLR_VALUE, RFLR);
+	sh_eth_write(ndev, ndev->mtu + ETH_HLEN + ETH_FCS_LEN, RFLR);
 

No VLAN_HDR ?

Thank you for your point.
I forgot care of VLAN. I will add "+ VLAN_HLEN" and submit a patch.

Best regards,
Yoshihiro Shimoda