net: stmmac: fix dma queue left shift overflow issue
Subsystems (4)
PATCH 1/2 net: stmmac: fix dma queue left shift overflow issue
When queue number is > 4, left shift overflows due to 32 bits integer variable. Mask calculation is wrong for MTL_RXQ_DMA_MAP1.
If CONFIG_UBSAN is enabled, kernel dumps below warning:
[ 10.363842] ================================================================== [ 10.363882] UBSAN: shift-out-of-bounds in /build/linux-intel-iotg-5.15-8e6Tf4/ linux-intel-iotg-5.15-5.15.0/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c:224:12 [ 10.363929] shift exponent 40 is too large for 32-bit type 'unsigned int' [ 10.363953] CPU: 1 PID: 599 Comm: NetworkManager Not tainted 5.15.0-1003-intel-iotg [ 10.363956] Hardware name: ADLINK Technology Inc. LEC-EL/LEC-EL, BIOS 0.15.11 12/22/2021 [ 10.363958] Call Trace: [ 10.363960] <TASK> [ 10.363963] dump_stack_lvl+0x4a/0x5f [ 10.363971] dump_stack+0x10/0x12 [ 10.363974] ubsan_epilogue+0x9/0x45 [ 10.363976] __ubsan_handle_shift_out_of_bounds.cold+0x61/0x10e [ 10.363979] ? wake_up_klogd+0x4a/0x50 [ 10.363983] ? vprintk_emit+0x8f/0x240 [ 10.363986] dwmac4_map_mtl_dma.cold+0x42/0x91 [stmmac] [ 10.364001] stmmac_mtl_configuration+0x1ce/0x7a0 [stmmac] [ 10.364009] ? dwmac410_dma_init_channel+0x70/0x70 [stmmac] [ 10.364020] stmmac_hw_setup.cold+0xf/0xb14 [stmmac] [ 10.364030] ? page_pool_alloc_pages+0x4d/0x70 [ 10.364034] ? stmmac_clear_tx_descriptors+0x6e/0xe0 [stmmac] [ 10.364042] stmmac_open+0x39e/0x920 [stmmac] [ 10.364050] __dev_open+0xf0/0x1a0 [ 10.364054] __dev_change_flags+0x188/0x1f0 [ 10.364057] dev_change_flags+0x26/0x60 [ 10.364059] do_setlink+0x908/0xc40 [ 10.364062] ? do_setlink+0xb10/0xc40 [ 10.364064] ? __nla_validate_parse+0x4c/0x1a0 [ 10.364068] __rtnl_newlink+0x597/0xa10 [ 10.364072] ? __nla_reserve+0x41/0x50 [ 10.364074] ? __kmalloc_node_track_caller+0x1d0/0x4d0 [ 10.364079] ? pskb_expand_head+0x75/0x310 [ 10.364082] ? nla_reserve_64bit+0x21/0x40 [ 10.364086] ? skb_free_head+0x65/0x80 [ 10.364089] ? security_sock_rcv_skb+0x2c/0x50 [ 10.364094] ? __cond_resched+0x19/0x30 [ 10.364097] ? kmem_cache_alloc_trace+0x15a/0x420 [ 10.364100] rtnl_newlink+0x49/0x70
This change fixes MTL_RXQ_DMA_MAP1 mask issue and channel/queue mapping warning.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +3 -0
@@ -269,6 +269,9 @@ static void dwmac4_map_mtl_dma(struct mac_device_info *hw, u32 queue, u32 chan)if (queue ==0 || queue ==4 ) { value &= ~MTL_RXQ_DMA_Q04MDMACH_MASK ; value |=MTL_RXQ_DMA_Q04MDMACH (chan); + }else if (queue >4 ) { + value &= ~MTL_RXQ_DMA_QXMDMACH_MASK (queue -4 ); + value |=MTL_RXQ_DMA_QXMDMACH (chan, queue -4 ); }else { value &= ~MTL_RXQ_DMA_QXMDMACH_MASK (queue); value |=MTL_RXQ_DMA_QXMDMACH (chan, queue);
Signature · 1 line
2.25.1
PATCH 2/2 net: stmmac: remove duplicate dma queue channel macros
It doesn't need extra macros for queue 0 & 4. Same macro could be used for all 8 queues.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 4 +--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -3
@@ -330,9 +330,7 @@ enum power_event {#define MTL_RXQ_DMA_MAP0 0x00000c30/* queue 0 to 3 */ #define MTL_RXQ_DMA_MAP1 0x00000c34/* queue 4 to 7 */ -#define MTL_RXQ_DMA_Q04MDMACH_MASK GENMASK(3, 0) -#define MTL_RXQ_DMA_Q04MDMACH (x) ((x) << 0) -#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(11 + (8 * ((x) - 1)), 8 * (x)) +#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(3 + (8 * (x)), 8 * (x))#define MTL_RXQ_DMA_QXMDMACH (chan, q) ((chan) << (8 * (q)))#define MTL_CHAN_BASE_ADDR 0x00000d00
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +4 -7
@@ -266,15 +266,12 @@ static void dwmac4_map_mtl_dma(struct mac_device_info *hw, u32 queue, u32 chan)else value =readl (ioaddr +MTL_RXQ_DMA_MAP1 ); -if (queue ==0 || queue ==4 ) { - value &= ~MTL_RXQ_DMA_Q04MDMACH_MASK ; - value |=MTL_RXQ_DMA_Q04MDMACH (chan); - }else if (queue >4 ) { - value &= ~MTL_RXQ_DMA_QXMDMACH_MASK (queue -4 ); - value |=MTL_RXQ_DMA_QXMDMACH (chan, queue -4 ); - }else { +if (queue <4 ) { value &= ~MTL_RXQ_DMA_QXMDMACH_MASK (queue); value |=MTL_RXQ_DMA_QXMDMACH (chan, queue); + }else { + value &= ~MTL_RXQ_DMA_QXMDMACH_MASK (queue -4 ); + value |=MTL_RXQ_DMA_QXMDMACH (chan, queue -4 ); }if (queue <4 )
Signature · 1 line
2.25.1
Paolo Abeni
maintainerRe: [PATCH 2/2] net: stmmac: remove duplicate dma queue channel macros
Quoted 4 lines · Junxiao Chang
It doesn't need extra macros for queue 0 & 4. Same macro could be used for all 8 queues.
Signed-off-by Junxiao Chang <[email protected]>
This looks like a net-next cleanup for the previous patch, which instead looks like a proper -net candidate. Would you mind re-posting the two patch separatelly, waiting for the fix to land into net-next before posting the cleanup?
Quoted 10 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 4 +--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac4.h +0
-0
drivers/net/ethernet/stmicro/stmmac/dwmac4.h enum power_event { · line 334
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1
-3@@ -330,9 +330,7 @@ enum power_event {#define MTL_RXQ_DMA_MAP0 0x00000c30/* queue 0 to 3 */ #define MTL_RXQ_DMA_MAP1 0x00000c34/* queue 4 to 7 */ -#define MTL_RXQ_DMA_Q04MDMACH_MASK GENMASK(3, 0) -#define MTL_RXQ_DMA_Q04MDMACH (x) ((x) << 0) -#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(11 + (8 * ((x) - 1)), 8 * (x)) +#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(3 + (8 * (x)), 8 * (x))#define MTL_RXQ_DMA_QXMDMACH (chan, q) ((chan) << (8 * (q)))
if you here use ((x) & 0x3) instead of (x) and ((q) & 0x3) instead of (q), you can avoid the if statement below.
Quoted 1 line
cheers,
Paolo
RE: [PATCH 2/2] net: stmmac: remove duplicate dma queue channel macros
Sure. Thank you for reviewing it. I will submit 1st "net: stmmac: fix dma queue left shift overflow issue" to net. In future, will post this patch to net-next after 1st patch landing.
Thanks,
Junxiao
-----Original Message-----
From: Paolo Abeni <[email protected]>
Sent: Thursday, July 14, 2022 6:13 PM
To: Chang, Junxiao <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] net: stmmac: remove duplicate dma queue channel macros
Quoted 4 lines · Junxiao Chang
It doesn't need extra macros for queue 0 & 4. Same macro could be used for all 8 queues.
Signed-off-by Junxiao Chang <[email protected]>
This looks like a net-next cleanup for the previous patch, which instead looks like a proper -net candidate. Would you mind re-posting the two patch separatelly, waiting for the fix to land into net-next before posting the cleanup?
Quoted 11 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 4 +--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac4.h +0
-0
drivers/net/ethernet/stmicro/stmmac/dwmac4.h enum power_event { · line 334
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1
-3@@ -330,9 +330,7 @@ enum power_event {#define MTL_RXQ_DMA_MAP0 0x00000c30/* queue 0 to 3 */ #define MTL_RXQ_DMA_MAP1 0x00000c34/* queue 4 to 7 */ -#define MTL_RXQ_DMA_Q04MDMACH_MASK GENMASK(3, 0) -#define MTL_RXQ_DMA_Q04MDMACH (x) ((x) << 0) -#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(11 + (8 * ((x) - 1)), 8 * (x)) +#define MTL_RXQ_DMA_QXMDMACH_MASK (x) GENMASK(3 + (8 * (x)), 8 * (x))#define MTL_RXQ_DMA_QXMDMACH (chan, q) ((chan) << (8 * (q)))
if you here use ((x) & 0x3) instead of (x) and ((q) & 0x3) instead of (q), you can avoid the if statement below.
Quoted 1 line
0x7 since there might be 8 channels/queues? This way looks a bit tricky. 😊
cheers,
Paolo
Quoted 42 lines · Junxiao Chang
When queue number is > 4, left shift overflows due to 32 bits integer variable. Mask calculation is wrong for
MTL_RXQ_DMA_MAP1.If
CONFIG_UBSANis enabled, kernel dumps below warning:[ 10.363842] ================================================================== [ 10.363882] UBSAN: shift-out-of-bounds in /build/linux-intel-iotg-5.15-8e6Tf4/ linux-intel-iotg-5.15-5.15.0/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c:224:12 [ 10.363929] shift exponent 40 is too large for 32-bit type 'unsigned int' [ 10.363953] CPU: 1 PID: 599 Comm: NetworkManager Not tainted 5.15.0-1003-intel-iotg [ 10.363956] Hardware name: ADLINK Technology Inc. LEC-EL/LEC-EL, BIOS 0.15.11 12/22/2021 [ 10.363958] Call Trace: [ 10.363960] <TASK> [ 10.363963] dump_stack_lvl+0x4a/0x5f [ 10.363971] dump_stack+0x10/0x12 [ 10.363974] ubsan_epilogue+0x9/0x45 [ 10.363976] __ubsan_handle_shift_out_of_bounds.cold+0x61/0x10e [ 10.363979] ? wake_up_klogd+0x4a/0x50 [ 10.363983] ? vprintk_emit+0x8f/0x240 [ 10.363986] dwmac4_map_mtl_dma.cold+0x42/0x91 [stmmac] [ 10.364001] stmmac_mtl_configuration+0x1ce/0x7a0 [stmmac] [ 10.364009] ? dwmac410_dma_init_channel+0x70/0x70 [stmmac] [ 10.364020] stmmac_hw_setup.cold+0xf/0xb14 [stmmac] [ 10.364030] ? page_pool_alloc_pages+0x4d/0x70 [ 10.364034] ? stmmac_clear_tx_descriptors+0x6e/0xe0 [stmmac] [ 10.364042] stmmac_open+0x39e/0x920 [stmmac] [ 10.364050] __dev_open+0xf0/0x1a0 [ 10.364054] __dev_change_flags+0x188/0x1f0 [ 10.364057] dev_change_flags+0x26/0x60 [ 10.364059] do_setlink+0x908/0xc40 [ 10.364062] ? do_setlink+0xb10/0xc40 [ 10.364064] ? __nla_validate_parse+0x4c/0x1a0 [ 10.364068] __rtnl_newlink+0x597/0xa10 [ 10.364072] ? __nla_reserve+0x41/0x50 [ 10.364074] ? __kmalloc_node_track_caller+0x1d0/0x4d0 [ 10.364079] ? pskb_expand_head+0x75/0x310 [ 10.364082] ? nla_reserve_64bit+0x21/0x40 [ 10.364086] ? skb_free_head+0x65/0x80 [ 10.364089] ? security_sock_rcv_skb+0x2c/0x50 [ 10.364094] ? __cond_resched+0x19/0x30 [ 10.364097] ? kmem_cache_alloc_trace+0x15a/0x420 [ 10.364100] rtnl_newlink+0x49/0x70
Quoted 5 lines
This change fixes
MTL_RXQ_DMA_MAP1mask issue and channel/queue mapping warning.Fixes d43042f4da3e ("net: stmmac: mapping mtl rx to dma channel")Signed-off-by Junxiao Chang <[email protected]>
Thanks for addressing it, maybe a:
would be courteous.
Signature · 1 line
Florian
There are two problems in Cedric's buglink(https://bugzilla.kernel.org/show_bug.cgi?id=216195):
1. There is UBSAN shift out ouf bounds warning.
2. Ethernet PHY GPY115B error and no IP addr.
I suppose my patch could fix 1st issue, not sure it could fix issue 2 or not. I will update patch and append
Thanks,
Junxiao
-----Original Message-----
From: Florian Fainelli <[email protected]>
Sent: Friday, July 15, 2022 9:44 AM
To: Chang, Junxiao <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Cedric Wassenaar <[email protected]>
Subject: Re: [PATCH 1/2] net: stmmac: fix dma queue left shift overflow issue
Quoted 42 lines · Junxiao Chang
When queue number is > 4, left shift overflows due to 32 bits integer variable. Mask calculation is wrong for
MTL_RXQ_DMA_MAP1.If
CONFIG_UBSANis enabled, kernel dumps below warning:[ 10.363842] ================================================================== [ 10.363882] UBSAN: shift-out-of-bounds in /build/linux-intel-iotg-5.15-8e6Tf4/ linux-intel-iotg-5.15-5.15.0/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c:224:12 [ 10.363929] shift exponent 40 is too large for 32-bit type 'unsigned int' [ 10.363953] CPU: 1 PID: 599 Comm: NetworkManager Not tainted 5.15.0-1003-intel-iotg [ 10.363956] Hardware name: ADLINK Technology Inc. LEC-EL/LEC-EL, BIOS 0.15.11 12/22/2021 [ 10.363958] Call Trace: [ 10.363960] <TASK> [ 10.363963] dump_stack_lvl+0x4a/0x5f [ 10.363971] dump_stack+0x10/0x12 [ 10.363974] ubsan_epilogue+0x9/0x45 [ 10.363976] __ubsan_handle_shift_out_of_bounds.cold+0x61/0x10e [ 10.363979] ? wake_up_klogd+0x4a/0x50 [ 10.363983] ? vprintk_emit+0x8f/0x240 [ 10.363986] dwmac4_map_mtl_dma.cold+0x42/0x91 [stmmac] [ 10.364001] stmmac_mtl_configuration+0x1ce/0x7a0 [stmmac] [ 10.364009] ? dwmac410_dma_init_channel+0x70/0x70 [stmmac] [ 10.364020] stmmac_hw_setup.cold+0xf/0xb14 [stmmac] [ 10.364030] ? page_pool_alloc_pages+0x4d/0x70 [ 10.364034] ? stmmac_clear_tx_descriptors+0x6e/0xe0 [stmmac] [ 10.364042] stmmac_open+0x39e/0x920 [stmmac] [ 10.364050] __dev_open+0xf0/0x1a0 [ 10.364054] __dev_change_flags+0x188/0x1f0 [ 10.364057] dev_change_flags+0x26/0x60 [ 10.364059] do_setlink+0x908/0xc40 [ 10.364062] ? do_setlink+0xb10/0xc40 [ 10.364064] ? __nla_validate_parse+0x4c/0x1a0 [ 10.364068] __rtnl_newlink+0x597/0xa10 [ 10.364072] ? __nla_reserve+0x41/0x50 [ 10.364074] ? __kmalloc_node_track_caller+0x1d0/0x4d0 [ 10.364079] ? pskb_expand_head+0x75/0x310 [ 10.364082] ? nla_reserve_64bit+0x21/0x40 [ 10.364086] ? skb_free_head+0x65/0x80 [ 10.364089] ? security_sock_rcv_skb+0x2c/0x50 [ 10.364094] ? __cond_resched+0x19/0x30 [ 10.364097] ? kmem_cache_alloc_trace+0x15a/0x420 [ 10.364100] rtnl_newlink+0x49/0x70
Quoted 5 lines
This change fixes
MTL_RXQ_DMA_MAP1mask issue and channel/queue mapping warning.Fixes d43042f4da3e ("net: stmmac: mapping mtl rx to dma channel")Signed-off-by Junxiao Chang <[email protected]>
Thanks for addressing it, maybe a:
would be courteous.
--
Florian
(please do not top post)
Quoted 5 lines · Junxiao
There are two problems in Cedric's buglink(https://bugzilla.kernel.org/show_bug.cgi?id=216195):
1. There is UBSAN shift out ouf bounds warning.
2. Ethernet PHY GPY115B error and no IP addr.I suppose my patch could fix 1st issue, not sure it could fix issue 2 or not.
Agreed, I think those are two unrelated problems your patch does definitively fix the undefined behavior. Thanks!
Quoted 72 lines
I will update patch and append
Reported-by Cedric Wassenaar <[email protected]>Thanks,
Junxiao-----Original Message-----
From: Florian Fainelli <[email protected]>
Sent: Friday, July 15, 2022 9:44 AM
To: Chang, Junxiao <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Cedric Wassenaar <[email protected]>
Subject: Re: [PATCH 1/2] net: stmmac: fix dma queue left shift overflow issueQuoted 42 lines · Junxiao Chang
When queue number is > 4, left shift overflows due to 32 bits integer variable. Mask calculation is wrong for
MTL_RXQ_DMA_MAP1.If
CONFIG_UBSANis enabled, kernel dumps below warning:[ 10.363842] ================================================================== [ 10.363882] UBSAN: shift-out-of-bounds in /build/linux-intel-iotg-5.15-8e6Tf4/ linux-intel-iotg-5.15-5.15.0/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c:224:12 [ 10.363929] shift exponent 40 is too large for 32-bit type 'unsigned int' [ 10.363953] CPU: 1 PID: 599 Comm: NetworkManager Not tainted 5.15.0-1003-intel-iotg [ 10.363956] Hardware name: ADLINK Technology Inc. LEC-EL/LEC-EL, BIOS 0.15.11 12/22/2021 [ 10.363958] Call Trace: [ 10.363960] <TASK> [ 10.363963] dump_stack_lvl+0x4a/0x5f [ 10.363971] dump_stack+0x10/0x12 [ 10.363974] ubsan_epilogue+0x9/0x45 [ 10.363976] __ubsan_handle_shift_out_of_bounds.cold+0x61/0x10e [ 10.363979] ? wake_up_klogd+0x4a/0x50 [ 10.363983] ? vprintk_emit+0x8f/0x240 [ 10.363986] dwmac4_map_mtl_dma.cold+0x42/0x91 [stmmac] [ 10.364001] stmmac_mtl_configuration+0x1ce/0x7a0 [stmmac] [ 10.364009] ? dwmac410_dma_init_channel+0x70/0x70 [stmmac] [ 10.364020] stmmac_hw_setup.cold+0xf/0xb14 [stmmac] [ 10.364030] ? page_pool_alloc_pages+0x4d/0x70 [ 10.364034] ? stmmac_clear_tx_descriptors+0x6e/0xe0 [stmmac] [ 10.364042] stmmac_open+0x39e/0x920 [stmmac] [ 10.364050] __dev_open+0xf0/0x1a0 [ 10.364054] __dev_change_flags+0x188/0x1f0 [ 10.364057] dev_change_flags+0x26/0x60 [ 10.364059] do_setlink+0x908/0xc40 [ 10.364062] ? do_setlink+0xb10/0xc40 [ 10.364064] ? __nla_validate_parse+0x4c/0x1a0 [ 10.364068] __rtnl_newlink+0x597/0xa10 [ 10.364072] ? __nla_reserve+0x41/0x50 [ 10.364074] ? __kmalloc_node_track_caller+0x1d0/0x4d0 [ 10.364079] ? pskb_expand_head+0x75/0x310 [ 10.364082] ? nla_reserve_64bit+0x21/0x40 [ 10.364086] ? skb_free_head+0x65/0x80 [ 10.364089] ? security_sock_rcv_skb+0x2c/0x50 [ 10.364094] ? __cond_resched+0x19/0x30 [ 10.364097] ? kmem_cache_alloc_trace+0x15a/0x420 [ 10.364100] rtnl_newlink+0x49/0x70Quoted 5 lines
This change fixes
MTL_RXQ_DMA_MAP1mask issue and channel/queue mapping warning.Fixes d43042f4da3e ("net: stmmac: mapping mtl rx to dma channel")Signed-off-by Junxiao Chang <[email protected]>Thanks for addressing it, maybe a:
Reported-by Cedric Wassenaar <[email protected]>would be courteous.
--
Florian
Signature · 1 line
Florian