opnsense/src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-04 03:00:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

virtio_p9fs: Fix handling of a full request queue

Browse Source 
If, when submitting a request, the virtqueue is full, we sleep until an
interrupt has fired, then restart the request.  However, while sleeping
the channel lock is dropped, and in the meantime another thread may have
reset the per-channel SG list, so upon retrying we'd (re)submit whatever
happened to be left over in the previous request.

Fix the problem by rebuilding the SG list after sleeping.

Sponsored by:	Klara, Inc.
This commit is contained in:
Mark Johnston 2024-10-25 17:51:16 +00:00 committed by Franco Fichtner
parent b9e54539c9
commit d6cd1fd7cf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ vt9p_request(void *handle, struct p9_req_t *req)
/* Grab the channel lock*/
VT9P_LOCK(chan);
req_retry:
sglist_reset(sg);
/* Handle out VirtIO ring buffers */
error = sglist_append(sg, req->tc->sdata, req->tc->size);
@ -170,9 +171,7 @@ vt9p_request(void *handle, struct p9_req_t *req)
}
writable = sg->sg_nseg - readable;
req_retry:
error = virtqueue_enqueue(vq, req, sg, readable, writable);
if (error != 0) {
if (error == ENOSPC) {
/*