Skip to content

Commit

Permalink
Revert "RedirectorStrategy: Ensure there are no short buffers on read"
Browse files Browse the repository at this point in the history
This reverts commit 32aadcb.

Reverting commit because a regression was discovered on some devices.

Signed-off-by: Dmitry Fleytman <[email protected]>
  • Loading branch information
Dmitry Fleytman committed Dec 25, 2015
1 parent 51ca127 commit 3b1f461
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 84 deletions.
61 changes: 2 additions & 59 deletions UsbDk/RedirectorStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,6 @@ typedef struct tag_USBDK_REDIRECTOR_REQUEST_CONTEXT

WDFMEMORY LockedIsochronousPacketsArray;
WDFMEMORY LockedIsochronousResultsArray;

WDFMEMORY ShadowBuffer;
PVOID ShadowBufferPtr;
} USBDK_REDIRECTOR_REQUEST_CONTEXT, *PUSBDK_REDIRECTOR_REQUEST_CONTEXT;

class CRedirectorRequest : public CWdfRequest
Expand Down Expand Up @@ -611,52 +608,6 @@ void CUsbDkRedirectorStrategy::TraceTransferError(const CRedirectorRequest &WdfR
DataBuffer.Size());
}

bool CUsbDkRedirectorStrategy::SupplyMaxPacketSizeShadowBuffer(CRedirectorRequest &WdfRequest,
PUSBDK_REDIRECTOR_REQUEST_CONTEXT RequestContext)
{
CPreAllocatedWdfMemoryBuffer OrigBuffer(RequestContext->LockedBuffer);
auto MaxPacketSize = m_Target.GetPipeMaxPacketSize(RequestContext->EndpointAddress);

if (OrigBuffer.Size() < MaxPacketSize)
{
TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_REDIRECTOR,
"%!FUNC! Going to allocate shadow buffer of %llu bytes intead of %llu bytes for pipe %llu",
MaxPacketSize, OrigBuffer.Size(), RequestContext->EndpointAddress);

auto status = WdfMemoryCreate(WDF_NO_OBJECT_ATTRIBUTES,
NonPagedPool,
'MBSU',
MaxPacketSize,
&RequestContext->ShadowBuffer,
&RequestContext->ShadowBufferPtr);
if (!NT_SUCCESS(status))
{
TraceEvents(TRACE_LEVEL_ERROR, TRACE_REDIRECTOR,
"%!FUNC! Failed to allocate shadow buffer of %llu bytes: %!STATUS!", MaxPacketSize, status);

WdfRequest.SetStatus(status);
return false;
}
}

return true;
}

void CUsbDkRedirectorStrategy::RetireMaxPacketSizeShadowBuffer(PUSBDK_REDIRECTOR_REQUEST_CONTEXT RequestContext)
{
if (RequestContext->ShadowBufferPtr != nullptr)
{
ASSERT(RequestContext->Direction == UsbDkTransferDirection::Read);

ASSERT((RequestContext->TransferType == BulkTransferType) ||
(RequestContext->TransferType == InterruptTransferType));

CPreAllocatedWdfMemoryBuffer OrigBuffer(RequestContext->LockedBuffer);
RtlCopyMemory(OrigBuffer.Ptr(), RequestContext->ShadowBufferPtr, OrigBuffer.Size());
WdfObjectDelete(RequestContext->ShadowBuffer);
}
}

void CUsbDkRedirectorStrategy::ReadPipe(WDFREQUEST Request)
{
CRedirectorRequest WdfRequest(Request);
Expand All @@ -680,14 +631,7 @@ void CUsbDkRedirectorStrategy::ReadPipe(WDFREQUEST Request)
case BulkTransferType:
case InterruptTransferType:
{
if (!SupplyMaxPacketSizeShadowBuffer(WdfRequest, Context))
{
break;
}

auto DataBuffer = (Context->ShadowBufferPtr != nullptr) ? Context->ShadowBuffer : Context->LockedBuffer;

m_Target.ReadPipeAsync(WdfRequest.Detach(), Context->EndpointAddress, DataBuffer,
m_Target.ReadPipeAsync(WdfRequest.Detach(), Context->EndpointAddress, Context->LockedBuffer,
[](WDFREQUEST Request, WDFIOTARGET, PWDF_REQUEST_COMPLETION_PARAMS Params, WDFCONTEXT)
{
auto status = Params->IoStatus.Status;
Expand All @@ -699,11 +643,10 @@ void CUsbDkRedirectorStrategy::ReadPipe(WDFREQUEST Request)
TraceTransferError(WdfRequest, status, usbCompletionParams->UsbdStatus);
}

RetireMaxPacketSizeShadowBuffer(WdfRequest.Context());

CompleteTransferRequest(WdfRequest, status,
usbCompletionParams->UsbdStatus,
usbCompletionParams->Parameters.PipeRead.Length);

});
}
break;
Expand Down
5 changes: 0 additions & 5 deletions UsbDk/RedirectorStrategy.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class CUsbDkRedirectorQueueConfig : public CWdfSpecificQueue
};

