| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <alpine.LNX.2.00.1706301412120.2069@nippy.intranet>
Date: Fri, 30 Jun 2017 17:12:37 +1000 (AEST)
From: Finn Thain <fthain@...egraphics.com.au>
To: Ondrej Zary <linux@...nbow-software.org>
cc: "James E.J. Bottomley" <jejb@...ux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
Michael Schmitz <schmitzmic@...il.com>
Subject: Re: [PATCH v5 0/6] g_NCR5380: PDMA fixes and cleanup
On Thu, 29 Jun 2017, Ondrej Zary wrote:
> The write corruption is still there. I'm afraid it can't be fixed
> without rolling "start" back (or inceasing residual) if an error
> occured, something like this:
>
> --- a/drivers/scsi/g_NCR5380.c
> +++ b/drivers/scsi/g_NCR5380.c
> @@ -619,6 +621,9 @@ static inline int generic_NCR5380_psend(struct
> (int)NCR5380_read(hostdata->c400_blk_cnt) * 128);
>
> if (residual != 0) {
> + residual += 128;
> /* 53c80 interrupt or transfer timeout. Reset 53c400 logic. */
> NCR5380_write(hostdata->c400_ctl_status, CSR_RESET);
> NCR5380_write(hostdata->c400_ctl_status, CSR_BASE);
>
> (seems to work - wrote 230MB and read it back with no differences)
>
> The corruption mechanism is:
> 1. Host buffer is ready so we write 128 B of data there and increment
> "start".
> 2. Chip swaps the buffers, decrements the block counter and starts
> writing the data to drive.
> 3. Drive does not like it (e.g. its buffer is full) so it disconnects.
> 4. Chip stops writing and asserts an IRQ.
> 5. We detect the IRQ. The block counter is already decremented, "start"
> is already incremented but the data was not written to the drive.
>
>
OK. Thanks for that analysis.
It sounds like the c400_blk_cnt value gives the number of buffer swaps
remaining. If so, that value isn't useful for calculating a residual. I'll
rework that calculation again.
In your patch, the residual gets increased regardless of the actual cause
of the short transfer. Nothing prevents the residual from being increased
beyond the original length of the transfer (due to a flaky target or bus).
Therefore I've taken a slightly different approach in my patch (below).
>
> No more log spamming on DTC but reads are corrupted even more than before.
> The IRQ check after data transfer increases the chance of catching an IRQ
> before the buffer could become ready.
If we delay the IRQ check, that just means that CSR_GATED_53C80_IRQ will
be detected a bit later (128 bytes later)... so not much difference.
> This patch:
> --- a/drivers/scsi/g_NCR5380.c
> +++ b/drivers/scsi/g_NCR5380.c
> @@ -548,8 +548,10 @@ static inline int generic_NCR5380_precv(struct
> start += 128;
>
> if (NCR5380_read(hostdata->c400_ctl_status) &
> - CSR_GATED_53C80_IRQ)
> + CSR_GATED_53C80_IRQ) {
> + printk("r irq at start=%d basr=0x%02x\n", start, NCR5380_read(BUS_AND_STATUS_REG));
> break;
> + }
> }
>
> residual = len - start;
>
> produces lots of these lines:
> [ 896.194054] r irq at start=128 basr=0x98
> [ 896.197758] r irq at start=3968 basr=0x98
>
Assuming that the registers are available and valid, the value 0x98 means
BASR_END_DMA_TRANSFER | BASR_IRQ | BASR_PHASE_MATCH. There is no
BASR_BUSY_ERROR here, so the cause of the CSR_GATED_53C80_IRQ must be that
the 53c400 has terminated the transfer by asserting /EOP. That shouldn't
happen before before the counters run down.
It doesn't make sense. So maybe the 53c80 registers are not valid at this
point? That means a phase mismatch can't be excluded... unlikely at 128
bytes into the transfer. Busy error? Also unlikely.
I have to conclude that CSR_GATED_53C80_IRQ and BASR_END_DMA_TRANSFER
can't be trusted on this board. I guess that's why you examine the BASR
directly in your original algorithm but ignore BASR_END_DMA_TRANSFER.
It does look like some kind of timing issue: the "start" value above
changes from one log message to the next. Who knows?
> This fixes the DTC read corruption, although I don't like the repeated
> ctl_status register reads:
> --- a/drivers/scsi/g_NCR5380.c
> +++ b/drivers/scsi/g_NCR5380.c
> @@ -533,7 +533,7 @@ static inline int generic_NCR5380_precv(struct
> break;
>
> if (NCR5380_read(hostdata->c400_ctl_status) &
> - CSR_HOST_BUF_NOT_RDY)
> + CSR_GATED_53C80_IRQ && (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY))
> break;
>
> if (hostdata->io_port && hostdata->io_width == 2)
But that means the transfer will continue even when CSR_HOST_BUF_NOT_RDY.
Your original algorithm doesn't attempt that. Neither does the algorithm
in the datasheet. We should try to omit this change.
> @@ -546,10 +546,6 @@ static inline int generic_NCR5380_precv(struct
> memcpy_fromio(dst + start,
> hostdata->io + NCR53C400_host_buffer, 128);
> start += 128;
> -
> - if (NCR5380_read(hostdata->c400_ctl_status) &
> - CSR_GATED_53C80_IRQ)
> - break;
> }
>
> residual = len - start;
I think we should keep the CSR_GATED_53C80_IRQ check for the other boards,
if this bogus BASR_END_DMA_TRANSFER problem is confined to DTC436.
How about this change? (to be applied on top of 6/6)
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 3948f522b4e1..8e80379cfaaa 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -525,16 +525,22 @@ static inline int generic_NCR5380_precv(struct NCR5380_hostdata *hostdata,
NCR5380_write(hostdata->c400_blk_cnt, len / 128);
do {
- if (NCR5380_poll_politely2(hostdata, hostdata->c400_ctl_status,
- CSR_HOST_BUF_NOT_RDY, 0,
- hostdata->c400_ctl_status,
- CSR_GATED_53C80_IRQ,
- CSR_GATED_53C80_IRQ, HZ / 64) < 0)
- break;
-
- if (NCR5380_read(hostdata->c400_ctl_status) &
- CSR_HOST_BUF_NOT_RDY)
- break;
+ if (hostdata->board == BOARD_DTC3181E) {
+ /* Ignore bogus CSR_GATED_53C80_IRQ */
+ if (NCR5380_poll_politely(hostdata, hostdata->c400_ctl_status,
+ CSR_HOST_BUF_NOT_RDY, 0, HZ / 64) < 0)
+ break;
+ } else {
+ if (NCR5380_poll_politely2(hostdata, hostdata->c400_ctl_status,
+ CSR_HOST_BUF_NOT_RDY, 0,
+ hostdata->c400_ctl_status,
+ CSR_GATED_53C80_IRQ,
+ CSR_GATED_53C80_IRQ, HZ / 64) < 0)
+ break;
+ if (NCR5380_read(hostdata->c400_ctl_status) &
+ CSR_HOST_BUF_NOT_RDY)
+ break;
+ }
if (hostdata->io_port && hostdata->io_width == 2)
insw(hostdata->io_port + hostdata->c400_host_buf,
@@ -546,10 +552,6 @@ static inline int generic_NCR5380_precv(struct NCR5380_hostdata *hostdata,
memcpy_fromio(dst + start,
hostdata->io + NCR53C400_host_buffer, 128);
start += 128;
-
- if (NCR5380_read(hostdata->c400_ctl_status) &
- CSR_GATED_53C80_IRQ)
- break;
} while (start < len);
residual = len - start;
@@ -600,6 +602,12 @@ static inline int generic_NCR5380_psend(struct NCR5380_hostdata *hostdata,
break;
if (NCR5380_read(hostdata->c400_ctl_status) &
+ CSR_HOST_BUF_NOT_RDY && start > 0) {
+ start -= 128;
+ break;
+ }
+
+ if (NCR5380_read(hostdata->c400_ctl_status) &
CSR_GATED_53C80_IRQ)
break;
@@ -615,8 +623,7 @@ static inline int generic_NCR5380_psend(struct NCR5380_hostdata *hostdata,
start += 128;
} while (start < len);
- residual = max(len - start,
- (int)NCR5380_read(hostdata->c400_blk_cnt) * 128);
+ residual = len - start;
if (residual != 0) {
/* 53c80 interrupt or transfer timeout. Reset 53c400 logic. */
Powered by blists - more mailing lists