Changeset 65078 in vbox

Timestamp:

Jan 3, 2017 1:24:58 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage/DrvHost*: Avoid using SCSI_MAX_BUFFER_SIZE (will be removed in the future) but query the maximum supported buffer size through a dedicated method from the platform specific code

Location:

trunk

Files:

• include/VBox/scsi.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvHostBase-darwin.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp (modified) (3 diffs)
• src/VBox/Devices/Storage/DrvHostBase-linux.cpp (modified) (5 diffs)
• src/VBox/Devices/Storage/DrvHostBase-solaris.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostBase-win.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostBase.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvHostDVD.cpp (modified) (3 diffs)

trunk/include/VBox/scsi.h

@@ -29 +29 @@
 #include <iprt/assert.h>
 
+/**
+ * @todo: Remove when the splitting code was removed from DevATA.
+ *        The limit doesn't belong here but is specific for each host platform.
+ */
 #ifdef RT_OS_FREEBSD
 /* The cam subsystem doesn't allow more */

trunk/src/VBox/Devices/Storage/DrvHostBase-darwin.cpp

@@ -26 +26 @@
 #include <mach/mach_error.h>
 #include <VBox/scsi.h>
+
+/** Maximum buffer size we support, check whether darwin has some real upper limit. */
+#define DARWIN_SCSI_MAX_BUFFER_SIZE (100 * _1K)
 
 /**
@@ -322 +325 @@
 
 
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return DARWIN_SCSI_MAX_BUFFER_SIZE;
+}
+
+
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)
 {

trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp

@@ -27 +27 @@
 #include <iprt/log.h>
 
+/** Maximum buffer size supported by the CAM subsystem. */
+#define FBSD_SCSI_MAX_BUFFER_SIZE (64 * _1K)
+
 /**
  * Host backend specific data.
@@ -149 +152 @@
 
 
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return FBSD_SCSI_MAX_BUFFER_SIZE;
+}
+
+
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)
 {
@@ -194 +205 @@
             const uint32_t  LBA       = off / pThis->Os.cbBlock;
             AssertReturn(!(off % pThis->Os.cbBlock), VERR_INVALID_PARAMETER);
-            uint32_t        cbRead32  =   cbRead > SCSI_MAX_BUFFER_SIZE
-                                        ? SCSI_MAX_BUFFER_SIZE
+            uint32_t        cbRead32  =   cbRead > FBSD_SCSI_MAX_BUFFER_SIZE
+                                        ? FBSD_SCSI_MAX_BUFFER_SIZE
                                         : (uint32_t)cbRead;
             const uint32_t  cBlocks   = cbRead32 / pThis->Os.cbBlock;

trunk/src/VBox/Devices/Storage/DrvHostBase-linux.cpp

@@ -39 +39 @@
 #include <VBox/scsi.h>
 
+/** Maximum buffer size supported by the kernel interface. */
+#define LNX_SCSI_MAX_BUFFER_SIZE (100 * _1K)
+
 /**
  * Host backend specific data.
@@ -75 +78 @@
     if(RT_UNLIKELY(!pThis->Os.pbDoubleBuffer))
     {
-        pThis->Os.pbDoubleBuffer = (uint8_t *)RTMemAlloc(SCSI_MAX_BUFFER_SIZE);
+        pThis->Os.pbDoubleBuffer = (uint8_t *)RTMemAlloc(LNX_SCSI_MAX_BUFFER_SIZE);
         if (!pThis->Os.pbDoubleBuffer)
             return VERR_NO_MEMORY;
@@ -92 +95 @@
         case PDMMEDIATXDIR_FROM_DEVICE:
             Assert(*pcbBuf != 0);
-            Assert(*pcbBuf <= SCSI_MAX_BUFFER_SIZE);
+            Assert(*pcbBuf <= LNX_SCSI_MAX_BUFFER_SIZE);
             /* Make sure that the buffer is clear for commands reading
              * data. The actually received data may be shorter than what
@@ -105 +108 @@
         case PDMMEDIATXDIR_TO_DEVICE:
             Assert(*pcbBuf != 0);
-            Assert(*pcbBuf <= SCSI_MAX_BUFFER_SIZE);
+            Assert(*pcbBuf <= LNX_SCSI_MAX_BUFFER_SIZE);
             memcpy(pThis->Os.pbDoubleBuffer, pvBuf, *pcbBuf);
             direction = CGC_DATA_WRITE;
@@ -154 +157 @@
 }
 
+
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return LNX_SCSI_MAX_BUFFER_SIZE;
+}
+
+
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)
 {

trunk/src/VBox/Devices/Storage/DrvHostBase-solaris.cpp

@@ -33 +33 @@
 
 #include <iprt/file.h>
+
+/** Maximum buffer size we support, check whether darwin has some real upper limit. */
+#define SOL_SCSI_MAX_BUFFER_SIZE (100 * _1K)
 
 /**
@@ -203 +206 @@
 }
 
+
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return SOL_SCSI_MAX_BUFFER_SIZE;
+}
+
+
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)
 {

trunk/src/VBox/Devices/Storage/DrvHostBase-win.cpp

@@ -80 +80 @@
 #include <iprt/file.h>
 #include <VBox/scsi.h>
+
+/** Maximum buffer size we support, check whether darwin has some real upper limit. */
+#define SOL_SCSI_MAX_BUFFER_SIZE (100 * _1K)
 
 /**
@@ -305 +308 @@
     return rc;
 }
+
+
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return WIN_SCSI_MAX_BUFFER_SIZE;
+}
+
 
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ -167 +167 @@
 DECLHIDDEN(int) drvHostBaseScsiCmdOs(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMMEDIATXDIR enmTxDir,
                                      void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis);
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb);
 DECLHIDDEN(int) drvHostBaseReadOs(PDRVHOSTBASE pThis, uint64_t off, void *pvBuf, size_t cbRead);

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ -555 +555 @@
     size_t cbXfer = 0;
     size_t cbSector = 0;
+    size_t cbScsiCmdBufLimit = drvHostBaseScsiCmdGetBufLimitOs(&pThis->Core);
     bool fPassthrough = drvHostDvdParseCdb(pThis, pReq, pbCdb, cbCdb, cbBuf,
                                            &enmXferDir, &cbXfer, &cbSector, pu8ScsiSts);
@@ -568 +569 @@
             rc = drvHostBaseBufferRetain(&pThis->Core, pReq, cbXfer, enmXferDir == PDMMEDIATXDIR_TO_DEVICE, &pvBuf);
 
-        if (cbXfer > SCSI_MAX_BUFFER_SIZE)
+        if (cbXfer > cbScsiCmdBufLimit)
         {
             /* Linux accepts commands with up to 100KB of data, but expects
@@ -610 +611 @@
             for (uint32_t i = cSectors; i > 0; i -= cReqSectors)
             {
-                if (i * cbSector > SCSI_MAX_BUFFER_SIZE)
-                    cReqSectors = SCSI_MAX_BUFFER_SIZE / (uint32_t)cbSector;
+                if (i * cbSector > cbScsiCmdBufLimit)
+                    cReqSectors = cbScsiCmdBufLimit / (uint32_t)cbSector;
                 else
                     cReqSectors = i;