xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

usbehci, usbuhci: paranoia

Browse source 
double the td abort delay and make sure the tsleep() isnt
shortened by a pending note. in that case, tsleep() would
raise error(Eintr); immidiately and would not sleep the
requested amount potentially cauing us to release active
dma memory too early! so we wrap the tsleep() call in a
while(waserror()) so we will at least wait the Abortdelay
amount if error is raised.

also, only try to idle the still active td's.

do not copy data in epio() when there was an error, theres
no reason to touch user buffer in that case.

for uhci, we also check that theres not more data in the
buffers than requested to avoid overflowing user buffer
in epio(). this should not happen but we'r paranoid.

for ehci, we also halt the queue head first in aborttds().
mark the queue heads as Qfree after unlinking and remove
some silly nil checks that are impossible.
This commit is contained in:
cinap_lenrek 2013-08-25 22:03:02 +02:00
parent 1556afae40
commit 808480f76b
2 changed files with 101 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

77
sys/src/9/pc/usbuhci.c
View file

@ -30,7 +30,7 @@ enum
{ {
Resetdelay = 100, /* delay after a controller reset (ms) */ Resetdelay = 100, /* delay after a controller reset (ms) */
Enabledelay = 100, /* waiting for a port to enable */ Enabledelay = 100, /* waiting for a port to enable */
Abortdelay = 5, /* delay after cancelling Tds (ms) */ Abortdelay = 10, /* delay after cancelling Tds (ms) */
Incr = 64, /* for Td and Qh pools */ Incr = 64, /* for Td and Qh pools */
Tdatomic = 8, /* max nb. of Tds per bulk I/O op. */ Tdatomic = 8, /* max nb. of Tds per bulk I/O op. */
@ -704,12 +704,8 @@ static void
qhfree(Ctlr *ctlr, Qh *qh) qhfree(Ctlr *ctlr, Qh *qh)
{ {
Td *td; Td *td;
Td *ltd;
Qh *q; Qh *q;
if(qh == nil)
return;
ilock(ctlr); ilock(ctlr);
for(q = ctlr->qhs; q != nil; q = q->next) for(q = ctlr->qhs; q != nil; q = q->next)
if(q->next == qh) if(q->next == qh)
@ -718,14 +714,15 @@ qhfree(Ctlr *ctlr, Qh *qh)
panic("qhfree: nil q"); panic("qhfree: nil q");
q->next = qh->next; q->next = qh->next;
q->link = qh->link; q->link = qh->link;
qh->state = Qfree; /* paranoia */
iunlock(ctlr); iunlock(ctlr);
for(td = qh->tds; td != nil; td = ltd){ while((td = qh->tds) != nil){
ltd = td->next; qh->tds = td->next;
tdfree(td); tdfree(td);
} }
lock(&qhpool); lock(&qhpool);
qh->state = Qfree; /* paranoia */
qh->next = qhpool.free; qh->next = qhpool.free;
qh->tag = nil; qh->tag = nil;
qh->io = nil; qh->io = nil;
@ -961,14 +958,14 @@ interrupt(Ureg*, void *a)
OUTS(Status, sts & Sall); OUTS(Status, sts & Sall);
cmd = INS(Cmd); cmd = INS(Cmd);
if(cmd & Crun == 0){ if(cmd & Crun == 0){
print("uhci %#ux: not running: uhci bug?\n", ctlr->port); iprint("uhci %#ux: not running: uhci bug?\n", ctlr->port);
/* BUG: should abort everything in this case */ /* BUG: should abort everything in this case */
} }
if(debug > 1){ if(debug > 1){
frptr = INL(Flbaseadd); frptr = INL(Flbaseadd);
frno = INL(Frnum); frno = INL(Frnum);
frno = TRUNC(frno, Nframes); frno = TRUNC(frno, Nframes);
print("cmd %#ux sts %#ux frptr %#ux frno %d\n", iprint("cmd %#ux sts %#ux frptr %#ux frno %d\n",
cmd, sts, frptr, frno); cmd, sts, frptr, frno);
} }
ctlr->ntdintr++; ctlr->ntdintr++;
@ -1220,12 +1217,14 @@ aborttds(Qh *qh)
{ {
Td *td; Td *td;
qh->state = Qdone;
qh->elink = QHterm; qh->elink = QHterm;
coherence();
for(td = qh->tds; td != nil; td = td->next){ for(td = qh->tds; td != nil; td = td->next){
if(td->csw & Tdactive) if(td->csw & Tdactive){
td->ndata = 0; td->ndata = 0;
td->csw &= ~(Tdactive|Tdioc); td->csw &= ~(Tdactive|Tdioc);
coherence();
}
} }
} }
@ -1263,13 +1262,15 @@ epiowait(Ctlr *ctlr, Qio *io, int tmout, ulong load)
else if(qh->state != Qdone && qh->state != Qclose) else if(qh->state != Qdone && qh->state != Qclose)
panic("epio: queue not done and not closed"); panic("epio: queue not done and not closed");
if(timedout){ if(timedout){
aborttds(io->qh); aborttds(qh);
io->err = "request timed out"; qh->state = Qdone;
if(io->err == nil)
io->err = "request timed out";
iunlock(ctlr); iunlock(ctlr);
if(!waserror()){ while(waserror())
tsleep(&up->sleep, return0, 0, Abortdelay); ;
poperror(); tsleep(&up->sleep, return0, 0, Abortdelay);
} poperror();
ilock(ctlr); ilock(ctlr);
} }
if(qh->state != Qclose) if(qh->state != Qclose)
@ -1297,7 +1298,6 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
ulong load; ulong load;
char *err; char *err;
qh = io->qh;
ctlr = ep->hp->aux; ctlr = ep->hp->aux;
io->debug = ep->debug; io->debug = ep->debug;
tmout = ep->tmout; tmout = ep->tmout;
@ -1317,7 +1317,8 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
} }
io->err = nil; io->err = nil;
ilock(ctlr); ilock(ctlr);
if(qh->state == Qclose){ /* Tds released by cancelio */ qh = io->qh;
if(qh == nil || qh->state == Qclose){ /* Tds released by cancelio */
iunlock(ctlr); iunlock(ctlr);
error(io->err ? io->err : Eio); error(io->err ? io->err : Eio);
} }
@ -1365,6 +1366,8 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
if(debug > 1 || ep->debug > 1) if(debug > 1 || ep->debug > 1)
dumptd(td0, "epio: got tds: "); dumptd(td0, "epio: got tds: ");
err = io->err;
tot = 0; tot = 0;
c = a; c = a;
saved = 0; saved = 0;
@ -1380,16 +1383,22 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
if(saved++ == 0) if(saved++ == 0)
io->toggle = td->token & Tddata1; io->toggle = td->token & Tddata1;
}else{ }else{
tot += td->ndata; n = td->ndata;
if(c != nil && tdtok(td) == Tdtokin && td->ndata > 0){ if(err == nil && n < 0)
memmove(c, td->data, td->ndata); err = Eio;
c += td->ndata; if(err == nil && n > 0 && tot < count){
if((tot + n) > count)
n = count - tot;
if(c != nil && tdtok(td) == Tdtokin){
memmove(c, td->data, n);
c += n;
}
tot += n;
} }
} }
ntd = td->next; ntd = td->next;
tdfree(td); tdfree(td);
} }
err = io->err;
if(mustlock){ if(mustlock){
qunlock(io); qunlock(io);
poperror(); poperror();
@ -1398,8 +1407,6 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
io, ntds, tot, err); io, ntds, tot, err);
if(err != nil) if(err != nil)
error(err); error(err);
if(tot < 0)
error(Eio);
return tot; return tot;
} }
@ -1817,7 +1824,7 @@ cancelio(Ctlr *ctlr, Qio *io)
ilock(ctlr); ilock(ctlr);
qh = io->qh; qh = io->qh;
if(io == nil || io->qh == nil || io->qh->state == Qclose){ if(qh == nil || qh->state == Qclose){
iunlock(ctlr); iunlock(ctlr);
return; return;
} }
@ -1826,18 +1833,20 @@ cancelio(Ctlr *ctlr, Qio *io)
aborttds(qh); aborttds(qh);
qh->state = Qclose; qh->state = Qclose;
iunlock(ctlr); iunlock(ctlr);
if(!waserror()){
tsleep(&up->sleep, return0, 0, Abortdelay); while(waserror())
poperror(); ;
} tsleep(&up->sleep, return0, 0, Abortdelay);
poperror();
wakeup(io); wakeup(io);
qlock(io); qlock(io);
/* wait for epio if running */ /* wait for epio if running */
if(io->qh == qh)
io->qh = nil;
qunlock(io); qunlock(io);
qhfree(ctlr, qh); qhfree(ctlr, qh);
io->qh = nil;
} }
static void static void

