On 18/08/2021 15:27, James Bottomley wrote:
On Wed, 2021-08-18 at 21:53 +0800, John Garry wrote:The driver does not compile under DEBUG_QLA1280 flag, so fix up with as little fuss as possible some debug statements. Also delete ql1280_dump_device(), which looks to have never been referenced. Signed-off-by: John Garry<john.garry@xxxxxxxxxx> --- drivers/scsi/qla1280.c | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index b4f7d8d7a01c..27b16ec399cd 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -2807,7 +2807,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)dprintk(2, "start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd,sp, cmd->cmnd[0], (long)CMD_HANDLE(sp->cmd)); - dprintk(2, " bus %i, target %i, lun %i\n", + dprintk(2, " bus %i, target %i, lun %lld\n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd)); qla1280_dump_buffer(2, cmd->cmnd, MAX_COMMAND_SIZE);@@ -2879,7 +2879,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host*ha, struct srb * sp) remseg--; } dprintk(5, "qla1280_64bit_start_scsi: Scatter/gather " - "command packet data - b %i, t %i, l %i \n", + "command packet data - b %i, t %i, l %lld \n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
Hi James,
These are the wrong fixes, I think. The qla1280 can only cope with 32 bits, which is why all the macros have an _32.
Looking structures like struct cmd_entry, mrk_entry, ecmd_entry, lun member is an 8-bit value. There is also this definition:
#define MAX_LUNS 8 /* 32 */ #define MAX_L_BITS 3 /* 5 */But not sure on where 32/5 comes from - I suppose it's the size the driver uses to hold the lun. Or the 32 bits you mention.
Over the years we've expanded the values in the SCSI command to be 64 bit but by and large, the truncation in this driver is silent. However, the correct fix should be to make the truncation explicit in the macro, so #define SCSI_LUN_32(Cmnd) ((int)Cmnd->device->lun)
SCSI_LUN_32 is used outside the masked debug code, so I didn't want to mess with that.
And the same for all the other _32 macros. This avoids the unexpected outcome that the _32 macros are actually returning 64 bits and cause me to do a WTF at your %lld change.
If a relevant scsi_device member really hold values > 32b in size for this driver then it's in trouble, as chopping off the top bits by casting won't help.
And if we only ever expect the bottom 32b to be used, using %lld as opposed to casting to an int and using %i should not really make a difference.
Anyway, I can change as you suggest. But I would rather do it only in SCSI_LUN_32().
Thanks!
