hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 20:01:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtio_p9fs: Simplify vt9p_req_wait() a bit

Browse Source 
Remove an always-false check for whether the request has already
completed before sleeping.  Even if the request is complete, the
response tag is updated while holding the channel lock, which is also
held here.

No functional change intended.

Sponsored by:	Klara, Inc.
This commit is contained in:
Mark Johnston 2024-10-25 17:52:52 +00:00
parent 1f6f247b35
commit 28c9b13b23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/virtio/p9fs/virtio_p9fs.c
View File

@ -110,20 +110,20 @@ SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0,
static int static int
vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req) vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req)
{ {
if (req->tc->tag != req->rc->tag) { KASSERT(req->tc->tag != req->rc->tag,
if (msleep(req, VT9P_MTX(chan), 0, "chan lock", ("%s: request %p already completed", __func__, req));
vt9p_ackmaxidle * hz)) {
/* if (msleep(req, VT9P_MTX(chan), 0, "chan lock", vt9p_ackmaxidle * hz)) {
* Waited for 120s. No response from host. /*
* Can't wait for ever.. * Waited for 120s. No response from host.
*/ * Can't wait for ever..
P9_DEBUG(ERROR, "Timeout after waiting %u seconds" */
"for an ack from host\n", vt9p_ackmaxidle); P9_DEBUG(ERROR, "Timeout after waiting %u seconds"
return (EIO); "for an ack from host\n", vt9p_ackmaxidle);
} return (EIO);
KASSERT(req->tc->tag == req->rc->tag,
("Spurious event on p9 req"));
} }
KASSERT(req->tc->tag == req->rc->tag,
("%s spurious event on request %p", __func__, req));
return (0); return (0);
} }