net/mlx5: don't build with CONFIG_CPUMASK_OFFSTACK
Subsystems (4)
RFC PATCH 1/1 net/mlx5: don't build with CONFIG_CPUMASK_OFFSTACK
From: Arnd Bergmann <[email protected]>
Local cpumask_t variables must be wrapped with alloc_cpumask_var() or similar helpers, to allow building with ridiculous values of CONFIG_NR_CPUS:
drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function ‘comp_irq_request_sf’:drivers/net/ethernet/mellanox/mlx5/core/eq.c:897:1: error: the frame size of 8560 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c: In function ‘mlx5_ctrl_irq_request’:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c:494:1: error: the frame size of 8544 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c: In function ‘mlx5_irq_request_vector’:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c:561:1: error: the frame size of 8560 bytes is larger than 1536 bytes [-Werror=frame-larger-than=] drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c: In function ‘irq_pool_request_irq’:drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c:74:1: error: the frame size of 8544 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]
The mlx5 driver used to do this correctly in the past, but was changed to use local 'irq_affinity_desc' structures in at least four places, which ends up having the mask on the stack again.
It is not easily possible to use alloc_cpumask_var() again without reverting that patch, so work around this by disallowing this drivers on kernels that rely on CONFIG_CPUMASK_OFFSTACK.
---
This is probably not a great idea since most enterprise distros do enable both CPUMASK_OFFSTACK and MLX5, and any ideas for how to sort this out better would be helpful.
I mainly tried setting CONFIG_NR_CPUS to an unrealistic value for my own compile testing, to see which files run into this problem. I have managed to come up with better fixes for the other three I found, but not this one.
--- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/Kconfig +1 -0
@@ -8,6 +8,7 @@ config MLX5_CORE depends on PCI select AUXILIARY_BUS select NET_DEVLINK + depends on !CPUMASK_OFFSTACK depends on VXLAN || !VXLAN depends on MLXFW || !MLXFW depends on PTP_1588_CLOCK_OPTIONAL
Signature · 1 line
2.39.5
Quoted 29 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Local
cpumask_tvariables must be wrapped withalloc_cpumask_var()or similar helpers, to allow building with ridiculous values ofCONFIG_NR_CPUS:
drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function ‘comp_irq_request_sf’:drivers/net/ethernet/mellanox/mlx5/core/eq.c:897:1: error: the frame size of 8560 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c: In function ‘mlx5_ctrl_irq_request’:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c:494:1: error: the frame size of 8544 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c: In function ‘mlx5_irq_request_vector’:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c:561:1: error: the frame size of 8560 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c: In function ‘irq_pool_request_irq’:drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c:74:1: error: the frame size of 8544 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]The mlx5 driver used to do this correctly in the past, but was changed to use local '
irq_affinity_desc' structures in at least four places, which ends up having the mask on the stack again.It is not easily possible to use
alloc_cpumask_var()again without reverting that patch, so work around this by disallowing this drivers on kernels that rely onCONFIG_CPUMASK_OFFSTACK.Fixes bbac70c74183 ("net/mlx5: Use newer affinity descriptor")Signed-off-by Arnd Bergmann <[email protected]>---
This is probably not a great idea since most enterprise distros do enable bothCPUMASK_OFFSTACKand MLX5, and any ideas for how to sort this out better would be helpful.
Quoted 8 lines
I mainly tried setting
CONFIG_NR_CPUSto an unrealistic value for my own compile testing, to see which files run into this problem. I have managed to come up with better fixes for the other three I found, but not this one.--- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+)
Thanks for the catch! We will look into this and provide a proper patch.
Thanks,
Dragos