net: mvvp2: fix short frame size on s390
Subsystems (5)
PATCH 1/1 net: mvvp2: fix short frame size on s390
On s390, the following build warning occurs:
drivers/net/ethernet/marvell/mvpp2/mvpp2.h:844:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow]
844 | ((total_size) - MVPP2_SKB_HEADROOM - MVPP2_SKB_SHINFO_SIZE)
This happens because MVPP2_SKB_SHINFO_SIZE, which is 320 bytes (which is already 64-byte aligned) on some architectures, actually gets ALIGN'd up to 512 bytes in the s390 case.
So then, when this is invoked:
MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE)
...that turns into:
704 - 224 - 512 == -32
...which is not a good frame size to end up with! The warning above is a bit lucky: it notices a signed/unsigned bad behavior here, which leads to the real problem of a frame that is too short for its contents.
Increase MVPP2_BM_SHORT_FRAME_SIZE by 32 (from 704 to 736), which is just exactly big enough. (The other values can't readily be changed without causing a lot of other problems.)
---
Hi,
This patch is based on today's linux.git (commit 902e7f373fff).
thanks,
John Hubbard
NVIDIA
drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +1 -1
@@ -938,7 +938,7 @@ enum mvpp22_ptp_packet_format {#define MVPP2_BM_COOKIE_POOL_OFFS 8#define MVPP2_BM_COOKIE_CPU_OFFS 24 -#define MVPP2_BM_SHORT_FRAME_SIZE 704/* frame size 128 */ +#define MVPP2_BM_SHORT_FRAME_SIZE 736/* frame size 128 */ #define MVPP2_BM_LONG_FRAME_SIZE 2240/* frame size 1664 */ #define MVPP2_BM_JUMBO_FRAME_SIZE 10432/* frame size 9856 */ /* BM short pool packet size
Signature · 1 line
2.32.0
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Thu, 5 Aug 2021 23:53:30 -0700 you wrote:
On s390, the following build warning occurs:
drivers/net/ethernet/marvell/mvpp2/mvpp2.h:844:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow]
844 | ((total_size) -MVPP2_SKB_HEADROOM-MVPP2_SKB_SHINFO_SIZE)[...]
Here is the summary with links:
- net: mvvp2: fix short frame size on s390
https://git.kernel.org/netdev/net/c/704e624f7b3e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html