[SPTILIB] Introduce SPTI static library for storage drivers (reactos#8209)

Add a SCSI and ATA passthrough support helper library for direct use
from low-level storage drivers.

Tested with: CDRoller, CloneCD, Magic ISO
NOTE: Vbox seems to lack support for CD/DVD burning; tested on real hardware.

CORE-10191 CORE-16452
CORE-14788 CORE-18241
CORE-17256 CORE-13866

Author: disean

drivers/storage/port/scsiport/CMakeLists.txt

@@ -1,6 +1,9 @@
 
 spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB)
 
+include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sptilib)
+
 # Embed RTC libs
 if (STACK_PROTECTOR)
     target_sources(libscsiport PRIVATE $<TARGET_OBJECTS:gcc_ssp_scsiport>)
@@ -27,5 +30,6 @@ add_library(scsiport MODULE
 
 add_pch(scsiport scsiport.h "${PCH_SKIP_SOURCE}")
 set_module_type(scsiport kernelmodedriver)
+target_link_libraries(scsiport sptilib ${PSEH_LIB})
 add_importlibs(scsiport ntoskrnl hal)
 add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all)

drivers/storage/port/scsiport/ioctl.c

@@ -8,6 +8,7 @@
  */
 
 #include "scsiport.h"
+#include <sptilib.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -276,7 +277,6 @@ PdoHandleQueryProperty(
         }
         default:
         {
-            UNREACHABLE;
             status = STATUS_NOT_IMPLEMENTED;
             goto completeIrp;
         }
@@ -288,6 +288,56 @@ PdoHandleQueryProperty(
     return status;
 }
 
