scsi: mpi3mr: reduce stack usage in mpi3mr_refresh_sas_ports()
Subsystems (2)
PATCH v2 1/1 scsi: mpi3mr: reduce stack usage in mpi3mr_refresh_sas_ports()
From: Arnd Bergmann <[email protected]>
Doubling the number of PHYs also doubled the stack usage of this function, exceeding the 32-bit limit of 1024 bytes:
drivers/scsi/mpi3mr/mpi3mr_transport.c: In function 'mpi3mr_refresh_sas_ports':drivers/scsi/mpi3mr/mpi3mr_transport.c:1818:1: error: the frame size of 1636 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
Since the sas_io_unit_pg0 structure is already allocated dynamically, use the same method here. The size of the allocation can be smaller based on the actual number of phys now, so use this as an upper bound.
---
v2: fix number of ports to be always 64 rather than num_phys
--- drivers/scsi/mpi3mr/mpi3mr_transport.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_transport.c +6 -1
@@ -1671,7 +1671,7 @@ mpi3mr_update_mr_sas_port(struct mpi3mr_ioc *mrioc, struct host_port *h_port,void mpi3mr_refresh_sas_ports (struct mpi3mr_ioc *mrioc) { -struct host_port h_port[64 ]; +struct host_port *h_port =NULL ;int i, j, found, host_port_count =0 , port_idx;u16 sz, attached_handle, ioc_status;struct mpi3_sas_io_unit_page0 *sas_io_unit_pg0 =NULL ;
@@ -1685,6 +1685,10 @@ mpi3mr_refresh_sas_ports(struct mpi3mr_ioc *mrioc) sas_io_unit_pg0 =kzalloc (sz,GFP_KERNEL );if (!sas_io_unit_pg0)return ; + h_port =kcalloc (64 ,sizeof (struct host_port ),GFP_KERNEL ); +if (!h_port) + goto out; +if (mpi3mr_cfg_get_sas_io_unit_pg0 (mrioc, sas_io_unit_pg0, sz)) {ioc_err (mrioc,"failure at %s:%d/%s()!\n" , __FILE__, __LINE__, __func__);
@@ -1814,6 +1818,7 @@ mpi3mr_refresh_sas_ports(struct mpi3mr_ioc *mrioc) } } out: +kfree (h_port);kfree (sas_io_unit_pg0); }
Signature · 1 line
2.39.2
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Doubling the number of PHYs also doubled the stack usage of this function, exceeding the 32-bit limit of 1024 bytes:
drivers/scsi/mpi3mr/mpi3mr_transport.c: In function 'mpi3mr_refresh_sas_ports':drivers/scsi/mpi3mr/mpi3mr_transport.c:1818:1: error: the frame size of 1636 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
Quoted 8 lines
Since the
sas_io_unit_pg0structure is already allocated dynamically, use the same method here. The size of the allocation can be smaller based on the actual number of phys now, so use this as an upper bound.Fixes cb5b60894602 ("scsi: mpi3mr: Increase maximum number of PHYs to 64 from 32")Reviewed-by Johannes Thumshirn <[email protected]>Cc Sathya Prakash Veerichetty <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Has this patch been missed?
I have this same build issue for i386 allmodconfig on v6.8-rc5 and earlier
John,
Quoted 5 lines
Has this patch been missed?
I have this same build issue for i386 allmodconfig on v6.8-rc5 and earlier
Broadcom requested changes and I haven't seen a v3.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 10 lines · Martin K. Petersen
John,
Quoted 5 lines
Has this patch been missed?
I have this same build issue for i386 allmodconfig on v6.8-rc5 and earlier
Broadcom requested changes and I haven't seen a v3.
From checking the history, changes were requested for the v1, and Arnd addressed them in this v2. Since then, there has been no activity.
Thanks,
John
Martin K. Petersen
AppliedJohn,
Quoted 4 lines
Quoted 1 line
Broadcom requested changes and I haven't seen a v3.
From checking the history, changes were requested for the v1, and Arnd addressed them in this v2. Since then, there has been no activity.
Interesting. For some reason I kept getting the previous version when I queried this patch.
Applied to 6.8/scsi-fixes, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 11 lines · Arnd Bergmann
Doubling the number of PHYs also doubled the stack usage of this function, exceeding the 32-bit limit of 1024 bytes:
drivers/scsi/mpi3mr/mpi3mr_transport.c: In function 'mpi3mr_refresh_sas_ports':drivers/scsi/mpi3mr/mpi3mr_transport.c:1818:1: error: the frame size of 1636 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]Since the
sas_io_unit_pg0structure is already allocated dynamically, use the same method here. The size of the allocation can be smaller based on the actual number of phys now, so use this as an upper bound.[...]
Applied to 6.8/scsi-fixes, thanks!
[1/1] scsi: mpi3mr: reduce stack usage in mpi3mr_refresh_sas_ports()
https://git.kernel.org/mkp/scsi/c/5cc2da0b60e5
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering