Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 02/03: [USBSTOR][SCSIPORT] Use STORAGE_ADAPTER_DESCRIPTOR from WIN8
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbe88e287f45ae0dead0d… commit cbe88e287f45ae0dead0d80f169a7e20e569480c Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Dec 6 01:57:56 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Dec 6 01:57:56 2020 +0300 [USBSTOR][SCSIPORT] Use STORAGE_ADAPTER_DESCRIPTOR from WIN8 This way, these drivers are more compatible with classpnp and cdrom used by ReactOS (and don't fire asserts) --- drivers/storage/port/scsiport/ioctl.c | 18 ++++++++-------- drivers/storage/port/scsiport/scsiport.h | 17 +++++++++++++++ drivers/usb/usbstor/disk.c | 37 ++++++++++++++++---------------- drivers/usb/usbstor/usbstor.h | 18 ++++++++++++++++ 4 files changed, 63 insertions(+), 27 deletions(-) diff --git a/drivers/storage/port/scsiport/ioctl.c b/drivers/storage/port/scsiport/ioctl.c index 7346f7f3228..b3a28416d09 100644 --- a/drivers/storage/port/scsiport/ioctl.c +++ b/drivers/storage/port/scsiport/ioctl.c @@ -335,7 +335,7 @@ FdoHandleQueryProperty( goto completeIrp; } - if (ioStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) + if (ioStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8)) { // buffer too small PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader = Irp->AssociatedIrp.SystemBuffer; @@ -343,8 +343,8 @@ FdoHandleQueryProperty( >= sizeof(STORAGE_DESCRIPTOR_HEADER)); // return required size - DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); - DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); + DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); status = STATUS_SUCCESS; @@ -352,14 +352,14 @@ FdoHandleQueryProperty( } // get adapter descriptor, information is returned in the same buffer - PSTORAGE_ADAPTER_DESCRIPTOR adapterDescriptor = Irp->AssociatedIrp.SystemBuffer; + PSTORAGE_ADAPTER_DESCRIPTOR_WIN8 adapterDescriptor = Irp->AssociatedIrp.SystemBuffer; // fill out descriptor - // NOTE: STORAGE_ADAPTER_DESCRIPTOR may vary in size, so it's important to zero out + // NOTE: STORAGE_ADAPTER_DESCRIPTOR_WIN8 may vary in size, so it's important to zero out // all unused fields - *adapterDescriptor = (STORAGE_ADAPTER_DESCRIPTOR) { - .Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR), - .Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR), + *adapterDescriptor = (STORAGE_ADAPTER_DESCRIPTOR_WIN8) { + .Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8), + .Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8), .MaximumTransferLength = portExt->PortCapabilities.MaximumTransferLength, .MaximumPhysicalPages = portExt->PortCapabilities.MaximumPhysicalPages, .AlignmentMask = portExt->PortCapabilities.AlignmentMask, @@ -373,7 +373,7 @@ FdoHandleQueryProperty( }; // store returned length - Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); status = STATUS_SUCCESS; completeIrp: diff --git a/drivers/storage/port/scsiport/scsiport.h b/drivers/storage/port/scsiport/scsiport.h index b2db80654f0..a81ef4cbb41 100644 --- a/drivers/storage/port/scsiport/scsiport.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -50,6 +50,23 @@ #define LUNEX_REQUEST_PENDING 0x0020 #define SCSI_PORT_SCAN_IN_PROGRESS 0x8000 +// we need this to be compatible with ReactOS' classpnp (which is compiled with NTDDI_WIN8) +typedef struct _STORAGE_ADAPTER_DESCRIPTOR_WIN8 { + ULONG Version; + ULONG Size; + ULONG MaximumTransferLength; + ULONG MaximumPhysicalPages; + ULONG AlignmentMask; + BOOLEAN AdapterUsesPio; + BOOLEAN AdapterScansDown; + BOOLEAN CommandQueueing; + BOOLEAN AcceleratedTransfer; + UCHAR BusType; + USHORT BusMajorVersion; + USHORT BusMinorVersion; + UCHAR SrbType; + UCHAR AddressType; +} STORAGE_ADAPTER_DESCRIPTOR_WIN8, *PSTORAGE_ADAPTER_DESCRIPTOR_WIN8; typedef enum _SCSI_PORT_TIMER_STATES { diff --git a/drivers/usb/usbstor/disk.c b/drivers/usb/usbstor/disk.c index 1e5bd1299fb..1dbe0ad83d8 100644 --- a/drivers/usb/usbstor/disk.c +++ b/drivers/usb/usbstor/disk.c @@ -230,7 +230,7 @@ USBSTOR_HandleQueryProperty( PIO_STACK_LOCATION IoStack; PSTORAGE_PROPERTY_QUERY PropertyQuery; PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader; - PSTORAGE_ADAPTER_DESCRIPTOR AdapterDescriptor; + PSTORAGE_ADAPTER_DESCRIPTOR_WIN8 AdapterDescriptor; ULONG FieldLengthVendor, FieldLengthProduct, FieldLengthRevision, TotalLength, FieldLengthSerialNumber; PPDO_DEVICE_EXTENSION PDODeviceExtension; PINQUIRYDATA InquiryData; @@ -375,39 +375,40 @@ USBSTOR_HandleQueryProperty( DPRINT("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8)) { // buffer too small DescriptorHeader = (PSTORAGE_DESCRIPTOR_HEADER)Irp->AssociatedIrp.SystemBuffer; ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(STORAGE_DESCRIPTOR_HEADER)); // return required size - DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); - DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); + DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); return STATUS_SUCCESS; } // get adapter descriptor, information is returned in the same buffer - AdapterDescriptor = (PSTORAGE_ADAPTER_DESCRIPTOR)Irp->AssociatedIrp.SystemBuffer; + AdapterDescriptor = Irp->AssociatedIrp.SystemBuffer; // fill out descriptor - AdapterDescriptor->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); - AdapterDescriptor->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); - AdapterDescriptor->MaximumTransferLength = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH; - AdapterDescriptor->MaximumPhysicalPages = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH / PAGE_SIZE + 1; // See CORE-10515 and CORE-10755 - AdapterDescriptor->AlignmentMask = 0; - AdapterDescriptor->AdapterUsesPio = FALSE; - AdapterDescriptor->AdapterScansDown = FALSE; - AdapterDescriptor->CommandQueueing = FALSE; - AdapterDescriptor->AcceleratedTransfer = FALSE; - AdapterDescriptor->BusType = BusTypeUsb; - AdapterDescriptor->BusMajorVersion = 0x2; //FIXME verify - AdapterDescriptor->BusMinorVersion = 0x00; //FIXME + // NOTE: STORAGE_ADAPTER_DESCRIPTOR_WIN8 may vary in size, so it's important to zero out + // all unused fields + *AdapterDescriptor = (STORAGE_ADAPTER_DESCRIPTOR_WIN8) { + .Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8), + .Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8), + .MaximumTransferLength = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH, + .MaximumPhysicalPages = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH / PAGE_SIZE + 1, // See CORE-10515 and CORE-10755 + .BusType = BusTypeUsb, + .BusMajorVersion = 2, //FIXME verify + .BusMinorVersion = 0 //FIXME + }; + + // __debugbreak(); // store returned length - Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR_WIN8); return STATUS_SUCCESS; } diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 71e90708311..318010f791e 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -169,6 +169,24 @@ typedef struct _ERRORHANDLER_WORKITEM_DATA PIRP Irp; } ERRORHANDLER_WORKITEM_DATA, *PERRORHANDLER_WORKITEM_DATA; +// we need this to be compatible with ReactOS' classpnp (which is compiled with NTDDI_WIN8) +typedef struct _STORAGE_ADAPTER_DESCRIPTOR_WIN8 { + ULONG Version; + ULONG Size; + ULONG MaximumTransferLength; + ULONG MaximumPhysicalPages; + ULONG AlignmentMask; + BOOLEAN AdapterUsesPio; + BOOLEAN AdapterScansDown; + BOOLEAN CommandQueueing; + BOOLEAN AcceleratedTransfer; + UCHAR BusType; + USHORT BusMajorVersion; + USHORT BusMinorVersion; + UCHAR SrbType; + UCHAR AddressType; +} STORAGE_ADAPTER_DESCRIPTOR_WIN8, *PSTORAGE_ADAPTER_DESCRIPTOR_WIN8; + //--------------------------------------------------------------------- //

1 0

[reactos] 01/03: [BOOTDATA] Fix boot (addendum to dd56e065bcb1cf366d7f6bf11d6ff9d37baf91e4)
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=139e8f530827ee6fb49b9… commit 139e8f530827ee6fb49b917a0c1ecd03d909eebd Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Dec 6 01:55:20 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Dec 6 01:55:20 2020 +0300 [BOOTDATA] Fix boot (addendum to dd56e065bcb1cf366d7f6bf11d6ff9d37baf91e4) - GenCdRom is actually required now to be in CDDB - Forgot to add partmgr registry keys CORE-6264 --- boot/bootdata/setupreg.inf | 1 - drivers/storage/partmgr/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf index 47d2d44a9ec..ed841fdd044 100644 --- a/boot/bootdata/setupreg.inf +++ b/boot/bootdata/setupreg.inf @@ -20,7 +20,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE" diff --git a/drivers/storage/partmgr/CMakeLists.txt b/drivers/storage/partmgr/CMakeLists.txt index 92a90931e06..275fc305fb4 100644 --- a/drivers/storage/partmgr/CMakeLists.txt +++ b/drivers/storage/partmgr/CMakeLists.txt @@ -15,5 +15,5 @@ add_library(partmgr MODULE add_pch(partmgr partmgr.h "${PCH_SKIP_SOURCE}") set_module_type(partmgr kernelmodedriver) add_importlibs(partmgr ntoskrnl hal) -# add_registry_inf(partmgr_reg.inf) +add_registry_inf(partmgr_reg.inf) add_cd_file(TARGET partmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[reactos] 01/01: [REACTOS] Enable PnP storage stack
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd56e065bcb1cf366d7f6… commit dd56e065bcb1cf366d7f6bf11d6ff9d37baf91e4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 20:36:29 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:30:43 2020 +0300 [REACTOS] Enable PnP storage stack - Use PnP storage class drivers - Make partmgr an upper filter driver for Disk class - Fill upper filters in txtsetup and usetup/devinst - Add cdrom driver to the critical device database CORE-6264 --- base/setup/usetup/devinst.c | 12 ++++++++++++ boot/bootdata/hivesys.inf | 11 +++++++++++ boot/bootdata/setupreg.inf | 1 + boot/bootdata/txtsetup.sif | 5 +++-- drivers/storage/class/CMakeLists.txt | 6 +++--- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index c9ca64dc949..5e5f4404f05 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -71,6 +71,7 @@ InstallDriver( UNICODE_STRING TypeU = RTL_CONSTANT_STRING(L"Type"); UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); PWSTR keyboardClass = L"kbdclass\0"; + PWSTR partMgr = L"partmgr\0"; UNICODE_STRING StringU; OBJECT_ATTRIBUTES ObjectAttributes; @@ -180,6 +181,7 @@ InstallDriver( INF_FreeData(ImagePath); + /* Add kbdclass and partmgr upper filters */ if (ClassGuid &&_wcsicmp(ClassGuid, L"{4D36E96B-E325-11CE-BFC1-08002BE10318}") == 0) { DPRINT1("Installing keyboard class driver for '%S'\n", DeviceId); @@ -190,6 +192,16 @@ InstallDriver( keyboardClass, (wcslen(keyboardClass) + 2) * sizeof(WCHAR)); } + else if (ClassGuid && _wcsicmp(ClassGuid, L"{4D36E967-E325-11CE-BFC1-08002BE10318}") == 0) + { + DPRINT1("Installing partition manager driver for '%S'\n", DeviceId); + NtSetValueKey(hDeviceKey, + &UpperFiltersU, + 0, + REG_MULTI_SZ, + partMgr, + (wcslen(partMgr) + 2) * sizeof(WCHAR)); + } INF_FreeData(ClassGuid); diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 8b1a02c38f1..518c8a666e9 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -47,6 +47,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Cla HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","Service",0x00000000,"usbhub" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","Service",0x00000000,"cdrom" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom","ClassGUID",0x00000000,"{4D36E965-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","Service",0x00000000,"disk" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","ClassGUID",0x00000000,"{4D36E967-E325-11CE-BFC1-08002BE10318}" @@ -343,6 +346,14 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-4445535400 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Icon",0x00000000,"-20" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","NoInstallClass",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Disk drives" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"DiskDrive" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-53" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"storprop.dll,DiskClassInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","SilentInstall",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"partmgr" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-3" diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf index ed841fdd044..47d2d44a9ec 100644 --- a/boot/bootdata/setupreg.inf +++ b/boot/bootdata/setupreg.inf @@ -20,6 +20,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 2668740ff53..4cc751b7834 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -99,7 +99,7 @@ c_437.nls = 1,,,,,,,2,,,,1,2 c_1252.nls = 1,,,,,,,2,,,,1,2 cdfs.sys = 1,,,,,,x,4,,,,1,4 cdrom.sys = 1,,,,,,x,4,,,,1,4 -class2.sys = 1,,,,,,x,4,,,,1,4 +classpnp.sys = 1,,,,,,x,4,,,,1,4 isapnp.sys = 1,,,,,,,4,,,,1,4 kdcom.dll = 1,,,,,,,2,,,,1,2 kdvbox.dll = 1,,,,,,,2,,,,1,2 @@ -135,6 +135,7 @@ ntdll.dll = 1,,,,,,,2,,,,1,2 wmilib.sys = 1,,,,,,,4,,,,1,4 ksecdd.sys = 1,,,,,,,4,,,,1,4 mountmgr.sys = 1,,,,,,x,4,,,,1,4 +partmgr.sys = 1,,,,,,x,4,,,,1,4 [SourceDisksFiles.x86] @@ -169,7 +170,7 @@ PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid,{4D36E96B-E325-11CE-BFC1-08002BE10318} USB\COMPOSITE = usbccgp -GenDisk = disk +GenDisk = disk,{4D36E967-E325-11CE-BFC1-08002BE10318} USB\Class_03 = hidusb GENERIC_HID_DEVICE = hidusb *PNP0303 = i8042prt,{4D36E96B-E325-11CE-BFC1-08002BE10318} diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt index a070202c0fe..1c275b94d48 100644 --- a/drivers/storage/class/CMakeLists.txt +++ b/drivers/storage/class/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(cdrom) -add_subdirectory(class2) -add_subdirectory(disk) +add_subdirectory(cdrom_new) +add_subdirectory(classpnp) +add_subdirectory(disk_new) add_subdirectory(ramdisk)

1 0

[reactos] 02/02: [SCSIPORT] Fix Sense request sending
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb155b4ea4f6e66231b17… commit fb155b4ea4f6e66231b17dcf5fc0938c1b0e9732 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Oct 28 15:20:23 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:28:54 2020 +0300 [SCSIPORT] Fix Sense request sending - Pass all SRB flags which Windows scsiport passes - Correctly reset the queue after completion This fixes the bug when MS cdrom driver hangs after media ejection --- drivers/storage/port/scsiport/scsi.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/scsi.c b/drivers/storage/port/scsiport/scsi.c index 29b683d10c0..6cfd1ba29f3 100644 --- a/drivers/storage/port/scsiport/scsi.c +++ b/drivers/storage/port/scsiport/scsi.c @@ -445,6 +445,9 @@ SpiSenseCompletionRoutine( _In_ PIRP Irp, _In_opt_ PVOID Context) { + PIO_STACK_LOCATION ioStack = IoGetNextIrpStackLocation(Irp); + PSCSI_PORT_LUN_EXTENSION lunExt = ioStack->DeviceObject->DeviceExtension; + PSCSI_PORT_DEVICE_EXTENSION portExt = lunExt->Common.LowerDevice->DeviceExtension; PSCSI_REQUEST_BLOCK Srb = (PSCSI_REQUEST_BLOCK)Context; PSCSI_REQUEST_BLOCK InitialSrb; PIRP InitialIrp; @@ -478,6 +481,26 @@ SpiSenseCompletionRoutine( /* Make sure initial SRB's queue is frozen */ ASSERT(InitialSrb->SrbStatus & SRB_STATUS_QUEUE_FROZEN); + // The queue is frozen, but the SRB had a SRB_FLAGS_NO_QUEUE_FREEZE => unfreeze the queue + if ((InitialSrb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE) && + (InitialSrb->SrbStatus & SRB_STATUS_QUEUE_FROZEN)) + { + KIRQL irql; + + KeAcquireSpinLock(&portExt->SpinLock, &irql); + + ASSERT(lunExt->Flags & LUNEX_FROZEN_QUEUE); + + lunExt->Flags &= ~LUNEX_FROZEN_QUEUE; + lunExt->Flags &= ~LUNEX_NEED_REQUEST_SENSE; + + // SpiGetNextRequestFromLun releases the lock + SpiGetNextRequestFromLun(portExt, lunExt); + KeLowerIrql(irql); + + InitialSrb->SrbStatus &= ~SRB_STATUS_QUEUE_FROZEN; + } + /* Complete this request */ IoCompleteRequest(InitialIrp, IO_DISK_INCREMENT); @@ -580,10 +603,16 @@ SpiSendRequestSense( Srb->SrbFlags = SRB_FLAGS_DATA_IN | SRB_FLAGS_BYPASS_FROZEN_QUEUE | SRB_FLAGS_DISABLE_DISCONNECT; - /* Transfer disable synch transfer flag */ + // pass some InitialSrb flags if (InitialSrb->SrbFlags & SRB_FLAGS_DISABLE_SYNCH_TRANSFER) Srb->SrbFlags |= SRB_FLAGS_DISABLE_SYNCH_TRANSFER; + if (InitialSrb->SrbFlags & SRB_FLAGS_BYPASS_LOCKED_QUEUE) + Srb->SrbFlags |= SRB_FLAGS_BYPASS_LOCKED_QUEUE; + + if (InitialSrb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE) + Srb->SrbFlags |= SRB_FLAGS_NO_QUEUE_FREEZE; + Srb->DataBuffer = InitialSrb->SenseInfoBuffer; /* Fill the transfer length */

1 0

[reactos] 01/02: [SCSIPORT] Make the driver PnP-aware
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a97c6e0aa92749a4c29f1… commit a97c6e0aa92749a4c29f180e42a63d0fdec1d2d4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Oct 28 02:42:56 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:28:54 2020 +0300 [SCSIPORT] Make the driver PnP-aware Basic functions are implemented in order to work in PnP stack, only legacy (non-pnp) miniport drivers are supported. Tested mostly with uniata CORE-17132 --- drivers/storage/port/scsiport/CMakeLists.txt | 17 +- drivers/storage/port/scsiport/fdo.c | 572 +++++++++++++------------ drivers/storage/port/scsiport/guid.c | 11 + drivers/storage/port/scsiport/ioctl.c | 495 +++++++++++++++++----- drivers/storage/port/scsiport/pdo.c | 595 ++++++++++++++++++++++++--- drivers/storage/port/scsiport/power.c | 41 ++ drivers/storage/port/scsiport/registry.c | 405 ++++++++---------- drivers/storage/port/scsiport/scsi.c | 204 ++++----- drivers/storage/port/scsiport/scsiport.c | 425 ++++++++++--------- drivers/storage/port/scsiport/scsiport.h | 192 ++++++--- drivers/storage/port/scsiport/scsitypes.h | 124 ++++++ 11 files changed, 2059 insertions(+), 1022 deletions(-) diff --git a/drivers/storage/port/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt index 13c4407e4d9..e0f3ce08a78 100644 --- a/drivers/storage/port/scsiport/CMakeLists.txt +++ b/drivers/storage/port/scsiport/CMakeLists.txt @@ -2,20 +2,25 @@ spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB) list(APPEND SOURCE - fdo.c - ioctl.c - pdo.c - registry.c - scsi.c + fdo.c + ioctl.c + pdo.c + power.c + registry.c + scsi.c scsiport.c stubs.c) +list(APPEND PCH_SKIP_SOURCE + guid.c) + add_library(scsiport MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} scsiport.rc ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) -add_pch(scsiport scsiport.h "") +add_pch(scsiport scsiport.h "${PCH_SKIP_SOURCE}") set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/port/scsiport/fdo.c b/drivers/storage/port/scsiport/fdo.c index 95a0f3b4ed5..2cc89ea7353 100644 --- a/drivers/storage/port/scsiport/fdo.c +++ b/drivers/storage/port/scsiport/fdo.c @@ -4,6 +4,7 @@ * PURPOSE: Adapter device object (FDO) support routines * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) * Aleksey Bragin (aleksey(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include "scsiport.h" @@ -14,9 +15,8 @@ static NTSTATUS -SpiSendInquiry( - _In_ PDEVICE_OBJECT DeviceObject, - _Inout_ PSCSI_LUN_INFO LunInfo) +FdoSendInquiry( + _In_ PDEVICE_OBJECT DeviceObject) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION IrpStack; @@ -30,12 +30,12 @@ SpiSendInquiry( ULONG RetryCount = 0; SCSI_REQUEST_BLOCK Srb; PCDB Cdb; - PSCSI_PORT_LUN_EXTENSION LunExtension; - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - DPRINT("SpiSendInquiry() called\n"); + DPRINT("FdoSendInquiry() called\n"); - DeviceExtension = (PSCSI_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PSCSI_PORT_LUN_EXTENSION LunExtension = DeviceObject->DeviceExtension; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = + LunExtension->Common.LowerDevice->DeviceExtension; InquiryBuffer = ExAllocatePoolWithTag(NonPagedPool, INQUIRYDATABUFFERSIZE, TAG_SCSIPORT); if (InquiryBuffer == NULL) @@ -80,9 +80,9 @@ SpiSendInquiry( Srb.Length = sizeof(SCSI_REQUEST_BLOCK); Srb.OriginalRequest = Irp; - Srb.PathId = LunInfo->PathId; - Srb.TargetId = LunInfo->TargetId; - Srb.Lun = LunInfo->Lun; + Srb.PathId = LunExtension->PathId; + Srb.TargetId = LunExtension->TargetId; + Srb.Lun = LunExtension->Lun; Srb.Function = SRB_FUNCTION_EXECUTE_SCSI; Srb.SrbFlags = SRB_FLAGS_DATA_IN | SRB_FLAGS_DISABLE_SYNCH_TRANSFER; Srb.TimeOutValue = 4; @@ -101,7 +101,7 @@ SpiSendInquiry( /* Fill in CDB */ Cdb = (PCDB)Srb.Cdb; Cdb->CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY; - Cdb->CDB6INQUIRY.LogicalUnitNumber = LunInfo->Lun; + Cdb->CDB6INQUIRY.LogicalUnitNumber = LunExtension->Lun; Cdb->CDB6INQUIRY.AllocationLength = INQUIRYDATABUFFERSIZE; /* Call the driver */ @@ -110,7 +110,7 @@ SpiSendInquiry( /* Wait for it to complete */ if (Status == STATUS_PENDING) { - DPRINT("SpiSendInquiry(): Waiting for the driver to process request...\n"); + DPRINT("FdoSendInquiry(): Waiting for the driver to process request...\n"); KeWaitForSingleObject(&Event, Executive, KernelMode, @@ -119,12 +119,12 @@ SpiSendInquiry( Status = IoStatusBlock.Status; } - DPRINT("SpiSendInquiry(): Request processed by driver, status = 0x%08X\n", Status); + DPRINT("FdoSendInquiry(): Request processed by driver, status = 0x%08X\n", Status); if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_SUCCESS) { /* All fine, copy data over */ - RtlCopyMemory(LunInfo->InquiryData, + RtlCopyMemory(&LunExtension->InquiryData, InquiryBuffer, INQUIRYDATABUFFERSIZE); @@ -142,12 +142,7 @@ SpiSendInquiry( /* Something weird happened, deal with it (unfreeze the queue) */ KeepTrying = FALSE; - DPRINT("SpiSendInquiry(): the queue is frozen at TargetId %d\n", Srb.TargetId); - - LunExtension = SpiGetLunExtension(DeviceExtension, - LunInfo->PathId, - LunInfo->TargetId, - LunInfo->Lun); + DPRINT("FdoSendInquiry(): the queue is frozen at TargetId %d\n", Srb.TargetId); /* Clear frozen flag */ LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; @@ -156,7 +151,7 @@ SpiSendInquiry( KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); /* Process the request */ - SpiGetNextRequestFromLun(DeviceObject->DeviceExtension, LunExtension); + SpiGetNextRequestFromLun(DeviceExtension, LunExtension); /* SpiGetNextRequestFromLun() releases the spinlock, so we just lower irql back to what it was before */ @@ -166,10 +161,10 @@ SpiSendInquiry( /* Check if data overrun happened */ if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN) { - DPRINT("Data overrun at TargetId %d\n", LunInfo->TargetId); + DPRINT("Data overrun at TargetId %d\n", LunExtension->TargetId); /* Nothing dramatic, just copy data, but limiting the size */ - RtlCopyMemory(LunInfo->InquiryData, + RtlCopyMemory(&LunExtension->InquiryData, InquiryBuffer, (Srb.DataTransferLength > INQUIRYDATABUFFERSIZE) ? INQUIRYDATABUFFERSIZE : Srb.DataTransferLength); @@ -221,229 +216,141 @@ SpiSendInquiry( ExFreePoolWithTag(InquiryBuffer, TAG_SCSIPORT); ExFreePoolWithTag(SenseBuffer, TAG_SCSIPORT); - DPRINT("SpiSendInquiry() done with Status 0x%08X\n", Status); + DPRINT("FdoSendInquiry() done with Status 0x%08X\n", Status); return Status; } /* Scans all SCSI buses */ VOID -SpiScanAdapter( - _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) +FdoScanAdapter( + _In_ PSCSI_PORT_DEVICE_EXTENSION PortExtension) { - PSCSI_PORT_LUN_EXTENSION LunExtension; - ULONG Bus; - ULONG Target; - ULONG Lun; - PSCSI_BUS_SCAN_INFO BusScanInfo; - PSCSI_LUN_INFO LastLunInfo, LunInfo, LunInfoExists; - BOOLEAN DeviceExists; - ULONG Hint; - NTSTATUS Status; - ULONG DevicesFound; + NTSTATUS status; + UINT32 totalLUNs = PortExtension->TotalLUCount; - DPRINT("SpiScanAdapter() called\n"); + DPRINT("FdoScanAdapter() called\n"); /* Scan all buses */ - for (Bus = 0; Bus < DeviceExtension->BusNum; Bus++) + for (UINT8 pathId = 0; pathId < PortExtension->NumberOfBuses; pathId++) { - DPRINT(" Scanning bus %d\n", Bus); - DevicesFound = 0; + DPRINT(" Scanning bus/pathID %u\n", pathId); /* Get pointer to the scan information */ - BusScanInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]; - - if (BusScanInfo) - { - /* Find the last LUN info in the list */ - LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; - LastLunInfo = LunInfo; - - while (LunInfo != NULL) - { - LastLunInfo = LunInfo; - LunInfo = LunInfo->Next; - } - } - else - { - /* We need to allocate this buffer */ - BusScanInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO), TAG_SCSIPORT); - if (!BusScanInfo) - { - DPRINT1("Out of resources!\n"); - return; - } - - /* Store the pointer in the BusScanInfo array */ - DeviceExtension->BusesConfig->BusScanInfo[Bus] = BusScanInfo; - - /* Fill this struct (length and bus ids for now) */ - BusScanInfo->Length = sizeof(SCSI_BUS_SCAN_INFO); - BusScanInfo->LogicalUnitsCount = 0; - BusScanInfo->BusIdentifier = DeviceExtension->PortConfig->InitiatorBusId[Bus]; - BusScanInfo->LunInfo = NULL; - - /* Set pointer to the last LUN info to NULL */ - LastLunInfo = NULL; - } - - /* Create LUN information structure */ - LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); - if (!LunInfo) - { - DPRINT1("Out of resources!\n"); - return; - } - - RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); - - /* Create LunExtension */ - LunExtension = SpiAllocateLunExtension(DeviceExtension); + PSCSI_BUS_INFO currentBus = &PortExtension->Buses[pathId]; /* And send INQUIRY to every target */ - for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) + for (UINT8 targetId = 0; + targetId < PortExtension->PortConfig->MaximumNumberOfTargets; + targetId++) { + BOOLEAN targetFound = FALSE; + /* TODO: Support scan bottom-up */ /* Skip if it's the same address */ - if (Target == BusScanInfo->BusIdentifier) + if (targetId == currentBus->BusIdentifier) continue; - /* Try to find an existing device here */ - DeviceExists = FALSE; - LunInfoExists = BusScanInfo->LunInfo; - - /* Find matching address on this bus */ - while (LunInfoExists) + /* Scan all logical units */ + for (UINT8 lun = 0; lun < PortExtension->MaxLunCount; lun++) { - if (LunInfoExists->TargetId == Target) + // try to find an existing device + PSCSI_PORT_LUN_EXTENSION lunExt = GetLunByPath(PortExtension, + pathId, + targetId, + lun); + + if (lunExt) { - DeviceExists = TRUE; - break; - } + // check if the device still exists + status = FdoSendInquiry(lunExt->Common.DeviceObject); + if (!NT_SUCCESS(status)) + { + // remove the device + UNIMPLEMENTED; + __debugbreak(); + } - /* Advance to the next one */ - LunInfoExists = LunInfoExists->Next; - } + if (lunExt->InquiryData.DeviceTypeQualifier == DEVICE_QUALIFIER_NOT_SUPPORTED) + { + // remove the device + UNIMPLEMENTED; + __debugbreak(); + } - /* No need to bother rescanning, since we already did that before */ - if (DeviceExists) - continue; + /* Decide whether we are continuing or not */ + if (status == STATUS_INVALID_DEVICE_REQUEST) + continue; + else + break; + } - /* Scan all logical units */ - for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) - { - if ((!LunExtension) || (!LunInfo)) - break; + // create a new LUN device + PDEVICE_OBJECT lunPDO = PdoCreateLunDevice(PortExtension); + if (!lunPDO) + { + continue; + } - /* Add extension to the list */ - Hint = (Target + Lun) % LUS_NUMBER; - LunExtension->Next = DeviceExtension->LunExtensionList[Hint]; - DeviceExtension->LunExtensionList[Hint] = LunExtension; + lunExt = lunPDO->DeviceExtension; - /* Fill Path, Target, Lun fields */ - LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus; - LunExtension->TargetId = LunInfo->TargetId = (UCHAR)Target; - LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun; + lunExt->PathId = pathId; + lunExt->TargetId = targetId; + lunExt->Lun = lun; - /* Set flag to prevent race conditions */ - LunExtension->Flags |= SCSI_PORT_SCAN_IN_PROGRESS; + DPRINT("Add PDO to list: PDO: %p, FDOExt: %p, PDOExt: %p\n", lunPDO, PortExtension, lunExt); - /* Zero LU extension contents */ - if (DeviceExtension->LunExtensionSize) - { - RtlZeroMemory(LunExtension + 1, - DeviceExtension->LunExtensionSize); - } + /* Set flag to prevent race conditions */ + lunExt->Flags |= SCSI_PORT_SCAN_IN_PROGRESS; /* Finally send the inquiry command */ - Status = SpiSendInquiry(DeviceExtension->DeviceObject, LunInfo); + status = FdoSendInquiry(lunPDO); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(status)) { /* Let's see if we really found a device */ - PINQUIRYDATA InquiryData = (PINQUIRYDATA)LunInfo->InquiryData; + PINQUIRYDATA InquiryData = &lunExt->InquiryData; /* Check if this device is unsupported */ if (InquiryData->DeviceTypeQualifier == DEVICE_QUALIFIER_NOT_SUPPORTED) { - DeviceExtension->LunExtensionList[Hint] = - DeviceExtension->LunExtensionList[Hint]->Next; - + IoDeleteDevice(lunPDO); continue; } /* Clear the "in scan" flag */ - LunExtension->Flags &= ~SCSI_PORT_SCAN_IN_PROGRESS; - - DPRINT("SpiScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", - InquiryData->DeviceType, Bus, Target, Lun); - - /* - * Cache the inquiry data into the LUN extension (or alternatively - * we could save a pointer to LunInfo within the LunExtension?) - */ - RtlCopyMemory(&LunExtension->InquiryData, - InquiryData, - INQUIRYDATABUFFERSIZE); - - /* Add this info to the linked list */ - LunInfo->Next = NULL; - if (LastLunInfo) - LastLunInfo->Next = LunInfo; - else - BusScanInfo->LunInfo = LunInfo; + lunExt->Flags &= ~SCSI_PORT_SCAN_IN_PROGRESS; - /* Store the last LUN info */ - LastLunInfo = LunInfo; + DPRINT("FdoScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", + InquiryData->DeviceType, pathId, targetId, lun); - /* Store DeviceObject */ - LunInfo->DeviceObject = DeviceExtension->DeviceObject; + InsertTailList(&currentBus->LunsListHead, &lunExt->LunEntry); - /* Allocate another buffer */ - LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); - if (!LunInfo) - { - DPRINT1("Out of resources!\n"); - break; - } - - RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); - - /* Create a new LU extension */ - LunExtension = SpiAllocateLunExtension(DeviceExtension); + DPRINT1("SCSIPORT: created lun device: %p Status: %x\n", lunPDO, status); - DevicesFound++; + totalLUNs++; + currentBus->LogicalUnitsCount++; + targetFound = TRUE; } else { - /* Remove this LUN from the list */ - DeviceExtension->LunExtensionList[Hint] = - DeviceExtension->LunExtensionList[Hint]->Next; - /* Decide whether we are continuing or not */ - if (Status == STATUS_INVALID_DEVICE_REQUEST) + if (status == STATUS_INVALID_DEVICE_REQUEST) continue; else break; } } - } - - /* Free allocated buffers */ - if (LunExtension) - ExFreePoolWithTag(LunExtension, TAG_SCSIPORT); - if (LunInfo) - ExFreePoolWithTag(LunInfo, TAG_SCSIPORT); - - /* Sum what we found */ - BusScanInfo->LogicalUnitsCount += (UCHAR)DevicesFound; - DPRINT(" Found %d devices on bus %d\n", DevicesFound, Bus); + if (targetFound) + { + currentBus->TargetsCount++; + } + } } - DPRINT("SpiScanAdapter() done\n"); + PortExtension->TotalLUCount = totalLUNs; } /** @@ -456,11 +363,11 @@ SpiScanAdapter( * @return NTSTATUS of the operation */ NTSTATUS -CallHWInitialize( +FdoCallHWInitialize( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) { PPORT_CONFIGURATION_INFORMATION PortConfig = DeviceExtension->PortConfig; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; KIRQL OldIrql; /* Deal with interrupts */ @@ -508,9 +415,13 @@ CallHWInitialize( } if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) + { MaxDirql = Dirql[0]; + } else + { MaxDirql = Dirql[1]; + } for (i = 0; i < DeviceExtension->InterruptCount; i++) { @@ -525,10 +436,16 @@ CallHWInitialize( InterruptShareable = FALSE; } - Status = IoConnectInterrupt( - &DeviceExtension->Interrupt[i], (PKSERVICE_ROUTINE)ScsiPortIsr, DeviceExtension, - &DeviceExtension->IrqLock, MappedIrq[i], Dirql[i], MaxDirql, InterruptMode[i], - InterruptShareable, Affinity[i], FALSE); + Status = IoConnectInterrupt(&DeviceExtension->Interrupt[i], + ScsiPortIsr, + DeviceExtension, + &DeviceExtension->IrqLock, + MappedIrq[i], Dirql[i], + MaxDirql, + InterruptMode[i], + InterruptShareable, + Affinity[i], + FALSE); if (!(NT_SUCCESS(Status))) { @@ -537,9 +454,6 @@ CallHWInitialize( return Status; } } - - if (!NT_SUCCESS(Status)) - return Status; } /* Save IoAddress (from access ranges) */ @@ -583,98 +497,96 @@ CallHWInitialize( if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) { /* Call DPC right away, because we're already at DISPATCH_LEVEL */ - ScsiPortDpcForIsr(NULL, DeviceExtension->DeviceObject, NULL, NULL); + ScsiPortDpcForIsr(NULL, DeviceExtension->Common.DeviceObject, NULL, NULL); } /* Lower irql back to what it was */ KeLowerIrql(OldIrql); - return Status; + return STATUS_SUCCESS; } -VOID -SpiCleanupAfterInit( +NTSTATUS +FdoRemoveAdapter( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) { - PSCSI_LUN_INFO LunInfo; - PVOID Ptr; - ULONG Bus, Lun; + IoStopTimer(DeviceExtension->Common.DeviceObject); + + // release device interface + if (DeviceExtension->InterfaceName.Buffer) + { + IoSetDeviceInterfaceState(&DeviceExtension->InterfaceName, FALSE); + + RtlFreeUnicodeString(&DeviceExtension->InterfaceName); + RtlInitUnicodeString(&DeviceExtension->InterfaceName, NULL); + } - /* Check if we have something to clean up */ - if (DeviceExtension == NULL) - return; + // remove the dos device link + WCHAR dosNameBuffer[12]; + UNICODE_STRING dosDeviceName; - /* Stop the timer */ - IoStopTimer(DeviceExtension->DeviceObject); + swprintf(dosNameBuffer, L"\\??\\Scsi%lu:", DeviceExtension->PortNumber); + RtlInitUnicodeString(&dosDeviceName, dosNameBuffer); + + IoDeleteSymbolicLink(&dosDeviceName); // don't check the result + + // decrease the port count + if (DeviceExtension->DeviceStarted) + { + PCONFIGURATION_INFORMATION sysConfig = IoGetConfigurationInformation(); + sysConfig->ScsiPortCount--; + } - /* Disconnect the interrupts */ + // disconnect the interrupts while (DeviceExtension->InterruptCount) { if (DeviceExtension->Interrupt[--DeviceExtension->InterruptCount]) IoDisconnectInterrupt(DeviceExtension->Interrupt[DeviceExtension->InterruptCount]); } - /* Delete ConfigInfo */ - if (DeviceExtension->BusesConfig) + // FIXME: delete LUNs + if (DeviceExtension->Buses) { - for (Bus = 0; Bus < DeviceExtension->BusNum; Bus++) + for (UINT8 pathId = 0; pathId < DeviceExtension->NumberOfBuses; pathId++) { - if (!DeviceExtension->BusesConfig->BusScanInfo[Bus]) - continue; - - LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; - - while (LunInfo) + PSCSI_BUS_INFO bus = &DeviceExtension->Buses[pathId]; + if (bus->RegistryMapKey) { - /* Free current, but save pointer to the next one */ - Ptr = LunInfo->Next; - ExFreePool(LunInfo); - LunInfo = Ptr; + ZwDeleteKey(bus->RegistryMapKey); + ZwClose(bus->RegistryMapKey); + bus->RegistryMapKey = NULL; } - - ExFreePool(DeviceExtension->BusesConfig->BusScanInfo[Bus]); } - ExFreePool(DeviceExtension->BusesConfig); + ExFreePoolWithTag(DeviceExtension->Buses, TAG_SCSIPORT); } /* Free PortConfig */ if (DeviceExtension->PortConfig) - ExFreePool(DeviceExtension->PortConfig); - - /* Free LUNs*/ - for(Lun = 0; Lun < LUS_NUMBER; Lun++) { - while (DeviceExtension->LunExtensionList[Lun]) - { - Ptr = DeviceExtension->LunExtensionList[Lun]; - DeviceExtension->LunExtensionList[Lun] = DeviceExtension->LunExtensionList[Lun]->Next; - - ExFreePool(Ptr); - } + ExFreePoolWithTag(DeviceExtension->PortConfig, TAG_SCSIPORT); } /* Free common buffer (if it exists) */ - if (DeviceExtension->SrbExtensionBuffer != NULL && - DeviceExtension->CommonBufferLength != 0) + if (DeviceExtension->SrbExtensionBuffer != NULL && DeviceExtension->CommonBufferLength != 0) { - if (!DeviceExtension->AdapterObject) - { - ExFreePool(DeviceExtension->SrbExtensionBuffer); - } - else - { - HalFreeCommonBuffer(DeviceExtension->AdapterObject, - DeviceExtension->CommonBufferLength, - DeviceExtension->PhysicalAddress, - DeviceExtension->SrbExtensionBuffer, - FALSE); - } + if (!DeviceExtension->AdapterObject) + { + ExFreePoolWithTag(DeviceExtension->SrbExtensionBuffer, TAG_SCSIPORT); + } + else + { + HalFreeCommonBuffer(DeviceExtension->AdapterObject, + DeviceExtension->CommonBufferLength, + DeviceExtension->PhysicalAddress, + DeviceExtension->SrbExtensionBuffer, + FALSE); + } } /* Free SRB info */ if (DeviceExtension->SrbInfo != NULL) - ExFreePool(DeviceExtension->SrbInfo); + ExFreePoolWithTag(DeviceExtension->SrbInfo, TAG_SCSIPORT); /* Unmap mapped addresses */ while (DeviceExtension->MappedAddressList != NULL) @@ -682,13 +594,161 @@ SpiCleanupAfterInit( MmUnmapIoSpace(DeviceExtension->MappedAddressList->MappedAddress, DeviceExtension->MappedAddressList->NumberOfBytes); - Ptr = DeviceExtension->MappedAddressList; + PVOID ptr = DeviceExtension->MappedAddressList; DeviceExtension->MappedAddressList = DeviceExtension->MappedAddressList->NextMappedAddress; - ExFreePool(Ptr); + ExFreePoolWithTag(ptr, TAG_SCSIPORT); + } + + IoDeleteDevice(DeviceExtension->Common.DeviceObject); + + return STATUS_SUCCESS; +} + +NTSTATUS +FdoStartAdapter( + _In_ PSCSI_PORT_DEVICE_EXTENSION PortExtension) +{ + WCHAR dosNameBuffer[12]; + UNICODE_STRING dosDeviceName; + NTSTATUS status; + + // Start our timer + IoStartTimer(PortExtension->Common.DeviceObject); + + // Create the dos device link + swprintf(dosNameBuffer, L"\\??\\Scsi%u:", PortExtension->PortNumber); + RtlInitUnicodeString(&dosDeviceName, dosNameBuffer); + status = IoCreateSymbolicLink(&dosDeviceName, &PortExtension->DeviceName); + if (!NT_SUCCESS(status)) + { + return status; + } + + // start building a device map + RegistryInitAdapterKey(PortExtension); + + // increase the port count + PCONFIGURATION_INFORMATION sysConfig = IoGetConfigurationInformation(); + sysConfig->ScsiPortCount++; + + // Register and enable the device interface + status = IoRegisterDeviceInterface(PortExtension->Common.DeviceObject, + &StoragePortClassGuid, + NULL, + &PortExtension->InterfaceName); + DPRINT("IoRegisterDeviceInterface status: %x, InterfaceName: %wZ\n", + status, &PortExtension->InterfaceName); + + if (NT_SUCCESS(status)) + { + IoSetDeviceInterfaceState(&PortExtension->InterfaceName, TRUE); + } + + PortExtension->DeviceStarted = TRUE; + + return STATUS_SUCCESS; +} + +static +NTSTATUS +FdoHandleDeviceRelations( + _In_ PSCSI_PORT_DEVICE_EXTENSION PortExtension, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + + // FDO always only handles bus relations + if (ioStack->Parameters.QueryDeviceRelations.Type == BusRelations) + { + FdoScanAdapter(PortExtension); + DPRINT("Found %u PD objects, FDOExt: %p\n", PortExtension->TotalLUCount, PortExtension); + + // check that no filter driver has messed up this + ASSERT(Irp->IoStatus.Information == 0); + + PDEVICE_RELATIONS deviceRelations = + ExAllocatePoolWithTag(PagedPool, + (sizeof(DEVICE_RELATIONS) + + sizeof(PDEVICE_OBJECT) * (PortExtension->TotalLUCount - 1)), + TAG_SCSIPORT); + + if (!deviceRelations) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + deviceRelations->Count = 0; + + for (UINT8 pathId = 0; pathId < PortExtension->NumberOfBuses; pathId++) + { + PSCSI_BUS_INFO bus = &PortExtension->Buses[pathId]; + + for (PLIST_ENTRY lunEntry = bus->LunsListHead.Flink; + lunEntry != &bus->LunsListHead; + lunEntry = lunEntry->Flink) + { + PSCSI_PORT_LUN_EXTENSION lunExt = + CONTAINING_RECORD(lunEntry, SCSI_PORT_LUN_EXTENSION, LunEntry); + + deviceRelations->Objects[deviceRelations->Count++] = lunExt->Common.DeviceObject; + ObReferenceObject(lunExt->Common.DeviceObject); + } + } + + ASSERT(deviceRelations->Count == PortExtension->TotalLUCount); + + Irp->IoStatus.Information = (ULONG_PTR)deviceRelations; + Irp->IoStatus.Status = STATUS_SUCCESS; + } + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(PortExtension->Common.LowerDevice, Irp); +} + +NTSTATUS +FdoDispatchPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + PSCSI_PORT_DEVICE_EXTENSION portExt = DeviceObject->DeviceExtension; + NTSTATUS status; + + ASSERT(portExt->Common.IsFDO); + + DPRINT("FDO PnP request %s\n", GetIRPMinorFunctionString(ioStack->MinorFunction)); + + switch (ioStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + // as we don't support PnP yet, this is a no-op for us + // (FdoStartAdapter is being called during initialization for legacy miniports) + status = STATUS_SUCCESS; + // status = FdoStartAdapter(DeviceExtension); + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + return FdoHandleDeviceRelations(portExt, Irp); + } + default: + { + // forward irp to next device object + IoCopyCurrentIrpStackLocationToNext(Irp); + return IoCallDriver(portExt->Common.LowerDevice, Irp); + } + } + + if (status != STATUS_PENDING) + { + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); } - /* Finally delete the device object */ - DPRINT("Deleting device %p\n", DeviceExtension->DeviceObject); - IoDeleteDevice(DeviceExtension->DeviceObject); + return status; } diff --git a/drivers/storage/port/scsiport/guid.c b/drivers/storage/port/scsiport/guid.c new file mode 100644 index 00000000000..757901b4222 --- /dev/null +++ b/drivers/storage/port/scsiport/guid.c @@ -0,0 +1,11 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <initguid.h> +#include <ioevent.h> +#include <wdmguid.h> + +#define DEVICE_TYPE ULONG +#include <ntddstor.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/drivers/storage/port/scsiport/ioctl.c b/drivers/storage/port/scsiport/ioctl.c index 08de2260961..7346f7f3228 100644 --- a/drivers/storage/port/scsiport/ioctl.c +++ b/drivers/storage/port/scsiport/ioctl.c @@ -4,6 +4,7 @@ * PURPOSE: IOCTL handlers * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) * Aleksey Bragin (aleksey(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include "scsiport.h" @@ -19,13 +20,10 @@ SpiGetInquiryData( _In_ PIRP Irp) { ULONG InquiryDataSize; - PSCSI_LUN_INFO LunInfo; - ULONG BusCount, LunCount, Length; + ULONG BusCount, Length; PIO_STACK_LOCATION IrpStack; PSCSI_ADAPTER_BUS_INFO AdapterBusInfo; PSCSI_INQUIRY_DATA InquiryData; - PSCSI_BUS_DATA BusData; - ULONG Bus; PUCHAR Buffer; DPRINT("SpiGetInquiryData() called\n"); @@ -35,22 +33,15 @@ SpiGetInquiryData( Buffer = Irp->AssociatedIrp.SystemBuffer; /* Initialize bus and LUN counters */ - BusCount = DeviceExtension->BusesConfig->NumberOfBuses; - LunCount = 0; - - /* Calculate total number of LUNs */ - for (Bus = 0; Bus < BusCount; Bus++) - LunCount += DeviceExtension->BusesConfig->BusScanInfo[Bus]->LogicalUnitsCount; + BusCount = DeviceExtension->NumberOfBuses; /* Calculate size of inquiry data, rounding up to sizeof(ULONG) */ - InquiryDataSize = - ((sizeof(SCSI_INQUIRY_DATA) - 1 + INQUIRYDATABUFFERSIZE + - sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1)); + InquiryDataSize = ALIGN_UP(sizeof(SCSI_INQUIRY_DATA) - 1 + INQUIRYDATABUFFERSIZE, ULONG); /* Calculate data size */ Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * sizeof(SCSI_BUS_DATA); - Length += InquiryDataSize * LunCount; + Length += InquiryDataSize * DeviceExtension->TotalLUCount; /* Check, if all data is going to fit into provided buffer */ if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < Length) @@ -73,47 +64,47 @@ SpiGetInquiryData( (BusCount - 1) * sizeof(SCSI_BUS_DATA)); /* Loop each bus */ - for (Bus = 0; Bus < BusCount; Bus++) + for (UINT8 pathId = 0; pathId < DeviceExtension->NumberOfBuses; pathId++) { - BusData = &AdapterBusInfo->BusData[Bus]; + PSCSI_BUS_DATA BusData = &AdapterBusInfo->BusData[pathId]; /* Calculate and save an offset of the inquiry data */ BusData->InquiryDataOffset = (ULONG)((PUCHAR)InquiryData - Buffer); - /* Get a pointer to the LUN information structure */ - LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; - /* Store Initiator Bus Id */ - BusData->InitiatorBusId = - DeviceExtension->BusesConfig->BusScanInfo[Bus]->BusIdentifier; + BusData->InitiatorBusId = DeviceExtension->Buses[pathId].BusIdentifier; /* Store LUN count */ - BusData->NumberOfLogicalUnits = - DeviceExtension->BusesConfig->BusScanInfo[Bus]->LogicalUnitsCount; + BusData->NumberOfLogicalUnits = DeviceExtension->Buses[pathId].LogicalUnitsCount; /* Loop all LUNs */ - while (LunInfo != NULL) + PSCSI_BUS_INFO bus = &DeviceExtension->Buses[pathId]; + + for (PLIST_ENTRY lunEntry = bus->LunsListHead.Flink; + lunEntry != &bus->LunsListHead; + lunEntry = lunEntry->Flink) { - DPRINT("(Bus %lu Target %lu Lun %lu)\n", - Bus, LunInfo->TargetId, LunInfo->Lun); + PSCSI_PORT_LUN_EXTENSION lunExt = + CONTAINING_RECORD(lunEntry, SCSI_PORT_LUN_EXTENSION, LunEntry); + + DPRINT("(Bus %lu Target %lu Lun %lu)\n", pathId, lunExt->TargetId, lunExt->Lun); /* Fill InquiryData with values */ - InquiryData->PathId = LunInfo->PathId; - InquiryData->TargetId = LunInfo->TargetId; - InquiryData->Lun = LunInfo->Lun; + InquiryData->PathId = lunExt->PathId; + InquiryData->TargetId = lunExt->TargetId; + InquiryData->Lun = lunExt->Lun; InquiryData->InquiryDataLength = INQUIRYDATABUFFERSIZE; - InquiryData->DeviceClaimed = LunInfo->DeviceClaimed; + InquiryData->DeviceClaimed = lunExt->DeviceClaimed; InquiryData->NextInquiryDataOffset = (ULONG)((PUCHAR)InquiryData + InquiryDataSize - Buffer); /* Copy data in it */ RtlCopyMemory(InquiryData->InquiryData, - LunInfo->InquiryData, + &lunExt->InquiryData, INQUIRYDATABUFFERSIZE); /* Move to the next LUN */ - LunInfo = LunInfo->Next; - InquiryData = (PSCSI_INQUIRY_DATA) ((PCHAR)InquiryData + InquiryDataSize); + InquiryData = (PSCSI_INQUIRY_DATA) ((ULONG_PTR)InquiryData + InquiryDataSize); } /* Either mark the end, or set offset to 0 */ @@ -128,6 +119,269 @@ SpiGetInquiryData( return STATUS_SUCCESS; } +static +UINT32 +GetFieldLength( + _In_ PUCHAR Name, + _In_ UINT32 MaxLength) +{ + UINT32 Index; + UINT32 LastCharacterPosition = 0; + + // scan the field and return last position which contains a valid character + for (Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] != ' ') + { + // trim white spaces from field + LastCharacterPosition = Index; + } + } + + // convert from zero based index to length + return LastCharacterPosition + 1; +} + +static +NTSTATUS +PdoHandleQueryProperty( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + PSCSI_PORT_LUN_EXTENSION lunExt = DeviceObject->DeviceExtension; + NTSTATUS status; + + ASSERT(ioStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(STORAGE_PROPERTY_QUERY)); + ASSERT(Irp->AssociatedIrp.SystemBuffer); + ASSERT(!lunExt->Common.IsFDO); + + PSTORAGE_PROPERTY_QUERY PropertyQuery = Irp->AssociatedIrp.SystemBuffer; + + // check property type + if (PropertyQuery->PropertyId != StorageDeviceProperty && + PropertyQuery->PropertyId != StorageAdapterProperty) + { + // only device property / adapter property are supported + status = STATUS_INVALID_PARAMETER_1; + goto completeIrp; + } + + // check query type + if (PropertyQuery->QueryType == PropertyExistsQuery) + { + // device property / adapter property is supported + status = STATUS_SUCCESS; + goto completeIrp; + } + + if (PropertyQuery->QueryType != PropertyStandardQuery) + { + // only standard query and exists query are supported + status = STATUS_INVALID_PARAMETER_2; + goto completeIrp; + } + + switch (PropertyQuery->PropertyId) + { + case StorageDeviceProperty: + { + PINQUIRYDATA inquiryData = &lunExt->InquiryData; + + // compute extra parameters length + UINT32 FieldLengthVendor = GetFieldLength(inquiryData->VendorId, 8), + FieldLengthProduct = GetFieldLength(inquiryData->ProductId, 16), + FieldLengthRevision = GetFieldLength(inquiryData->ProductRevisionLevel, 4); + + // total length required is sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLength + 4 extra null bytes - 1 + // -1 due STORAGE_DEVICE_DESCRIPTOR contains one byte length of parameter data + UINT32 TotalLength = sizeof(STORAGE_DEVICE_DESCRIPTOR) + + FieldLengthVendor + + FieldLengthProduct + + FieldLengthRevision + + 3; + + // check if output buffer is long enough + if (ioStack->Parameters.DeviceIoControl.OutputBufferLength < TotalLength) + { + // buffer too small + PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader = Irp->AssociatedIrp.SystemBuffer; + ASSERT(ioStack->Parameters.DeviceIoControl.OutputBufferLength >= + sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // return required size + DescriptorHeader->Version = TotalLength; + DescriptorHeader->Size = TotalLength; + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + status = STATUS_SUCCESS; + goto completeIrp; + } + + // initialize the device descriptor + PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor = Irp->AssociatedIrp.SystemBuffer; + + deviceDescriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); + deviceDescriptor->Size = TotalLength; + deviceDescriptor->DeviceType = inquiryData->DeviceType; + deviceDescriptor->DeviceTypeModifier = inquiryData->DeviceTypeModifier; + deviceDescriptor->RemovableMedia = inquiryData->RemovableMedia; + deviceDescriptor->CommandQueueing = inquiryData->CommandQueue; + deviceDescriptor->BusType = BusTypeScsi; + deviceDescriptor->VendorIdOffset = + FIELD_OFFSET(STORAGE_DEVICE_DESCRIPTOR, RawDeviceProperties); + deviceDescriptor->ProductIdOffset = + deviceDescriptor->VendorIdOffset + FieldLengthVendor + 1; + deviceDescriptor->ProductRevisionOffset = + deviceDescriptor->ProductIdOffset + FieldLengthProduct + 1; + deviceDescriptor->SerialNumberOffset = 0; + deviceDescriptor->RawPropertiesLength = + FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 3; + + // copy descriptors + PUCHAR Buffer = deviceDescriptor->RawDeviceProperties; + + RtlCopyMemory(Buffer, inquiryData->VendorId, FieldLengthVendor); + Buffer[FieldLengthVendor] = '\0'; + Buffer += FieldLengthVendor + 1; + + RtlCopyMemory(Buffer, inquiryData->ProductId, FieldLengthProduct); + Buffer[FieldLengthProduct] = '\0'; + Buffer += FieldLengthProduct + 1; + + RtlCopyMemory(Buffer, inquiryData->ProductRevisionLevel, FieldLengthRevision); + Buffer[FieldLengthRevision] = '\0'; + Buffer += FieldLengthRevision + 1; + + DPRINT("Vendor %s\n", + (LPCSTR)((ULONG_PTR)deviceDescriptor + deviceDescriptor->VendorIdOffset)); + DPRINT("Product %s\n", + (LPCSTR)((ULONG_PTR)deviceDescriptor + deviceDescriptor->ProductIdOffset)); + DPRINT("Revision %s\n", + (LPCSTR)((ULONG_PTR)deviceDescriptor + deviceDescriptor->ProductRevisionOffset)); + + Irp->IoStatus.Information = TotalLength; + status = STATUS_SUCCESS; + goto completeIrp; + } + case StorageAdapterProperty: + { + // forward to the lower device + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(lunExt->Common.LowerDevice, Irp); + } + case StorageDeviceIdProperty: + { + // TODO + } + default: + { + UNREACHABLE; + status = STATUS_NOT_IMPLEMENTED; + goto completeIrp; + } + } + +completeIrp: + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return status; +} + +static +NTSTATUS +FdoHandleQueryProperty( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + PSCSI_PORT_DEVICE_EXTENSION portExt = DeviceObject->DeviceExtension; + NTSTATUS status; + + ASSERT(ioStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(STORAGE_PROPERTY_QUERY)); + ASSERT(Irp->AssociatedIrp.SystemBuffer); + ASSERT(portExt->Common.IsFDO); + + PSTORAGE_PROPERTY_QUERY PropertyQuery = Irp->AssociatedIrp.SystemBuffer; + + // check property type (handle only StorageAdapterProperty) + if (PropertyQuery->PropertyId != StorageAdapterProperty) + { + if (PropertyQuery->PropertyId == StorageDeviceProperty || + PropertyQuery->PropertyId == StorageDeviceIdProperty) + { + status = STATUS_INVALID_DEVICE_REQUEST; + } + else + { + status = STATUS_INVALID_PARAMETER_1; + } + + goto completeIrp; + } + + // check query type + if (PropertyQuery->QueryType == PropertyExistsQuery) + { + // device property / adapter property is supported + status = STATUS_SUCCESS; + goto completeIrp; + } + + if (PropertyQuery->QueryType != PropertyStandardQuery) + { + // only standard query and exists query are supported + status = STATUS_INVALID_PARAMETER_2; + goto completeIrp; + } + + if (ioStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) + { + // buffer too small + PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader = Irp->AssociatedIrp.SystemBuffer; + ASSERT(ioStack->Parameters.DeviceIoControl.OutputBufferLength + >= sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // return required size + DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + status = STATUS_SUCCESS; + goto completeIrp; + } + + // get adapter descriptor, information is returned in the same buffer + PSTORAGE_ADAPTER_DESCRIPTOR adapterDescriptor = Irp->AssociatedIrp.SystemBuffer; + + // fill out descriptor + // NOTE: STORAGE_ADAPTER_DESCRIPTOR may vary in size, so it's important to zero out + // all unused fields + *adapterDescriptor = (STORAGE_ADAPTER_DESCRIPTOR) { + .Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR), + .Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR), + .MaximumTransferLength = portExt->PortCapabilities.MaximumTransferLength, + .MaximumPhysicalPages = portExt->PortCapabilities.MaximumPhysicalPages, + .AlignmentMask = portExt->PortCapabilities.AlignmentMask, + .AdapterUsesPio = portExt->PortCapabilities.AdapterUsesPio, + .AdapterScansDown = portExt->PortCapabilities.AdapterScansDown, + .CommandQueueing = portExt->PortCapabilities.TaggedQueuing, + .AcceleratedTransfer = TRUE, + .BusType = BusTypeScsi, // FIXME + .BusMajorVersion = 2, + .BusMinorVersion = 0 + }; + + // store returned length + Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + status = STATUS_SUCCESS; + +completeIrp: + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return status; +} + /********************************************************************** * NAME INTERNAL * ScsiPortDeviceControl @@ -152,104 +406,147 @@ ScsiPortDeviceControl( _In_ PIRP Irp) { PIO_STACK_LOCATION Stack; - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - PDUMP_POINTERS DumpPointers; - NTSTATUS Status; + PSCSI_PORT_COMMON_EXTENSION comExt = DeviceObject->DeviceExtension; + PSCSI_PORT_DEVICE_EXTENSION portExt; + PSCSI_PORT_LUN_EXTENSION lunExt; + NTSTATUS status; DPRINT("ScsiPortDeviceControl()\n"); Irp->IoStatus.Information = 0; Stack = IoGetCurrentIrpStackLocation(Irp); - DeviceExtension = DeviceObject->DeviceExtension; switch (Stack->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_SCSI_GET_DUMP_POINTERS: - DPRINT(" IOCTL_SCSI_GET_DUMP_POINTERS\n"); - - if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DUMP_POINTERS)) + case IOCTL_STORAGE_QUERY_PROPERTY: { - Status = STATUS_BUFFER_OVERFLOW; - Irp->IoStatus.Information = sizeof(DUMP_POINTERS); - break; + DPRINT(" IOCTL_STORAGE_QUERY_PROPERTY\n"); + + if (!VerifyIrpInBufferSize(Irp, sizeof(STORAGE_PROPERTY_QUERY))) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + if (comExt->IsFDO) + return FdoHandleQueryProperty(DeviceObject, Irp); + else + return PdoHandleQueryProperty(DeviceObject, Irp); } + case IOCTL_SCSI_GET_ADDRESS: + { + DPRINT(" IOCTL_SCSI_GET_ADDRESS\n"); - DumpPointers = Irp->AssociatedIrp.SystemBuffer; - DumpPointers->DeviceObject = DeviceObject; - /* More data.. ? */ + if (comExt->IsFDO) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(DUMP_POINTERS); - break; + PSCSI_ADDRESS address = Irp->AssociatedIrp.SystemBuffer; + if (!VerifyIrpOutBufferSize(Irp, sizeof(*address))) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } - case IOCTL_SCSI_GET_CAPABILITIES: - DPRINT(" IOCTL_SCSI_GET_CAPABILITIES\n"); - if (Stack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(PVOID)) - { - *((PVOID *)Irp->AssociatedIrp.SystemBuffer) = &DeviceExtension->PortCapabilities; + lunExt = DeviceObject->DeviceExtension; + portExt = comExt->LowerDevice->DeviceExtension; + + address->Length = sizeof(SCSI_ADDRESS); + address->PortNumber = portExt->PortNumber; + address->PathId = lunExt->PathId; + address->TargetId = lunExt->TargetId; + address->Lun = lunExt->Lun; - Irp->IoStatus.Information = sizeof(PVOID); - Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(SCSI_ADDRESS); + status = STATUS_SUCCESS; break; } - - if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(IO_SCSI_CAPABILITIES)) + case IOCTL_SCSI_GET_DUMP_POINTERS: { - Status = STATUS_BUFFER_TOO_SMALL; + DPRINT(" IOCTL_SCSI_GET_DUMP_POINTERS\n"); + + if (!comExt->IsFDO) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(comExt->LowerDevice, Irp); + } + + PDUMP_POINTERS dumpPointers = Irp->AssociatedIrp.SystemBuffer; + if (!VerifyIrpOutBufferSize(Irp, sizeof(*dumpPointers))) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + dumpPointers->DeviceObject = DeviceObject; + /* More data.. ? */ + + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(DUMP_POINTERS); break; } + case IOCTL_SCSI_GET_CAPABILITIES: + { + DPRINT(" IOCTL_SCSI_GET_CAPABILITIES\n"); - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &DeviceExtension->PortCapabilities, - sizeof(IO_SCSI_CAPABILITIES)); - - Irp->IoStatus.Information = sizeof(IO_SCSI_CAPABILITIES); - Status = STATUS_SUCCESS; - break; + if (!comExt->IsFDO) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } - case IOCTL_SCSI_GET_INQUIRY_DATA: - DPRINT(" IOCTL_SCSI_GET_INQUIRY_DATA\n"); + if (!VerifyIrpOutBufferSize(Irp, sizeof(IO_SCSI_CAPABILITIES))) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } - /* Copy inquiry data to the port device extension */ - Status = SpiGetInquiryData(DeviceExtension, Irp); - break; + portExt = DeviceObject->DeviceExtension; - case IOCTL_SCSI_MINIPORT: - DPRINT1("IOCTL_SCSI_MINIPORT unimplemented!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + &portExt->PortCapabilities, + sizeof(IO_SCSI_CAPABILITIES)); - case IOCTL_SCSI_PASS_THROUGH: - DPRINT1("IOCTL_SCSI_PASS_THROUGH unimplemented!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(IO_SCSI_CAPABILITIES); + break; + } + case IOCTL_SCSI_GET_INQUIRY_DATA: + { + DPRINT(" IOCTL_SCSI_GET_INQUIRY_DATA\n"); - default: - if (DEVICE_TYPE_FROM_CTL_CODE(Stack->Parameters.DeviceIoControl.IoControlCode) == MOUNTDEVCONTROLTYPE) - { - switch (Stack->Parameters.DeviceIoControl.IoControlCode) + if (!comExt->IsFDO) { - case IOCTL_MOUNTDEV_QUERY_DEVICE_NAME: - DPRINT1("Got unexpected IOCTL_MOUNTDEV_QUERY_DEVICE_NAME\n"); - break; - case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: - DPRINT1("Got unexpected IOCTL_MOUNTDEV_QUERY_UNIQUE_ID\n"); - break; - default: - DPRINT(" got ioctl intended for the mount manager: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + status = STATUS_INVALID_DEVICE_REQUEST; break; } - } else { - DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); - } - Status = STATUS_NOT_IMPLEMENTED; - break; + + /* Copy inquiry data to the port device extension */ + status = SpiGetInquiryData(DeviceObject->DeviceExtension, Irp); + break; + } + case IOCTL_SCSI_MINIPORT: + DPRINT1("IOCTL_SCSI_MINIPORT unimplemented!\n"); + status = STATUS_NOT_IMPLEMENTED; + break; + + case IOCTL_SCSI_PASS_THROUGH: + DPRINT1("IOCTL_SCSI_PASS_THROUGH unimplemented!\n"); + status = STATUS_NOT_IMPLEMENTED; + break; + + default: + DPRINT1("unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + status = STATUS_NOT_SUPPORTED; + break; } /* Complete the request with the given status */ - Irp->IoStatus.Status = Status; + Irp->IoStatus.Status = status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return status; } diff --git a/drivers/storage/port/scsiport/pdo.c b/drivers/storage/port/scsiport/pdo.c index 7365f42e443..182f2b029ec 100644 --- a/drivers/storage/port/scsiport/pdo.c +++ b/drivers/storage/port/scsiport/pdo.c @@ -4,40 +4,48 @@ * PURPOSE: Logical Unit (PDO) functions * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) * Aleksey Bragin (aleksey(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include "scsiport.h" +#include "scsitypes.h" #define NDEBUG #include <debug.h> -PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension( +PDEVICE_OBJECT +PdoCreateLunDevice( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) { PSCSI_PORT_LUN_EXTENSION LunExtension; - ULONG LunExtensionSize; - - DPRINT("SpiAllocateLunExtension(%p)\n", DeviceExtension); + PDEVICE_OBJECT LunPDO; - /* Round LunExtensionSize first to the sizeof LONGLONG */ - LunExtensionSize = (DeviceExtension->LunExtensionSize + - sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); + ULONG LunExtensionSize = DeviceExtension->LunExtensionSize + sizeof(SCSI_PORT_LUN_EXTENSION); - LunExtensionSize += sizeof(SCSI_PORT_LUN_EXTENSION); - DPRINT("LunExtensionSize %lu\n", LunExtensionSize); + NTSTATUS Status = IoCreateDevice(DeviceExtension->Common.DeviceObject->DriverObject, + LunExtensionSize, + NULL, + FILE_DEVICE_DISK, + FILE_AUTOGENERATED_DEVICE_NAME | FILE_DEVICE_SECURE_OPEN, + FALSE, + &LunPDO); - LunExtension = ExAllocatePoolWithTag(NonPagedPool, LunExtensionSize, TAG_SCSIPORT); - if (LunExtension == NULL) + if (!NT_SUCCESS(Status)) { - DPRINT1("Out of resources!\n"); + DPRINT1("Failed to create a Lun PDO, status: %x\n", Status); return NULL; } + LunExtension = LunPDO->DeviceExtension; + /* Zero everything */ RtlZeroMemory(LunExtension, LunExtensionSize); + LunExtension->Common.IsFDO = FALSE; + LunExtension->Common.DeviceObject = LunPDO; + LunExtension->Common.LowerDevice = DeviceExtension->Common.DeviceObject; + /* Initialize a list of requests */ InitializeListHead(&LunExtension->SrbInfo.Requests); @@ -50,66 +58,54 @@ SpiAllocateLunExtension( /* Initialize request queue */ KeInitializeDeviceQueue(&LunExtension->DeviceQueue); - return LunExtension; + LunPDO->Flags |= DO_DIRECT_IO; + LunPDO->Flags &= ~DO_DEVICE_INITIALIZING; + + return LunPDO; } PSCSI_PORT_LUN_EXTENSION -SpiGetLunExtension( +GetLunByPath( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, _In_ UCHAR PathId, _In_ UCHAR TargetId, _In_ UCHAR Lun) { - PSCSI_PORT_LUN_EXTENSION LunExtension; - - DPRINT("SpiGetLunExtension(%p %u %u %u) called\n", - DeviceExtension, PathId, TargetId, Lun); + if (PathId >= DeviceExtension->NumberOfBuses) + { + DPRINT1("Invalid PathId: %u\n", PathId); + return NULL; + } - /* Get appropriate list */ - LunExtension = DeviceExtension->LunExtensionList[(TargetId + Lun) % LUS_NUMBER]; + PSCSI_BUS_INFO bus = &DeviceExtension->Buses[PathId]; - /* Iterate it until we find what we need */ - while (LunExtension) + for (PLIST_ENTRY lunEntry = bus->LunsListHead.Flink; + lunEntry != &bus->LunsListHead; + lunEntry = lunEntry->Flink) { - if (LunExtension->TargetId == TargetId && - LunExtension->Lun == Lun && - LunExtension->PathId == PathId) + PSCSI_PORT_LUN_EXTENSION lunExt = + CONTAINING_RECORD(lunEntry, SCSI_PORT_LUN_EXTENSION, LunEntry); + + if (lunExt->PathId == PathId && + lunExt->TargetId == TargetId && + lunExt->Lun == Lun) { - /* All matches, return */ - return LunExtension; + return lunExt; } - - /* Advance to the next item */ - LunExtension = LunExtension->Next; } - /* We did not find anything */ - DPRINT("Nothing found\n"); + DPRINT("SCSI LUN (%u, %u, %u) was not found\n", PathId, TargetId, Lun); return NULL; } PSCSI_REQUEST_BLOCK_INFO SpiGetSrbData( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _In_ UCHAR PathId, - _In_ UCHAR TargetId, - _In_ UCHAR Lun, + _In_ PSCSI_PORT_LUN_EXTENSION LunExtension, _In_ UCHAR QueueTag) { - PSCSI_PORT_LUN_EXTENSION LunExtension; - if (QueueTag == SP_UNTAGGED) { - /* Untagged request, get LU and return pointer to SrbInfo */ - LunExtension = SpiGetLunExtension(DeviceExtension, - PathId, - TargetId, - Lun); - - /* Return NULL in case of error */ - if (!LunExtension) - return(NULL); - /* Return the pointer to SrbInfo */ return &LunExtension->SrbInfo; } @@ -122,3 +118,506 @@ SpiGetSrbData( return &DeviceExtension->SrbInfo[QueueTag -1]; } } + +static +ULONG +CopyField( + IN PUCHAR Name, + IN PCHAR Buffer, + IN ULONG MaxLength) +{ + ULONG Index; + + for (Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] <= ' ' || Name[Index] >= 0x7F /* last printable ascii character */ || Name[Index] == ',') + { + // convert to underscore + Buffer[Index] = '_'; + } + else + { + // just copy character + Buffer[Index] = Name[Index]; + } + } + + return MaxLength; +} + +static +ULONG +CopyFieldTruncate( + IN PUCHAR Name, + IN PCHAR Buffer, + IN ULONG MaxLength) +{ + ULONG Index; + + for (Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] == '\0') + { + break; + } + else if (Name[Index] <= ' ' || Name[Index] >= 0x7F /* last printable ascii character */ || Name[Index] == ',') + { + // convert to space + Buffer[Index] = ' '; + } + else + { + // just copy character + Buffer[Index] = Name[Index]; + } + } + + return Index; +} + +static +NTSTATUS +PdoHandleQueryDeviceText( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_LUN_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IoStack; + UINT32 Offset = 0; + PINQUIRYDATA InquiryData; + CHAR LocalBuffer[sizeof(InquiryData->VendorId) + sizeof(InquiryData->ProductId) + 2]; + ANSI_STRING AnsiString; + UNICODE_STRING DeviceDescription; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + InquiryData = &DeviceExtension->InquiryData; + + switch (IoStack->Parameters.QueryDeviceText.DeviceTextType) + { + case DeviceTextDescription: + case DeviceTextLocationInformation: + { + DPRINT("PdoHandleQueryDeviceText\n"); + + Offset += CopyFieldTruncate(InquiryData->VendorId, + &LocalBuffer[Offset], + sizeof(InquiryData->VendorId)); + LocalBuffer[Offset++] = ' '; + Offset += CopyFieldTruncate(InquiryData->ProductId, + &LocalBuffer[Offset], + sizeof(InquiryData->ProductId)); + LocalBuffer[Offset++] = '\0'; + + RtlInitAnsiString(&AnsiString, (PCSZ)&LocalBuffer); + + DeviceDescription.Length = 0; + DeviceDescription.MaximumLength = (USHORT)(Offset * sizeof(WCHAR)); + DeviceDescription.Buffer = ExAllocatePoolWithTag(PagedPool, + DeviceDescription.MaximumLength, + TAG_SCSIPORT); + if (!DeviceDescription.Buffer) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAnsiStringToUnicodeString(&DeviceDescription, &AnsiString, FALSE); + + Irp->IoStatus.Information = (ULONG_PTR)DeviceDescription.Buffer; + return STATUS_SUCCESS; + } + default: + { + Irp->IoStatus.Information = 0; + return Irp->IoStatus.Status; + } + } +} + +static +NTSTATUS +PdoHandleQueryDeviceId( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_LUN_EXTENSION DeviceExtension; + NTSTATUS Status; + CHAR Buffer[100] = {0}; + LPCSTR DeviceType; + ULONG Offset = 0; + PINQUIRYDATA InquiryData; + ANSI_STRING AnsiString; + UNICODE_STRING DeviceId; + + DeviceExtension = DeviceObject->DeviceExtension; + InquiryData = &DeviceExtension->InquiryData; + + DeviceType = GetDeviceType(InquiryData); + + // lets create device string + Offset = sprintf(&Buffer[Offset], "SCSI\\"); + Offset += sprintf(&Buffer[Offset], DeviceType); + Offset += sprintf(&Buffer[Offset], "&Ven_"); + Offset += CopyField(InquiryData->VendorId, &Buffer[Offset], 8); + Offset += sprintf(&Buffer[Offset], "&Prod_"); + Offset += CopyField(InquiryData->ProductId, &Buffer[Offset], 16); + Offset += sprintf(&Buffer[Offset], "&Rev_"); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Buffer[Offset], 4); + + RtlInitAnsiString(&AnsiString, (PCSZ)Buffer); + + // allocate DeviceId string + Status = RtlAnsiStringToUnicodeString(&DeviceId, &AnsiString, TRUE); + + if (NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer; + } + + DPRINT("DeviceId %wZ Status %x\n", &DeviceId, Status); + + return Status; +} + +static +VOID +ConvertToUnicodeString( + IN CHAR * Buffer, + IN ULONG ResultBufferLength, + IN ULONG ResultBufferOffset, + OUT LPWSTR ResultBuffer, + OUT PULONG NewResultBufferOffset) +{ + UNICODE_STRING DeviceString; + ANSI_STRING AnsiString; + NTSTATUS Status; + + ASSERT(ResultBufferLength); + ASSERT(ResultBufferLength > ResultBufferOffset); + + DPRINT("ResultBufferOffset %lu ResultBufferLength %lu Buffer %s Length %lu\n", + ResultBufferOffset, ResultBufferLength, Buffer, strlen(Buffer)); + + // construct destination string + DeviceString.Buffer = &ResultBuffer[ResultBufferOffset]; + DeviceString.Length = 0; + DeviceString.MaximumLength = (ResultBufferLength - ResultBufferOffset) * sizeof(WCHAR); + + // initialize source string + RtlInitAnsiString(&AnsiString, Buffer); + + Status = RtlAnsiStringToUnicodeString(&DeviceString, &AnsiString, FALSE); + ASSERT(Status == STATUS_SUCCESS); + + // subtract consumed bytes + ResultBufferLength -= (DeviceString.Length + sizeof(WCHAR)) / sizeof(WCHAR); + ResultBufferOffset += (DeviceString.Length + sizeof(WCHAR)) / sizeof(WCHAR); + + *NewResultBufferOffset = ResultBufferOffset; +} + +static +NTSTATUS +PdoHandleQueryHardwareId( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_LUN_EXTENSION PDODeviceExtension = DeviceObject->DeviceExtension; + LPCSTR GenericType, DeviceType; + LPWSTR Buffer; + CHAR Id1[50], Id2[50], Id3[50], Id4[50], Id5[50], Id6[50], Id7[50]; + ULONG Id1Length, Id2Length, Id3Length, Id4Length, Id5Length, Id6Length, Id7Length; + ULONG Offset, TotalLength, Length; + PINQUIRYDATA InquiryData; + + InquiryData = &PDODeviceExtension->InquiryData; + + DeviceType = GetDeviceType(InquiryData); + GenericType = GetGenericType(InquiryData); + + ASSERT(GenericType); + + // generate id 1 + // SCSI\SCSIType_VendorId(8)_ProductId(16)_Revision(4) + RtlZeroMemory(Id1, sizeof(Id1)); + Offset = 0; + Offset = sprintf(&Id1[Offset], "SCSI\\"); + Offset += sprintf(&Id1[Offset], DeviceType); + Offset += CopyField(InquiryData->VendorId, &Id1[Offset], 8); + Offset += CopyField(InquiryData->ProductId, &Id1[Offset], 16); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id1[Offset], 4); + Id1Length = strlen(Id1) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId1 %s\n", Id1); + + // generate id 2 + // SCSI\SCSIType_VendorId(8)_ProductId(16) + RtlZeroMemory(Id2, sizeof(Id2)); + Offset = 0; + Offset = sprintf(&Id2[Offset], "SCSI\\"); + Offset += sprintf(&Id2[Offset], DeviceType); + Offset += CopyField(InquiryData->VendorId, &Id2[Offset], 8); + Offset += CopyField(InquiryData->ProductId, &Id2[Offset], 16); + Id2Length = strlen(Id2) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId2 %s\n", Id2); + + // generate id 3 + // SCSI\SCSIType_VendorId(8) + RtlZeroMemory(Id3, sizeof(Id3)); + Offset = 0; + Offset = sprintf(&Id3[Offset], "SCSI\\"); + Offset += sprintf(&Id3[Offset], DeviceType); + Offset += CopyField(InquiryData->VendorId, &Id3[Offset], 8); + Id3Length = strlen(Id3) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); + + // generate id 4 + // SCSI\SCSIType_VendorId(8)_ProductId(16)_Revision(1) + RtlZeroMemory(Id4, sizeof(Id4)); + Offset = 0; + Offset = sprintf(&Id4[Offset], "SCSI\\"); + Offset += sprintf(&Id4[Offset], DeviceType); + Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8); + Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1); + Id4Length = strlen(Id4) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); + + // generate id 5 + // SCSIType_VendorId(8)_ProductId(16)_Revision(1) + RtlZeroMemory(Id5, sizeof(Id5)); + Offset = 0; + Offset = sprintf(&Id5[Offset], DeviceType); + Offset += CopyField(InquiryData->VendorId, &Id5[Offset], 8); + Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1); + Id5Length = strlen(Id5) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); + + // generate id 6 + // SCSI\SCSIType + RtlZeroMemory(Id6, sizeof(Id6)); + Offset = 0; + Offset = sprintf(&Id6[Offset], "SCSI\\"); + Offset += sprintf(&Id6[Offset], GenericType); + Id6Length = strlen(Id6) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); + + // generate id 7 + // SCSIType + RtlZeroMemory(Id7, sizeof(Id7)); + Offset = 0; + Offset = sprintf(&Id7[Offset], GenericType); + Id7Length = strlen(Id7) + 1; + DPRINT("PdoHandleQueryHardwareId HardwareId7 %s\n", Id7); + + TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + Id7Length + 1; + + Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), TAG_SCSIPORT); + if (!Buffer) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // reset offset + Offset = 0; + Length = TotalLength; + + ConvertToUnicodeString(Id1, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id2, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id3, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id4, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id5, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id6, Length, Offset, Buffer, &Offset); + ConvertToUnicodeString(Id7, Length, Offset, Buffer, &Offset); + + Buffer[Offset] = UNICODE_NULL; + + ASSERT(Offset + 1 == Length); + + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; +} + +static +NTSTATUS +PdoHandleQueryCompatibleId( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_LUN_EXTENSION PDODeviceExtension = DeviceObject->DeviceExtension; + CHAR Buffer[100] = {0}; + ULONG Length, Offset; + LPWSTR InstanceId; + LPCSTR DeviceType; + + DeviceType = GetDeviceType(&PDODeviceExtension->InquiryData); + + // format instance id + Length = sprintf(Buffer, "%s", DeviceType) + 1; + Length += sprintf(&Buffer[Length], "%s", "RAW") + 2; + + InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_SCSIPORT); + if (!InstanceId) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset); + ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset); + + InstanceId[Offset] = UNICODE_NULL; + + DPRINT("PdoHandleQueryCompatibleId %S\n", InstanceId); + + Irp->IoStatus.Information = (ULONG_PTR)InstanceId; + return STATUS_SUCCESS; +} + +static +NTSTATUS +PdoHandleQueryInstanceId( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_LUN_EXTENSION lunExt = DeviceObject->DeviceExtension; + WCHAR Buffer[26]; + ULONG Length; + LPWSTR InstanceId; + + // use instance count and LUN + swprintf(Buffer, L"%x%x%x", lunExt->PathId, lunExt->TargetId, lunExt->Lun); + + Length = wcslen(Buffer) + 1; + + InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_SCSIPORT); + if (!InstanceId) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(InstanceId, Buffer); + + DPRINT("PdoHandleQueryInstanceId %S\n", InstanceId); + + Irp->IoStatus.Information = (ULONG_PTR)InstanceId; + return STATUS_SUCCESS; +} + +static +NTSTATUS +PdoHandleDeviceRelations( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PDEVICE_RELATIONS deviceRelations; + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + + // check if relation type is BusRelations + if (ioStack->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + { + // PDO handles only target device relation + return Irp->IoStatus.Status; + } + + deviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_SCSIPORT); + if (!deviceRelations) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + // initialize device relations + deviceRelations->Count = 1; + deviceRelations->Objects[0] = DeviceObject; + ObReferenceObject(DeviceObject); + + Irp->IoStatus.Information = (ULONG_PTR)deviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS +PdoDispatchPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + PSCSI_PORT_LUN_EXTENSION lunExt = DeviceObject->DeviceExtension; + NTSTATUS status; + + DPRINT("PDO PnP request %s\n", GetIRPMinorFunctionString(ioStack->MinorFunction)); + + ASSERT(!lunExt->Common.IsFDO); + + switch (ioStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + RegistryInitLunKey(lunExt); + status = STATUS_SUCCESS; + break; + } + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_QUERY_CAPABILITIES: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + { + status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + status = PdoHandleDeviceRelations(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_TEXT: + { + status = PdoHandleQueryDeviceText(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_ID: + { + DPRINT("IRP_MN_QUERY_ID IdType %s\n", + DbgGetDeviceIDString(ioStack->Parameters.QueryId.IdType)); + + if (ioStack->Parameters.QueryId.IdType == BusQueryDeviceID) + { + status = PdoHandleQueryDeviceId(DeviceObject, Irp); + break; + } + else if (ioStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + status = PdoHandleQueryHardwareId(DeviceObject, Irp); + break; + } + else if (ioStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + status = PdoHandleQueryInstanceId(DeviceObject, Irp); + break; + } + else if (ioStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + status = PdoHandleQueryCompatibleId(DeviceObject, Irp); + break; + } + + // fallthrough + } + default: + { + // do nothing + status = Irp->IoStatus.Status; + } + } + + if (status != STATUS_PENDING) + { + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return status; +} diff --git a/drivers/storage/port/scsiport/power.c b/drivers/storage/port/scsiport/power.c new file mode 100644 index 00000000000..b3c7b4ce89a --- /dev/null +++ b/drivers/storage/port/scsiport/power.c @@ -0,0 +1,41 @@ +/* + * PROJECT: ReactOS Storage Stack / SCSIPORT storage port library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PnP power handlers + * COPYRIGHT: Copyright 2016 Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "scsiport.h" + + +NTSTATUS +NTAPI +ScsiPortDispatchPower( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PSCSI_PORT_COMMON_EXTENSION comExt = DeviceObject->DeviceExtension; + + if (comExt->IsFDO) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(comExt->LowerDevice, Irp); + } + else + { + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + switch (ioStack->MinorFunction) + { + case IRP_MN_SET_POWER: + case IRP_MN_QUERY_POWER: + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + + NTSTATUS status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return status; + } +} diff --git a/drivers/storage/port/scsiport/registry.c b/drivers/storage/port/scsiport/registry.c index 5deaf85c8e9..3b9e235d752 100644 --- a/drivers/storage/port/scsiport/registry.c +++ b/drivers/storage/port/scsiport/registry.c @@ -4,9 +4,11 @@ * PURPOSE: Registry operations * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) * Aleksey Bragin (aleksey(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include "scsiport.h" +#include "scsitypes.h" #define NDEBUG #include <debug.h> @@ -15,26 +17,28 @@ VOID SpiInitOpenKeys( _Inout_ PCONFIGURATION_INFO ConfigInfo, - _In_ PUNICODE_STRING RegistryPath) + _In_ PSCSI_PORT_DRIVER_EXTENSION DriverExtension) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; NTSTATUS Status; + HANDLE parametersKey; + + DriverExtension->IsLegacyDriver = TRUE; /* Open the service key */ InitializeObjectAttributes(&ObjectAttributes, - RegistryPath, - OBJ_CASE_INSENSITIVE, + &DriverExtension->RegistryPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&ConfigInfo->ServiceKey, - KEY_READ, - &ObjectAttributes); + Status = ZwOpenKey(&ConfigInfo->ServiceKey, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); + DPRINT("Unable to open driver's registry key %wZ, status 0x%08x\n", + DriverExtension->RegistryPath, Status); ConfigInfo->ServiceKey = NULL; } @@ -44,14 +48,12 @@ SpiInitOpenKeys( RtlInitUnicodeString(&KeyName, L"Parameters"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigInfo->ServiceKey, - (PSECURITY_DESCRIPTOR) NULL); + NULL); /* Try to open it */ - Status = ZwOpenKey(&ConfigInfo->DeviceKey, - KEY_READ, - &ObjectAttributes); + Status = ZwOpenKey(&ConfigInfo->DeviceKey, KEY_READ, &ObjectAttributes); if (NT_SUCCESS(Status)) { @@ -69,14 +71,32 @@ SpiInitOpenKeys( RtlInitUnicodeString(&KeyName, L"Device"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigInfo->ServiceKey, NULL); /* We don't check for failure here - not needed */ - ZwOpenKey(&ConfigInfo->DeviceKey, - KEY_READ, - &ObjectAttributes); + ZwOpenKey(&ConfigInfo->DeviceKey, KEY_READ, &ObjectAttributes); + + // Detect the driver PnP capabilities via its Parameters\PnpInterface key + // for example: HKLM\SYSTEM\CurrentControlSet\Services\UNIATA\Parameters\PnpInterface + + RtlInitUnicodeString(&KeyName, L"PnpInterface"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + ConfigInfo->ServiceKey, + NULL); + + Status = ZwOpenKey(&parametersKey, KEY_READ, &ObjectAttributes); + + if (NT_SUCCESS(Status)) + { + // if the key exists, it's enough for us for now + // (the proper check should iterate over INTERFACE_TYPE values) + DriverExtension->IsLegacyDriver = FALSE; + ZwClose(parametersKey); + } } } @@ -104,34 +124,24 @@ SpiInitOpenKeys( */ NTSTATUS -SpiBuildDeviceMap( - _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _In_ PUNICODE_STRING RegistryPath) +RegistryInitAdapterKey( + _Inout_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) { - PSCSI_PORT_LUN_EXTENSION LunExtension; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; WCHAR NameBuffer[64]; - ULONG Disposition; HANDLE ScsiKey; HANDLE ScsiPortKey = NULL; HANDLE ScsiBusKey = NULL; HANDLE ScsiInitiatorKey = NULL; - HANDLE ScsiTargetKey = NULL; - HANDLE ScsiLunKey = NULL; ULONG BusNumber; - ULONG Target; - ULONG CurrentTarget; - ULONG Lun; - PWCHAR DriverName; ULONG UlongData; - PWCHAR TypeName; NTSTATUS Status; DPRINT("SpiBuildDeviceMap() called\n"); - if (DeviceExtension == NULL || RegistryPath == NULL) + if (DeviceExtension == NULL) { DPRINT1("Invalid parameter\n"); return STATUS_INVALID_PARAMETER; @@ -151,7 +161,7 @@ SpiBuildDeviceMap( 0, NULL, REG_OPTION_VOLATILE, - &Disposition); + NULL); if (!NT_SUCCESS(Status)) { DPRINT("ZwCreateKey() failed (Status %lx)\n", Status); @@ -165,18 +175,14 @@ SpiBuildDeviceMap( L"Scsi Port %lu", DeviceExtension->PortNumber); RtlInitUnicodeString(&KeyName, NameBuffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_KERNEL_HANDLE, - ScsiKey, - NULL); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_KERNEL_HANDLE, ScsiKey, NULL); Status = ZwCreateKey(&ScsiPortKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, - &Disposition); + NULL); ZwClose(ScsiKey); if (!NT_SUCCESS(Status)) { @@ -206,14 +212,29 @@ SpiBuildDeviceMap( } /* Set 'Driver' (REG_SZ) value */ - DriverName = wcsrchr(RegistryPath->Buffer, L'\\') + 1; + PUNICODE_STRING driverNameU = &DeviceExtension->Common.DeviceObject->DriverObject->DriverName; + PWCHAR driverName = ExAllocatePoolWithTag(PagedPool, + driverNameU->Length + sizeof(UNICODE_NULL), + TAG_SCSIPORT); + if (!driverName) + { + DPRINT("Failed to allocate driverName!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(driverName, driverNameU->Buffer, driverNameU->Length); + driverName[driverNameU->Length / sizeof(WCHAR)] = UNICODE_NULL; + RtlInitUnicodeString(&ValueName, L"Driver"); Status = ZwSetValueKey(ScsiPortKey, &ValueName, 0, REG_SZ, - DriverName, - (ULONG)((wcslen(DriverName) + 1) * sizeof(WCHAR))); + driverName, + driverNameU->Length + sizeof(UNICODE_NULL)); + + ExFreePoolWithTag(driverName, TAG_SCSIPORT); + if (!NT_SUCCESS(Status)) { DPRINT("ZwSetValueKey('Driver') failed (Status %lx)\n", Status); @@ -256,7 +277,7 @@ SpiBuildDeviceMap( } /* Enumerate buses */ - for (BusNumber = 0; BusNumber < DeviceExtension->PortConfig->NumberOfBuses; BusNumber++) + for (BusNumber = 0; BusNumber < DeviceExtension->NumberOfBuses; BusNumber++) { /* Create 'Scsi Bus X' key */ DPRINT(" Scsi Bus %lu\n", BusNumber); @@ -266,7 +287,7 @@ SpiBuildDeviceMap( RtlInitUnicodeString(&KeyName, NameBuffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - 0, + OBJ_KERNEL_HANDLE, ScsiPortKey, NULL); Status = ZwCreateKey(&ScsiBusKey, @@ -275,7 +296,7 @@ SpiBuildDeviceMap( 0, NULL, REG_OPTION_VOLATILE, - &Disposition); + NULL); if (!NT_SUCCESS(Status)) { DPRINT("ZwCreateKey() failed (Status %lx)\n", Status); @@ -291,7 +312,7 @@ SpiBuildDeviceMap( RtlInitUnicodeString(&KeyName, NameBuffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - 0, + OBJ_KERNEL_HANDLE, ScsiBusKey, NULL); Status = ZwCreateKey(&ScsiInitiatorKey, @@ -300,7 +321,7 @@ SpiBuildDeviceMap( 0, NULL, REG_OPTION_VOLATILE, - &Disposition); + NULL); if (!NT_SUCCESS(Status)) { DPRINT("ZwCreateKey() failed (Status %lx)\n", Status); @@ -312,202 +333,14 @@ SpiBuildDeviceMap( ZwClose(ScsiInitiatorKey); ScsiInitiatorKey = NULL; - - /* Enumerate targets */ - CurrentTarget = (ULONG)-1; - ScsiTargetKey = NULL; - for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) - { - for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) - { - LunExtension = SpiGetLunExtension(DeviceExtension, - (UCHAR)BusNumber, - (UCHAR)Target, - (UCHAR)Lun); - if (LunExtension == NULL) - continue; - - if (Target != CurrentTarget) - { - /* Close old target key */ - if (ScsiTargetKey != NULL) - { - ZwClose(ScsiTargetKey); - ScsiTargetKey = NULL; - } - - /* Create 'Target Id X' key */ - DPRINT(" Target Id %lu\n", Target); - swprintf(NameBuffer, - L"Target Id %lu", - Target); - RtlInitUnicodeString(&KeyName, NameBuffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - 0, - ScsiBusKey, - NULL); - Status = ZwCreateKey(&ScsiTargetKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateKey() failed (Status %lx)\n", Status); - goto ByeBye; - } - - CurrentTarget = Target; - } - - /* Create 'Logical Unit Id X' key */ - DPRINT(" Logical Unit Id %lu\n", Lun); - swprintf(NameBuffer, - L"Logical Unit Id %lu", - Lun); - RtlInitUnicodeString(&KeyName, NameBuffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - 0, - ScsiTargetKey, - NULL); - Status = ZwCreateKey(&ScsiLunKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateKey() failed (Status %lx)\n", Status); - goto ByeBye; - } - - /* Set 'Identifier' (REG_SZ) value */ - swprintf(NameBuffer, - L"%.8S%.16S%.4S", - LunExtension->InquiryData.VendorId, - LunExtension->InquiryData.ProductId, - LunExtension->InquiryData.ProductRevisionLevel); - DPRINT(" Identifier = '%S'\n", NameBuffer); - RtlInitUnicodeString(&ValueName, L"Identifier"); - Status = ZwSetValueKey(ScsiLunKey, - &ValueName, - 0, - REG_SZ, - NameBuffer, - (ULONG)((wcslen(NameBuffer) + 1) * sizeof(WCHAR))); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey('Identifier') failed (Status %lx)\n", Status); - goto ByeBye; - } - - /* Set 'Type' (REG_SZ) value */ - /* - * See https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… - * and https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… - * for a list of types with their human-readable forms. - */ - switch (LunExtension->InquiryData.DeviceType) - { - case 0: - TypeName = L"DiskPeripheral"; - break; - case 1: - TypeName = L"TapePeripheral"; - break; - case 2: - TypeName = L"PrinterPeripheral"; - break; - // case 3: "ProcessorPeripheral", classified as 'other': fall back to default case. - case 4: - TypeName = L"WormPeripheral"; - break; - case 5: - TypeName = L"CdRomPeripheral"; - break; - case 6: - TypeName = L"ScannerPeripheral"; - break; - case 7: - TypeName = L"OpticalDiskPeripheral"; - break; - case 8: - TypeName = L"MediumChangerPeripheral"; - break; - case 9: - TypeName = L"CommunicationsPeripheral"; - break; - - /* New peripheral types (SCSI only) */ - case 10: case 11: - TypeName = L"ASCPrePressGraphicsPeripheral"; - break; - case 12: - TypeName = L"ArrayPeripheral"; - break; - case 13: - TypeName = L"EnclosurePeripheral"; - break; - case 14: - TypeName = L"RBCPeripheral"; - break; - case 15: - TypeName = L"CardReaderPeripheral"; - break; - case 16: - TypeName = L"BridgePeripheral"; - break; - - default: - TypeName = L"OtherPeripheral"; - break; - } - DPRINT(" Type = '%S'\n", TypeName); - RtlInitUnicodeString(&ValueName, L"Type"); - Status = ZwSetValueKey(ScsiLunKey, - &ValueName, - 0, - REG_SZ, - TypeName, - (ULONG)((wcslen(TypeName) + 1) * sizeof(WCHAR))); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey('Type') failed (Status %lx)\n", Status); - goto ByeBye; - } - - ZwClose(ScsiLunKey); - ScsiLunKey = NULL; - } - - /* Close old target key */ - if (ScsiTargetKey != NULL) - { - ZwClose(ScsiTargetKey); - ScsiTargetKey = NULL; - } - } - - ZwClose(ScsiBusKey); + DeviceExtension->Buses[BusNumber].RegistryMapKey = ScsiBusKey; ScsiBusKey = NULL; } ByeBye: - if (ScsiLunKey != NULL) - ZwClose(ScsiLunKey); - if (ScsiInitiatorKey != NULL) ZwClose(ScsiInitiatorKey); - if (ScsiTargetKey != NULL) - ZwClose(ScsiTargetKey); - if (ScsiBusKey != NULL) ZwClose(ScsiBusKey); @@ -518,3 +351,109 @@ ByeBye: return Status; } + +NTSTATUS +RegistryInitLunKey( + _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension) +{ + WCHAR nameBuffer[64]; + UNICODE_STRING keyName; + UNICODE_STRING valueName; + OBJECT_ATTRIBUTES objectAttributes; + HANDLE targetKey; + NTSTATUS status; + + // get the LUN's bus key + PSCSI_PORT_DEVICE_EXTENSION portExt = LunExtension->Common.LowerDevice->DeviceExtension; + HANDLE busKey = portExt->Buses[LunExtension->PathId].RegistryMapKey; + + // create/open 'Target Id X' key + swprintf(nameBuffer, L"Target Id %lu", LunExtension->TargetId); + RtlInitUnicodeString(&keyName, nameBuffer); + InitializeObjectAttributes(&objectAttributes, &keyName, OBJ_KERNEL_HANDLE, busKey, NULL); + status = ZwCreateKey(&targetKey, + KEY_ALL_ACCESS, + &objectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(status)) + { + DPRINT("ZwCreateKey() failed (Status %lx)\n", status); + return status; + } + + // Create 'Logical Unit Id X' key + swprintf(nameBuffer, L"Logical Unit Id %lu", LunExtension->Lun); + RtlInitUnicodeString(&keyName, nameBuffer); + InitializeObjectAttributes(&objectAttributes, &keyName, OBJ_KERNEL_HANDLE, targetKey, NULL); + status = ZwCreateKey(&LunExtension->RegistryMapKey, + KEY_ALL_ACCESS, + &objectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(status)) + { + DPRINT("ZwCreateKey() failed (Status %lx)\n", status); + goto ByeBye; + } + + // Set 'Identifier' (REG_SZ) value + swprintf(nameBuffer, + L"%.8S%.16S%.4S", + LunExtension->InquiryData.VendorId, + LunExtension->InquiryData.ProductId, + LunExtension->InquiryData.ProductRevisionLevel); + RtlInitUnicodeString(&valueName, L"Identifier"); + status = ZwSetValueKey(LunExtension->RegistryMapKey, + &valueName, + 0, + REG_SZ, + nameBuffer, + (wcslen(nameBuffer) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(status)) + { + DPRINT("ZwSetValueKey('Identifier') failed (Status %lx)\n", status); + goto ByeBye; + } + + // Set 'Type' (REG_SZ) value + PWCHAR typeName = (PWCHAR)GetPeripheralTypeW(&LunExtension->InquiryData); + DPRINT(" Type = '%S'\n", typeName); + RtlInitUnicodeString(&valueName, L"Type"); + status = ZwSetValueKey(LunExtension->RegistryMapKey, + &valueName, + 0, + REG_SZ, + typeName, + (wcslen(typeName) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(status)) + { + DPRINT("ZwSetValueKey('Type') failed (Status %lx)\n", status); + goto ByeBye; + } + + // Set 'InquiryData' (REG_BINARY) value + RtlInitUnicodeString(&valueName, L"InquiryData"); + status = ZwSetValueKey(LunExtension->RegistryMapKey, + &valueName, + 0, + REG_BINARY, + &LunExtension->InquiryData, + INQUIRYDATABUFFERSIZE); + if (!NT_SUCCESS(status)) + { + DPRINT("ZwSetValueKey('InquiryData') failed (Status %lx)\n", status); + goto ByeBye; + } + +ByeBye: + ZwClose(targetKey); + // TODO: maybe we will need it in future + ZwClose(LunExtension->RegistryMapKey); + + return status; +} diff --git a/drivers/storage/port/scsiport/scsi.c b/drivers/storage/port/scsiport/scsi.c index 7feb6da5cdf..29b683d10c0 100644 --- a/drivers/storage/port/scsiport/scsi.c +++ b/drivers/storage/port/scsiport/scsi.c @@ -50,47 +50,17 @@ SpiStatusSrbToNt( static NTSTATUS SpiHandleAttachRelease( - _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, + _In_ PSCSI_PORT_LUN_EXTENSION LunExtension, _Inout_ PIRP Irp) { - PSCSI_LUN_INFO LunInfo; - PIO_STACK_LOCATION IrpStack; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = + LunExtension->Common.LowerDevice->DeviceExtension; PDEVICE_OBJECT DeviceObject; - PSCSI_REQUEST_BLOCK Srb; KIRQL Irql; /* Get pointer to the SRB */ - IrpStack = IoGetCurrentIrpStackLocation(Irp); - Srb = (PSCSI_REQUEST_BLOCK)IrpStack->Parameters.Others.Argument1; - - /* Check if PathId matches number of buses */ - if (DeviceExtension->BusesConfig == NULL || - DeviceExtension->BusesConfig->NumberOfBuses <= Srb->PathId) - { - Srb->SrbStatus = SRB_STATUS_NO_DEVICE; - return STATUS_DEVICE_DOES_NOT_EXIST; - } - - /* Get pointer to LunInfo */ - LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Srb->PathId]->LunInfo; - - /* Find matching LunInfo */ - while (LunInfo) - { - if (LunInfo->PathId == Srb->PathId && - LunInfo->TargetId == Srb->TargetId && - LunInfo->Lun == Srb->Lun) - { - break; - } - - LunInfo = LunInfo->Next; - } - - /* If we couldn't find it - exit */ - if (LunInfo == NULL) - return STATUS_DEVICE_DOES_NOT_EXIST; - + PIO_STACK_LOCATION IrpStack = IoGetCurrentIrpStackLocation(Irp); + PSCSI_REQUEST_BLOCK Srb = IrpStack->Parameters.Scsi.Srb; /* Get spinlock */ KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); @@ -98,7 +68,7 @@ SpiHandleAttachRelease( /* Release, if asked */ if (Srb->Function == SRB_FUNCTION_RELEASE_DEVICE) { - LunInfo->DeviceClaimed = FALSE; + LunExtension->DeviceClaimed = FALSE; KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); Srb->SrbStatus = SRB_STATUS_SUCCESS; @@ -106,7 +76,7 @@ SpiHandleAttachRelease( } /* Attach, if not already claimed */ - if (LunInfo->DeviceClaimed) + if (LunExtension->DeviceClaimed) { KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); Srb->SrbStatus = SRB_STATUS_BUSY; @@ -115,13 +85,13 @@ SpiHandleAttachRelease( } /* Save the device object */ - DeviceObject = LunInfo->DeviceObject; + DeviceObject = LunExtension->Common.DeviceObject; if (Srb->Function == SRB_FUNCTION_CLAIM_DEVICE) - LunInfo->DeviceClaimed = TRUE; + LunExtension->DeviceClaimed = TRUE; if (Srb->Function == SRB_FUNCTION_ATTACH_DEVICE) - LunInfo->DeviceObject = Srb->DataBuffer; + LunExtension->Common.DeviceObject = Srb->DataBuffer; Srb->DataBuffer = DeviceObject; @@ -154,8 +124,8 @@ ScsiPortDispatchScsi( _In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - PSCSI_PORT_LUN_EXTENSION LunExtension; + PSCSI_PORT_DEVICE_EXTENSION portExt; + PSCSI_PORT_LUN_EXTENSION lunExt; PIO_STACK_LOCATION Stack; PSCSI_REQUEST_BLOCK Srb; KIRQL Irql; @@ -165,10 +135,12 @@ ScsiPortDispatchScsi( DPRINT("ScsiPortDispatchScsi(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); - Srb = Stack->Parameters.Scsi.Srb; + lunExt = DeviceObject->DeviceExtension; + ASSERT(!lunExt->Common.IsFDO); + portExt = lunExt->Common.LowerDevice->DeviceExtension; + if (Srb == NULL) { DPRINT1("ScsiPortDispatchScsi() called with Srb = NULL!\n"); @@ -179,15 +151,16 @@ ScsiPortDispatchScsi( IoCompleteRequest(Irp, IO_NO_INCREMENT); - return (Status); + return Status; } - DPRINT("Srb: %p\n", Srb); - DPRINT("Srb->Function: %lu\n", Srb->Function); - DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n", Srb->PathId, Srb->TargetId, Srb->Lun); + DPRINT("Srb: %p, Srb->Function: %lu\n", Srb, Srb->Function); - LunExtension = SpiGetLunExtension(DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun); - if (LunExtension == NULL) + Srb->PathId = lunExt->PathId; + Srb->TargetId = lunExt->TargetId; + Srb->Lun = lunExt->Lun; + + if (lunExt == NULL) { DPRINT("ScsiPortDispatchScsi() called with an invalid LUN\n"); Status = STATUS_NO_SUCH_DEVICE; @@ -198,7 +171,7 @@ ScsiPortDispatchScsi( IoCompleteRequest(Irp, IO_NO_INCREMENT); - return (Status); + return Status; } switch (Srb->Function) @@ -206,7 +179,7 @@ ScsiPortDispatchScsi( case SRB_FUNCTION_SHUTDOWN: case SRB_FUNCTION_FLUSH: DPRINT(" SRB_FUNCTION_SHUTDOWN or FLUSH\n"); - if (DeviceExtension->CachesData == FALSE) + if (portExt->CachesData == FALSE) { /* All success here */ Srb->SrbStatus = SRB_STATUS_SUCCESS; @@ -225,7 +198,7 @@ ScsiPortDispatchScsi( if (Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) { /* Start IO directly */ - IoStartPacket(DeviceObject, Irp, NULL, NULL); + IoStartPacket(portExt->Common.DeviceObject, Irp, NULL, NULL); } else { @@ -235,13 +208,12 @@ ScsiPortDispatchScsi( KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); /* Insert IRP into the queue */ - if (!KeInsertByKeyDeviceQueue( - &LunExtension->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry, - Srb->QueueSortKey)) + if (!KeInsertByKeyDeviceQueue(&lunExt->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry, + Srb->QueueSortKey)) { /* It means the queue is empty, and we just start this request */ - IoStartPacket(DeviceObject, Irp, NULL, NULL); + IoStartPacket(portExt->Common.DeviceObject, Irp, NULL, NULL); } /* Back to the old IRQL */ @@ -254,39 +226,40 @@ ScsiPortDispatchScsi( DPRINT(" SRB_FUNCTION_CLAIM_DEVICE or ATTACH\n"); /* Reference device object and keep the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); + Status = SpiHandleAttachRelease(lunExt, Irp); break; case SRB_FUNCTION_RELEASE_DEVICE: DPRINT(" SRB_FUNCTION_RELEASE_DEVICE\n"); /* Dereference device object and clear the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); + Status = SpiHandleAttachRelease(lunExt, Irp); break; case SRB_FUNCTION_RELEASE_QUEUE: DPRINT(" SRB_FUNCTION_RELEASE_QUEUE\n"); /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + KeAcquireSpinLock(&portExt->SpinLock, &Irql); - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + if (!(lunExt->Flags & LUNEX_FROZEN_QUEUE)) { DPRINT("Queue is not frozen really\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + KeReleaseSpinLock(&portExt->SpinLock, Irql); Srb->SrbStatus = SRB_STATUS_SUCCESS; Status = STATUS_SUCCESS; break; + } /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + lunExt->Flags &= ~LUNEX_FROZEN_QUEUE; - if (LunExtension->SrbInfo.Srb == NULL) + if (lunExt->SrbInfo.Srb == NULL) { /* Get next logical unit request */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + SpiGetNextRequestFromLun(portExt, lunExt); /* SpiGetNextRequestFromLun() releases the spinlock */ KeLowerIrql(Irql); @@ -294,7 +267,7 @@ ScsiPortDispatchScsi( else { DPRINT("The queue has active request\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + KeReleaseSpinLock(&portExt->SpinLock, Irql); } Srb->SrbStatus = SRB_STATUS_SUCCESS; @@ -305,23 +278,23 @@ ScsiPortDispatchScsi( DPRINT(" SRB_FUNCTION_FLUSH_QUEUE\n"); /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + KeAcquireSpinLock(&portExt->SpinLock, &Irql); - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + if (!(lunExt->Flags & LUNEX_FROZEN_QUEUE)) { DPRINT("Queue is not frozen really\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + KeReleaseSpinLock(&portExt->SpinLock, Irql); Status = STATUS_INVALID_DEVICE_REQUEST; break; } /* Make sure there is no active request */ - ASSERT(LunExtension->SrbInfo.Srb == NULL); + ASSERT(lunExt->SrbInfo.Srb == NULL); /* Compile a list from the device queue */ IrpList = NULL; - while ((Entry = KeRemoveDeviceQueue(&LunExtension->DeviceQueue)) != NULL) + while ((Entry = KeRemoveDeviceQueue(&lunExt->DeviceQueue)) != NULL) { NextIrp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); @@ -339,10 +312,10 @@ ScsiPortDispatchScsi( } /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + lunExt->Flags &= ~LUNEX_FROZEN_QUEUE; /* Release the spinlock */ - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + KeReleaseSpinLock(&portExt->SpinLock, Irql); /* Complete those requests */ while (IrpList) @@ -415,7 +388,7 @@ SpiGetNextRequestFromLun( KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); /* Start the next pending request */ - IoStartPacket(DeviceExtension->DeviceObject, NextIrp, (PULONG)NULL, NULL); + IoStartPacket(DeviceExtension->Common.DeviceObject, NextIrp, (PULONG)NULL, NULL); return; } @@ -454,7 +427,7 @@ SpiGetNextRequestFromLun( KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); /* Start the next pending request */ - IoStartPacket(DeviceExtension->DeviceObject, NextIrp, (PULONG)NULL, NULL); + IoStartPacket(DeviceExtension->Common.DeviceObject, NextIrp, (PULONG)NULL, NULL); } else { @@ -525,7 +498,7 @@ SpiSenseCompletionRoutine( static VOID SpiSendRequestSense( - _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, + _In_ PSCSI_PORT_LUN_EXTENSION LunExtension, _In_ PSCSI_REQUEST_BLOCK InitialSrb) { PSCSI_REQUEST_BLOCK Srb; @@ -544,7 +517,7 @@ SpiSendRequestSense( /* Allocate IRP */ LargeInt.QuadPart = (LONGLONG) 1; Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_READ, - DeviceExtension->DeviceObject, + LunExtension->Common.DeviceObject, InitialSrb->SenseInfoBuffer, InitialSrb->SenseInfoBufferLength, &LargeInt, @@ -621,7 +594,7 @@ SpiSendRequestSense( Srb->NextSrb = 0; /* Call the driver */ - (VOID)IoCallDriver(DeviceExtension->DeviceObject, Irp); + (VOID)IoCallDriver(LunExtension->Common.DeviceObject, Irp); DPRINT("SpiSendRequestSense() done\n"); } @@ -642,12 +615,11 @@ SpiProcessCompletedRequest( Srb = SrbInfo->Srb; Irp = Srb->OriginalRequest; + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); /* Get Lun extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); + LunExtension = IoStack->DeviceObject->DeviceExtension; + ASSERT(LunExtension && !LunExtension->Common.IsFDO); if (Srb->SrbFlags & SRB_FLAGS_UNSPECIFIED_DIRECTION && DeviceExtension->MapBuffers && @@ -697,7 +669,7 @@ SpiProcessCompletedRequest( !(*NeedToCallStartIo)) { /* We're not busy, but we have a request pending */ - IoStartNextPacket(DeviceExtension->DeviceObject, FALSE); + IoStartNextPacket(DeviceExtension->Common.DeviceObject, FALSE); } } @@ -931,7 +903,7 @@ Error: KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); /* Send RequestSense */ - SpiSendRequestSense(DeviceExtension, Srb); + SpiSendRequestSense(LunExtension, Srb); /* Exit */ return; @@ -950,10 +922,11 @@ NTAPI ScsiPortStartPacket( _In_ PVOID Context) { - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION IrpStack; PSCSI_REQUEST_BLOCK Srb; PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; + PSCSI_PORT_COMMON_EXTENSION CommonExtension = DeviceObject->DeviceExtension; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; PSCSI_REQUEST_BLOCK_INFO SrbInfo; BOOLEAN Result; @@ -961,16 +934,20 @@ ScsiPortStartPacket( DPRINT("ScsiPortStartPacket() called\n"); - DeviceExtension = (PSCSI_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IrpStack = IoGetCurrentIrpStackLocation(DeviceObject->CurrentIrp); Srb = IrpStack->Parameters.Scsi.Srb; - /* Get LUN extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); + if (CommonExtension->IsFDO) // IsFDO + { + DeviceExtension = DeviceObject->DeviceExtension; + LunExtension = IrpStack->DeviceObject->DeviceExtension; + ASSERT(LunExtension && !LunExtension->Common.IsFDO); + } + else + { + LunExtension = DeviceObject->DeviceExtension; + DeviceExtension = LunExtension->Common.LowerDevice->DeviceExtension; + } /* Check if we are in a reset state */ if (DeviceExtension->InterruptData.Flags & SCSI_PORT_RESET) @@ -1006,11 +983,7 @@ ScsiPortStartPacket( if (Srb->Function == SRB_FUNCTION_ABORT_COMMAND) { /* Get pointer to SRB info structure */ - SrbInfo = SpiGetSrbData(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun, - Srb->QueueTag); + SrbInfo = SpiGetSrbData(DeviceExtension, LunExtension, Srb->QueueTag); /* Check if the request is still "active" */ if (SrbInfo == NULL || @@ -1036,7 +1009,7 @@ ScsiPortStartPacket( DeviceExtension->MiniPortDeviceExtension); /* They might ask for some work, so queue the DPC for them */ - IoRequestDpc(DeviceExtension->DeviceObject, NULL, NULL); + IoRequestDpc(DeviceExtension->Common.DeviceObject, NULL, NULL); /* We're done in this branch */ return TRUE; @@ -1096,7 +1069,7 @@ ScsiPortStartPacket( /* If notification is needed, then request a DPC */ if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) - IoRequestDpc(DeviceExtension->DeviceObject, NULL, NULL); + IoRequestDpc(DeviceExtension->Common.DeviceObject, NULL, NULL); return Result; } @@ -1140,10 +1113,9 @@ SpiSaveInterruptData(IN PVOID Context) /* Get SRB and LunExtension */ Srb = SrbInfo->Srb; - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Srb->OriginalRequest); + LunExtension = IoStack->DeviceObject->DeviceExtension; + ASSERT(LunExtension && !LunExtension->Common.IsFDO); /* We have to check special cases if request is unsuccessful*/ if (Srb->SrbStatus != SRB_STATUS_SUCCESS) @@ -1359,7 +1331,7 @@ TryAgain: /* If we ready for next packet, start it */ if (InterruptData.Flags & SCSI_PORT_NEXT_REQUEST_READY) - IoStartNextPacket(DeviceExtension->DeviceObject, FALSE); + IoStartNextPacket(DeviceExtension->Common.DeviceObject, FALSE); NeedToStartIo = FALSE; @@ -1456,11 +1428,7 @@ SpiAllocateSrbStructures( /* Treat the abort request in a special way */ if (Srb->Function == SRB_FUNCTION_ABORT_COMMAND) { - SrbInfo = SpiGetSrbData(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun, - Srb->QueueTag); + SrbInfo = SpiGetSrbData(DeviceExtension, LunExtension, Srb->QueueTag); } else if (Srb->SrbFlags & (SRB_FLAGS_QUEUE_ACTION_ENABLE | SRB_FLAGS_NO_QUEUE_FREEZE) && @@ -1606,20 +1574,18 @@ ScsiPortStartIo( DeviceExtension = DeviceObject->DeviceExtension; IrpStack = IoGetCurrentIrpStackLocation(Irp); + LunExtension = IrpStack->DeviceObject->DeviceExtension; - DPRINT("DeviceExtension %p\n", DeviceExtension); + ASSERT(DeviceExtension->Common.IsFDO); + ASSERT(!LunExtension->Common.IsFDO); + + DPRINT("LunExtension %p DeviceExtension %p\n", LunExtension, DeviceExtension); Srb = IrpStack->Parameters.Scsi.Srb; /* Apply "default" flags */ Srb->SrbFlags |= DeviceExtension->SrbFlags; - /* Get LUN extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); - if (DeviceExtension->NeedSrbDataAlloc || DeviceExtension->NeedSrbExtensionAlloc) { @@ -1699,7 +1665,7 @@ ScsiPortStartIo( /* Allocate adapter channel */ Status = IoAllocateAdapterChannel(DeviceExtension->AdapterObject, - DeviceExtension->DeviceObject, + DeviceExtension->Common.DeviceObject, SrbInfo->NumberOfMapRegisters, SpiAdapterControl, SrbInfo); @@ -1717,7 +1683,7 @@ ScsiPortStartIo( DeviceExtension + 1); /* Request DPC for that work */ - IoRequestDpc(DeviceExtension->DeviceObject, NULL, NULL); + IoRequestDpc(DeviceExtension->Common.DeviceObject, NULL, NULL); } /* Control goes to SpiAdapterControl */ diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index 1f527947d25..8e6e3e3c198 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -4,6 +4,7 @@ * PURPOSE: Main and exported functions * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) * Aleksey Bragin (aleksey(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -112,8 +113,43 @@ NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT("ScsiPort Driver %s\n", VERSION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; +} + +VOID +NTAPI +ScsiPortUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + // no-op +} + +NTSTATUS +NTAPI +ScsiPortDispatchPnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + if (((PSCSI_PORT_COMMON_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + { + return FdoDispatchPnp(DeviceObject, Irp); + } + else + { + return PdoDispatchPnp(DeviceObject, Irp); + } +} + +NTSTATUS +NTAPI +ScsiPortAddDevice( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT PhysicalDeviceObject) +{ + + DPRINT("AddDevice no-op DriverObj: %p, PDO: %p\n", DriverObject, PhysicalDeviceObject); + + return STATUS_SUCCESS; } @@ -202,8 +238,6 @@ ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, PSCSI_PORT_LUN_EXTENSION LunExtension; PSCSI_REQUEST_BLOCK_INFO SrbInfo; PLIST_ENTRY ListEntry; - ULONG BusNumber; - ULONG Target; DPRINT("ScsiPortCompleteRequest() called\n"); @@ -212,60 +246,56 @@ ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, MiniPortDeviceExtension); /* Go through all buses */ - for (BusNumber = 0; BusNumber < 8; BusNumber++) + for (UINT8 pathId = 0; pathId < DeviceExtension->NumberOfBuses; pathId++) { - /* Go through all targets */ - for (Target = 0; Target < DeviceExtension->MaxTargedIds; Target++) + PSCSI_BUS_INFO bus = &DeviceExtension->Buses[pathId]; + + /* Go through all logical units */ + for (PLIST_ENTRY lunEntry = bus->LunsListHead.Flink; + lunEntry != &bus->LunsListHead; + lunEntry = lunEntry->Flink) { - /* Get logical unit list head */ - LunExtension = DeviceExtension->LunExtensionList[Target % 8]; + LunExtension = CONTAINING_RECORD(lunEntry, SCSI_PORT_LUN_EXTENSION, LunEntry); - /* Go through all logical units */ - while (LunExtension) + /* Now match what caller asked with what we are at now */ + if ((PathId == SP_UNTAGGED || PathId == LunExtension->PathId) && + (TargetId == SP_UNTAGGED || TargetId == LunExtension->TargetId) && + (Lun == SP_UNTAGGED || Lun == LunExtension->Lun)) { - /* Now match what caller asked with what we are at now */ - if ((PathId == SP_UNTAGGED || PathId == LunExtension->PathId) && - (TargetId == SP_UNTAGGED || TargetId == LunExtension->TargetId) && - (Lun == SP_UNTAGGED || Lun == LunExtension->Lun)) + /* Yes, that's what caller asked for. Complete abort requests */ + if (LunExtension->CompletedAbortRequests) { - /* Yes, that's what caller asked for. Complete abort requests */ - if (LunExtension->CompletedAbortRequests) - { - /* TODO: Save SrbStatus in this request */ - DPRINT1("Completing abort request without setting SrbStatus!\n"); + /* TODO: Save SrbStatus in this request */ + DPRINT1("Completing abort request without setting SrbStatus!\n"); - /* Issue a notification request */ - ScsiPortNotification(RequestComplete, - HwDeviceExtension, - LunExtension->CompletedAbortRequests); - } + /* Issue a notification request */ + ScsiPortNotification(RequestComplete, + HwDeviceExtension, + LunExtension->CompletedAbortRequests); + } + + /* Complete the request using our helper */ + SpiCompleteRequest(HwDeviceExtension, + &LunExtension->SrbInfo, + SrbStatus); - /* Complete the request using our helper */ + /* Go through the queue and complete everything there too */ + ListEntry = LunExtension->SrbInfo.Requests.Flink; + while (ListEntry != &LunExtension->SrbInfo.Requests) + { + /* Get the actual SRB info entry */ + SrbInfo = CONTAINING_RECORD(ListEntry, + SCSI_REQUEST_BLOCK_INFO, + Requests); + + /* Complete it */ SpiCompleteRequest(HwDeviceExtension, - &LunExtension->SrbInfo, + SrbInfo, SrbStatus); - /* Go through the queue and complete everything there too */ - ListEntry = LunExtension->SrbInfo.Requests.Flink; - while (ListEntry != &LunExtension->SrbInfo.Requests) - { - /* Get the actual SRB info entry */ - SrbInfo = CONTAINING_RECORD(ListEntry, - SCSI_REQUEST_BLOCK_INFO, - Requests); - - /* Complete it */ - SpiCompleteRequest(HwDeviceExtension, - SrbInfo, - SrbStatus); - - /* Advance to the next request in queue */ - ListEntry = SrbInfo->Requests.Flink; - } + /* Advance to the next request in queue */ + ListEntry = SrbInfo->Requests.Flink; } - - /* Advance to the next one */ - LunExtension = LunExtension->Next; } } } @@ -468,10 +498,8 @@ ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, return NULL; } - LunExtension = SpiGetLunExtension(DeviceExtension, - PathId, - TargetId, - Lun); + LunExtension = GetLunByPath(DeviceExtension, PathId, TargetId, Lun); + /* Check that the logical unit exists */ if (!LunExtension) { @@ -517,12 +545,12 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, } else if (DeviceExtension->MapRegisters) { + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Srb->OriginalRequest); + PSCSI_PORT_LUN_EXTENSION LunExtension = IoStack->DeviceObject->DeviceExtension; + ASSERT(LunExtension && !LunExtension->Common.IsFDO); + /* Scatter-gather list must be used */ - SrbInfo = SpiGetSrbData(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun, - Srb->QueueTag); + SrbInfo = SpiGetSrbData(DeviceExtension, LunExtension, Srb->QueueTag); SGList = SrbInfo->ScatterGather; @@ -816,7 +844,6 @@ ScsiPortInitialize( PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = NULL; PCONFIGURATION_INFORMATION SystemConfig; PPORT_CONFIGURATION_INFORMATION PortConfig; - PORT_CONFIGURATION_INFORMATION InitialPortConfig; CONFIGURATION_INFO ConfigInfo; ULONG DeviceExtensionSize; ULONG PortConfigSize; @@ -829,16 +856,10 @@ ScsiPortInitialize( PCI_SLOT_NUMBER SlotNumber; PDEVICE_OBJECT PortDeviceObject; - WCHAR NameBuffer[80]; UNICODE_STRING DeviceName; - WCHAR DosNameBuffer[80]; - UNICODE_STRING DosDeviceName; PIO_SCSI_CAPABILITIES PortCapabilities; PCM_RESOURCE_LIST ResourceList; - BOOLEAN Conflict; - SIZE_T BusConfigSize; - DPRINT ("ScsiPortInitialize() called!\n"); @@ -849,15 +870,46 @@ ScsiPortInitialize( (HwInitializationData->HwFindAdapter == NULL) || (HwInitializationData->HwResetBus == NULL)) { - return STATUS_INVALID_PARAMETER; + return STATUS_REVISION_MISMATCH; } + PSCSI_PORT_DRIVER_EXTENSION driverExtension; + + // ScsiPortInitialize may be called multiple times by the same driver + driverExtension = IoGetDriverObjectExtension(DriverObject, HwInitializationData->HwInitialize); + + if (!driverExtension) + { + Status = IoAllocateDriverObjectExtension(DriverObject, + HwInitializationData->HwInitialize, + sizeof(SCSI_PORT_DRIVER_EXTENSION), + (PVOID *)&driverExtension); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate the driver extension! Status 0x%x\n", Status); + return Status; + } + } + + // set up the driver extension + driverExtension->RegistryPath.Buffer = + ExAllocatePoolWithTag(PagedPool, RegistryPath->MaximumLength, TAG_SCSIPORT); + driverExtension->RegistryPath.MaximumLength = RegistryPath->MaximumLength; + RtlCopyUnicodeString(&driverExtension->RegistryPath, RegistryPath); + + driverExtension->DriverObject = DriverObject; + /* Set handlers */ + DriverObject->DriverUnload = ScsiPortUnload; DriverObject->DriverStartIo = ScsiPortStartIo; + DriverObject->DriverExtension->AddDevice = ScsiPortAddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = ScsiPortCreateClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScsiPortCreateClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScsiPortDeviceControl; DriverObject->MajorFunction[IRP_MJ_SCSI] = ScsiPortDispatchScsi; + DriverObject->MajorFunction[IRP_MJ_PNP] = ScsiPortDispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = ScsiPortDispatchPower; /* Obtain configuration information */ SystemConfig = IoGetConfigurationInformation(); @@ -880,8 +932,11 @@ ScsiPortInitialize( return STATUS_INSUFFICIENT_RESOURCES; } - /* Open registry keys */ - SpiInitOpenKeys(&ConfigInfo, (PUNICODE_STRING)Argument2); + /* Open registry keys and fill the driverExtension */ + SpiInitOpenKeys(&ConfigInfo, driverExtension); + + // FIXME: PnP miniports are not supported + ASSERT(driverExtension->IsLegacyDriver); /* Last adapter number = not known */ ConfigInfo.LastAdapterNumber = SP_UNINITIALIZED_VALUE; @@ -895,11 +950,18 @@ ScsiPortInitialize( while (TRUE) { + WCHAR NameBuffer[27]; /* Create a unicode device name */ swprintf(NameBuffer, L"\\Device\\ScsiPort%lu", SystemConfig->ScsiPortCount); - RtlInitUnicodeString(&DeviceName, NameBuffer); + if (!RtlCreateUnicodeString(&DeviceName, NameBuffer)) + { + DPRINT1("Failed to allocate memory for device name!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + PortDeviceObject = NULL; + break; + } DPRINT("Creating device: %wZ\n", &DeviceName); @@ -908,7 +970,7 @@ ScsiPortInitialize( DeviceExtensionSize, &DeviceName, FILE_DEVICE_CONTROLLER, - 0, + FILE_DEVICE_SECURE_OPEN, FALSE, &PortDeviceObject); @@ -919,7 +981,7 @@ ScsiPortInitialize( break; } - DPRINT ("Created device: %wZ (%p)\n", &DeviceName, PortDeviceObject); + DPRINT1("Created device: %wZ (%p)\n", &DeviceName, PortDeviceObject); /* Set the buffering strategy here... */ PortDeviceObject->Flags |= DO_DIRECT_IO; @@ -928,9 +990,11 @@ ScsiPortInitialize( /* Fill Device Extension */ DeviceExtension = PortDeviceObject->DeviceExtension; RtlZeroMemory(DeviceExtension, DeviceExtensionSize); + DeviceExtension->Common.DeviceObject = PortDeviceObject; + DeviceExtension->Common.IsFDO = TRUE; DeviceExtension->Length = DeviceExtensionSize; - DeviceExtension->DeviceObject = PortDeviceObject; DeviceExtension->PortNumber = SystemConfig->ScsiPortCount; + DeviceExtension->DeviceName = DeviceName; /* Driver's routines... */ DeviceExtension->HwInitialize = HwInitializationData->HwInitialize; @@ -941,13 +1005,10 @@ ScsiPortInitialize( /* Extensions sizes */ DeviceExtension->MiniPortExtensionSize = HwInitializationData->DeviceExtensionSize; - DeviceExtension->LunExtensionSize = HwInitializationData->SpecificLuExtensionSize; - DeviceExtension->SrbExtensionSize = HwInitializationData->SrbExtensionSize; - - /* Round Srb extension size to the quadword */ + DeviceExtension->LunExtensionSize = + ALIGN_UP(HwInitializationData->SpecificLuExtensionSize, INT64); DeviceExtension->SrbExtensionSize = - ~(sizeof(LONGLONG) - 1) & (DeviceExtension->SrbExtensionSize + - sizeof(LONGLONG) - 1); + ALIGN_UP(HwInitializationData->SrbExtensionSize, INT64); /* Fill some numbers (bus count, lun count, etc) */ DeviceExtension->MaxLunCount = SCSI_MAXIMUM_LOGICAL_UNITS; @@ -975,22 +1036,10 @@ ScsiPortInitialize( CreatePortConfig: - Status = SpiCreatePortConfig(DeviceExtension, - HwInitializationData, - &ConfigInfo, - &InitialPortConfig, - FirstConfigCall); - - if (!NT_SUCCESS(Status)) - { - DPRINT("SpiCreatePortConfig() failed with Status 0x%08X\n", Status); - break; - } - /* Allocate and initialize port configuration info */ - PortConfigSize = (sizeof(PORT_CONFIGURATION_INFORMATION) + - HwInitializationData->NumberOfAccessRanges * - sizeof(ACCESS_RANGE) + 7) & ~7; + PortConfigSize = sizeof(PORT_CONFIGURATION_INFORMATION) + + HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE); + PortConfigSize = ALIGN_UP(PortConfigSize, INT64); DeviceExtension->PortConfig = ExAllocatePoolWithTag(NonPagedPool, PortConfigSize, TAG_SCSIPORT); /* Fail if failed */ @@ -1000,13 +1049,19 @@ CreatePortConfig: break; } - PortConfig = DeviceExtension->PortConfig; + Status = SpiCreatePortConfig(DeviceExtension, + HwInitializationData, + &ConfigInfo, + DeviceExtension->PortConfig, + FirstConfigCall); - /* Copy information here */ - RtlCopyMemory(PortConfig, - &InitialPortConfig, - sizeof(PORT_CONFIGURATION_INFORMATION)); + if (!NT_SUCCESS(Status)) + { + DPRINT("SpiCreatePortConfig() failed with Status 0x%08X\n", Status); + break; + } + PortConfig = DeviceExtension->PortConfig; /* Copy extension sizes into the PortConfig */ PortConfig->SpecificLuExtensionSize = DeviceExtension->LunExtensionSize; @@ -1015,11 +1070,7 @@ CreatePortConfig: /* Initialize Access ranges */ if (HwInitializationData->NumberOfAccessRanges != 0) { - PortConfig->AccessRanges = (PVOID)(PortConfig+1); - - /* Align to LONGLONG */ - PortConfig->AccessRanges = (PVOID)((ULONG_PTR)(PortConfig->AccessRanges) + 7); - PortConfig->AccessRanges = (PVOID)((ULONG_PTR)(PortConfig->AccessRanges) & ~7); + PortConfig->AccessRanges = ALIGN_UP_POINTER(PortConfig + 1, INT64); /* Copy the data */ RtlCopyMemory(PortConfig->AccessRanges, @@ -1113,54 +1164,44 @@ CreatePortConfig: (PortConfig->SrbExtensionSize != DeviceExtension->SrbExtensionSize)) { /* Set it (rounding to LONGLONG again) */ - DeviceExtension->SrbExtensionSize = - (PortConfig->SrbExtensionSize + sizeof(LONGLONG)) & ~(sizeof(LONGLONG) - 1); + DeviceExtension->SrbExtensionSize = ALIGN_UP(PortConfig->SrbExtensionSize, INT64); } /* The same with LUN extension size */ if (PortConfig->SpecificLuExtensionSize != DeviceExtension->LunExtensionSize) DeviceExtension->LunExtensionSize = PortConfig->SpecificLuExtensionSize; - if (!((HwInitializationData->AdapterInterfaceType == PCIBus) && - (HwInitializationData->VendorIdLength > 0) && - (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && - (HwInitializationData->DeviceId != NULL))) - { - /* Construct a resource list */ - ResourceList = SpiConfigToResource(DeviceExtension, PortConfig); + /* Construct a resource list */ + ResourceList = SpiConfigToResource(DeviceExtension, PortConfig); - if (ResourceList) - { - UNICODE_STRING UnicodeString; - RtlInitUnicodeString(&UnicodeString, L"ScsiAdapter"); - DPRINT("Reporting resources\n"); - Status = IoReportResourceUsage(&UnicodeString, - DriverObject, - NULL, - 0, - PortDeviceObject, - ResourceList, - FIELD_OFFSET(CM_RESOURCE_LIST, - List[0].PartialResourceList.PartialDescriptors) + - ResourceList->List[0].PartialResourceList.Count * - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - FALSE, - &Conflict); - ExFreePool(ResourceList); - - /* In case of a failure or a conflict, break */ - if (Conflict || (!NT_SUCCESS(Status))) - { - if (Conflict) - Status = STATUS_CONFLICTING_ADDRESSES; - break; - } - } + PDEVICE_OBJECT LowerPDO = NULL; + + Status = IoReportDetectedDevice(DriverObject, + HwInitializationData->AdapterInterfaceType, + ConfigInfo.BusNumber, + PortConfig->SlotNumber, + ResourceList, + NULL, + TRUE, + &LowerPDO); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoReportDetectedDevice failed. Status: 0x%x\n", Status); + __debugbreak(); + break; } - /* Reset the Conflict var */ - Conflict = FALSE; + DeviceExtension->Common.LowerDevice = IoAttachDeviceToDeviceStack(PortDeviceObject, LowerPDO); + + ASSERT(DeviceExtension->Common.LowerDevice); + + PortDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + if (ResourceList) + { + ExFreePoolWithTag(ResourceList, TAG_SCSIPORT); + } /* Copy all stuff which we ever need from PortConfig to the DeviceExtension */ if (PortConfig->MaximumNumberOfTargets > SCSI_MAXIMUM_TARGETS_PER_BUS) @@ -1168,12 +1209,30 @@ CreatePortConfig: else DeviceExtension->MaxTargedIds = PortConfig->MaximumNumberOfTargets; - DeviceExtension->BusNum = PortConfig->NumberOfBuses; + DeviceExtension->NumberOfBuses = PortConfig->NumberOfBuses; DeviceExtension->CachesData = PortConfig->CachesData; DeviceExtension->ReceiveEvent = PortConfig->ReceiveEvent; DeviceExtension->SupportsTaggedQueuing = PortConfig->TaggedQueuing; DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu; + /* Initialize bus scanning information */ + size_t BusConfigSize = DeviceExtension->NumberOfBuses * sizeof(*DeviceExtension->Buses); + DeviceExtension->Buses = ExAllocatePoolZero(NonPagedPool, BusConfigSize, TAG_SCSIPORT); + if (!DeviceExtension->Buses) + { + DPRINT1("Out of resources!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // initialize bus data + for (UINT8 pathId = 0; pathId < DeviceExtension->NumberOfBuses; pathId++) + { + DeviceExtension->Buses[pathId].BusIdentifier = + DeviceExtension->PortConfig->InitiatorBusId[pathId]; + InitializeListHead(&DeviceExtension->Buses[pathId].LunsListHead); + } + /* If something was disabled via registry - apply it */ if (ConfigInfo.DisableMultipleLun) DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu = FALSE; @@ -1283,43 +1342,18 @@ CreatePortConfig: } } - CallHWInitialize(DeviceExtension); + FdoCallHWInitialize(DeviceExtension); - /* Start our timer */ - IoStartTimer(PortDeviceObject); + Status = FdoStartAdapter(DeviceExtension); - /* Initialize bus scanning information */ - BusConfigSize = FIELD_OFFSET( - BUSES_CONFIGURATION_INFORMATION, - BusScanInfo[DeviceExtension->PortConfig->NumberOfBuses]); - DeviceExtension->BusesConfig = - ExAllocatePoolWithTag(PagedPool, BusConfigSize, TAG_SCSIPORT); - if (!DeviceExtension->BusesConfig) + if (!NT_SUCCESS(Status)) { - DPRINT1("Out of resources!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("Failed to start the legacy adapter. Status 0x%x\n", Status); break; } - /* Zero it */ - RtlZeroMemory(DeviceExtension->BusesConfig, BusConfigSize); - - /* Store number of buses there */ - DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; - - /* Scan the adapter for devices */ - SpiScanAdapter(DeviceExtension); - - /* Build the registry device map */ - SpiBuildDeviceMap(DeviceExtension, (PUNICODE_STRING)Argument2); + FdoScanAdapter(DeviceExtension); - /* Create the dos device link */ - swprintf(DosNameBuffer, L"\\??\\Scsi%lu:", SystemConfig->ScsiPortCount); - RtlInitUnicodeString(&DosDeviceName, DosNameBuffer); - IoCreateSymbolicLink(&DosDeviceName, &DeviceName); - - /* Increase the port count */ - SystemConfig->ScsiPortCount++; FirstConfigCall = FALSE; /* Increase adapter number and bus number respectively */ @@ -1334,7 +1368,10 @@ CreatePortConfig: } /* Clean up the mess */ - SpiCleanupAfterInit(DeviceExtension); + if (!NT_SUCCESS(Status) && PortDeviceObject) + { + FdoRemoveAdapter(DeviceExtension); + } /* Close registry keys */ if (ConfigInfo.ServiceKey != NULL) @@ -1461,9 +1498,12 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDevi } else { + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Srb->OriginalRequest); + PSCSI_PORT_LUN_EXTENSION LunExtension = IoStack->DeviceObject->DeviceExtension; + ASSERT(LunExtension && !LunExtension->Common.IsFDO); + /* Get the SRB data */ - SrbData = SpiGetSrbData( - DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun, Srb->QueueTag); + SrbData = SpiGetSrbData(DeviceExtension, LunExtension, Srb->QueueTag); /* Make sure there are no CompletedRequests and there is a Srb */ ASSERT(SrbData->CompletedRequests == NULL && SrbData->Srb != NULL); @@ -1504,7 +1544,7 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDevi DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; /* Get the LUN extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, PathId, TargetId, Lun); + LunExtension = GetLunByPath(DeviceExtension, PathId, TargetId, Lun); /* If returned LunExtension is NULL, break out */ if (!LunExtension) @@ -2104,7 +2144,7 @@ ScsiPortIsr( /* If flag of notification is set - queue a DPC */ if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) { - IoRequestDpc(DeviceExtension->DeviceObject, + IoRequestDpc(DeviceExtension->Common.DeviceObject, DeviceExtension->CurrentIrp, DeviceExtension); } @@ -2140,7 +2180,7 @@ SpiProcessTimeout(PVOID ServiceContext) { DPRINT("Resetting the bus\n"); - for (Bus = 0; Bus < DeviceExtension->BusNum; Bus++) + for (Bus = 0; Bus < DeviceExtension->NumberOfBuses; Bus++) { DeviceExtension->HwResetBus(DeviceExtension->MiniPortDeviceExtension, Bus); @@ -2151,7 +2191,7 @@ SpiProcessTimeout(PVOID ServiceContext) /* If miniport requested - request a dpc for it */ if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) - IoRequestDpc(DeviceExtension->DeviceObject, NULL, NULL); + IoRequestDpc(DeviceExtension->Common.DeviceObject, NULL, NULL); } return TRUE; @@ -2176,7 +2216,7 @@ SpiResetBus(PVOID ServiceContext) /* If miniport requested - give him a DPC */ if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) - IoRequestDpc(DeviceExtension->DeviceObject, NULL, NULL); + IoRequestDpc(DeviceExtension->Common.DeviceObject, NULL, NULL); return TRUE; } @@ -2198,7 +2238,6 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; - ULONG Lun; PIRP Irp; DPRINT("ScsiPortIoTimer()\n"); @@ -2219,7 +2258,7 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, /* Timeout, process it */ if (KeSynchronizeExecution(DeviceExtension->Interrupt[0], SpiProcessTimeout, - DeviceExtension->DeviceObject)) + DeviceExtension->Common.DeviceObject)) { DPRINT("Error happened during processing timeout, but nothing critical\n"); } @@ -2232,12 +2271,16 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, } /* Per-Lun scanning of timeouts is needed... */ - for (Lun = 0; Lun < LUS_NUMBER; Lun++) + for (UINT8 pathId = 0; pathId < DeviceExtension->NumberOfBuses; pathId++) { - LunExtension = DeviceExtension->LunExtensionList[Lun]; + PSCSI_BUS_INFO bus = &DeviceExtension->Buses[pathId]; - while (LunExtension) + for (PLIST_ENTRY lunEntry = bus->LunsListHead.Flink; + lunEntry != &bus->LunsListHead; + lunEntry = lunEntry->Flink) { + LunExtension = CONTAINING_RECORD(lunEntry, SCSI_PORT_LUN_EXTENSION, LunEntry); + if (LunExtension->Flags & LUNEX_BUSY) { if (!(LunExtension->Flags & @@ -2283,8 +2326,6 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, /* Decrement the timeout counter */ LunExtension->RequestTimeout--; } - - LunExtension = LunExtension->Next; } } @@ -2320,7 +2361,7 @@ SpiMiniportTimerDpc(IN struct _KDPC *Dpc, if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) { ScsiPortDpcForIsr(NULL, - DeviceExtension->DeviceObject, + DeviceExtension->Common.DeviceObject, NULL, NULL); } @@ -2398,8 +2439,8 @@ TryNextAd: { /* Open registry key for HW database */ InitializeObjectAttributes(&ObjectAttributes, - DeviceExtension->DeviceObject->DriverObject->HardwareDatabase, - OBJ_CASE_INSENSITIVE, + DeviceExtension->Common.DeviceObject->DriverObject->HardwareDatabase, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -2418,7 +2459,7 @@ TryNextAd: /* Open device key */ InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, RootKey, NULL); @@ -2479,7 +2520,7 @@ TryNextAd: /* Open the service key */ InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, InternalConfigInfo->ServiceKey, NULL); @@ -3012,5 +3053,3 @@ ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address) DPRINT("ScsiPortConvertPhysicalAddressToUlong()\n"); return(Address.u.LowPart); } - -/* EOF */ diff --git a/drivers/storage/port/scsiport/scsiport.h b/drivers/storage/port/scsiport/scsiport.h index 73c9a91599b..b2db80654f0 100644 --- a/drivers/storage/port/scsiport/scsiport.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -7,15 +7,16 @@ #pragma once -#include <wdm.h> -#include <ntddk.h> +#include <ntifs.h> #include <stdio.h> #include <scsi.h> #include <ntddscsi.h> #include <ntdddisk.h> #include <mountdev.h> -#define VERSION "0.0.3" +#ifdef DBG +#include <debug/driverdbg.h> +#endif #define TAG_SCSIPORT 'ISCS' @@ -25,29 +26,29 @@ #define MAX_SG_LIST 17 /* Flags */ -#define SCSI_PORT_DEVICE_BUSY 0x0001 -#define SCSI_PORT_LU_ACTIVE 0x0002 -#define SCSI_PORT_NOTIFICATION_NEEDED 0x0004 -#define SCSI_PORT_NEXT_REQUEST_READY 0x0008 -#define SCSI_PORT_FLUSH_ADAPTERS 0x0010 -#define SCSI_PORT_MAP_TRANSFER 0x0020 -#define SCSI_PORT_RESET 0x0080 -#define SCSI_PORT_RESET_REQUEST 0x0100 -#define SCSI_PORT_RESET_REPORTED 0x0200 -#define SCSI_PORT_REQUEST_PENDING 0x0800 -#define SCSI_PORT_DISCONNECT_ALLOWED 0x1000 -#define SCSI_PORT_DISABLE_INT_REQUESET 0x2000 -#define SCSI_PORT_DISABLE_INTERRUPTS 0x4000 -#define SCSI_PORT_ENABLE_INT_REQUEST 0x8000 -#define SCSI_PORT_TIMER_NEEDED 0x10000 +#define SCSI_PORT_DEVICE_BUSY 0x00001 +#define SCSI_PORT_LU_ACTIVE 0x00002 +#define SCSI_PORT_NOTIFICATION_NEEDED 0x00004 +#define SCSI_PORT_NEXT_REQUEST_READY 0x00008 +#define SCSI_PORT_FLUSH_ADAPTERS 0x00010 +#define SCSI_PORT_MAP_TRANSFER 0x00020 +#define SCSI_PORT_RESET 0x00080 +#define SCSI_PORT_RESET_REQUEST 0x00100 +#define SCSI_PORT_RESET_REPORTED 0x00200 +#define SCSI_PORT_REQUEST_PENDING 0x00800 +#define SCSI_PORT_DISCONNECT_ALLOWED 0x01000 +#define SCSI_PORT_DISABLE_INT_REQUESET 0x02000 +#define SCSI_PORT_DISABLE_INTERRUPTS 0x04000 +#define SCSI_PORT_ENABLE_INT_REQUEST 0x08000 +#define SCSI_PORT_TIMER_NEEDED 0x10000 /* LUN Extension flags*/ -#define LUNEX_FROZEN_QUEUE 0x0001 -#define LUNEX_NEED_REQUEST_SENSE 0x0004 -#define LUNEX_BUSY 0x0008 -#define LUNEX_FULL_QUEUE 0x0010 -#define LUNEX_REQUEST_PENDING 0x0020 -#define SCSI_PORT_SCAN_IN_PROGRESS 0x8000 +#define LUNEX_FROZEN_QUEUE 0x0001 +#define LUNEX_NEED_REQUEST_SENSE 0x0004 +#define LUNEX_BUSY 0x0008 +#define LUNEX_FULL_QUEUE 0x0010 +#define LUNEX_REQUEST_PENDING 0x0020 +#define SCSI_PORT_SCAN_IN_PROGRESS 0x8000 typedef enum _SCSI_PORT_TIMER_STATES @@ -115,18 +116,27 @@ typedef struct _SCSI_REQUEST_BLOCK_INFO SCSI_SG_ADDRESS ScatterGatherList[MAX_SG_LIST]; } SCSI_REQUEST_BLOCK_INFO, *PSCSI_REQUEST_BLOCK_INFO; +typedef struct _SCSI_PORT_COMMON_EXTENSION +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT LowerDevice; + BOOLEAN IsFDO; +} SCSI_PORT_COMMON_EXTENSION, *PSCSI_PORT_COMMON_EXTENSION; + +// PDO device typedef struct _SCSI_PORT_LUN_EXTENSION { + SCSI_PORT_COMMON_EXTENSION Common; + UCHAR PathId; UCHAR TargetId; UCHAR Lun; ULONG Flags; - struct _SCSI_PORT_LUN_EXTENSION *Next; + LIST_ENTRY LunEntry; BOOLEAN DeviceClaimed; - PDEVICE_OBJECT DeviceObject; INQUIRYDATA InquiryData; @@ -146,6 +156,8 @@ typedef struct _SCSI_PORT_LUN_EXTENSION SCSI_REQUEST_BLOCK_INFO SrbInfo; + HANDLE RegistryMapKey; + /* More data? */ UCHAR MiniportLunExtension[1]; /* must be the last entry */ @@ -153,31 +165,14 @@ typedef struct _SCSI_PORT_LUN_EXTENSION /* Structures for inquiries support */ -typedef struct _SCSI_LUN_INFO -{ - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - BOOLEAN DeviceClaimed; - PVOID DeviceObject; - struct _SCSI_LUN_INFO *Next; - UCHAR InquiryData[INQUIRYDATABUFFERSIZE]; -} SCSI_LUN_INFO, *PSCSI_LUN_INFO; - -typedef struct _SCSI_BUS_SCAN_INFO +typedef struct _SCSI_BUS_INFO { - USHORT Length; + LIST_ENTRY LunsListHead; UCHAR LogicalUnitsCount; + UCHAR TargetsCount; UCHAR BusIdentifier; - PSCSI_LUN_INFO LunInfo; -} SCSI_BUS_SCAN_INFO, *PSCSI_BUS_SCAN_INFO; - -typedef struct _BUSES_CONFIGURATION_INFORMATION -{ - UCHAR NumberOfBuses; - PSCSI_BUS_SCAN_INFO BusScanInfo[1]; -} BUSES_CONFIGURATION_INFORMATION, *PBUSES_CONFIGURATION_INFORMATION; - + HANDLE RegistryMapKey; +} SCSI_BUS_INFO, *PSCSI_BUS_INFO; typedef struct _SCSI_PORT_INTERRUPT_DATA { @@ -201,16 +196,19 @@ typedef struct _SCSI_PORT_SAVE_INTERRUPT * SCSI_PORT_DEVICE_EXTENSION * * DESCRIPTION - * First part of the port objects device extension. The second - * part is the miniport-specific device extension. + * First part of the port objects device extension. The second + * part is the miniport-specific device extension. */ +// FDO typedef struct _SCSI_PORT_DEVICE_EXTENSION { + SCSI_PORT_COMMON_EXTENSION Common; + ULONG Length; ULONG MiniPortExtensionSize; PPORT_CONFIGURATION_INFORMATION PortConfig; - PBUSES_CONFIGURATION_INFORMATION BusesConfig; + PSCSI_BUS_INFO Buses; // children LUNs are stored here PVOID NonCachedExtension; ULONG PortNumber; @@ -218,7 +216,7 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION ULONG SrbFlags; ULONG Flags; - ULONG BusNum; + UCHAR NumberOfBuses; ULONG MaxTargedIds; ULONG MaxLunCount; @@ -238,7 +236,6 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION PMAPPED_ADDRESS MappedAddressList; ULONG LunExtensionSize; - PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; SCSI_PORT_INTERRUPT_DATA InterruptData; @@ -254,7 +251,6 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION IO_SCSI_CAPABILITIES PortCapabilities; - PDEVICE_OBJECT DeviceObject; PCONTROLLER_OBJECT ControllerObject; PHW_INITIALIZE HwInitialize; @@ -294,6 +290,11 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION ULONG InterruptCount; + UNICODE_STRING DeviceName; + UNICODE_STRING InterfaceName; + BOOLEAN DeviceStarted; + UINT8 TotalLUCount; + UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ } SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; @@ -303,6 +304,42 @@ typedef struct _RESETBUS_PARAMS PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; } RESETBUS_PARAMS, *PRESETBUS_PARAMS; +typedef struct _SCSIPORT_DRIVER_EXTENSION +{ + PDRIVER_OBJECT DriverObject; + UNICODE_STRING RegistryPath; + BOOLEAN IsLegacyDriver; +} SCSI_PORT_DRIVER_EXTENSION, *PSCSI_PORT_DRIVER_EXTENSION; + +FORCEINLINE +BOOLEAN +VerifyIrpOutBufferSize( + _In_ PIRP Irp, + _In_ SIZE_T Size) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + if (ioStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + return FALSE; + } + return TRUE; +} + +FORCEINLINE +BOOLEAN +VerifyIrpInBufferSize( + _In_ PIRP Irp, + _In_ SIZE_T Size) +{ + PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); + if (ioStack->Parameters.DeviceIoControl.InputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + return FALSE; + } + return TRUE; +} // ioctl.c @@ -315,25 +352,34 @@ ScsiPortDeviceControl( // fdo.c VOID -SpiScanAdapter( +FdoScanAdapter( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); NTSTATUS -CallHWInitialize( +FdoCallHWInitialize( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); -VOID -SpiCleanupAfterInit( +NTSTATUS +FdoRemoveAdapter( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); +NTSTATUS +FdoStartAdapter( + _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +FdoDispatchPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp); + // pdo.c -PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension( +PDEVICE_OBJECT +PdoCreateLunDevice( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); PSCSI_PORT_LUN_EXTENSION -SpiGetLunExtension( +GetLunByPath( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, _In_ UCHAR PathId, _In_ UCHAR TargetId, @@ -342,22 +388,32 @@ SpiGetLunExtension( PSCSI_REQUEST_BLOCK_INFO SpiGetSrbData( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _In_ UCHAR PathId, - _In_ UCHAR TargetId, - _In_ UCHAR Lun, + _In_ PSCSI_PORT_LUN_EXTENSION LunExtension, _In_ UCHAR QueueTag); +NTSTATUS +PdoDispatchPnp( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp); + +// power.c + +DRIVER_DISPATCH ScsiPortDispatchPower; + // registry.c VOID SpiInitOpenKeys( _Inout_ PCONFIGURATION_INFO ConfigInfo, - _In_ PUNICODE_STRING RegistryPath); + _In_ PSCSI_PORT_DRIVER_EXTENSION DriverExtension); NTSTATUS -SpiBuildDeviceMap( - _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _In_ PUNICODE_STRING RegistryPath); +RegistryInitAdapterKey( + _Inout_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +RegistryInitLunKey( + _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension); // scsi.c diff --git a/drivers/storage/port/scsiport/scsitypes.h b/drivers/storage/port/scsiport/scsitypes.h new file mode 100644 index 00000000000..984c6db4e7a --- /dev/null +++ b/drivers/storage/port/scsiport/scsitypes.h @@ -0,0 +1,124 @@ + +// see https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… +// and https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… + +FORCEINLINE +PCSTR +GetDeviceType( + _In_ PINQUIRYDATA InquiryData) +{ + switch (InquiryData->DeviceType) + { + case DIRECT_ACCESS_DEVICE: + return "Disk"; + case SEQUENTIAL_ACCESS_DEVICE: + return "Sequential"; + case PRINTER_DEVICE: + return "Printer"; + case PROCESSOR_DEVICE: + return "Processor"; + case WRITE_ONCE_READ_MULTIPLE_DEVICE: + return "Worm"; + case READ_ONLY_DIRECT_ACCESS_DEVICE: + return "CdRom"; + case SCANNER_DEVICE: + return "Scanner"; + case OPTICAL_DEVICE: + return "Optical"; + case MEDIUM_CHANGER: + return "Changer"; + case COMMUNICATION_DEVICE: + return "Net"; + case ARRAY_CONTROLLER_DEVICE: + return "Array"; + case SCSI_ENCLOSURE_DEVICE: + return "Enclosure"; + case REDUCED_BLOCK_DEVICE: + return "RBC"; + case OPTICAL_CARD_READER_WRITER_DEVICE: + return "CardReader"; + case BRIDGE_CONTROLLER_DEVICE: + return "Bridge"; + default: + return "Other"; + } +} + +FORCEINLINE +PCSTR +GetGenericType( + _In_ PINQUIRYDATA InquiryData) +{ + switch (InquiryData->DeviceType) + { + case DIRECT_ACCESS_DEVICE: + return "GenDisk"; + case PRINTER_DEVICE: + return "GenPrinter"; + case WRITE_ONCE_READ_MULTIPLE_DEVICE: + return "GenWorm"; + case READ_ONLY_DIRECT_ACCESS_DEVICE: + return "GenCdRom"; + case SCANNER_DEVICE: + return "GenScanner"; + case OPTICAL_DEVICE: + return "GenOptical"; + case MEDIUM_CHANGER: + return "ScsiChanger"; + case COMMUNICATION_DEVICE: + return "ScsiNet"; + case ARRAY_CONTROLLER_DEVICE: + return "ScsiArray"; + case SCSI_ENCLOSURE_DEVICE: + return "ScsiEnclosure"; + case REDUCED_BLOCK_DEVICE: + return "ScsiRBC"; + case OPTICAL_CARD_READER_WRITER_DEVICE: + return "ScsiCardReader"; + case BRIDGE_CONTROLLER_DEVICE: + return "ScsiBridge"; + default: + return "ScsiOther"; + } +} + +FORCEINLINE +PCWSTR +GetPeripheralTypeW( + _In_ PINQUIRYDATA InquiryData) +{ + switch (InquiryData->DeviceType) + { + case DIRECT_ACCESS_DEVICE: + return L"DiskPeripheral"; + case SEQUENTIAL_ACCESS_DEVICE: + return L"TapePeripheral"; + case PRINTER_DEVICE: + return L"PrinterPeripheral"; + // case 3: "ProcessorPeripheral", classified as 'other': fall back to default case. + case WRITE_ONCE_READ_MULTIPLE_DEVICE: + return L"WormPeripheral"; + case READ_ONLY_DIRECT_ACCESS_DEVICE: + return L"CdRomPeripheral"; + case SCANNER_DEVICE: + return L"ScannerPeripheral"; + case OPTICAL_DEVICE: + return L"OpticalDiskPeripheral"; + case MEDIUM_CHANGER: + return L"MediumChangerPeripheral"; + case COMMUNICATION_DEVICE: + return L"CommunicationsPeripheral"; + case ARRAY_CONTROLLER_DEVICE: + return L"ArrayPeripheral"; + case SCSI_ENCLOSURE_DEVICE: + return L"EnclosurePeripheral"; + case REDUCED_BLOCK_DEVICE: + return L"RBCPeripheral"; + case OPTICAL_CARD_READER_WRITER_DEVICE: + return L"CardReaderPeripheral"; + case BRIDGE_CONTROLLER_DEVICE: + return L"BridgePeripheral"; + default: + return L"OtherPeripheral"; + } +}

1 0

[reactos] 02/02: [NTOS:PNP] Improve and refactor PnP notifications
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=582ca686965e51629df88… commit 582ca686965e51629df88cdb340a2480060cd638 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Nov 29 16:41:58 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:25:40 2020 +0300 [NTOS:PNP] Improve and refactor PnP notifications - BUGFIX: do not call IoGetRelatedTargetDevice while guarded mutex is acquired (the function issues an APC, but they are disabled inside a critical section) - BUGFIX: only the beginning of a structure for GUID_PNP_CUSTOM_NOTIFICATION was copied and queued. Just pass it as-is to a subscriber, without copying - Don't convert event GUID to string, store and compare GUID struct itself - Split IopNotifyPlugPlayNotification into 3 functions for each type of notification (less stack usage and for future changes) - Move initialization code for notifications into a separate routine - Use separate lists and locks for every type of notification - Put "TargetDeviceChange" notifications into their place inside DEVICE_NODE --- ntoskrnl/include/internal/io.h | 43 ++- ntoskrnl/io/iomgr/deviface.c | 8 +- ntoskrnl/io/iomgr/iomgr.c | 7 +- ntoskrnl/io/pnpmgr/devaction.c | 18 +- ntoskrnl/io/pnpmgr/devnode.c | 3 + ntoskrnl/io/pnpmgr/pnpnotify.c | 660 ++++++++++++++++++++++++----------------- ntoskrnl/io/pnpmgr/pnpreport.c | 6 +- 7 files changed, 435 insertions(+), 310 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index d0e0bb5e94e..628929f1cff 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -609,20 +609,6 @@ IopInitDriverImplementation( VOID ); -VOID -IopInitPnpNotificationImplementation( - VOID -); - -VOID -IopNotifyPlugPlayNotification( - IN PDEVICE_OBJECT DeviceObject, - IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN LPCGUID Event, - IN PVOID EventCategoryData1, - IN PVOID EventCategoryData2 -); - NTSTATUS IopGetSystemPowerDeviceObject( IN PDEVICE_OBJECT *DeviceObject @@ -828,6 +814,10 @@ IoInitializeCrashDump( IN HANDLE PageFileHandle ); +VOID +PiInitializeNotifications( + VOID); + // // Device/Volume Routines // @@ -926,6 +916,12 @@ IopDereferenceDeviceObject( IN BOOLEAN ForceUnload ); +NTSTATUS +NTAPI +IopGetRelatedTargetDevice( + IN PFILE_OBJECT FileObject, + OUT PDEVICE_NODE *DeviceNode); + NTSTATUS NTAPI IoGetRelatedTargetDevice( @@ -1412,6 +1408,25 @@ PiPerformSyncDeviceAction( _In_ PDEVICE_OBJECT DeviceObject, _In_ DEVICE_ACTION Action); +// +// PnP notifications +// +VOID +PiNotifyDeviceInterfaceChange( + _In_ LPCGUID Event, + _In_ LPCGUID InterfaceClassGuid, + _In_ PUNICODE_STRING SymbolicLinkName); + +VOID +PiNotifyHardwareProfileChange( + _In_ LPCGUID Event); + +VOID +PiNotifyTargetDeviceChange( + _In_ LPCGUID Event, + _In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PTARGET_DEVICE_CUSTOM_NOTIFICATION CustomNotification); + // // Global I/O Data // diff --git a/ntoskrnl/io/iomgr/deviface.c b/ntoskrnl/io/iomgr/deviface.c index 34245027627..f909d536461 100644 --- a/ntoskrnl/io/iomgr/deviface.c +++ b/ntoskrnl/io/iomgr/deviface.c @@ -1463,12 +1463,8 @@ IoSetDeviceInterfaceState(IN PUNICODE_STRING SymbolicLinkName, ExFreePoolWithTag(DeviceInstance.Buffer, TAG_IO); EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; - IopNotifyPlugPlayNotification( - PhysicalDeviceObject, - EventCategoryDeviceInterfaceChange, - EventGuid, - &DeviceGuid, - (PVOID)SymbolicLinkName); + + PiNotifyDeviceInterfaceChange(EventGuid, &DeviceGuid, SymbolicLinkName); ObDereferenceObject(PhysicalDeviceObject); DPRINT("Status %x\n", Status); diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 0173cf4911d..d7dc1bcb8c4 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -59,14 +59,12 @@ extern POBJECT_TYPE IoAdapterObjectType; extern ERESOURCE IopDatabaseResource; ERESOURCE IopSecurityResource; extern ERESOURCE IopDriverLoadResource; -extern KGUARDED_MUTEX PnpNotifyListLock; extern LIST_ENTRY IopDiskFileSystemQueueHead; extern LIST_ENTRY IopCdRomFileSystemQueueHead; extern LIST_ENTRY IopTapeFileSystemQueueHead; extern LIST_ENTRY IopNetworkFileSystemQueueHead; extern LIST_ENTRY DriverBootReinitListHead; extern LIST_ENTRY DriverReinitListHead; -extern LIST_ENTRY PnpNotifyListHead; extern LIST_ENTRY IopFsNotifyChangeQueueHead; extern LIST_ENTRY IopErrorLogListHead; extern LIST_ENTRY IopTimerQueueHead; @@ -480,14 +478,12 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) ExInitializeResourceLite(&IopDatabaseResource); ExInitializeResourceLite(&IopSecurityResource); ExInitializeResourceLite(&IopDriverLoadResource); - KeInitializeGuardedMutex(&PnpNotifyListLock); InitializeListHead(&IopDiskFileSystemQueueHead); InitializeListHead(&IopCdRomFileSystemQueueHead); InitializeListHead(&IopTapeFileSystemQueueHead); InitializeListHead(&IopNetworkFileSystemQueueHead); InitializeListHead(&DriverBootReinitListHead); InitializeListHead(&DriverReinitListHead); - InitializeListHead(&PnpNotifyListHead); InitializeListHead(&ShutdownListHead); InitializeListHead(&LastChanceShutdownListHead); InitializeListHead(&IopFsNotifyChangeQueueHead); @@ -498,6 +494,9 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) KeInitializeSpinLock(&ShutdownListLock); KeInitializeSpinLock(&IopLogListLock); + /* Initialize PnP notifications */ + PiInitializeNotifications(); + /* Initialize the reserve IRP */ if (!IopInitializeReserveIrp(&IopReserveIrpAllocator)) { diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index e6479074f32..4f5fb6b3884 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1513,11 +1513,7 @@ IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); - IopNotifyPlugPlayNotification(DeviceObject, - EventCategoryTargetDeviceChange, - &GUID_TARGET_DEVICE_REMOVE_COMPLETE, - NULL, - NULL); + PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_REMOVE_COMPLETE, DeviceObject, NULL); ObDereferenceObject(DeviceObject); } @@ -1592,11 +1588,7 @@ IopCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject) /* Drivers should never fail a IRP_MN_CANCEL_REMOVE_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); - IopNotifyPlugPlayNotification(DeviceObject, - EventCategoryTargetDeviceChange, - &GUID_TARGET_DEVICE_REMOVE_CANCELLED, - NULL, - NULL); + PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_REMOVE_CANCELLED, DeviceObject, NULL); } static @@ -1692,11 +1684,7 @@ IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); - IopNotifyPlugPlayNotification(DeviceObject, - EventCategoryTargetDeviceChange, - &GUID_TARGET_DEVICE_QUERY_REMOVE, - NULL, - NULL); + PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_QUERY_REMOVE, DeviceObject, NULL); if (!NT_SUCCESS(Status)) { diff --git a/ntoskrnl/io/pnpmgr/devnode.c b/ntoskrnl/io/pnpmgr/devnode.c index a068cd71ddb..230fcce100b 100644 --- a/ntoskrnl/io/pnpmgr/devnode.c +++ b/ntoskrnl/io/pnpmgr/devnode.c @@ -114,6 +114,7 @@ IopCreateDeviceNode( } RtlZeroMemory(Node, sizeof(DEVICE_NODE)); + InitializeListHead(&Node->TargetDeviceNotify); if (!ServiceName) ServiceName1 = &UnknownDeviceName; @@ -259,6 +260,8 @@ IopFreeDeviceNode( /* All children must be deleted before a parent is deleted */ ASSERT(!DeviceNode->Child); ASSERT(DeviceNode->PhysicalDeviceObject); + /* No notifications should be registered for this device */ + ASSERT(IsListEmpty(&DeviceNode->TargetDeviceNotify)); KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); diff --git a/ntoskrnl/io/pnpmgr/pnpnotify.c b/ntoskrnl/io/pnpmgr/pnpnotify.c index 089215071fd..cc169aba171 100644 --- a/ntoskrnl/io/pnpmgr/pnpnotify.c +++ b/ntoskrnl/io/pnpmgr/pnpnotify.c @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/pnpmgr/pnpnotify.c - * PURPOSE: Plug & Play notification functions - * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) - * Herv� Poussineau (hpoussin(a)reactos.org) - * Pierre Schweitzer + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Plug & Play notification functions + * COPYRIGHT: Copyright 2003 Filip Navara <xnavara(a)volny.cz> + * Copyright 2005-2006 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2010 Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2020 Victor Perevertkin <victor.perevertkin(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -14,215 +14,309 @@ #define NDEBUG #include <debug.h> -/* TYPES *******************************************************************/ +/* DATA **********************************************************************/ + +KGUARDED_MUTEX PiNotifyTargetDeviceLock; +KGUARDED_MUTEX PiNotifyHwProfileLock; +KGUARDED_MUTEX PiNotifyDeviceInterfaceLock; + +_Guarded_by_(PiNotifyHwProfileLock) +LIST_ENTRY PiNotifyHwProfileListHead; + +_Guarded_by_(PiNotifyDeviceInterfaceLock) +LIST_ENTRY PiNotifyDeviceInterfaceListHead; + +/* TYPES *********************************************************************/ typedef struct _PNP_NOTIFY_ENTRY { LIST_ENTRY PnpNotifyList; - IO_NOTIFICATION_EVENT_CATEGORY EventCategory; PVOID Context; - UNICODE_STRING Guid; - PFILE_OBJECT FileObject; PDRIVER_OBJECT DriverObject; PDRIVER_NOTIFICATION_CALLBACK_ROUTINE PnpNotificationProc; + union + { + GUID Guid; // for EventCategoryDeviceInterfaceChange + struct + { + PFILE_OBJECT FileObject; // for EventCategoryTargetDeviceChange + PDEVICE_OBJECT DeviceObject; + }; + }; + IO_NOTIFICATION_EVENT_CATEGORY EventCategory; + UINT8 RefCount; + BOOLEAN Deleted; } PNP_NOTIFY_ENTRY, *PPNP_NOTIFY_ENTRY; -KGUARDED_MUTEX PnpNotifyListLock; -LIST_ENTRY PnpNotifyListHead; - /* FUNCTIONS *****************************************************************/ +CODE_SEG("INIT") VOID -IopNotifyPlugPlayNotification( - IN PDEVICE_OBJECT DeviceObject, - IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN LPCGUID Event, - IN PVOID EventCategoryData1, - IN PVOID EventCategoryData2) +PiInitializeNotifications(VOID) { - PPNP_NOTIFY_ENTRY ChangeEntry; - PLIST_ENTRY ListEntry; - PVOID NotificationStructure; - BOOLEAN CallCurrentEntry; - UNICODE_STRING GuidString; - NTSTATUS Status; - PDEVICE_OBJECT EntryDeviceObject = NULL; + KeInitializeGuardedMutex(&PiNotifyTargetDeviceLock); + KeInitializeGuardedMutex(&PiNotifyHwProfileLock); + KeInitializeGuardedMutex(&PiNotifyDeviceInterfaceLock); + InitializeListHead(&PiNotifyHwProfileListHead); + InitializeListHead(&PiNotifyDeviceInterfaceListHead); +} - ASSERT(DeviceObject); +static +CODE_SEG("PAGE") +VOID +PiDereferencePnpNotifyEntry( + _In_ PPNP_NOTIFY_ENTRY Entry) +{ + PAGED_CODE(); + ASSERT(Entry->RefCount > 0); - KeAcquireGuardedMutex(&PnpNotifyListLock); - if (IsListEmpty(&PnpNotifyListHead)) + ObDereferenceObject(Entry->DriverObject); + Entry->RefCount--; + if (Entry->RefCount == 0) { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } + ASSERT(Entry->Deleted); - switch (EventCategory) - { - case EventCategoryDeviceInterfaceChange: - { - PDEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - RtlCopyMemory(&NotificationInfos->InterfaceClassGuid, EventCategoryData1, sizeof(GUID)); - NotificationInfos->SymbolicLinkName = (PUNICODE_STRING)EventCategoryData2; - Status = RtlStringFromGUID(&NotificationInfos->InterfaceClassGuid, &GuidString); - if (!NT_SUCCESS(Status)) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); - return; - } - break; - } - case EventCategoryHardwareProfileChange: - { - PHWPROFILE_CHANGE_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(HWPROFILE_CHANGE_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(HWPROFILE_CHANGE_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - break; - } - case EventCategoryTargetDeviceChange: - { - if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) - { - PTARGET_DEVICE_REMOVAL_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - } - else - { - PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - RtlCopyMemory(NotificationInfos, EventCategoryData1, sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION)); - } - break; - } - default: + RemoveEntryList(&Entry->PnpNotifyList); + if (Entry->EventCategory == EventCategoryTargetDeviceChange) { - DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; + // IopGetRelatedTargetDevice referenced the device upon the notification registration + ObDereferenceObject(Entry->DeviceObject); } + ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); } +} + +static +CODE_SEG("PAGE") +VOID +PiReferencePnpNotifyEntry( + _In_ PPNP_NOTIFY_ENTRY Entry) +{ + PAGED_CODE(); + ObReferenceObject(Entry->DriverObject); + Entry->RefCount++; +} + +/** + * @brief Calls PnP notification routine and makes some checks to detect faulty drivers + */ +static +CODE_SEG("PAGE") +VOID +PiCallNotifyProc( + _In_ PDRIVER_NOTIFICATION_CALLBACK_ROUTINE Proc, + _In_ PVOID NotificationStructure, + _In_ PVOID Context) +{ + PAGED_CODE(); +#if DBG + KIRQL oldIrql = KeGetCurrentIrql(); + ULONG oldApcDisable = KeGetCurrentThread()->CombinedApcDisable; +#endif + + Proc(NotificationStructure, Context); + + ASSERT(oldIrql == KeGetCurrentIrql() && + oldApcDisable == KeGetCurrentThread()->CombinedApcDisable); +} + +static +CODE_SEG("PAGE") +_Requires_lock_held_(Lock) +VOID +PiProcessSingleNotification( + _In_ PPNP_NOTIFY_ENTRY Entry, + _In_ PVOID NotificationStructure, + _In_ PKGUARDED_MUTEX Lock, + _Out_ PLIST_ENTRY *NextEntry) +{ + PAGED_CODE(); + + // the notification may be unregistered inside the procedure + // thus reference the entry so we may proceed + PiReferencePnpNotifyEntry(Entry); + + // release the lock because the notification routine has to be called without any + // limitations regarding APCs + KeReleaseGuardedMutex(Lock); + PiCallNotifyProc(Entry->PnpNotificationProc, NotificationStructure, Entry->Context); + KeAcquireGuardedMutex(Lock); + + // take the next entry link only after the callback finishes + // the lock is not held there, so Entry may have changed at this point + *NextEntry = Entry->PnpNotifyList.Flink; + PiDereferencePnpNotifyEntry(Entry); +} + +/** + * @brief Delivers the event to all drivers subscribed to + * EventCategoryDeviceInterfaceChange + * + * @param[in] Event The PnP event GUID + * @param[in] InterfaceClassGuid The GUID of an interface class + * @param[in] SymbolicLinkName Pointer to a string identifying the device interface name + */ +CODE_SEG("PAGE") +VOID +PiNotifyDeviceInterfaceChange( + _In_ LPCGUID Event, + _In_ LPCGUID InterfaceClassGuid, + _In_ PUNICODE_STRING SymbolicLinkName) +{ + PAGED_CODE(); + + PDEVICE_INTERFACE_CHANGE_NOTIFICATION notifyStruct; + notifyStruct = ExAllocatePoolWithTag(PagedPool, sizeof(*notifyStruct), TAG_PNP_NOTIFY); + if (!notifyStruct) + { + return; + } + + *notifyStruct = (DEVICE_INTERFACE_CHANGE_NOTIFICATION) { + .Version = 1, + .Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION), + .Event = *Event, + .InterfaceClassGuid = *InterfaceClassGuid, + .SymbolicLinkName = SymbolicLinkName + }; + + DPRINT("Delivering a DeviceInterfaceChange PnP event\n"); - /* Loop through procedures registred in PnpNotifyListHead - * list to find those that meet some criteria. - */ - ListEntry = PnpNotifyListHead.Flink; - while (ListEntry != &PnpNotifyListHead) + KeAcquireGuardedMutex(&PiNotifyDeviceInterfaceLock); + + PLIST_ENTRY entry = PiNotifyDeviceInterfaceListHead.Flink; + while (entry != &PiNotifyDeviceInterfaceListHead) { - ChangeEntry = CONTAINING_RECORD(ListEntry, PNP_NOTIFY_ENTRY, PnpNotifyList); - CallCurrentEntry = FALSE; + PPNP_NOTIFY_ENTRY nEntry = CONTAINING_RECORD(entry, PNP_NOTIFY_ENTRY, PnpNotifyList); - if (ChangeEntry->EventCategory != EventCategory) + if (!IsEqualGUID(&notifyStruct->InterfaceClassGuid, &nEntry->Guid)) { - ListEntry = ListEntry->Flink; + entry = entry->Flink; continue; } - switch (EventCategory) - { - case EventCategoryDeviceInterfaceChange: - { - if (RtlCompareUnicodeString(&ChangeEntry->Guid, &GuidString, FALSE) == 0) - { - CallCurrentEntry = TRUE; - } - break; - } - case EventCategoryHardwareProfileChange: - { - CallCurrentEntry = TRUE; - break; - } - case EventCategoryTargetDeviceChange: - { - Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); - if (NT_SUCCESS(Status)) - { - if (DeviceObject == EntryDeviceObject) - { - if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) - { - ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - else - { - ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - CallCurrentEntry = TRUE; - } - } - break; - } - default: - { - DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); - break; - } - } + PiProcessSingleNotification(nEntry, notifyStruct, &PiNotifyDeviceInterfaceLock, &entry); + } + + KeReleaseGuardedMutex(&PiNotifyDeviceInterfaceLock); + ExFreePoolWithTag(notifyStruct, TAG_PNP_NOTIFY); +} + + +/** + * @brief Delivers the event to all drivers subscribed to + * EventCategoryHardwareProfileChange PnP event + * + * @param[in] Event The PnP event GUID + */ +CODE_SEG("PAGE") +VOID +PiNotifyHardwareProfileChange( + _In_ LPCGUID Event) +{ + PAGED_CODE(); + + PHWPROFILE_CHANGE_NOTIFICATION notifyStruct; + notifyStruct = ExAllocatePoolWithTag(PagedPool, sizeof(*notifyStruct), TAG_PNP_NOTIFY); + if (!notifyStruct) + { + return; + } + + *notifyStruct = (HWPROFILE_CHANGE_NOTIFICATION) { + .Version = 1, + .Size = sizeof(HWPROFILE_CHANGE_NOTIFICATION), + .Event = *Event + }; + + DPRINT("Delivering a HardwareProfileChange PnP event\n"); + + KeAcquireGuardedMutex(&PiNotifyHwProfileLock); + + PLIST_ENTRY entry = PiNotifyHwProfileListHead.Flink; + while (entry != &PiNotifyHwProfileListHead) + { + PPNP_NOTIFY_ENTRY nEntry = CONTAINING_RECORD(entry, PNP_NOTIFY_ENTRY, PnpNotifyList); + + PiProcessSingleNotification(nEntry, notifyStruct, &PiNotifyHwProfileLock, &entry); + } + + KeReleaseGuardedMutex(&PiNotifyHwProfileLock); + ExFreePoolWithTag(notifyStruct, TAG_PNP_NOTIFY); +} + +/** + * @brief Delivers the event to all drivers subscribed to + * EventCategoryTargetDeviceChange PnP event + * + * @param[in] Event The PnP event GUID + * @param[in] DeviceObject The (target) device object + * @param[in] CustomNotification Pointer to a custom notification for GUID_PNP_CUSTOM_NOTIFICATION + */ +CODE_SEG("PAGE") +VOID +PiNotifyTargetDeviceChange( + _In_ LPCGUID Event, + _In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PTARGET_DEVICE_CUSTOM_NOTIFICATION CustomNotification) +{ + PAGED_CODE(); - /* Move to the next element now, as callback may unregister itself */ - ListEntry = ListEntry->Flink; - /* FIXME: If ListEntry was the last element and that callback registers - * new notifications, those won't be checked... */ + PVOID notificationStruct; + // just in case our device is removed during the operation + ObReferenceObject(DeviceObject); - if (CallCurrentEntry) + PDEVICE_NODE deviceNode = IopGetDeviceNode(DeviceObject); + ASSERT(deviceNode); + + if (!IsEqualGUID(Event, &GUID_PNP_CUSTOM_NOTIFICATION)) + { + PTARGET_DEVICE_REMOVAL_NOTIFICATION notifStruct; + notifStruct = ExAllocatePoolWithTag(PagedPool, sizeof(*notifStruct), TAG_PNP_NOTIFY); + if (!notifStruct) { - /* Call entry into new allocated memory */ - DPRINT("IopNotifyPlugPlayNotification(): found suitable callback %p\n", - ChangeEntry); - - KeReleaseGuardedMutex(&PnpNotifyListLock); - (ChangeEntry->PnpNotificationProc)(NotificationStructure, - ChangeEntry->Context); - KeAcquireGuardedMutex(&PnpNotifyListLock); + return; } + *notifStruct = (TARGET_DEVICE_REMOVAL_NOTIFICATION) { + .Version = 1, + .Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), + .Event = *Event + }; + + notificationStruct = notifStruct; + + DPRINT("Delivering a (non-custom) TargetDeviceChange PnP event\n"); + } + else + { + ASSERT(CustomNotification); + // assuming everythng else is correct + + notificationStruct = CustomNotification; + + DPRINT("Delivering a (custom) TargetDeviceChange PnP event\n"); + } + + KeAcquireGuardedMutex(&PiNotifyTargetDeviceLock); + + PLIST_ENTRY entry = deviceNode->TargetDeviceNotify.Flink; + while (entry != &deviceNode->TargetDeviceNotify) + { + PPNP_NOTIFY_ENTRY nEntry = CONTAINING_RECORD(entry, PNP_NOTIFY_ENTRY, PnpNotifyList); + + // put the file object from our saved entry to this particular notification's struct + ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)notificationStruct)->FileObject = nEntry->FileObject; + // so you don't need to look at the definition ;) + C_ASSERT(FIELD_OFFSET(TARGET_DEVICE_REMOVAL_NOTIFICATION, FileObject) + == FIELD_OFFSET(TARGET_DEVICE_CUSTOM_NOTIFICATION, FileObject)); + + PiProcessSingleNotification(nEntry, notificationStruct, &PiNotifyTargetDeviceLock, &entry); } - KeReleaseGuardedMutex(&PnpNotifyListLock); - ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); - if (EventCategory == EventCategoryDeviceInterfaceChange) - RtlFreeUnicodeString(&GuidString); + + KeReleaseGuardedMutex(&PiNotifyTargetDeviceLock); + ExFreePoolWithTag(notificationStruct, TAG_PNP_NOTIFY); + ObDereferenceObject(DeviceObject); } /* PUBLIC FUNCTIONS **********************************************************/ @@ -232,10 +326,11 @@ IopNotifyPlugPlayNotification( */ ULONG NTAPI -IoPnPDeliverServicePowerNotification(ULONG VetoedPowerOperation OPTIONAL, - ULONG PowerNotification, - ULONG Unknown OPTIONAL, - BOOLEAN Synchronous) +IoPnPDeliverServicePowerNotification( + _In_ ULONG VetoedPowerOperation, + _In_ ULONG PowerNotificationCode, + _In_ ULONG PowerNotificationData, + _In_ BOOLEAN Synchronous) { UNIMPLEMENTED; return 0; @@ -244,15 +339,17 @@ IoPnPDeliverServicePowerNotification(ULONG VetoedPowerOperation OPTIONAL, /* * @implemented */ +CODE_SEG("PAGE") NTSTATUS NTAPI -IoRegisterPlugPlayNotification(IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN ULONG EventCategoryFlags, - IN PVOID EventCategoryData OPTIONAL, - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_NOTIFICATION_CALLBACK_ROUTINE CallbackRoutine, - IN PVOID Context, - OUT PVOID *NotificationEntry) +IoRegisterPlugPlayNotification( + _In_ IO_NOTIFICATION_EVENT_CATEGORY EventCategory, + _In_ ULONG EventCategoryFlags, + _In_opt_ PVOID EventCategoryData, + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDRIVER_NOTIFICATION_CALLBACK_ROUTINE CallbackRoutine, + _Inout_opt_ PVOID Context, + _Out_ PVOID *NotificationEntry) { PPNP_NOTIFY_ENTRY Entry; PWSTR SymbolicLinkList; @@ -260,18 +357,12 @@ IoRegisterPlugPlayNotification(IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, PAGED_CODE(); DPRINT("%s(EventCategory 0x%x, EventCategoryFlags 0x%lx, DriverObject %p) called.\n", - __FUNCTION__, - EventCategory, - EventCategoryFlags, - DriverObject); + __FUNCTION__, EventCategory, EventCategoryFlags, DriverObject); ObReferenceObject(DriverObject); /* Try to allocate entry for notification before sending any notification */ - Entry = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PNP_NOTIFY_ENTRY), - TAG_PNP_NOTIFY); - + Entry = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_NOTIFY_ENTRY), TAG_PNP_NOTIFY); if (!Entry) { DPRINT("ExAllocatePool() failed\n"); @@ -279,83 +370,99 @@ IoRegisterPlugPlayNotification(IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, return STATUS_INSUFFICIENT_RESOURCES; } - if (EventCategory == EventCategoryDeviceInterfaceChange && - EventCategoryFlags & PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES) - { - DEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; - UNICODE_STRING SymbolicLinkU; - PWSTR SymbolicLink; - - Status = IoGetDeviceInterfaces((LPGUID)EventCategoryData, - NULL, /* PhysicalDeviceObject OPTIONAL */ - 0, /* Flags */ - &SymbolicLinkList); - if (NT_SUCCESS(Status)) - { - /* Enumerate SymbolicLinkList */ - NotificationInfos.Version = 1; - NotificationInfos.Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); - RtlCopyMemory(&NotificationInfos.Event, - &GUID_DEVICE_INTERFACE_ARRIVAL, - sizeof(GUID)); - RtlCopyMemory(&NotificationInfos.InterfaceClassGuid, - EventCategoryData, - sizeof(GUID)); - NotificationInfos.SymbolicLinkName = &SymbolicLinkU; - - for (SymbolicLink = SymbolicLinkList; - *SymbolicLink; - SymbolicLink += wcslen(SymbolicLink) + 1) - { - RtlInitUnicodeString(&SymbolicLinkU, SymbolicLink); - DPRINT("Calling callback routine for %S\n", SymbolicLink); - (*CallbackRoutine)(&NotificationInfos, Context); - } - - ExFreePool(SymbolicLinkList); - } - } + *Entry = (PNP_NOTIFY_ENTRY) { + .PnpNotificationProc = CallbackRoutine, + .Context = Context, + .DriverObject = DriverObject, + .EventCategory = EventCategory, + .RefCount = 1 + }; - Entry->PnpNotificationProc = CallbackRoutine; - Entry->EventCategory = EventCategory; - Entry->Context = Context; - Entry->DriverObject = DriverObject; switch (EventCategory) { case EventCategoryDeviceInterfaceChange: { - Status = RtlStringFromGUID(EventCategoryData, &Entry->Guid); - if (!NT_SUCCESS(Status)) + Entry->Guid = *(LPGUID)EventCategoryData; + + // first register the notification + KeAcquireGuardedMutex(&PiNotifyDeviceInterfaceLock); + InsertTailList(&PiNotifyDeviceInterfaceListHead, &Entry->PnpNotifyList); + KeReleaseGuardedMutex(&PiNotifyDeviceInterfaceLock); + + // then process existing interfaces if asked + if (EventCategoryFlags & PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES) { - ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); - ObDereferenceObject(DriverObject); - return Status; + DEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; + UNICODE_STRING SymbolicLinkU; + PWSTR SymbolicLink; + + Status = IoGetDeviceInterfaces((LPGUID)EventCategoryData, + NULL, /* PhysicalDeviceObject OPTIONAL */ + 0, /* Flags */ + &SymbolicLinkList); + if (NT_SUCCESS(Status)) + { + /* Enumerate SymbolicLinkList */ + NotificationInfos.Version = 1; + NotificationInfos.Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); + NotificationInfos.Event = GUID_DEVICE_INTERFACE_ARRIVAL; + NotificationInfos.InterfaceClassGuid = *(LPGUID)EventCategoryData; + NotificationInfos.SymbolicLinkName = &SymbolicLinkU; + + for (SymbolicLink = SymbolicLinkList; + *SymbolicLink; + SymbolicLink += (SymbolicLinkU.Length / sizeof(WCHAR)) + 1) + { + RtlInitUnicodeString(&SymbolicLinkU, SymbolicLink); + DPRINT("Calling callback routine for %S\n", SymbolicLink); + PiCallNotifyProc(CallbackRoutine, &NotificationInfos, Context); + } + + ExFreePool(SymbolicLinkList); + } } break; } case EventCategoryHardwareProfileChange: { - /* nothing to do */ - break; + KeAcquireGuardedMutex(&PiNotifyHwProfileLock); + InsertTailList(&PiNotifyHwProfileListHead, &Entry->PnpNotifyList); + KeReleaseGuardedMutex(&PiNotifyHwProfileLock); + break; } case EventCategoryTargetDeviceChange: { + PDEVICE_NODE deviceNode; Entry->FileObject = (PFILE_OBJECT)EventCategoryData; + + // NOTE: the device node's PDO is referenced here + Status = IopGetRelatedTargetDevice(Entry->FileObject, &deviceNode); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(DriverObject); + ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); + return Status; + } + // save it so we can dereference it later + Entry->DeviceObject = deviceNode->PhysicalDeviceObject; + + // each DEVICE_NODE has its own registered notifications list + KeAcquireGuardedMutex(&PiNotifyTargetDeviceLock); + InsertTailList(&deviceNode->TargetDeviceNotify, &Entry->PnpNotifyList); + KeReleaseGuardedMutex(&PiNotifyTargetDeviceLock); break; } default: { DPRINT1("%s: unknown EventCategory 0x%x UNIMPLEMENTED\n", __FUNCTION__, EventCategory); - break; + + ObDereferenceObject(DriverObject); + ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); + return STATUS_NOT_SUPPORTED; } } - KeAcquireGuardedMutex(&PnpNotifyListLock); - InsertHeadList(&PnpNotifyListHead, - &Entry->PnpNotifyList); - KeReleaseGuardedMutex(&PnpNotifyListLock); - DPRINT("%s returns NotificationEntry %p\n", __FUNCTION__, Entry); *NotificationEntry = Entry; @@ -366,25 +473,46 @@ IoRegisterPlugPlayNotification(IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, /* * @implemented */ +CODE_SEG("PAGE") NTSTATUS NTAPI -IoUnregisterPlugPlayNotification(IN PVOID NotificationEntry) +IoUnregisterPlugPlayNotification( + _In_ PVOID NotificationEntry) { - PPNP_NOTIFY_ENTRY Entry; + PPNP_NOTIFY_ENTRY Entry = NotificationEntry; + PKGUARDED_MUTEX Lock; + PAGED_CODE(); - Entry = (PPNP_NOTIFY_ENTRY)NotificationEntry; DPRINT("%s(NotificationEntry %p) called\n", __FUNCTION__, Entry); - KeAcquireGuardedMutex(&PnpNotifyListLock); - RemoveEntryList(&Entry->PnpNotifyList); - KeReleaseGuardedMutex(&PnpNotifyListLock); - - RtlFreeUnicodeString(&Entry->Guid); - - ObDereferenceObject(Entry->DriverObject); + switch (Entry->EventCategory) + { + case EventCategoryDeviceInterfaceChange: + Lock = &PiNotifyDeviceInterfaceLock; + break; + case EventCategoryHardwareProfileChange: + Lock = &PiNotifyHwProfileLock; + break; + case EventCategoryTargetDeviceChange: + Lock = &PiNotifyTargetDeviceLock; + break; + default: + UNREACHABLE; + return STATUS_NOT_SUPPORTED; + } - ExFreePoolWithTag(Entry, TAG_PNP_NOTIFY); + KeAcquireGuardedMutex(Lock); + if (!Entry->Deleted) + { + Entry->Deleted = TRUE; // so it can't be unregistered two times + PiDereferencePnpNotifyEntry(Entry); + } + else + { + DPRINT1("IoUnregisterPlugPlayNotification called two times for 0x%p\n", NotificationEntry); + } + KeReleaseGuardedMutex(Lock); return STATUS_SUCCESS; } diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index cb60a133329..ae0ac9566d3 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -131,11 +131,7 @@ PpSetCustomTargetEvent(IN PDEVICE_OBJECT DeviceObject, } /* That call is totally wrong but notifications handler must be fixed first */ - IopNotifyPlugPlayNotification(DeviceObject, - EventCategoryTargetDeviceChange, - &GUID_PNP_CUSTOM_NOTIFICATION, - NotificationStructure, - NULL); + PiNotifyTargetDeviceChange(&GUID_PNP_CUSTOM_NOTIFICATION, DeviceObject, NotificationStructure); if (SyncEvent) {

1 0

[reactos] 01/02: [NTOS:PNP] Check if APCs are enabled before waiting inside IopSynchronousCall
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3198fb644317d30c8f8b… commit e3198fb644317d30c8f8b25c196334f9928c8402 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Oct 15 05:52:11 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:25:39 2020 +0300 [NTOS:PNP] Check if APCs are enabled before waiting inside IopSynchronousCall --- ntoskrnl/io/pnpmgr/pnpmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 3e142b081d0..1a72481691b 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -599,6 +599,8 @@ IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject, /* Call the driver */ Status = IoCallDriver(TopDeviceObject, Irp); + /* Otherwise we may get stuck here or have IoStatusBlock not populated */ + ASSERT(!KeAreAllApcsDisabled()); if (Status == STATUS_PENDING) { /* Wait for it */

1 0

[reactos] 04/04: [NTOS:CONFIG] Comment out the assertion until fixed
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9eafb2971faec6a148239… commit 9eafb2971faec6a14823966dd658b772f70a56f7 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 22:17:08 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:17:08 2020 +0300 [NTOS:CONFIG] Comment out the assertion until fixed CORE-17263 --- ntoskrnl/config/cmapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index fe81bbc3051..ee801a64aae 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -2129,7 +2129,7 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, { DPRINT1("CmpLinkHiveToMaster failed, Status %lx\n", Status); /* FIXME: TODO */ - ASSERT(FALSE); + // ASSERT(FALSE); see CORE-17263 } /* Is this first profile load? */

1 0

[reactos] 03/04: [CLASSPNP][CDROM_NEW][DISK_NEW] Fix clang build
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15a7b9dd2f302061f20ef… commit 15a7b9dd2f302061f20efa4bbf1fdfd2c8bd2216 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 20:52:13 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:15:29 2020 +0300 [CLASSPNP][CDROM_NEW][DISK_NEW] Fix clang build CORE-17129 --- drivers/storage/class/cdrom_new/cdrom.h | 24 +++++++------- drivers/storage/class/cdrom_new/ioctl.c | 4 +-- drivers/storage/class/cdrom_new/scratch.h | 6 ++-- drivers/storage/class/classpnp/autorun.c | 2 +- drivers/storage/class/classpnp/classp.h | 52 +++++++++++++++---------------- drivers/storage/class/classpnp/debug.c | 2 +- drivers/storage/class/classpnp/utils.c | 8 +++-- drivers/storage/class/disk_new/disk.h | 4 +-- drivers/storage/class/disk_new/diskwmi.c | 10 +++--- sdk/include/ddk/storduid.h | 4 +-- 10 files changed, 59 insertions(+), 57 deletions(-) diff --git a/drivers/storage/class/cdrom_new/cdrom.h b/drivers/storage/class/cdrom_new/cdrom.h index f9c0f43e818..e0dd90b9e00 100644 --- a/drivers/storage/class/cdrom_new/cdrom.h +++ b/drivers/storage/class/cdrom_new/cdrom.h @@ -807,7 +807,7 @@ VOID #define CLEAR_FLAG(Flags, Bit) ((Flags) &= ~(Bit)) #define TEST_FLAG(Flags, Bit) (((Flags) & (Bit)) != 0) -__inline +FORCEINLINE // __REACTOS__ BOOLEAN ValidChar(UCHAR Ch) { @@ -821,7 +821,7 @@ ValidChar(UCHAR Ch) } // could be #define, but this allows typechecking -__inline +FORCEINLINE // __REACTOS__ BOOLEAN PORT_ALLOCATED_SENSE( _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, @@ -834,7 +834,7 @@ PORT_ALLOCATED_SENSE( ); } -__inline +FORCEINLINE // __REACTOS__ VOID FREE_PORT_ALLOCATED_SENSE_BUFFER( _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, @@ -1497,19 +1497,19 @@ DvdSendKey( // // neat little hacks to count number of bits set efficiently // -__inline ULONG CountOfSetBitsUChar(UCHAR _X) +FORCEINLINE ULONG CountOfSetBitsUChar(UCHAR _X) { ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; } -__inline ULONG CountOfSetBitsULong(ULONG _X) +FORCEINLINE ULONG CountOfSetBitsULong(ULONG _X) { ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; } -__inline ULONG CountOfSetBitsULong32(ULONG32 _X) +FORCEINLINE ULONG CountOfSetBitsULong32(ULONG32 _X) { ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; } -__inline ULONG CountOfSetBitsULong64(ULONG64 _X) +FORCEINLINE ULONG CountOfSetBitsULong64(ULONG64 _X) { ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; } -__inline ULONG CountOfSetBitsUlongPtr(ULONG_PTR _X) +FORCEINLINE ULONG CountOfSetBitsUlongPtr(ULONG_PTR _X) { ULONG i = 0; while (_X) { _X &= _X - 1; i++; } return i; } -__inline +FORCEINLINE // __REACTOS__ BOOLEAN IsVolumeMounted( _In_ PDEVICE_OBJECT DeviceObject @@ -1523,7 +1523,7 @@ IsVolumeMounted( } -__inline _Ret_range_(0,MAXIMUM_RETRY_FOR_SINGLE_IO_IN_100NS_UNITS) +FORCEINLINE _Ret_range_(0,MAXIMUM_RETRY_FOR_SINGLE_IO_IN_100NS_UNITS) LONGLONG ConvertSectorsPerSecondTo100nsUnitsFor64kWrite( _In_range_(1,0xFFFFFFFF) ULONG SectorsPerSecond // zero would cause divide-by-zero @@ -1549,7 +1549,7 @@ ConvertSectorsPerSecondTo100nsUnitsFor64kWrite( return 320000000 / SectorsPerSecond; } -__inline +FORCEINLINE // __REACTOS__ UCHAR RequestGetCurrentStackLocationFlags( _In_ WDFREQUEST Request @@ -1564,7 +1564,7 @@ RequestGetCurrentStackLocationFlags( return currentStack->Flags; } -__inline +FORCEINLINE // __REACTOS__ ULONG TimeOutValueGetCapValue( _In_ ULONG TimeOutValue, diff --git a/drivers/storage/class/cdrom_new/ioctl.c b/drivers/storage/class/cdrom_new/ioctl.c index f1db7724a86..e9971a7ee8d 100644 --- a/drivers/storage/class/cdrom_new/ioctl.c +++ b/drivers/storage/class/cdrom_new/ioctl.c @@ -6675,7 +6675,7 @@ Return Value: return status; } // end RequestHandleReserveRelease() -__inline +static // __REACTOS__ BOOLEAN ValidPersistentReserveScope( UCHAR Scope) @@ -6692,7 +6692,7 @@ ValidPersistentReserveScope( } } -__inline +static // __REACTOS__ BOOLEAN ValidPersistentReserveType( UCHAR Type) diff --git a/drivers/storage/class/cdrom_new/scratch.h b/drivers/storage/class/cdrom_new/scratch.h index 92d75328f0a..f142589e296 100644 --- a/drivers/storage/class/cdrom_new/scratch.h +++ b/drivers/storage/class/cdrom_new/scratch.h @@ -87,7 +87,7 @@ ScratchBuffer_PerformNextReadWrite( #define ScratchBuffer_BeginUse(context) ScratchBuffer_BeginUseX((context), NULL, (ULONG)-1) #endif -__inline VOID ScratchBuffer_BeginUseX(_Inout_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_opt_ LPCSTR File, ULONG Line) +FORCEINLINE VOID ScratchBuffer_BeginUseX(_Inout_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_opt_ LPCSTR File, ULONG Line) { // NOTE: these are not "real" locks. They are simply to help // avoid multiple uses of the scratch buffer. Thus, it @@ -101,7 +101,7 @@ __inline VOID ScratchBuffer_BeginUseX(_Inout_ PCDROM_DEVICE_EXTENSION DeviceExte RequestClearSendTime(DeviceExtension->ScratchContext.ScratchRequest); return; } -__inline VOID ScratchBuffer_EndUse(_Inout_ PCDROM_DEVICE_EXTENSION DeviceExtension) +FORCEINLINE VOID ScratchBuffer_EndUse(_Inout_ PCDROM_DEVICE_EXTENSION DeviceExtension) { // NOTE: these are not "real" locks. They are simply to help // avoid multiple uses of the scratch buffer. Thus, it @@ -162,7 +162,7 @@ ScratchBuffer_ExecuteCdbEx( ); _IRQL_requires_max_(APC_LEVEL) -__inline +FORCEINLINE // __REACTOS__ NTSTATUS ScratchBuffer_ExecuteCdb( _Inout_ PCDROM_DEVICE_EXTENSION DeviceExtension, diff --git a/drivers/storage/class/classpnp/autorun.c b/drivers/storage/class/classpnp/autorun.c index 8791764915e..6500b4c998f 100644 --- a/drivers/storage/class/classpnp/autorun.c +++ b/drivers/storage/class/classpnp/autorun.c @@ -56,7 +56,7 @@ const GUID StoragePredictFailureEventGuid = WMI_STORAGE_PREDICT_FAILURE_EVENT_GU // would be to serialize the polling and power down irps so that // only one of them is sent to the device at a time. // -__inline +static BOOLEAN ClasspCanSendPollingIrp( _In_ PFUNCTIONAL_DEVICE_EXTENSION fdoExtension diff --git a/drivers/storage/class/classpnp/classp.h b/drivers/storage/class/classpnp/classp.h index dace321951d..81e47b2c66f 100644 --- a/drivers/storage/class/classpnp/classp.h +++ b/drivers/storage/class/classpnp/classp.h @@ -1208,16 +1208,16 @@ typedef struct _IO_RETRIED_LOG_MESSAGE_CONTEXT { /* * Simple singly-linked-list queuing macros, with no synchronization. */ -__inline VOID SimpleInitSlistHdr(SINGLE_LIST_ENTRY *SListHdr) +FORCEINLINE VOID SimpleInitSlistHdr(SINGLE_LIST_ENTRY *SListHdr) { SListHdr->Next = NULL; } -__inline VOID SimplePushSlist(SINGLE_LIST_ENTRY *SListHdr, SINGLE_LIST_ENTRY *SListEntry) +FORCEINLINE VOID SimplePushSlist(SINGLE_LIST_ENTRY *SListHdr, SINGLE_LIST_ENTRY *SListEntry) { SListEntry->Next = SListHdr->Next; SListHdr->Next = SListEntry; } -__inline SINGLE_LIST_ENTRY *SimplePopSlist(SINGLE_LIST_ENTRY *SListHdr) +FORCEINLINE SINGLE_LIST_ENTRY *SimplePopSlist(SINGLE_LIST_ENTRY *SListHdr) { SINGLE_LIST_ENTRY *sListEntry = SListHdr->Next; if (sListEntry){ @@ -1226,12 +1226,12 @@ __inline SINGLE_LIST_ENTRY *SimplePopSlist(SINGLE_LIST_ENTRY *SListHdr) } return sListEntry; } -__inline BOOLEAN SimpleIsSlistEmpty(SINGLE_LIST_ENTRY *SListHdr) +FORCEINLINE BOOLEAN SimpleIsSlistEmpty(SINGLE_LIST_ENTRY *SListHdr) { return (SListHdr->Next == NULL); } -__inline +FORCEINLINE BOOLEAN ClasspIsIdleRequestSupported( PCLASS_PRIVATE_FDO_DATA FdoData, @@ -1246,7 +1246,7 @@ ClasspIsIdleRequestSupported( #endif } -__inline +FORCEINLINE VOID ClasspMarkIrpAsIdle( PIRP Irp, @@ -1263,7 +1263,7 @@ ClasspMarkIrpAsIdle( #endif } -__inline +FORCEINLINE BOOLEAN ClasspIsIdleRequest( PIRP Irp @@ -1275,7 +1275,7 @@ ClasspIsIdleRequest( return ((BOOLEAN)Irp->Tail.Overlay.DriverContext[1]); } -__inline +FORCEINLINE LARGE_INTEGER ClasspGetCurrentTime( VOID @@ -1292,7 +1292,7 @@ ClasspGetCurrentTime( return currentTime; } -__inline +FORCEINLINE ULONGLONG ClasspTimeDiffToMs( ULONGLONG TimeDiff @@ -1303,7 +1303,7 @@ ClasspTimeDiffToMs( return TimeDiff; } -__inline +FORCEINLINE BOOLEAN ClasspSupportsUnmap( _In_ PCLASS_FUNCTION_SUPPORT_INFO SupportInfo @@ -1312,7 +1312,7 @@ ClasspSupportsUnmap( return SupportInfo->LBProvisioningData.LBPU; } -__inline +FORCEINLINE BOOLEAN ClasspIsThinProvisioned( _In_ PCLASS_FUNCTION_SUPPORT_INFO SupportInfo @@ -1330,7 +1330,7 @@ ClasspIsThinProvisioned( return FALSE; } -__inline +FORCEINLINE BOOLEAN ClasspIsObsoletePortDriver( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension @@ -2018,7 +2018,7 @@ ClasspBinaryToAscii( _Inout_ PULONG UpdateLength ); -__inline +FORCEINLINE BOOLEAN ClasspIsTokenOperationComplete( _In_ ULONG CurrentStatus @@ -2039,7 +2039,7 @@ ClasspIsTokenOperationComplete( return operationCompleted; } -__inline +FORCEINLINE BOOLEAN ClasspIsTokenOperation( _In_ PCDB Cdb @@ -2061,7 +2061,7 @@ ClasspIsTokenOperation( return tokenOperation; } -__inline +FORCEINLINE BOOLEAN ClasspIsReceiveTokenInformation( _In_ PCDB Cdb @@ -2082,7 +2082,7 @@ ClasspIsReceiveTokenInformation( return receiveTokenInformation; } -__inline +FORCEINLINE BOOLEAN ClasspIsOffloadDataTransferCommand( _In_ PCDB Cdb @@ -2441,7 +2441,7 @@ ClasspConvertToScsiRequestBlock( _In_ PSTORAGE_REQUEST_BLOCK SrbEx ); -__inline PCDB +FORCEINLINE PCDB ClasspTransferPacketGetCdb( _In_ PTRANSFER_PACKET Pkt ) @@ -2455,7 +2455,7 @@ ClasspTransferPacketGetCdb( // // For unknown operation codes this function will return false and will set TimesAlreadyRetried with zero // -__inline BOOLEAN +FORCEINLINE BOOLEAN ClasspTransferPacketGetNumberOfRetriesDone( _In_ PTRANSFER_PACKET Pkt, _In_ PCDB Cdb, @@ -2509,7 +2509,7 @@ ClasspTransferPacketGetNumberOfRetriesDone( } -__inline PVOID +FORCEINLINE PVOID ClasspTransferPacketGetSenseInfoBuffer( _In_ PTRANSFER_PACKET Pkt ) @@ -2517,7 +2517,7 @@ ClasspTransferPacketGetSenseInfoBuffer( return SrbGetSenseInfoBuffer(Pkt->Srb); } -__inline UCHAR +FORCEINLINE UCHAR ClasspTransferPacketGetSenseInfoBufferLength( _In_ PTRANSFER_PACKET Pkt ) @@ -2526,7 +2526,7 @@ ClasspTransferPacketGetSenseInfoBufferLength( } -__inline VOID +FORCEINLINE VOID ClasspSrbSetOriginalIrp( _In_ PSTORAGE_REQUEST_BLOCK_HEADER Srb, _In_ PIRP Irp @@ -2542,7 +2542,7 @@ ClasspSrbSetOriginalIrp( } } -__inline +FORCEINLINE BOOLEAN PORT_ALLOCATED_SENSE_EX( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, @@ -2555,7 +2555,7 @@ PORT_ALLOCATED_SENSE_EX( ); } -__inline +FORCEINLINE VOID FREE_PORT_ALLOCATED_SENSE_BUFFER_EX( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, @@ -2580,7 +2580,7 @@ ClasspFailurePredictionPeriodMissed( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); -__inline +FORCEINLINE ULONG ClasspGetMaxUsableBufferLengthFromOffset( _In_ PVOID BaseAddress, @@ -2633,7 +2633,7 @@ ClasspIsThinProvisioningError ( _In_ PSCSI_REQUEST_BLOCK _Srb ); -__inline +FORCEINLINE BOOLEAN ClasspLowerLayerNotSupport ( _In_ NTSTATUS Status @@ -2646,7 +2646,7 @@ ClasspLowerLayerNotSupport ( } #if defined(__REACTOS__) && (NTDDI_VERSION >= NTDDI_WINBLUE) -__inline +FORCEINLINE BOOLEAN ClasspSrbTimeOutStatus ( _In_ PSTORAGE_REQUEST_BLOCK_HEADER Srb diff --git a/drivers/storage/class/classpnp/debug.c b/drivers/storage/class/classpnp/debug.c index b39f1e9db48..45902a8933e 100644 --- a/drivers/storage/class/classpnp/debug.c +++ b/drivers/storage/class/classpnp/debug.c @@ -422,7 +422,7 @@ Revision History: A pointer to the value to be incremented. --*/ - __inline VOID DbgSafeInc(PULONG pValue) + static VOID DbgSafeInc(PULONG pValue) { ULONG incrementResult; if(NT_SUCCESS(RtlULongAdd(*pValue, 1, &incrementResult))) { diff --git a/drivers/storage/class/classpnp/utils.c b/drivers/storage/class/classpnp/utils.c index ee7593c2f5d..37aeddaf41d 100644 --- a/drivers/storage/class/classpnp/utils.c +++ b/drivers/storage/class/classpnp/utils.c @@ -1883,7 +1883,7 @@ Exit: return status; } -__inline +static NTSTATUS IncursSeekPenalty ( _In_ USHORT MediumRotationRate, @@ -6147,7 +6147,7 @@ __ClasspQueueLogIOEventWithContextWorker_Exit: } } -__inline +static BOOLEAN ValidPersistentReserveScope( UCHAR Scope) @@ -6166,7 +6166,7 @@ ValidPersistentReserveScope( return FALSE; } -__inline +static BOOLEAN ValidPersistentReserveType( UCHAR Type) @@ -8324,6 +8324,7 @@ retry: #endif // #if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) +#ifndef __REACTOS__ // the functions is not used __inline BOOLEAN ClassDeviceHwFirmwareIsPortDriverSupported( @@ -8359,6 +8360,7 @@ Return Value: return isSupported; } +#endif NTSTATUS ClassDeviceHwFirmwareGetInfoProcess( diff --git a/drivers/storage/class/disk_new/disk.h b/drivers/storage/class/disk_new/disk.h index 3ba2bf2ac15..7954cb0eb1e 100644 --- a/drivers/storage/class/disk_new/disk.h +++ b/drivers/storage/class/disk_new/disk.h @@ -985,7 +985,7 @@ DiskIoctlSmartSendDriveCommand( IN OUT PIRP Irp ); -__inline +FORCEINLINE // __REACTOS__ PCDB GetSrbScsiData( _In_ PSTORAGE_REQUEST_BLOCK SrbEx, @@ -1175,7 +1175,7 @@ Return Value: return Cdb; } -__inline +FORCEINLINE // __REACTOS__ VOID SetSrbScsiData( _In_ PSTORAGE_REQUEST_BLOCK SrbEx, diff --git a/drivers/storage/class/disk_new/diskwmi.c b/drivers/storage/class/disk_new/diskwmi.c index 449d3e16b38..ad022975ee1 100644 --- a/drivers/storage/class/disk_new/diskwmi.c +++ b/drivers/storage/class/disk_new/diskwmi.c @@ -267,7 +267,7 @@ GUID DiskPredictFailureEventGuid = WMI_STORAGE_PREDICT_FAILURE_EVENT_GUID; // // Enable SMART // -_inline NTSTATUS +static NTSTATUS DiskEnableSmart( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -289,7 +289,7 @@ DiskEnableSmart( // // Disable SMART // -_inline NTSTATUS +static NTSTATUS DiskDisableSmart( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -307,7 +307,7 @@ DiskDisableSmart( &bufferSize); } - +#ifndef __REACTOS__ // functions are not used // // Enable Attribute Autosave // @@ -350,12 +350,12 @@ DiskDisableSmartAttributeAutosave( (PSRB_IO_CONTROL)srbControl, &bufferSize); } - +#endif // // Initialize execution of SMART online diagnostics // -_inline NTSTATUS +static NTSTATUS DiskExecuteSmartDiagnostics( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, UCHAR Subcommand diff --git a/sdk/include/ddk/storduid.h b/sdk/include/ddk/storduid.h index fa8d89eb751..cba21bb42f1 100644 --- a/sdk/include/ddk/storduid.h +++ b/sdk/include/ddk/storduid.h @@ -45,13 +45,13 @@ typedef struct _STORAGE_DEVICE_LAYOUT_SIGNATURE } DeviceSpecific; } STORAGE_DEVICE_LAYOUT_SIGNATURE, *PSTORAGE_DEVICE_LAYOUT_SIGNATURE; -inline +FORCEINLINE DUID_MATCH_STATUS CompareStorageDuids( _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid1, _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid2); -inline +FORCEINLINE DUID_MATCH_STATUS CompareStorageDuids( _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid1,

1 0

[reactos] 02/04: [CLASSPNP] Fix amd64 build
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe1b98fc36d970859f691… commit fe1b98fc36d970859f691efd98e81203e595c49d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 20:19:34 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:15:10 2020 +0300 [CLASSPNP] Fix amd64 build CORE-17129 --- drivers/storage/class/classpnp/xferpkt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/storage/class/classpnp/xferpkt.c b/drivers/storage/class/classpnp/xferpkt.c index 69cf602736f..d704b3ab0f3 100644 --- a/drivers/storage/class/classpnp/xferpkt.c +++ b/drivers/storage/class/classpnp/xferpkt.c @@ -582,7 +582,7 @@ VOID EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, __drv_aliasesMem PTRANSFER_PA // Queue a work item to trim down the total number of transfer packets to with the // working size. // - IoQueueWorkItemEx(workItem, CleanupTransferPacketToWorkingSetSizeWorker, DelayedWorkQueue, (PVOID) allocateNode); + IoQueueWorkItemEx(workItem, CleanupTransferPacketToWorkingSetSizeWorker, DelayedWorkQueue, (PVOID)(ULONG_PTR)allocateNode); } else { @@ -960,9 +960,14 @@ TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context) // #ifdef _WIN64 +#ifndef __REACTOS__ lastIoCompletionTime = ReadULong64NoFence((volatile ULONG64*)&fdoData->LastIoCompletionTime.QuadPart); WriteULong64NoFence((volatile ULONG64*)&fdoData->LastIoCompletionTime.QuadPart, completionTime.QuadPart); +#else + lastIoCompletionTime = *(volatile ULONG64*)&fdoData->LastIoCompletionTime.QuadPart; + *((volatile ULONG64*)&fdoData->LastIoCompletionTime.QuadPart) = completionTime.QuadPart; +#endif #else lastIoCompletionTime = InterlockedExchangeNoFence64((volatile LONG64*)&fdoData->LastIoCompletionTime.QuadPart, completionTime.QuadPart);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2020