mirror of
https://github.com/winfsp/winfsp.git
synced 2025-04-23 00:43:00 -05:00
sys: IRP_MJ_READ, IRP_MJ_WRITE: do not block user-mode file system thread for FlushAndPurge
This commit is contained in:
parent
15f39c3ca8
commit
b44c6d64db
@ -12,7 +12,8 @@ static NTSTATUS FspFsvolReadCached(
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
|
||||
BOOLEAN CanWait);
|
||||
static NTSTATUS FspFsvolReadNonCached(
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp);
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
|
||||
BOOLEAN CanWait);
|
||||
FSP_IOPREP_DISPATCH FspFsvolReadPrepare;
|
||||
FSP_IOCMPL_DISPATCH FspFsvolReadComplete;
|
||||
static FSP_IOP_REQUEST_FINI FspFsvolReadNonCachedRequestFini;
|
||||
@ -77,7 +78,7 @@ static NTSTATUS FspFsvolRead(
|
||||
!FlagOn(Irp->Flags, IRP_PAGING_IO | IRP_NOCACHE))
|
||||
Result = FspFsvolReadCached(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
|
||||
else
|
||||
Result = FspFsvolReadNonCached(FsvolDeviceObject, Irp, IrpSp);
|
||||
Result = FspFsvolReadNonCached(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
|
||||
|
||||
return Result;
|
||||
}
|
||||
@ -190,7 +191,8 @@ cleanup:
|
||||
}
|
||||
|
||||
static NTSTATUS FspFsvolReadNonCached(
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp)
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
|
||||
BOOLEAN CanWait)
|
||||
{
|
||||
PAGED_CODE();
|
||||
|
||||
@ -204,8 +206,10 @@ static NTSTATUS FspFsvolReadNonCached(
|
||||
LARGE_INTEGER ReadOffset = IrpSp->Parameters.Read.ByteOffset;
|
||||
ULONG ReadLength = IrpSp->Parameters.Read.Length;
|
||||
ULONG ReadKey = IrpSp->Parameters.Read.Key;
|
||||
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
|
||||
FSP_FSCTL_FILE_INFO FileInfo;
|
||||
FSP_FSCTL_TRANSACT_REQ *Request;
|
||||
BOOLEAN Success;
|
||||
|
||||
ASSERT(FileNode == FileDesc->FileNode);
|
||||
|
||||
@ -228,10 +232,42 @@ static NTSTATUS FspFsvolReadNonCached(
|
||||
return Result;
|
||||
}
|
||||
|
||||
/* acquire FileNode exclusive Full */
|
||||
Success = DEBUGTEST(90, TRUE) &&
|
||||
FspFileNodeTryAcquireExclusiveF(FileNode, FspFileNodeAcquireFull, CanWait);
|
||||
if (!Success)
|
||||
return FspWqRepostIrpWorkItem(Irp, FspFsvolReadNonCached, 0);
|
||||
|
||||
/* if this is a non-cached transfer on a cached file then flush the file */
|
||||
if (!PagingIo && 0 != FileObject->SectionObjectPointer->DataSectionObject)
|
||||
{
|
||||
if (!CanWait)
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return FspWqRepostIrpWorkItem(Irp, FspFsvolReadNonCached, 0);
|
||||
}
|
||||
|
||||
Result = FspFileNodeFlushAndPurgeCache(FileNode,
|
||||
IrpSp->Parameters.Read.ByteOffset.QuadPart,
|
||||
IrpSp->Parameters.Read.Length,
|
||||
FALSE);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
}
|
||||
|
||||
/* convert FileNode to shared */
|
||||
FspFileNodeConvertExclusiveToShared(FileNode, Full);
|
||||
|
||||
/* create request */
|
||||
Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolReadNonCachedRequestFini, &Request);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
|
||||
Request->Kind = FspFsctlTransactReadKind;
|
||||
Request->Req.Read.UserContext = FileNode->UserContext;
|
||||
@ -240,6 +276,9 @@ static NTSTATUS FspFsvolReadNonCached(
|
||||
Request->Req.Read.Length = ReadLength;
|
||||
Request->Req.Read.Key = ReadKey;
|
||||
|
||||
FspFileNodeSetOwner(FileNode, Full, Request);
|
||||
FspIopRequestContext(Request, RequestIrp) = Irp;
|
||||
|
||||
return FSP_STATUS_IOQ_POST;
|
||||
}
|
||||
|
||||
@ -249,54 +288,16 @@ NTSTATUS FspFsvolReadPrepare(
|
||||
PAGED_CODE();
|
||||
|
||||
NTSTATUS Result;
|
||||
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
|
||||
PFILE_OBJECT FileObject = IrpSp->FileObject;
|
||||
FSP_FILE_NODE *FileNode = FileObject->FsContext;
|
||||
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
|
||||
FSP_SAFE_MDL *SafeMdl = 0;
|
||||
PVOID Address;
|
||||
PEPROCESS Process;
|
||||
BOOLEAN FlushCache;
|
||||
BOOLEAN Success;
|
||||
|
||||
FlushCache = !PagingIo && 0 != FileObject->SectionObjectPointer->DataSectionObject;
|
||||
/* !!!: DataSectionObject accessed outside a lock. Hmmm! */
|
||||
|
||||
if (FlushCache)
|
||||
Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
|
||||
else
|
||||
Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireShared(FileNode, Full);
|
||||
if (!Success)
|
||||
{
|
||||
FspIopRetryPrepareIrp(Irp, &Result);
|
||||
return Result;
|
||||
}
|
||||
|
||||
/* if this is a non-cached transfer on a cached file then flush the file */
|
||||
if (FlushCache)
|
||||
{
|
||||
Result = FspFileNodeFlushAndPurgeCache(FileNode,
|
||||
IrpSp->Parameters.Read.ByteOffset.QuadPart,
|
||||
IrpSp->Parameters.Read.Length,
|
||||
FALSE);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
|
||||
FspFileNodeConvertExclusiveToShared(FileNode, Full);
|
||||
}
|
||||
|
||||
/* create a "safe" MDL if necessary */
|
||||
if (!FspSafeMdlCheck(Irp->MdlAddress))
|
||||
{
|
||||
Result = FspSafeMdlCreate(Irp->MdlAddress, IoWriteAccess, &SafeMdl);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return STATUS_INSUFFICIENT_RESOURCES;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
/* map the MDL into user-mode */
|
||||
@ -306,7 +307,6 @@ NTSTATUS FspFsvolReadPrepare(
|
||||
if (0 != SafeMdl)
|
||||
FspSafeMdlDelete(SafeMdl);
|
||||
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
|
||||
@ -316,8 +316,6 @@ NTSTATUS FspFsvolReadPrepare(
|
||||
|
||||
Request->Req.Read.Address = (UINT64)(UINT_PTR)Address;
|
||||
|
||||
FspFileNodeSetOwner(FileNode, Full, Request);
|
||||
FspIopRequestContext(Request, RequestIrp) = Irp;
|
||||
FspIopRequestContext(Request, RequestSafeMdl) = SafeMdl;
|
||||
FspIopRequestContext(Request, RequestAddress) = Address;
|
||||
FspIopRequestContext(Request, RequestProcess) = Process;
|
||||
|
19
src/sys/wq.c
19
src/sys/wq.c
@ -67,6 +67,7 @@ static VOID FspWqWorkRoutine(PVOID Context)
|
||||
{
|
||||
PIRP Irp = Context;
|
||||
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
|
||||
PDEVICE_OBJECT DeviceObject = IrpSp->DeviceObject;
|
||||
FSP_FSCTL_TRANSACT_REQ *RequestWorkItem = FspIrpRequest(Irp);
|
||||
FSP_WQ_REQUEST_WORK *WorkRoutine = (FSP_WQ_REQUEST_WORK *)(UINT_PTR)
|
||||
FspIopRequestContext(RequestWorkItem, FspWqRequestWorkRoutine);
|
||||
@ -74,10 +75,26 @@ static VOID FspWqWorkRoutine(PVOID Context)
|
||||
|
||||
IoSetTopLevelIrp(Irp);
|
||||
|
||||
Result = WorkRoutine(IrpSp->DeviceObject, Irp, IrpSp, TRUE);
|
||||
Result = WorkRoutine(DeviceObject, Irp, IrpSp, TRUE);
|
||||
if (STATUS_PENDING != Result)
|
||||
{
|
||||
ASSERT(0 == (FSP_STATUS_PRIVATE_BIT & Result) ||
|
||||
FSP_STATUS_IOQ_POST == Result || FSP_STATUS_IOQ_POST_BEST_EFFORT == Result);
|
||||
|
||||
DEBUGLOGIRP(Irp, Result);
|
||||
|
||||
if (FSP_STATUS_PRIVATE_BIT & Result)
|
||||
{
|
||||
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension =
|
||||
FspFsvolDeviceExtension(DeviceObject);
|
||||
if (!FspIoqPostIrpEx(FsvolDeviceExtension->Ioq, Irp,
|
||||
FSP_STATUS_IOQ_POST_BEST_EFFORT == Result, &Result))
|
||||
{
|
||||
DEBUGLOG("FspIoqPostIrpEx = %s", NtStatusSym(Result));
|
||||
FspIopCompleteIrp(Irp, Result);
|
||||
}
|
||||
}
|
||||
else
|
||||
FspIopCompleteIrp(Irp, Result);
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,8 @@ static NTSTATUS FspFsvolWriteCached(
|
||||
BOOLEAN CanWait);
|
||||
static VOID FspFsvolWriteCachedDeferred(PVOID Context1, PVOID Context2);
|
||||
static NTSTATUS FspFsvolWriteNonCached(
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp);
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
|
||||
BOOLEAN CanWait);
|
||||
FSP_IOPREP_DISPATCH FspFsvolWritePrepare;
|
||||
FSP_IOCMPL_DISPATCH FspFsvolWriteComplete;
|
||||
static FSP_IOP_REQUEST_FINI FspFsvolWriteNonCachedRequestFini;
|
||||
@ -77,7 +78,7 @@ static NTSTATUS FspFsvolWrite(
|
||||
!FlagOn(Irp->Flags, IRP_PAGING_IO | IRP_NOCACHE))
|
||||
Result = FspFsvolWriteCached(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
|
||||
else
|
||||
Result = FspFsvolWriteNonCached(FsvolDeviceObject, Irp, IrpSp);
|
||||
Result = FspFsvolWriteNonCached(FsvolDeviceObject, Irp, IrpSp, IoIsOperationSynchronous(Irp));
|
||||
|
||||
return Result;
|
||||
}
|
||||
@ -235,7 +236,8 @@ static VOID FspFsvolWriteCachedDeferred(PVOID Context1, PVOID Context2)
|
||||
}
|
||||
|
||||
static NTSTATUS FspFsvolWriteNonCached(
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp)
|
||||
PDEVICE_OBJECT FsvolDeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp,
|
||||
BOOLEAN CanWait)
|
||||
{
|
||||
PAGED_CODE();
|
||||
|
||||
@ -254,6 +256,7 @@ static NTSTATUS FspFsvolWriteNonCached(
|
||||
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
|
||||
FSP_FSCTL_FILE_INFO FileInfo;
|
||||
FSP_FSCTL_TRANSACT_REQ *Request;
|
||||
BOOLEAN Success;
|
||||
|
||||
ASSERT(FileNode == FileDesc->FileNode);
|
||||
|
||||
@ -295,46 +298,21 @@ static NTSTATUS FspFsvolWriteNonCached(
|
||||
return Result;
|
||||
}
|
||||
|
||||
/* create request */
|
||||
Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolWriteNonCachedRequestFini, &Request);
|
||||
if (!NT_SUCCESS(Result))
|
||||
return Result;
|
||||
|
||||
Request->Kind = FspFsctlTransactWriteKind;
|
||||
Request->Req.Write.UserContext = FileNode->UserContext;
|
||||
Request->Req.Write.UserContext2 = FileDesc->UserContext2;
|
||||
Request->Req.Write.Offset = WriteOffset.QuadPart;
|
||||
Request->Req.Write.Length = WriteLength;
|
||||
Request->Req.Write.Key = WriteKey;
|
||||
|
||||
return FSP_STATUS_IOQ_POST;
|
||||
}
|
||||
|
||||
NTSTATUS FspFsvolWritePrepare(
|
||||
PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request)
|
||||
{
|
||||
PAGED_CODE();
|
||||
|
||||
NTSTATUS Result;
|
||||
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
|
||||
PFILE_OBJECT FileObject = IrpSp->FileObject;
|
||||
FSP_FILE_NODE *FileNode = FileObject->FsContext;
|
||||
BOOLEAN PagingIo = BooleanFlagOn(Irp->Flags, IRP_PAGING_IO);
|
||||
FSP_SAFE_MDL *SafeMdl = 0;
|
||||
PVOID Address;
|
||||
PEPROCESS Process;
|
||||
BOOLEAN Success;
|
||||
|
||||
Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
|
||||
/* acquire FileNode exclusive Full */
|
||||
Success = DEBUGTEST(90, TRUE) &&
|
||||
FspFileNodeTryAcquireExclusiveF(FileNode, FspFileNodeAcquireFull, CanWait);
|
||||
if (!Success)
|
||||
{
|
||||
FspIopRetryPrepareIrp(Irp, &Result);
|
||||
return Result;
|
||||
}
|
||||
return FspWqRepostIrpWorkItem(Irp, FspFsvolWriteNonCached, 0);
|
||||
|
||||
/* if this is a non-cached transfer on a cached file then flush and purge the file */
|
||||
if (!PagingIo && 0 != FileObject->SectionObjectPointer->DataSectionObject)
|
||||
{
|
||||
if (!CanWait)
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return FspWqRepostIrpWorkItem(Irp, FspFsvolWriteNonCached, 0);
|
||||
}
|
||||
|
||||
Result = FspFileNodeFlushAndPurgeCache(FileNode,
|
||||
IrpSp->Parameters.Write.ByteOffset.QuadPart,
|
||||
IrpSp->Parameters.Write.Length,
|
||||
@ -346,15 +324,43 @@ NTSTATUS FspFsvolWritePrepare(
|
||||
}
|
||||
}
|
||||
|
||||
/* create request */
|
||||
Result = FspIopCreateRequestEx(Irp, 0, 0, FspFsvolWriteNonCachedRequestFini, &Request);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
|
||||
Request->Kind = FspFsctlTransactWriteKind;
|
||||
Request->Req.Write.UserContext = FileNode->UserContext;
|
||||
Request->Req.Write.UserContext2 = FileDesc->UserContext2;
|
||||
Request->Req.Write.Offset = WriteOffset.QuadPart;
|
||||
Request->Req.Write.Length = WriteLength;
|
||||
Request->Req.Write.Key = WriteKey;
|
||||
|
||||
FspFileNodeSetOwner(FileNode, Full, Request);
|
||||
FspIopRequestContext(Request, RequestIrp) = Irp;
|
||||
|
||||
return FSP_STATUS_IOQ_POST;
|
||||
}
|
||||
|
||||
NTSTATUS FspFsvolWritePrepare(
|
||||
PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request)
|
||||
{
|
||||
PAGED_CODE();
|
||||
|
||||
NTSTATUS Result;
|
||||
FSP_SAFE_MDL *SafeMdl = 0;
|
||||
PVOID Address;
|
||||
PEPROCESS Process;
|
||||
|
||||
/* create a "safe" MDL if necessary */
|
||||
if (!FspSafeMdlCheck(Irp->MdlAddress))
|
||||
{
|
||||
Result = FspSafeMdlCreate(Irp->MdlAddress, IoReadAccess, &SafeMdl);
|
||||
if (!NT_SUCCESS(Result))
|
||||
{
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return STATUS_INSUFFICIENT_RESOURCES;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
/* map the MDL into user-mode */
|
||||
@ -364,7 +370,6 @@ NTSTATUS FspFsvolWritePrepare(
|
||||
if (0 != SafeMdl)
|
||||
FspSafeMdlDelete(SafeMdl);
|
||||
|
||||
FspFileNodeRelease(FileNode, Full);
|
||||
return Result;
|
||||
}
|
||||
|
||||
@ -374,8 +379,6 @@ NTSTATUS FspFsvolWritePrepare(
|
||||
|
||||
Request->Req.Write.Address = (UINT64)(UINT_PTR)Address;
|
||||
|
||||
FspFileNodeSetOwner(FileNode, Full, Request);
|
||||
FspIopRequestContext(Request, RequestIrp) = Irp;
|
||||
FspIopRequestContext(Request, RequestSafeMdl) = SafeMdl;
|
||||
FspIopRequestContext(Request, RequestAddress) = Address;
|
||||
FspIopRequestContext(Request, RequestProcess) = Process;
|
||||
|
Loading…
x
Reference in New Issue
Block a user