Patchwork scsi-disk: Inquiry with allocation length of CDB < 36

login
register
mail settings
Submitter Artyom Tarasenko
Date Oct. 26, 2009, 1:36 p.m.
Message ID <fb8d4f70910260636j74e11d89o9ad1fe274f98421f@mail.gmail.com>
Download mbox | patch
Permalink /patch/36906/
State New
Headers show

Comments

Artyom Tarasenko - Oct. 26, 2009, 1:36 p.m.
According to SCSI-2 specification,
http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-08.html#8.2.5 ,
"if the allocation length of the command descriptor block (CDB) is too
small to transfer
all of the parameters, the additional length shall not be adjusted to
reflect the truncation."
The 36 mandatory bytes of response are written to outbuf, and then
only the length requested
in CDB is transferred.

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
         if(len > SCSI_MAX_INQUIRY_LEN)
@@ -604,7 +605,13 @@ static int32_t scsi_send_command(SCSIDevice *d,
uint32_t tag,
            Some later commands are also implemented. */
        outbuf[2] = 3;
        outbuf[3] = 2; /* Format 2 */
-       outbuf[4] = len - 5; /* Additional Length = (Len - 1) - 4 */
+       if (len > 36) {
+           outbuf[4] = len - 5; /* Additional Length = (Len - 1) - 4 */
+       } else {
+              /* If the allocation length of CDB is too small, the
additional length
+                 is not adjusted */
+           outbuf[4] = 36 - 5;
+       }
         /* Sync data transfer and TCQ.  */
         outbuf[7] = 0x10 | (r->bus->tcq ? 0x02 : 0);
        r->iov.iov_len = len;
Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 2a9268a..1a7487e 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -5,6 +5,12 @@
  * Based on code by Fabrice Bellard
  *
  * Written by Paul Brook
+ * Modifications:
+ *  2009-Oct-26 Artyom Tarasenko : implemented stamdard inquiry for the case
+ *                                 when the allocation length of CDB is smaller
+ *                                 than 36.
+ *  2009-Oct-13 Artyom Tarasenko : implemented the block descriptor in the 
+ *                                 MODE SENSE response.
  *
  * This code is licenced under the LGPL.
  *
@@ -576,11 +582,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
                      "is less than 5\n", len);
                 goto fail;
             }
-
-            if (len < 36) {
-                BADF("Error: Inquiry (STANDARD) buffer size %d "
-                     "is less than 36 (TODO: only 5 required)\n", len);
-            }
         }
 
         if(len > SCSI_MAX_INQUIRY_LEN)
@@ -604,7 +605,13 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
            Some later commands are also implemented. */
 	outbuf[2] = 3;
 	outbuf[3] = 2; /* Format 2 */
-	outbuf[4] = len - 5; /* Additional Length = (Len - 1) - 4 */
+	if (len > 36) {
+	    outbuf[4] = len - 5; /* Additional Length = (Len - 1) - 4 */
+	} else {
+              /* If the allocation length of CDB is too small, the additional length
+                 is not adjusted */  
+	    outbuf[4] = 36 - 5;
+	}
         /* Sync data transfer and TCQ.  */
         outbuf[7] = 0x10 | (r->bus->tcq ? 0x02 : 0);
 	r->iov.iov_len = len;
Anthony Liguori - Oct. 27, 2009, 6:03 p.m.
Artyom Tarasenko wrote:
> According to SCSI-2 specification,
> http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-08.html#8.2.5 ,
> "if the allocation length of the command descriptor block (CDB) is too
> small to transfer
> all of the parameters, the additional length shall not be adjusted to
> reflect the truncation."
> The 36 mandatory bytes of response are written to outbuf, and then
> only the length requested
> in CDB is transferred.
>
> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
>   

This patch is whitespace damaged.

Regards,

Anthony Liguori
Artyom Tarasenko - Oct. 27, 2009, 6:09 p.m.
2009/10/27 Anthony Liguori <anthony@codemonkey.ws>:
> Artyom Tarasenko wrote:
>>
>> According to SCSI-2 specification,
>> http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-08.html#8.2.5 ,
>> "if the allocation length of the command descriptor block (CDB) is too
>> small to transfer
>> all of the parameters, the additional length shall not be adjusted to
>> reflect the truncation."
>> The 36 mandatory bytes of response are written to outbuf, and then
>> only the length requested
>> in CDB is transferred.
>>
>> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
>>
>
> This patch is whitespace damaged.

Also the attached one? I tried to keep the original identation: used
tabs where the tabs originally were.
Artyom Tarasenko - Oct. 28, 2009, 11:31 a.m.
2009/10/27 Artyom Tarasenko <atar4qemu@googlemail.com>:
> 2009/10/27 Anthony Liguori <anthony@codemonkey.ws>:
>> Artyom Tarasenko wrote:
>>>
>>> According to SCSI-2 specification,
>>> http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-08.html#8.2.5 ,
>>> "if the allocation length of the command descriptor block (CDB) is too
>>> small to transfer
>>> all of the parameters, the additional length shall not be adjusted to
>>> reflect the truncation."
>>> The 36 mandatory bytes of response are written to outbuf, and then
>>> only the length requested
>>> in CDB is transferred.
>>>
>>> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
>>>
>>
>> This patch is whitespace damaged.
>
> Also the attached one? I tried to keep the original indentation: used
> tabs where the tabs originally were.

What is actually the indentation policy for patches? Should they be
conform with CODING_STYLE even if the original code isn't?
If they are conform the code may look badly indented with any tab
settings, including the ones from the original author.
If they keep author's indentation, the code still may look badly
indented with the CODING_STYLE tab settings.

Should patches for badly indented code explicitly require
indentation-only patches which shall be applied before?

Patch

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 2a9268a..1a7487e 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -5,6 +5,12 @@ 
  * Based on code by Fabrice Bellard
  *
  * Written by Paul Brook
+ * Modifications:
+ *  2009-Oct-26 Artyom Tarasenko : implemented stamdard inquiry for the case
+ *                                 when the allocation length of CDB is smaller
+ *                                 than 36.
+ *  2009-Oct-13 Artyom Tarasenko : implemented the block descriptor in the
+ *                                 MODE SENSE response.
  *
  * This code is licenced under the LGPL.
  *
@@ -576,11 +582,6 @@  static int32_t scsi_send_command(SCSIDevice *d,
uint32_t tag,
                      "is less than 5\n", len);
                 goto fail;
             }
-
-            if (len < 36) {
-                BADF("Error: Inquiry (STANDARD) buffer size %d "
-                     "is less than 36 (TODO: only 5 required)\n", len);
-            }
         }