cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nusb/disk: kill 9p procs before sysfatal(), devctl() before opendevdata()

Browse source 
This is an error probably when converting from libthread
to classid plan9 procs. umsrequest() used to just sysfatal()
once the error counter reached some value. But this leaves
9p procs (created by srvrelease()) around keeping the
device hanging around.

Instead, reply first, then attempt some recovery.
If that fails, kill our notegroup.

Also, for upcoming devusb changes, make sure we do
devctl() while the endpoint is not in use.
This commit is contained in:
cinap_lenrek 2024-10-23 21:30:49 +00:00
parent 235681677d
commit a610f2eac2
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/src/cmd/nusb/disk/disk.c
View file

@ -241,17 +241,19 @@ umsreset(void)
return 0;
}
static int
static void
umsrecover(void)
{
if(umsreset() < 0)
return -1;
if(umsreset() < 0){
/* kill the 9p procs */
postnote(PNGROUP, getpid(), "shutdown");
sysfatal("umsrecover: %r");
}
if(unstall(dev, ums->epin, Ein) < 0)
dprint(2, "%s: unstall epin: %r\n", argv0);
/* do we need this when epin == epout? */
if(unstall(dev, ums->epout, Eout) < 0)
dprint(2, "%s: unstall epout: %r\n", argv0);
return 0;
}
static int
@ -500,14 +502,10 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status)
dprint(2, "%s: phase error\n", argv0);
goto Fail;
}
ums->nerrs = 0;
return data->count - csw.dataresidue;
Fail:
*status = STharderr;
if(ums->nerrs++ > 15)
sysfatal("%s: too many errors", dev->dir);
umsrecover();
return -1;
}
@ -765,6 +763,7 @@ dread(Req *req)
if(count < 0){
lun->lbsize = 0; /* medium may have changed */
responderror(req);
umsrecover();
}else{
req->ofcall.count = count;
respond(req, nil);
@ -878,6 +877,7 @@ dwrite(Req *req)
if(count < 0){
lun->lbsize = 0; /* medium may have changed */
responderror(req);
umsrecover();
}else{
req->ofcall.count = count;
respond(req, nil);
@ -997,6 +997,15 @@ Found:
closedev(ums->epin);
return -1;
}
devctl(ums->epin, "timeout 2000");
devctl(ums->epout, "timeout 2000");
if(usbdebug > 1 || diskdebug > 2){
devctl(ums->epin, "debug 1");
devctl(ums->epout, "debug 1");
devctl(dev, "debug 1");
}
if(ums->epin == ums->epout)
opendevdata(ums->epin, ORDWR);
else{
@ -1009,15 +1018,6 @@ Found:
return -1;
}
dprint(2, "%s: ep in %s out %s\n", argv0, ums->epin->dir, ums->epout->dir);
devctl(ums->epin, "timeout 2000");
devctl(ums->epout, "timeout 2000");
if(usbdebug > 1 || diskdebug > 2){
devctl(ums->epin, "debug 1");
devctl(ums->epout, "debug 1");
devctl(dev, "debug 1");
}
return 0;
}

1
sys/src/cmd/nusb/disk/ums.h
View file

@ -96,7 +96,6 @@ struct Ums
Umsc *lun;
uchar maxlun;
int seq;
int nerrs;
int wrongresidues;
};