fix(tuntap): disable created queue for multi-queue devices to fix KeepCarrier - #423
Open
deepin-ci-robot wants to merge 1 commit into
Conversation
…pCarrier When KeepCarrier is set, networkd doesn't close tun/tap file descriptor preserving the active interface state, but doesn't disable its queue which makes kernel to think that it's still active and send packets to it. This patch disables the created queue right after tun/tap interface creation. Changes: - Add debian/patches/fix-tuntap-keep-carrier-device-option.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@0e1ab22 Generated-By: glm-5.3-flash Co-Authored-By: deepin-ci-robot <packages@deepin.org>
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot TAG: 255.2-4deepin68 |
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
1 participant
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.
Problem Before the Change
When
KeepCarrier=yesis set on a tun/tap netdev, networkd does not close the tun/tap file descriptor in order to preserve the active interface state. However, it never disables the queue attached to that file descriptor, so the kernel still considers the queue active and keeps sending packets to it. Since networkd never reads from the descriptor, those packets are silently dropped — for multi-queue devices this breaks theKeepCarrieroption entirely (e.g. a user-space program attached to another queue of the same device never receives any traffic).What This PR Changes
Backports upstream systemd commit 0e1ab2261cd91f3f7beec1f24134498a853ea4d5: for multi-queue tun/tap devices, right after the device is created/attached, issue
TUNSETQUEUEwithIFF_DETACH_QUEUEto detach networkd's own queue so the kernel stops routing packets to a queue that will never be read.Problem Solved After the Change
With
MultiQueue=yesandKeepCarrier=yes, packets sent to the tun/tap device are no longer swallowed by networkd's unused queue and are correctly delivered to the active user-space queue, making theKeepCarrieroption work as intended.Changes
Upstream
systemd/systemd@0e1ab22
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org