megasas: fix mapped frame size
PATCH RESEND 1/1 megasas: fix mapped frame size
the current value of 1024 bytes (16 * MFI_FRAME_SIZE) we map is not enough to hold the maximum number of scatter gather elements we advertise. We actually need a maximum of 2048 bytes. This is 128 max sg elements * 16 bytes (sizeof (union mfi_sgl)).
Signed-off-by Peter Lieven <[email protected]>
Reviewed-by Hannes Reinecke <[email protected]>
--- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/scsi/megasas.c +1 -1
@@ -477,7 +477,7 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *s, {PCIDevice *pcid =PCI_DEVICE (s);MegasasCmd *cmd =NULL ; -int frame_size =MFI_FRAME_SIZE *16 ; +int frame_size =MEGASAS_MAX_SGE *sizeof (union mfi_sgl );hwaddr frame_size_p = frame_size;unsigned long index;
Signature · 1 line
2.17.1
Quoted 3 lines · Peter Lieven
the current value of 1024 bytes (16 *
MFI_FRAME_SIZE) we map is not enough to hold the maximum number of scatter gather elements we advertise. We actually need a maximum of 2048 bytes. This is 128 max sg elements * 16 bytes (sizeof (unionmfi_sgl)).
Looking at megasas_map_sgl(), we indeed accept up to MEGASAS_MAX_SGE iov_count. Broken since ever then?
Fixes e8f943c3bcc2
Quoted 4 lines
Signed-off-by Peter Lieven <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 18 lines
--- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/scsi/megasas.c +1
-1@@ -477,7 +477,7 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *s, {PCIDevice *pcid =PCI_DEVICE (s);MegasasCmd *cmd =NULL ; -int frame_size =MFI_FRAME_SIZE *16 ; +int frame_size =MEGASAS_MAX_SGE *sizeof (union mfi_sgl );hwaddr frame_size_p = frame_size;unsigned long index;