+static
+NTSTATUS
+PdoHandleScsiPassthrough(
+    _In_ PDEVICE_OBJECT DeviceObject,
+    _Inout_ PIRP Irp)
+{
+    PSCSI_PORT_LUN_EXTENSION lunExt = DeviceObject->DeviceExtension;
+    PSCSI_PORT_DEVICE_EXTENSION portExt;
+
+    ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL);
+    ASSERT(!lunExt->Common.IsFDO);
+
+    /* Skip requests that bypassed the class driver. See also cdrom!RequestHandleScsiPassThrough */
+    if ((IoGetCurrentIrpStackLocation(Irp)->MinorFunction == 0) && lunExt->DeviceClaimed)
+        return STATUS_INVALID_DEVICE_REQUEST;
+
+    portExt = lunExt->Common.LowerDevice->DeviceExtension;
+
+    return SptiHandleScsiPassthru(DeviceObject,
+                                  Irp,
+                                  portExt->PortCapabilities.MaximumTransferLength,
+                                  portExt->PortCapabilities.MaximumPhysicalPages);
+}
+
+static
+NTSTATUS
+FdoHandleScsiPassthrough(
+    _In_ PDEVICE_OBJECT DeviceObject,
+    _Inout_ PIRP Irp)
+{
+    PSCSI_PORT_DEVICE_EXTENSION portExt;
+    PSCSI_PORT_LUN_EXTENSION lunExt;
+    PSCSI_PASS_THROUGH spt;
+
+    ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL);
+
+    if (!VerifyIrpInBufferSize(Irp, RTL_SIZEOF_THROUGH_FIELD(SCSI_PASS_THROUGH, Lun)))
+        return STATUS_BUFFER_TOO_SMALL;
+
+    portExt = DeviceObject->DeviceExtension;
+    ASSERT(portExt->Common.IsFDO);
+
+    spt = Irp->AssociatedIrp.SystemBuffer;
+    lunExt = GetLunByPath(portExt, spt->PathId, spt->TargetId, spt->Lun);
+    if (!lunExt)
+        return STATUS_NO_SUCH_DEVICE;
+
+    return PdoHandleScsiPassthrough(lunExt->Common.DeviceObject, Irp);
+}
+
 static
 NTSTATUS
 FdoHandleQueryProperty(
@@ -409,15 +459,17 @@ ScsiPortDeviceControl(
     PSCSI_PORT_COMMON_EXTENSION comExt = DeviceObject->DeviceExtension;
     PSCSI_PORT_DEVICE_EXTENSION portExt;
     PSCSI_PORT_LUN_EXTENSION lunExt;
+    ULONG IoControlCode;
     NTSTATUS status;
 
     DPRINT("ScsiPortDeviceControl()\n");
 
     Irp->IoStatus.Information = 0;
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
+    IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode;
 
-    switch (Stack->Parameters.DeviceIoControl.IoControlCode)
+    switch (IoControlCode)
     {
         case IOCTL_STORAGE_QUERY_PROPERTY:
         {
@@ -534,20 +586,27 @@ ScsiPortDeviceControl(
             break;
 
         case IOCTL_SCSI_PASS_THROUGH:
-            DPRINT1("IOCTL_SCSI_PASS_THROUGH unimplemented!\n");
-            status = STATUS_NOT_IMPLEMENTED;
+        case IOCTL_SCSI_PASS_THROUGH_DIRECT:
+        {
+            DPRINT("  IOCTL_SCSI_PASS_THROUGH%s\n",
+                   IoControlCode == IOCTL_SCSI_PASS_THROUGH_DIRECT ? "_DIRECT" : "");
+
+            if (comExt->IsFDO)
+                status = FdoHandleScsiPassthrough(DeviceObject, Irp);
+            else
+                status = PdoHandleScsiPassthrough(DeviceObject, Irp);
             break;
+        }
 
         case IOCTL_ATA_PASS_THROUGH:
         case IOCTL_ATA_PASS_THROUGH_DIRECT:
             /* ATA passthrough IOCTLs not supported by MS scsiport */
-            DPRINT1("ATA passthrough IOCTLs not supported: 0x%lX\n",
-                    Stack->Parameters.DeviceIoControl.IoControlCode);
+            DPRINT1("ATA passthrough IOCTLs not supported: 0x%lX\n", IoControlCode);
             status = STATUS_NOT_SUPPORTED;
             break;
 
         default:
-            DPRINT1("unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode);
+            DPRINT1("unknown ioctl code: 0x%lX\n", IoControlCode);
             status = STATUS_NOT_SUPPORTED;
             break;
     }

drivers/storage/port/storport/CMakeLists.txt

@@ -1,6 +1,9 @@
 
 spec2def(storport.sys storport.spec ADD_IMPORTLIB)
 
+include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sptilib)
+
 list(APPEND SOURCE
     fdo.c
     miniport.c
@@ -20,5 +23,6 @@ add_library(storport MODULE
 
 add_pch(storport precomp.h "${PCH_SKIP_SOURCE}")
 set_module_type(storport kernelmodedriver)
+target_link_libraries(storport sptilib ${PSEH_LIB})
 add_importlibs(storport ntoskrnl hal)
 add_cd_file(TARGET storport DESTINATION reactos/system32/drivers NO_CAB FOR all)

drivers/usb/usbstor/CMakeLists.txt

@@ -1,4 +1,7 @@
 
+include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sptilib)
+
 list(APPEND SOURCE
     descriptor.c
     disk.c
@@ -19,6 +22,7 @@ add_library(usbstor MODULE
     usbstor.rc)
 
 set_module_type(usbstor kernelmodedriver)
+target_link_libraries(usbstor sptilib ${PSEH_LIB})
 add_importlibs(usbstor ntoskrnl hal usbd)
 add_pch(usbstor usbstor.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all)

drivers/usb/usbstor/disk.c

@@ -9,10 +9,13 @@
  */
 
 #include "usbstor.h"
+#include <sptilib.h>
 
 #define NDEBUG
 #include <debug.h>
 
+// See CORE-10515 and CORE-10755
+#define USBSTOR_DEFAULT_MAX_PHYS_PAGES    (USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH / PAGE_SIZE + 1)
 
 static
 BOOLEAN
@@ -394,7 +397,7 @@ USBSTOR_HandleQueryProperty(
             .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
+            .MaximumPhysicalPages = USBSTOR_DEFAULT_MAX_PHYS_PAGES,
             .BusType = BusTypeUsb,
             .BusMajorVersion = 2, //FIXME verify
             .BusMinorVersion = 0 //FIXME
@@ -429,13 +432,27 @@ USBSTOR_HandleDeviceControl(
             Status = USBSTOR_HandleQueryProperty(DeviceObject, Irp);
             break;
         case IOCTL_SCSI_PASS_THROUGH:
-            DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH NOT implemented\n");
-            Status = STATUS_NOT_SUPPORTED;
-            break;
         case IOCTL_SCSI_PASS_THROUGH_DIRECT:
-            DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH_DIRECT NOT implemented\n");
-            Status = STATUS_NOT_SUPPORTED;
+        {
+            PDODeviceExtension = DeviceObject->DeviceExtension;
+
+            ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL);
+            ASSERT(PDODeviceExtension);
+            ASSERT(PDODeviceExtension->Common.IsFDO == FALSE);
+
+            /* Skip requests that bypassed the class driver. See also cdrom!RequestHandleScsiPassThrough */
+            if ((IoGetCurrentIrpStackLocation(Irp)->MinorFunction == 0) && PDODeviceExtension->Claimed)
+            {
+                Status = STATUS_INVALID_DEVICE_REQUEST;
+                break;
+            }
+
+            Status = SptiHandleScsiPassthru(DeviceObject,
+                                            Irp,
+                                            USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH,
+                                            USBSTOR_DEFAULT_MAX_PHYS_PAGES);
             break;
+        }
         case IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER:
             DPRINT1("USBSTOR_HandleDeviceControl IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER NOT implemented\n");
             Status = STATUS_NOT_SUPPORTED;
@@ -461,7 +478,7 @@ USBSTOR_HandleDeviceControl(
             if (Capabilities)
             {
                 Capabilities->MaximumTransferLength = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH;
-                Capabilities->MaximumPhysicalPages = USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH / PAGE_SIZE + 1; // See CORE-10515 and CORE-10755
+                Capabilities->MaximumPhysicalPages = USBSTOR_DEFAULT_MAX_PHYS_PAGES;
                 Capabilities->SupportedAsynchronousEvents = 0;
                 Capabilities->AlignmentMask = 0;
                 Capabilities->TaggedQueuing = FALSE;

sdk/include/ddk/scsi.h

@@ -1886,6 +1886,27 @@ typedef union _CDB {
     UCHAR Streaming:1;
     UCHAR Control;
   } WRITE12;
+  struct _ATA_PASSTHROUGH12 {
+    UCHAR OperationCode;
+    UCHAR Reserved1:1;
+    UCHAR Protocol:4;
+    UCHAR MultipleCount:3;
+    UCHAR TLength:2;
+    UCHAR ByteBlock:1;
+    UCHAR TDir:1;
+    UCHAR Reserved2:1;
+    UCHAR CkCond:1;
+    UCHAR Offline:2;
+    UCHAR Features;
+    UCHAR SectorCount;
+    UCHAR LbaLow;
+    UCHAR LbaMid;
+    UCHAR LbaHigh;
+    UCHAR Device;
+    UCHAR Command;
+    UCHAR Reserved3;
+    UCHAR Control;
+  } ATA_PASSTHROUGH12;
   struct _READ16 {
     UCHAR OperationCode;
     UCHAR Reserved1:3;
@@ -1944,6 +1965,31 @@ typedef union _CDB {
     UCHAR Reserved2:7;
     UCHAR Control;
   } READ_CAPACITY16;
+  struct _ATA_PASSTHROUGH16 {
+    UCHAR OperationCode;
+    UCHAR Extend:1;
+    UCHAR Protocol:4;
+    UCHAR MultipleCount:3;
+    UCHAR TLength:2;
+    UCHAR ByteBlock:1;
+    UCHAR TDir:1;
+    UCHAR Reserved1:1;
+    UCHAR CkCond:1;
+    UCHAR Offline:2;
+    UCHAR Features15_8;
+    UCHAR Features7_0;
+    UCHAR SectorCount15_8;
+    UCHAR SectorCount7_0;
+    UCHAR LbaLow15_8;
+    UCHAR LbaLow7_0;
+    UCHAR LbaMid15_8;
+    UCHAR LbaMid7_0;
+    UCHAR LbaHigh15_8;
+    UCHAR LbaHigh7_0;
+    UCHAR Device;
+    UCHAR Command;
+    UCHAR Control;
+  } ATA_PASSTHROUGH16;
   struct _TOKEN_OPERATION {
     UCHAR OperationCode;
     UCHAR ServiceAction:5;

sdk/include/psdk/ntddscsi.h

@@ -256,6 +256,7 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT32_EX
 #define ATA_FLAGS_DATA_OUT (1 << 2)
 #define ATA_FLAGS_48BIT_COMMAND (1 << 3)
 #define ATA_FLAGS_USE_DMA (1 << 4)
+#define ATA_FLAGS_NO_MULTIPLE (1 << 5)
 
   typedef struct _SCSI_BUS_DATA {
     UCHAR NumberOfLogicalUnits;

sdk/lib/drivers/CMakeLists.txt

@@ -9,5 +9,6 @@ add_subdirectory(rdbsslib)
 add_subdirectory(rtlver)
 add_subdirectory(rxce)
 add_subdirectory(sound)
+add_subdirectory(sptilib)
 add_subdirectory(virtio)
 add_subdirectory(wdf)

sdk/lib/drivers/sptilib/CMakeLists.txt

@@ -0,0 +1,7 @@
+
+list(APPEND SOURCE
+    sptilib.c)
+
+add_library(sptilib ${SOURCE})
+target_link_libraries(sptilib PRIVATE ${PSEH_LIB})
+add_dependencies(sptilib xdk)