Re: TYPE_RBC cache fixes (sbp2.c affected)

Al Viro
2006-02-21T21:51:45Z

On Tue, Feb 21, 2006 at 08:56:08PM +0100, Stefan Richter wrote:
> 2.6.16-rc4-mm1's sbp2 already detects most of the Initio bridges and
> flags them with skip_ms_page_8. It does so based on the
> firmware_revision config ROM entry. This seems to catch most Initio
> bridges but there was at least one report of a different
> firmware_revision key value. However all of them feature "Initio" as
> vendor string. I suppose I should let sbp2_slave_configure check for
> this string in sdev->vendor and for sdev->type == TYPE_DISK, then bend
> sdev->type to TYPE_RBC. (Or set skip_ms_page_8; I will check how my disk
> behaves when forced to TYPE_RBC...)

Same - it still forgets to generate proper header.

See if that helps (might allow killing that skip_ms_page_8 in those, BTW):

--- a/drivers/scsi/scsi_lib.c 2006-02-20 10:02:58.000000000 -0600
+++ b/drivers/scsi/scsi_lib.c 2006-02-21 01:47:18.000000000 -0600
@@ -1892,8 +1892,16 @@
}

if(scsi_status_is_good(result)) {
- data->header_length = header_length;
- if(use_10_for_ms) {
+ if (unlikely(buffer[0] == 0x86 && buffer[1] == 0x0b &&
+ (modepage == 6 || modepage == 8))) {
+ /* Initio breakage? */
+ header_length = 0;
+ data->length = 13;
+ data->medium_type = 0;
+ data->device_specific = 0;
+ data->longlba = 0;
+ data->block_descriptor_length = 0;
+ } else if(use_10_for_ms) {
data->length = buffer[0]*256 + buffer[1] + 2;
data->medium_type = buffer[2];
data->device_specific = buffer[3];
@@ -1906,6 +1914,7 @@
data->device_specific = buffer[2];
data->block_descriptor_length = buffer[3];
}
+ data->header_length = header_length;
}

return result;
--- a/drivers/scsi/sd.c 2006-02-17 16:26:52.000000000 -0600
+++ b/drivers/scsi/sd.c 2006-02-20 18:15:44.000000000 -0600
@@ -1328,6 +1328,12 @@
if (!scsi_status_is_good(res))
goto bad_sense;

+ if (!data.header_length) {
+ modepage = 6;
+ printk(KERN_ERR "%s: missing header in MODE_SENSE response\n",
+ diskname);
+ }
+
/* that went OK, now ask for the proper length */
len = data.length;

@@ -1342,6 +1348,8 @@

/* Take headers and block descriptors into account */
len += data.header_length + data.block_descriptor_length;
+ if (len > 512)
+ goto bad_sense;

/* Get the data */
res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
@@ -1354,8 +1362,15 @@
int ct = 0;
int offset = data.header_length + data.block_descriptor_length;

+ if (offset >= 512 - 2) {
+ printk(KERN_ERR "%s: malformed MODE SENSE response",
+ diskname);
+ goto defaults;
+ }
+
if ((buffer[offset] & 0x3f) != modepage) {
- printk(KERN_ERR "%s: got wrong page\n", diskname);
+ printk(KERN_ERR "%s: got wrong page (%d -> %d)\n",
+ diskname, modepage, buffer[offset] & 0x3f);
goto defaults;
}