lkml.org 
[lkml]   [2003]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Regarding drivers/ide/ide-cd.c in 2.5.72
> > > > ... In the nutshell the problem is that [as it is
> > > > now] every failed SG_IO request is replayed second time without data
> > > > transfer. ... Suggested patch
> > > > overcomes this problem by immediately purging the failed SG_IO request
> > > > from the request queue.
> > >
> > > Patch looks fine, care to resend actually trying to follow the style in
> > > the file in question?
> >
> > Revised to my best ability for follow the coding style of file in
> > question. A:-)
>
> Much better, thanks :)

And it slipped through again:-( Sharpen up! BTW, the proposed patch
fixes even http://marc.theaimsgroup.com/?t=105634805100001&r=1&w=2,
where induced kernel crash occurs upon packet replay. Applicable to
up to 2.5.75. A.
8<--------8<--------8<--------8<--------8<--------8<--------8<--------
--- ./drivers/ide/ide-cd.c.orig Tue Jun 17 06:20:00 2003
+++ ./drivers/ide/ide-cd.c Thu Jun 19 15:56:39 2003
@@ -749,12 +749,17 @@
by transferring the semaphore from the packet
command request to the request sense request. */

+ rq->flags |= REQ_FAILED;
if ((stat & ERR_STAT) != 0) {
wait = rq->waiting;
rq->waiting = NULL;
+ if ((rq->flags & REQ_BLOCK_PC) != 0) {
+ cdrom_queue_request_sense(drive, wait,
+ rq->sense, rq);
+ return 1; /* REQ_BLOCK_PC self-cares */
+ }
}

- rq->flags |= REQ_FAILED;
cdrom_end_request(drive, 0);

if ((stat & ERR_STAT) != 0)
@@ -1657,13 +1662,14 @@
dma = info->dma;
if (dma) {
info->dma = 0;
- if ((dma_error = HWIF(drive)->ide_dma_end(drive))) {
- printk("ide-cd: dma error\n");
- HWIF(drive)->ide_dma_off(drive);
- }
+ dma_error = HWIF(drive)->ide_dma_end(drive);
}

if (cdrom_decode_status(drive, 0, &stat)) {
+ if ((stat & ERR_STAT) != 0) {
+ end_that_request_chunk(rq, 0, rq->data_len);
+ goto end_request; /* purge the whole thing... */
+ }
end_that_request_chunk(rq, 1, rq->data_len);
return ide_stopped;
}
@@ -1672,8 +1678,11 @@
* using dma, transfer is complete now
*/
if (dma) {
- if (dma_error)
+ if (dma_error) {
+ printk("ide-cd: dma error\n");
+ HWIF(drive)->ide_dma_off(drive);
return DRIVER(drive)->error(drive, "dma error", stat);
+ }

end_that_request_chunk(rq, 1, rq->data_len);
rq->data_len = 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:46    [W:0.043 / U:0.900 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site