The patch works for us. Regards, Bo Yang -----Original Message----- From: Yang, Bo Sent: Friday, October 24, 2008 9:31 AM To: 'FUJITA Tomonori'; pterjan@xxxxxxxxx; James.Bottomley@xxxxxxxxxxxxxxxxxxxxx Cc: bharrosh@xxxxxxxxxxx; matthew@xxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx; linux-scsi@xxxxxxxxxxxxxxx; Patro, Sumant; bugme-daemon@xxxxxxxxxxxxxxxxxxx; Austria, Winston Subject: RE: [Bugme-new] [Bug 11792] New: Oops when reading /proc/megaraid/hba0/diskdrives-ch* Tom, I will update you as soon as LSI verifies it. Not today, next week will be safe. Regards, Bo Yang -----Original Message----- From: FUJITA Tomonori [mailto:fujita.tomonori@xxxxxxxxxxxxx] Sent: Thursday, October 23, 2008 8:21 PM To: pterjan@xxxxxxxxx; James.Bottomley@xxxxxxxxxxxxxxxxxxxxx Cc: fujita.tomonori@xxxxxxxxxxxxx; bharrosh@xxxxxxxxxxx; matthew@xxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx; linux-scsi@xxxxxxxxxxxxxxx; Patro, Sumant; Yang, Bo; bugme-daemon@xxxxxxxxxxxxxxxxxxx Subject: Re: [Bugme-new] [Bug 11792] New: Oops when reading /proc/megaraid/hba0/diskdrives-ch* On Fri, 24 Oct 2008 00:49:07 +0200 "Pascal Terjan" <pterjan@xxxxxxxxx> wrote: > On Wed, Oct 22, 2008 at 2:33 PM, FUJITA Tomonori > <fujita.tomonori@xxxxxxxxxxxxx> wrote: > > > > diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c > > index 28c9da7..7dc62de 100644 > > --- a/drivers/scsi/megaraid.c > > +++ b/drivers/scsi/megaraid.c > > @@ -4402,6 +4402,10 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) > > scb_t *scb; > > int rval; > > > > + scmd = scsi_allocate_command(GFP_KERNEL); > > + if (!scmd) > > + return -ENOMEM; > > + > > /* > > * The internal commands share one command id and hence are > > * serialized. This is so because we want to reserve maximum number of > > @@ -4412,12 +4416,11 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) > > scb = &adapter->int_scb; > > memset(scb, 0, sizeof(scb_t)); > > > > - scmd = &adapter->int_scmd; > > - memset(scmd, 0, sizeof(Scsi_Cmnd)); > > - > > sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); > > scmd->device = sdev; > > > > + memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb)); > > + scmd->cmnd = adapter->int_cdb; > > scmd->device->host = adapter->host; > > scmd->host_scribble = (void *)scb; > > scmd->cmnd[0] = MEGA_INTERNAL_CMD; > > @@ -4456,6 +4459,8 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) > > > > mutex_unlock(&adapter->int_mtx); > > > > + scsi_free_command(GFP_KERNEL, scmd); > > + > > return rval; > > } > > > > diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h > > index ee70bd4..795201f 100644 > > --- a/drivers/scsi/megaraid.h > > +++ b/drivers/scsi/megaraid.h > > @@ -888,8 +888,8 @@ typedef struct { > > > > u8 sglen; /* f/w supported scatter-gather list length */ > > > > + unsigned char int_cdb[MAX_COMMAND_SIZE]; > > scb_t int_scb; > > - Scsi_Cmnd int_scmd; > > struct mutex int_mtx; /* To synchronize the internal > > commands */ > > struct completion int_waitq; /* wait queue for internal > > > > I confirm that this patch fixes the oops and I can now read the usual info Thanks! LSI people, can I get the ack on this? = From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Subject: [PATCH] megaraid: fix mega_internal_command oops scsi_cmnd->cmnd was changed from a static array to a pointer post 2.6.25. It breaks mega_internal_command(): static int mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) { ... scb = &adapter->int_scb; memset(scb, 0, sizeof(scb_t)); scmd = &adapter->int_scmd; memset(scmd, 0, sizeof(Scsi_Cmnd)); sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); scmd->device = sdev; scmd->device->host = adapter->host; scmd->host_scribble = (void *)scb; scmd->cmnd[0] = MEGA_INTERNAL_CMD; mega_internal_command() uses scsi_cmnd allocated internally so scmd->cmnd is NULL here. This patch adds a static array for cdb to adapter_t and uses it here. This also uses scsi_allocate_command/scsi_free_command, the recommended way to allocate struct scsi_cmnd since the driver might use sense_buffer in struct scsi_cmnd. Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Reviewed-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx> Tested-by: Pascal Terjan <pterjan@xxxxxxxxx> Reported-by: Pascal Terjan <pterjan@xxxxxxxxx> --- drivers/scsi/megaraid.c | 11 ++++++++--- drivers/scsi/megaraid.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 28c9da7..7dc62de 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -4402,6 +4402,10 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) scb_t *scb; int rval; + scmd = scsi_allocate_command(GFP_KERNEL); + if (!scmd) + return -ENOMEM; + /* * The internal commands share one command id and hence are * serialized. This is so because we want to reserve maximum number of @@ -4412,12 +4416,11 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) scb = &adapter->int_scb; memset(scb, 0, sizeof(scb_t)); - scmd = &adapter->int_scmd; - memset(scmd, 0, sizeof(Scsi_Cmnd)); - sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); scmd->device = sdev; + memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb)); + scmd->cmnd = adapter->int_cdb; scmd->device->host = adapter->host; scmd->host_scribble = (void *)scb; scmd->cmnd[0] = MEGA_INTERNAL_CMD; @@ -4456,6 +4459,8 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) mutex_unlock(&adapter->int_mtx); + scsi_free_command(GFP_KERNEL, scmd); + return rval; } diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index ee70bd4..795201f 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h @@ -888,8 +888,8 @@ typedef struct { u8 sglen; /* f/w supported scatter-gather list length */ + unsigned char int_cdb[MAX_COMMAND_SIZE]; scb_t int_scb; - Scsi_Cmnd int_scmd; struct mutex int_mtx; /* To synchronize the internal commands */ struct completion int_waitq; /* wait queue for internal -- 1.5.5.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
