virtio_net: don't kill worker on malformed tx packet#2777
Closed
benhillis wants to merge 3 commits intomicrosoft:mainfrom
Closed
virtio_net: don't kill worker on malformed tx packet#2777benhillis wants to merge 3 commits intomicrosoft:mainfrom
benhillis wants to merge 3 commits intomicrosoft:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR prevents the virtio_net TX worker loop from permanently exiting when it encounters a malformed TX descriptor chain (e.g., empty payload). Instead of propagating the error out of main_loop, it logs a warning and continues processing subsequent packets.
Changes:
- Catch
queue_tx_packetfailures in the TX receive path and continue the worker loop. - Emit a warning when a malformed TX packet is dropped instead of terminating the queue-pair worker.
benhillis
force-pushed
the
fix/virtio_net-malformed-tx
branch
from
a181ecd to
fa52f5b
Compare
added 3 commits
February 10, 2026 19:47
A single malformed TX packet (e.g. empty payload) caused queue_tx_packet to return an error that propagated through the main_loop, permanently killing the worker for that queue pair. Instead, log a warning and continue processing.
benhillis
force-pushed
the
fix/virtio_net-malformed-tx
branch
from
fa52f5b to
a9fae07
Compare
Comment on lines
+842
to
+851
| match err { | ||
| WorkerError::Packet(_) => { | ||
| tracelimit::warn_ratelimited!( | ||
| error = &err as &dyn std::error::Error, | ||
| "dropping malformed tx packet" | ||
| ); | ||
| continue; | ||
| } | ||
| other => return Err(other), | ||
| } |
There was a problem hiding this comment.
This match err { ... } moves err, but the logging line inside the WorkerError::Packet(_) arm still references err (error = &err ...). This should fail to compile with a "use of moved value" error. Restructure to match on &err (or use if let WorkerError::Packet(_) = &err { ... }) so you can borrow for logging and still propagate the owned err in the non-packet case.
Suggested change
| match err { | |
| WorkerError::Packet(_) => { | |
| tracelimit::warn_ratelimited!( | |
| error = &err as &dyn std::error::Error, | |
| "dropping malformed tx packet" | |
| ); | |
| continue; | |
| } | |
| other => return Err(other), | |
| } | |
| if let WorkerError::Packet(_) = &err { | |
| tracelimit::warn_ratelimited!( | |
| error = &err as &dyn std::error::Error, | |
| "dropping malformed tx packet" | |
| ); | |
| continue; | |
| } | |
| return Err(err); |
Member
Author
|
this has been fixed in a different change |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A single malformed TX packet (e.g. empty payload) caused queue_tx_packet to return an error that propagated through the main_loop, permanently killing the worker for that queue pair. Instead, log a warning and continue processing.