class CRedirectorRequest;
typedef struct tag_USBDK_REDIRECTOR_REQUEST_CONTEXT *PUSBDK_REDIRECTOR_REQUEST_CONTEXT;

class CUsbDkRedirectorStrategy : public CUsbDkFilterStrategy
{
Expand Down Expand Up @@ -117,10 +116,6 @@ class CUsbDkRedirectorStrategy : public CUsbDkFilterStrategy
NTSTATUS Status,
USBD_STATUS UsbdStatus);

bool SupplyMaxPacketSizeShadowBuffer(CRedirectorRequest &WdfRequest,
PUSBDK_REDIRECTOR_REQUEST_CONTEXT RequestContext);
static void RetireMaxPacketSizeShadowBuffer(PUSBDK_REDIRECTOR_REQUEST_CONTEXT RequestContext);

CWdfUsbTarget m_Target;

CUsbDkRedirectorQueueData m_IncomingDataQueue;
Expand Down
14 changes: 1 addition & 13 deletions UsbDk/UsbTarget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ void CWdfUsbPipe::Create(WDFUSBDEVICE Device, WDFUSBINTERFACE Interface, UCHAR P

m_Pipe = WdfUsbInterfaceGetConfiguredPipe(m_Interface, PipeIndex, &m_Info);
ASSERT(m_Pipe != nullptr);
WdfUsbTargetPipeSetNoMaximumPacketSizeCheck(m_Pipe);

TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_USBTARGET,
"%!FUNC! Created pipe #%d, "
Expand Down Expand Up @@ -332,19 +333,6 @@ void CWdfUsbTarget::ReadPipeAsync(WDFREQUEST Request, ULONG64 EndpointAddress, W
}
}

size_t CWdfUsbTarget::GetPipeMaxPacketSize(ULONG64 EndpointAddress)
{
size_t res;

if (!DoPipeOperation<CWdfUsbInterface::SharedLock>(EndpointAddress, [&res](CWdfUsbPipe &Pipe) { res = Pipe.MaxPacketSize(); }))
{
TraceEvents(TRACE_LEVEL_ERROR, TRACE_USBTARGET, "%!FUNC! Failed because pipe was not found");
return 0;
}

return res;
}

void CWdfUsbTarget::ReadIsochronousPipeAsync(WDFREQUEST Request, ULONG64 EndpointAddress, WDFMEMORY Buffer,
PULONG64 PacketSizes, size_t PacketNumber,
PFN_WDF_REQUEST_COMPLETION_ROUTINE Completion)
Expand Down
8 changes: 1 addition & 7 deletions UsbDk/UsbTarget.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ class CWdfUsbPipe : public CAllocatable<NonPagedPool, 'PUHR'>
return m_Info.EndpointAddress;
}

size_t MaxPacketSize() const
{
return m_Info.MaximumPacketSize;
}

private:
WDFUSBINTERFACE m_Interface = WDF_NO_HANDLE;
WDFUSBDEVICE m_Device = WDF_NO_HANDLE;
Expand All @@ -81,7 +76,6 @@ class CWdfUsbPipe : public CAllocatable<NonPagedPool, 'PUHR'>
PULONG64 PacketSizes,
size_t PacketNumber,
PFN_WDF_REQUEST_COMPLETION_ROUTINE Completion);

CWdfUsbPipe(const CWdfUsbPipe&) = delete;
CWdfUsbPipe& operator= (const CWdfUsbPipe&) = delete;
};
Expand Down Expand Up @@ -164,7 +158,7 @@ class CWdfUsbTarget
NTSTATUS AbortPipe(WDFREQUEST Request, ULONG64 EndpointAddress);
NTSTATUS ResetPipe(WDFREQUEST Request, ULONG64 EndpointAddress);
NTSTATUS ResetDevice(WDFREQUEST Request);
size_t GetPipeMaxPacketSize(ULONG64 EndpointAddress);

private:
void TracePipeNotFoundError(ULONG64 EndpointAddress);

Expand Down

0 comments on commit 3b1f461

Please sign in to comment.