Skip to contentSkip to conversation

igb: cope with large MAX_SKB_FRAGS.

PATCH In review Corinna Vinschen 5 participants 5 messages Jul 18, 2024 – Aug 6, 2024

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

PATCH v3 1/1 igb: cope with large MAX_SKB_FRAGS.

From: Paolo Abeni <[email protected]>

Sabrina reports that the igb driver does not cope well with large MAX_SKB_FRAG values: setting MAX_SKB_FRAG to 45 causes payload corruption on TX.

An easy reproducer is to run ssh to connect to the machine. With MAX_SKB_FRAGS=17 it works, with MAX_SKB_FRAGS=45 it fails.

The root cause of the issue is that the driver does not take into account properly the (possibly large) shared info size when selecting the ring layout, and will try to fit two packets inside the same 4K page even when the 1st fraglist will trump over the 2nd head.

Address the issue forcing the driver to fit a single packet per page, leaving there enough room to store the (currently) largest possible skb_shared_info.

Fixes 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS")

---
v2: fix subject, add a simple reproducer
v3: fix Fixes, tested with all MTUs from 1200 to 1280 per Eric's suggestion

 drivers/net/ethernet/intel/igb/igb_main.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/igb/igb_main.c +1 -0
index 11be39f435f3..232d6cb836a9 100644
@@ -4808,6 +4808,7 @@ static void igb_set_rx_buffer_len(struct igb_adapter *adapter,
 
 #if (PAGE_SIZE < 8192)
 	if (adapter->max_frame_size > IGB_MAX_FRAME_BUILD_SKB ||
+	    SKB_HEAD_ALIGN(adapter->max_frame_size) > (PAGE_SIZE / 2) ||
 	    rd32(E1000_RCTL) & E1000_RCTL_SBP)
 		set_ring_uses_large_buffer(rx_ring);
 #endif
Signature · 1 line
2.45.2
maintainer
#1 lore raw
Quoted 18 lines · Corinna Vinschen

From: Paolo Abeni <[email protected]>

Sabrina reports that the igb driver does not cope well with large MAX_SKB_FRAG values: setting MAX_SKB_FRAG to 45 causes payload corruption on TX.

An easy reproducer is to run ssh to connect to the machine. With MAX_SKB_FRAGS=17 it works, with MAX_SKB_FRAGS=45 it fails.

The root cause of the issue is that the driver does not take into account properly the (possibly large) shared info size when selecting the ring layout, and will try to fit two packets inside the same 4K page even when the 1st fraglist will trump over the 2nd head.

Address the issue forcing the driver to fit a single packet per page, leaving there enough room to store the (currently) largest possible skb_shared_info.

Quoted 7 lines
Fixes 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS")

@Tony: would you like to take this one in your tree first, or we can merge it directly?

Thanks!

Paolo

maintainer Reviewed-by
#2 lore raw
Quoted 27 lines · Paolo Abeni
Quoted 18 lines · Corinna Vinschen

From: Paolo Abeni <[email protected]>

Sabrina reports that the igb driver does not cope well with large MAX_SKB_FRAG values: setting MAX_SKB_FRAG to 45 causes payload corruption on TX.

An easy reproducer is to run ssh to connect to the machine.  With MAX_SKB_FRAGS=17 it works, with MAX_SKB_FRAGS=45 it fails.

The root cause of the issue is that the driver does not take into account properly the (possibly large) shared info size when selecting the ring layout, and will try to fit two packets inside the same 4K page even when the 1st fraglist will trump over the 2nd head.

Address the issue forcing the driver to fit a single packet per page, leaving there enough room to store the (currently) largest possible skb_shared_info.

Quoted 7 lines
Fixes 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS")
Quoted 2 lines

@Tony: would you like to take this one in your tree first, or we can merge it directly?

Hi Paolo,

I can take it through IWL unless you need to get it in sooner, in which case, feel free to take it directly. If so...

Thanks,
Tony

Reviewed-by on v3 1/1
#3 lore raw
In reply to Corinna Vinschen
Quoted 19 lines · Corinna Vinschen

From: Paolo Abeni <[email protected]>

Sabrina reports that the igb driver does not cope well with large MAX_SKB_FRAG values: setting MAX_SKB_FRAG to 45 causes payload corruption on TX.

An easy reproducer is to run ssh to connect to the machine. With MAX_SKB_FRAGS=17 it works, with MAX_SKB_FRAGS=45 it fails.

The root cause of the issue is that the driver does not take into account properly the (possibly large) shared info size when selecting the ring layout, and will try to fit two packets inside the same 4K page even when the 1st fraglist will trump over the 2nd head.

Address the issue forcing the driver to fit a single packet per page, leaving there enough room to store the (currently) largest possible skb_shared_info.

Quoted 7 lines
Fixes 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS")
Tested-by on v3 1/1
#4 lore raw
In reply to Corinna Vinschen
Quoted 25 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Corinna Vinschen
Sent: Thursday, July 18, 2024 2:27 PM
To: [email protected]; [email protected]; Eric Dumazet <[email protected]>
Cc: Jason Xing <[email protected]>; Nikolay Aleksandrov <[email protected]>; [email protected]; Nguyen, Anthony L <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; David S . Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH net v3] igb: cope with large MAX_SKB_FRAGS.

From: Paolo Abeni <[email protected]>

Sabrina reports that the igb driver does not cope well with large MAX_SKB_FRAG values: setting MAX_SKB_FRAG to 45 causes payload corruption on TX.

An easy reproducer is to run ssh to connect to the machine. With MAX_SKB_FRAGS=17 it works, with MAX_SKB_FRAGS=45 it fails.

The root cause of the issue is that the driver does not take into account properly the (possibly large) shared info size when selecting the ring layout, and will try to fit two packets inside the same 4K page even when the 1st fraglist will trump over the 2nd head.

Address the issue forcing the driver to fit a single packet per page, leaving there enough room to store the (currently) largest possible skb_shared_info.

Fixes 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS")
Quoted 7 lines

---
v2: fix subject, add a simple reproducer
v3: fix Fixes, tested with all MTUs from 1200 to 1280 per Eric's suggestion

 drivers/net/ethernet/intel/igb/igb_main.c | 1 +
 1 file changed, 1 insertion(+)