tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg ScsiDiskDxe: Raise the Tpl of async IO callback to TPL_NOTIFY 

When reading data from non-blockingly from a CD-ROM logic partition, the
procedure can be shown by the following call stack:
(The write process is similar)

|-------------------|
| DiskIoDxe (logic) |<---Raise Tpl to TPL_CALLBACK
|-------------------|
 |
 | Sub-task 1 (UnderRun) succeeds
 |
 |    |-----------------|     |-----------------|     |-----------------|
 +--->|  PartitionDxe   |---->| DiskIoDxe (Phy) |---->|   ScsiDiskDxe   |
 |    |-----------------|     |-----------------|     |-----------------|
 |
 | Sub-task 2 (OverRun) fails
 |
 |    |-----------------|     |-----------------|     |-----------------|
 +--->|  PartitionDxe   |---->| DiskIoDxe (Phy) |---->|   ScsiDiskDxe   |
 |    |-----------------|     |-----------------|     |-----------------|
 |                                     ^
 |                                     |
 More subtasks...              Wait indefinitely
 |
 |<---Restore Tpl
 |
 Completes

In PartitionDxe, if the 'Lba' and 'BufferSize' parameters passed to
function PartitionReadBlocksEx() are invalid, the function will issue a
blocking ReadDisk call (in function ProbeMediaStatusEx()).

In DiskIoDxe, blocking I/O request will wait for all the non-blocking I/O
requests to complete first before sending down the blocking request.

If the Tpl of the async I/O callback in ScsiDiskDxe is TPL_CALLBACK and
Sub-task 1 (UnderRun) succeeds but Sub-task 2 (OverRun) fails with an
invalid parameter, DiskIoDxe will wait indefinitely for the event created
by ScsiDiskDxe of Sub-task 1 to signal.

Hence, this commit will raise the Tpl of async IO callback in ScsiDiskDxe
to TPL_NOTIFY so that the indefinite wait in DiskIoDxe can be avoided.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19452 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Hao Wu 2015-12-22 13:57:42 +00:00 committed by hwu1225
parent d7617bad96
commit a717086c5f
2 changed files with 105 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
View File