110
sys/src/9/port/usbehci.c
View file

@ -53,7 +53,7 @@ enum
Qfree, Qfree,
Enabledelay = 100, /* waiting for a port to enable */ Enabledelay = 100, /* waiting for a port to enable */
Abortdelay = 5, /* delay after cancelling Tds (ms) */ Abortdelay = 10, /* delay after cancelling Tds (ms) */
Incr = 64, /* for pools of Tds, Qhs, etc. */ Incr = 64, /* for pools of Tds, Qhs, etc. */
Align = 128, /* in bytes for all those descriptors */ Align = 128, /* in bytes for all those descriptors */
@ -739,11 +739,12 @@ qhcoherency(Ctlr *ctlr)
qlock(&ctlr->portlck); qlock(&ctlr->portlck);
ctlr->opio->cmd |= Ciasync; /* ask for intr. on async advance */ ctlr->opio->cmd |= Ciasync; /* ask for intr. on async advance */
coherence(); coherence();
for(i = 0; i < 3 && qhadvanced(ctlr) == 0; i++) for(i = 0; i < 3 && qhadvanced(ctlr) == 0; i++){
if(!waserror()){ while(waserror())
tsleep(ctlr, qhadvanced, ctlr, Abortdelay); ;
poperror(); tsleep(ctlr, qhadvanced, ctlr, Abortdelay);
} poperror();
}
dprint("ehci: qhcoherency: doorbell %d\n", qhadvanced(ctlr)); dprint("ehci: qhcoherency: doorbell %d\n", qhadvanced(ctlr));
if(i == 3) if(i == 3)
print("ehci: async advance doorbell did not ring\n"); print("ehci: async advance doorbell did not ring\n");
@ -754,11 +755,9 @@ qhcoherency(Ctlr *ctlr)
static void static void
qhfree(Ctlr *ctlr, Qh *qh) qhfree(Ctlr *ctlr, Qh *qh)
{ {
Td *td, *ltd; Td *td;
Qh *q; Qh *q;
if(qh == nil)
return;
ilock(ctlr); ilock(ctlr);
if(qh->sched < 0){ if(qh->sched < 0){
for(q = ctlr->qhs; q != nil; q = q->next) for(q = ctlr->qhs; q != nil; q = q->next)
@ -771,12 +770,13 @@ qhfree(Ctlr *ctlr, Qh *qh)
coherence(); coherence();
}else }else
unschedq(ctlr, qh); unschedq(ctlr, qh);
qh->state = Qfree; /* paranoia */
iunlock(ctlr); iunlock(ctlr);
qhcoherency(ctlr); qhcoherency(ctlr);
for(td = qh->tds; td != nil; td = ltd){ while((td = qh->tds) != nil){
ltd = td->next; qh->tds = td->next;
tdfree(td); tdfree(td);
} }
@ -1512,36 +1512,30 @@ qhinterrupt(Ctlr *ctlr, Qh *qh)
} }
static int static int
ehciintr(Hci *hp) ctlrinterrupt(Ctlr *ctlr)
{ {
Ctlr *ctlr;
Eopio *opio; Eopio *opio;
Isoio *iso; Isoio *iso;
ulong sts; ulong sts;
Qh *qh; Qh *qh;
int i, some; int i, some;
ctlr = hp->aux;
opio = ctlr->opio; opio = ctlr->opio;
/* /*
* Will we know in USB 3.0 who the interrupt was for?. * Will we know in USB 3.0 who the interrupt was for?.
* Do they still teach indexing in CS? * Do they still teach indexing in CS?
* This is Intel's doing. * This is Intel's doing.
*/ */
ilock(ctlr);
ctlr->nintr++;
sts = opio->sts & Sintrs; sts = opio->sts & Sintrs;
if(sts == 0){ /* not ours; shared intr. */ if(sts == 0) /* not ours; shared intr. */
iunlock(ctlr);
return 0; return 0;
}
opio->sts = sts; opio->sts = sts;
coherence(); coherence();
ctlr->nintr++;
if((sts & Sherr) != 0) if((sts & Sherr) != 0)
print("ehci: port %#p fatal host system error\n", ctlr->capio); iprint("ehci: port %#p fatal host system error\n", ctlr->capio);
if((sts & Shalted) != 0) if((sts & Shalted) != 0)
print("ehci: port %#p: halted\n", ctlr->capio); iprint("ehci: port %#p: halted\n", ctlr->capio);
if((sts & Sasync) != 0){ if((sts & Sasync) != 0){
dprint("ehci: doorbell\n"); dprint("ehci: doorbell\n");
wakeup(ctlr); wakeup(ctlr);
@ -1555,12 +1549,12 @@ ehciintr(Hci *hp)
if((sts & (Serrintr|Sintr)) != 0){ if((sts & (Serrintr|Sintr)) != 0){
ctlr->ntdintr++; ctlr->ntdintr++;
if(ehcidebug > 1){ if(ehcidebug > 1){
print("ehci port %#p frames %#p nintr %d ntdintr %d", iprint("ehci port %#p frames %#p nintr %d ntdintr %d",
ctlr->capio, ctlr->frames, ctlr->capio, ctlr->frames,
ctlr->nintr, ctlr->ntdintr); ctlr->nintr, ctlr->ntdintr);
print(" nqhintr %d nisointr %d\n", iprint(" nqhintr %d nisointr %d\n",
ctlr->nqhintr, ctlr->nisointr); ctlr->nqhintr, ctlr->nisointr);
print("\tcmd %#lux sts %#lux intr %#lux frno %uld", iprint("\tcmd %#lux sts %#lux intr %#lux frno %uld",
opio->cmd, opio->sts, opio->intr, opio->frno); opio->cmd, opio->sts, opio->intr, opio->frno);
} }
@ -1588,8 +1582,20 @@ ehciintr(Hci *hp)
qh = qh->next; qh = qh->next;
}while(qh != ctlr->qhs && i++ < 100); }while(qh != ctlr->qhs && i++ < 100);
if(i > 100) if(i > 100)
print("echi: interrupt: qh loop?\n"); iprint("echi: interrupt: qh loop?\n");
} }
return some;
}
static int
ehciintr(Hci *hp)
{
Ctlr *ctlr;
int some;
ctlr = hp->aux;
ilock(ctlr);
some = ctlrinterrupt(ctlr);
iunlock(ctlr); iunlock(ctlr);
return some; return some;
} }
@ -1694,7 +1700,7 @@ portreset(Hci *hp, int port, int on)
for(i = 0; *portscp & Psreset && i < 10; i++) for(i = 0; *portscp & Psreset && i < 10; i++)
delay(10); delay(10);
if (*portscp & Psreset) if (*portscp & Psreset)
iprint("ehci %#p: port %d didn't reset within %d ms; sts %#lux\n", if(0) iprint("ehci %#p: port %d didn't reset within %d ms; sts %#lux\n",
ctlr->capio, port, i * 10, *portscp); ctlr->capio, port, i * 10, *portscp);
*portscp &= ~Psreset; /* force appearance of reset done */ *portscp &= ~Psreset; /* force appearance of reset done */
coherence(); coherence();
@ -2180,16 +2186,16 @@ aborttds(Qh *qh)
{ {
Td *td; Td *td;
qh->state = Qdone;
coherence();
if(qh->sched >= 0 && (qh->eps0 & Qhspeedmask) != Qhhigh) if(qh->sched >= 0 && (qh->eps0 & Qhspeedmask) != Qhhigh)
qh->eps0 |= Qhint; /* inactivate on next pass */ qh->eps0 |= Qhint; /* inactivate on next pass */
qh->csw = (qh->csw & ~Tdactive) | Tdhalt;
coherence(); coherence();
for(td = qh->tds; td != nil; td = td->next){ for(td = qh->tds; td != nil; td = td->next){
if(td->csw & Tdactive) if(td->csw & Tdactive){
td->ndata = 0; td->ndata = 0;
td->csw |= Tdhalt; td->csw |= Tdhalt;
coherence(); coherence();
}
} }
} }
@ -2288,9 +2294,7 @@ epiowait(Hci *hp, Qio *io, int tmout, ulong load)
ilock(ctlr); ilock(ctlr);
/* Are we missing interrupts? */ /* Are we missing interrupts? */
if(qh->state == Qrun){ if(qh->state == Qrun){
iunlock(ctlr); ctlrinterrupt(ctlr);
ehciintr(hp);
ilock(ctlr);
if(qh->state == Qdone){ if(qh->state == Qdone){
dqprint("ehci %#p: polling required\n", ctlr->capio); dqprint("ehci %#p: polling required\n", ctlr->capio);
ctlr->poll.must = 1; ctlr->poll.must = 1;
@ -2304,18 +2308,19 @@ epiowait(Hci *hp, Qio *io, int tmout, ulong load)
}else if(qh->state != Qdone && qh->state != Qclose) }else if(qh->state != Qdone && qh->state != Qclose)
panic("ehci: epio: queue state %d", qh->state); panic("ehci: epio: queue state %d", qh->state);
if(timedout){ if(timedout){
aborttds(io->qh); aborttds(qh);
io->err = "request timed out"; qh->state = Qdone;
if(io->err == nil)
io->err = "request timed out";
iunlock(ctlr); iunlock(ctlr);
if(!waserror()){ while(waserror())
tsleep(&up->sleep, return0, 0, Abortdelay); ;
poperror(); tsleep(&up->sleep, return0, 0, Abortdelay);
} poperror();
ilock(ctlr); ilock(ctlr);
} }
if(qh->state != Qclose) if(qh->state != Qclose)
qh->state = Qidle; qh->state = Qidle;
coherence();
qhlinktd(qh, nil); qhlinktd(qh, nil);
ctlr->load -= load; ctlr->load -= load;
ctlr->nreqs--; ctlr->nreqs--;
@ -2340,7 +2345,6 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
Qh* qh; Qh* qh;
Td *td, *ltd, *td0, *ntd; Td *td, *ltd, *td0, *ntd;
qh = io->qh;
ctlr = ep->hp->aux; ctlr = ep->hp->aux;
io->debug = ep->debug; io->debug = ep->debug;
tmout = ep->tmout; tmout = ep->tmout;
@ -2360,7 +2364,8 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
} }
io->err = nil; io->err = nil;
ilock(ctlr); ilock(ctlr);
if(qh->state == Qclose){ /* Tds released by cancelio */ qh = io->qh;
if(qh == nil || qh->state == Qclose){ /* Tds released by cancelio */
iunlock(ctlr); iunlock(ctlr);
error(io->err ? io->err : Eio); error(io->err ? io->err : Eio);
} }
@ -2417,6 +2422,7 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
dumptd(td0, "epio: got: "); dumptd(td0, "epio: got: ");
qhdump(qh); qhdump(qh);
} }
err = io->err;
tot = 0; tot = 0;
c = a; c = a;
@ -2438,7 +2444,7 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
io->toggle = td->csw & Tddata1; io->toggle = td->csw & Tddata1;
coherence(); coherence();
} }
if((n = td->ndata) > 0 && tot < count){ if(err == nil && (n = td->ndata) > 0 && tot < count){
if((tot + n) > count) if((tot + n) > count)
n = count - tot; n = count - tot;
if(c != nil && (td->csw & Tdtok) == Tdtokin){ if(c != nil && (td->csw & Tdtok) == Tdtokin){
@ -2451,7 +2457,6 @@ epio(Ep *ep, Qio *io, void *a, long count, int mustlock)
ntd = td->next; ntd = td->next;
tdfree(td); tdfree(td);
} }
err = io->err;
if(mustlock){ if(mustlock){
qunlock(io); qunlock(io);
poperror(); poperror();
@ -2955,7 +2960,7 @@ cancelio(Ctlr *ctlr, Qio *io)
ilock(ctlr); ilock(ctlr);
qh = io->qh; qh = io->qh;
if(io == nil || io->qh == nil || io->qh->state == Qclose){ if(qh == nil || qh->state == Qclose){
iunlock(ctlr); iunlock(ctlr);
return; return;
} }
@ -2964,17 +2969,18 @@ cancelio(Ctlr *ctlr, Qio *io)
aborttds(qh); aborttds(qh);
qh->state = Qclose; qh->state = Qclose;
iunlock(ctlr); iunlock(ctlr);
if(!waserror()){ while(waserror())
tsleep(&up->sleep, return0, 0, Abortdelay); ;
poperror(); tsleep(&up->sleep, return0, 0, Abortdelay);
} poperror();
wakeup(io); wakeup(io);
qlock(io); qlock(io);
/* wait for epio if running */ /* wait for epio if running */
if(io->qh == qh)
io->qh = nil;
qunlock(io); qunlock(io);
qhfree(ctlr, qh); qhfree(ctlr, qh);
io->qh = nil;
} }
static void static void