[hbelusca] 70511: [USB(E|O|U)HCI]: Handle failure cases of BuildTransferDescriptorChain. By contributor 'vgal'. This is needed for gracefully handling failure cases hit during diagnosing CORE-8046....
Author: hbelusca Date: Wed Jan 6 23:43:38 2016 New Revision: 70511
URL: http://svn.reactos.org/svn/reactos?rev=70511&view=rev Log: [USB(E|O|U)HCI]: Handle failure cases of BuildTransferDescriptorChain. By contributor 'vgal'. This is needed for gracefully handling failure cases hit during diagnosing CORE-8046. CORE-10776
Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp
Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_req... ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -836,13 +836,14 @@ // // first allocate the queue head // - Status = CreateQueueHead(&QueueHead); + Status = CreateQueueHead(&QueueHead); if (!NT_SUCCESS(Status)) { // // failed to allocate queue head // - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("[EHCI] Failed to create queue head\n"); + return Status; }
// @@ -856,11 +857,12 @@ Status = BuildSetupPacket(); if (!NT_SUCCESS(Status)) { - // - // failed to allocate setup packet - // - ASSERT(FALSE); - return STATUS_INSUFFICIENT_RESOURCES; + // failed to create setup packet + DPRINT1("[EHCI] Failed to create setup packet\n"); + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; }
// @@ -869,10 +871,17 @@ Status = CreateDescriptor(&SetupDescriptor); if (!NT_SUCCESS(Status)) { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); + // failed to create setup transfer descriptor + DPRINT1("[EHCI] Failed to create setup descriptor\n"); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); return Status; }
@@ -882,10 +891,20 @@ Status = CreateDescriptor(&StatusDescriptor); if (!NT_SUCCESS(Status)) { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); + // failed to create status transfer descriptor + DPRINT1("[EHCI] Failed to create status descriptor\n"); + + // release setup transfer descriptor + m_DmaManager->Release(SetupDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); return Status; }
@@ -928,11 +947,28 @@ &LastDescriptor, NULL, &DescriptorChainLength); - - // - // FIXME handle errors - // - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + // failed to create descriptor chain + DPRINT1("[EHCI] Failed to create status descriptor\n"); + + // release status transfer descriptor + m_DmaManager->Release(StatusDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + // release setup transfer descriptor + m_DmaManager->Release(SetupDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; + } + if (m_TransferBufferLength != DescriptorChainLength) { DPRINT1("DescriptorChainLength %x\n", DescriptorChainLength); @@ -1075,13 +1111,13 @@ // Allocate the queue head // Status = CreateQueueHead(&QueueHead); - if (!NT_SUCCESS(Status)) { // - // failed to allocate queue heads - // - return STATUS_INSUFFICIENT_RESOURCES; + // failed to allocate queue head + // + DPRINT1("[EHCI] Failed to create queue head\n"); + return Status; }
// @@ -1128,13 +1164,20 @@ &LastDescriptor, &m_EndpointDescriptor->DataToggle, &ChainDescriptorLength); + if (!NT_SUCCESS(Status)) + { + // + // failed to build transfer descriptor chain + // + DPRINT1("[EHCI] Failed to create descriptor chain\n"); + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; + }
// // move to next offset // m_TransferBufferLengthCompleted += ChainDescriptorLength; - - ASSERT(Status == STATUS_SUCCESS);
// // init queue head @@ -1228,7 +1271,6 @@ // allocate queue head // Status = m_DmaManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysicalAddress); - if (!NT_SUCCESS(Status)) { //
Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_req... ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -1288,6 +1288,14 @@ &FirstDescriptor, &LastDescriptor, &ChainDescriptorLength); + if (!NT_SUCCESS(Status)) + { + // + // failed to build transfer descriptor chain + // + m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + return Status; + }
// // move to next offset
Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_req... ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -1008,7 +1008,7 @@ Status = BuildQueueHead(&QueueHead); if (!NT_SUCCESS(Status)) { - // failed to allocate descriptor + // failed to allocate queue head DPRINT1("[UHCI] Failed to create queue head\n"); return Status; } @@ -1040,6 +1040,15 @@ &LastDescriptor, &ChainDescriptorLength, NULL); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create descriptor chain\n"); + m_DmaManager->Release(QueueHead, sizeof(UHCI_QUEUE_HEAD)); + return Status; + }
// adjust buffer offset m_TransferBufferLengthCompleted += ChainDescriptorLength; @@ -1076,7 +1085,7 @@ if (!NT_SUCCESS(Status)) { // - // failed to allocate descriptor + // failed to allocate queue head // DPRINT1("[UHCI] Failed to create queue head\n"); return Status;
-
hbelusca＠svn.reactos.org