@ -2609,6 +2609,7 @@ ScsiDiskAsyncReadSectors (
UINT64 Timeout;
SCSI_BLKIO2_REQUEST *BlkIo2Req;
EFI_STATUS Status;
EFI_TPL OldTpl;
if ((Token == NULL) || (Token->Event == NULL)) {
return EFI_INVALID_PARAMETER;
@ -2620,7 +2621,11 @@ ScsiDiskAsyncReadSectors (
}
BlkIo2Req->Token = Token;
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&ScsiDiskDevice->BlkIo2Queue, &BlkIo2Req->Link);
gBS->RestoreTPL (OldTpl);
InitializeListHead (&BlkIo2Req->ScsiRWQueue);
Status = EFI_SUCCESS;
@ -2727,6 +2732,7 @@ ScsiDiskAsyncReadSectors (
}
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
//
// Free the SCSI_BLKIO2_REQUEST structure only when there is no other
@ -2735,19 +2741,25 @@ ScsiDiskAsyncReadSectors (
//
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
BlkIo2Req = NULL;
gBS->RestoreTPL (OldTpl);
//
// It is safe to return error status to the caller, since there is no
// previous SCSI sub-task executing.
//
return EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
goto Done;
} else {
gBS->RestoreTPL (OldTpl);
//
// There are previous SCSI commands still running, EFI_SUCCESS should
// be returned to make sure that the caller does not free resources
// still using by these SCSI commands.
//
return EFI_SUCCESS;
Status = EFI_SUCCESS;
goto Done;
}
}
@ -2761,7 +2773,24 @@ ScsiDiskAsyncReadSectors (
BlocksRemaining -= SectorCount;
}
return EFI_SUCCESS;
Status = EFI_SUCCESS;
Done:
if (BlkIo2Req != NULL) {
BlkIo2Req->LastScsiRW = TRUE;
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
BlkIo2Req = NULL;
gBS->SignalEvent (Token->Event);
}
gBS->RestoreTPL (OldTpl);
}
return Status;
}
/**
@ -2797,6 +2826,7 @@ ScsiDiskAsyncWriteSectors (
UINT64 Timeout;
SCSI_BLKIO2_REQUEST *BlkIo2Req;
EFI_STATUS Status;
EFI_TPL OldTpl;
if ((Token == NULL) || (Token->Event == NULL)) {
return EFI_INVALID_PARAMETER;
@ -2808,7 +2838,11 @@ ScsiDiskAsyncWriteSectors (
}
BlkIo2Req->Token = Token;
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&ScsiDiskDevice->BlkIo2Queue, &BlkIo2Req->Link);
gBS->RestoreTPL (OldTpl);
InitializeListHead (&BlkIo2Req->ScsiRWQueue);
Status = EFI_SUCCESS;
@ -2915,6 +2949,7 @@ ScsiDiskAsyncWriteSectors (
}
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
//
// Free the SCSI_BLKIO2_REQUEST structure only when there is no other
@ -2923,19 +2958,25 @@ ScsiDiskAsyncWriteSectors (
//
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
BlkIo2Req = NULL;
gBS->RestoreTPL (OldTpl);
//
// It is safe to return error status to the caller, since there is no
// previous SCSI sub-task executing.
//
return EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
goto Done;
} else {
gBS->RestoreTPL (OldTpl);
//
// There are previous SCSI commands still running, EFI_SUCCESS should
// be returned to make sure that the caller does not free resources
// still using by these SCSI commands.
//
return EFI_SUCCESS;
Status = EFI_SUCCESS;
goto Done;
}
}
@ -2949,7 +2990,24 @@ ScsiDiskAsyncWriteSectors (
BlocksRemaining -= SectorCount;
}
return EFI_SUCCESS;
Status = EFI_SUCCESS;
Done:
if (BlkIo2Req != NULL) {
BlkIo2Req->LastScsiRW = TRUE;
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
BlkIo2Req = NULL;
gBS->SignalEvent (Token->Event);
}
gBS->RestoreTPL (OldTpl);
}
return Status;
}
@ -3713,7 +3771,8 @@ Retry:
Exit:
RemoveEntryList (&Request->Link);
if (IsListEmpty (&Request->BlkIo2Req->ScsiRWQueue)) {
if ((IsListEmpty (&Request->BlkIo2Req->ScsiRWQueue)) &&
(Request->BlkIo2Req->LastScsiRW)) {
//
// The last SCSI R/W command of a BlockIo2 request completes
//
@ -3763,6 +3822,7 @@ ScsiDiskAsyncRead10 (
EFI_STATUS Status;
SCSI_ASYNC_RW_REQUEST *Request;
EFI_EVENT AsyncIoEvent;
EFI_TPL OldTpl;
AsyncIoEvent = NULL;
@ -3770,7 +3830,10 @@ ScsiDiskAsyncRead10 (
if (Request == NULL) {
return EFI_OUT_OF_RESOURCES;
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);
gBS->RestoreTPL (OldTpl);
Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));
Request->SenseData = AllocateZeroPool (Request->SenseDataLength);
@ -3793,7 +3856,7 @@ ScsiDiskAsyncRead10 (
//
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
TPL_CALLBACK,
TPL_NOTIFY,
ScsiDiskNotify,
Request,
&AsyncIoEvent
@ -3831,7 +3894,10 @@ ErrorExit:
FreePool (Request->SenseData);
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
RemoveEntryList (&Request->Link);
gBS->RestoreTPL (OldTpl);
FreePool (Request);
}
@ -3875,6 +3941,7 @@ ScsiDiskAsyncWrite10 (
EFI_STATUS Status;
SCSI_ASYNC_RW_REQUEST *Request;
EFI_EVENT AsyncIoEvent;
EFI_TPL OldTpl;
AsyncIoEvent = NULL;
@ -3882,7 +3949,10 @@ ScsiDiskAsyncWrite10 (
if (Request == NULL) {
return EFI_OUT_OF_RESOURCES;
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);
gBS->RestoreTPL (OldTpl);
Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));
Request->SenseData = AllocateZeroPool (Request->SenseDataLength);
@ -3905,7 +3975,7 @@ ScsiDiskAsyncWrite10 (
//
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
TPL_CALLBACK,
TPL_NOTIFY,
ScsiDiskNotify,
Request,
&AsyncIoEvent
@ -3943,7 +4013,10 @@ ErrorExit:
FreePool (Request->SenseData);
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
RemoveEntryList (&Request->Link);
gBS->RestoreTPL (OldTpl);
FreePool (Request);
}
@ -3987,6 +4060,7 @@ ScsiDiskAsyncRead16 (
EFI_STATUS Status;
SCSI_ASYNC_RW_REQUEST *Request;
EFI_EVENT AsyncIoEvent;
EFI_TPL OldTpl;
AsyncIoEvent = NULL;
@ -3994,7 +4068,10 @@ ScsiDiskAsyncRead16 (
if (Request == NULL) {
return EFI_OUT_OF_RESOURCES;
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);
gBS->RestoreTPL (OldTpl);
Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));
Request->SenseData = AllocateZeroPool (Request->SenseDataLength);
@ -4017,7 +4094,7 @@ ScsiDiskAsyncRead16 (
//
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
TPL_CALLBACK,
TPL_NOTIFY,
ScsiDiskNotify,
Request,
&AsyncIoEvent
@ -4055,7 +4132,10 @@ ErrorExit:
FreePool (Request->SenseData);
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
RemoveEntryList (&Request->Link);
gBS->RestoreTPL (OldTpl);
FreePool (Request);
}
@ -4099,6 +4179,7 @@ ScsiDiskAsyncWrite16 (
EFI_STATUS Status;
SCSI_ASYNC_RW_REQUEST *Request;
EFI_EVENT AsyncIoEvent;
EFI_TPL OldTpl;
AsyncIoEvent = NULL;
@ -4106,7 +4187,10 @@ ScsiDiskAsyncWrite16 (
if (Request == NULL) {
return EFI_OUT_OF_RESOURCES;
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
InsertTailList (&BlkIo2Req->ScsiRWQueue, &Request->Link);
gBS->RestoreTPL (OldTpl);
Request->SenseDataLength = (UINT8) (6 * sizeof (EFI_SCSI_SENSE_DATA));
Request->SenseData = AllocateZeroPool (Request->SenseDataLength);
@ -4129,7 +4213,7 @@ ScsiDiskAsyncWrite16 (
//
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
TPL_CALLBACK,
TPL_NOTIFY,
ScsiDiskNotify,
Request,
&AsyncIoEvent
@ -4167,7 +4251,10 @@ ErrorExit:
FreePool (Request->SenseData);
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
RemoveEntryList (&Request->Link);
gBS->RestoreTPL (OldTpl);
FreePool (Request);
}

8
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
View File

@ -98,7 +98,13 @@ typedef struct {
typedef struct {
EFI_BLOCK_IO2_TOKEN *Token;
//
// The queue for Scsi Read/Write requests of a BlockIo2
// The flag indicates if the last Scsi Read/Write sub-task for a BlockIo2
// request is sent to device
//
BOOLEAN LastScsiRW;
//
// The queue for Scsi Read/Write sub-tasks of a BlockIo2 request
//
LIST_ENTRY ScsiRWQueue;