8000 nstun/tcp: keep EPOLLOUT armed after a partial write to the host socket by lanre-ade · Pull Request #389 · google/nsjail · GitHub
[go: up one dir, main page]

Skip to content

nstun/tcp: keep EPOLLOUT armed after a partial write to the host socket - #389

Open
lanre-ade wants to merge 1 commit into
google:masterfrom
lanre-ade:nstun-flush-partial-write
Open

lanre-ade wants to merge 1 commit into
google:masterfrom
lanre-ade:nstun-flush-partial-write

Conversation

@lanre-ade
@lanre-ade lanre-ade commented Nov 11, 2026 •
Copy link
Copy Markdown

TL;DR

This change sets the EPOLLOUT registration after a successful send() to match whether data is still pending, instead of only clearing it once the buffer is empty.

Summary

A TCP transfer from guest to host can lose its tail when the host socket accepts only part of the pending data.

flush_to_host() registers EPOLLOUT only when send() fails with EAGAIN. When send() succeeds but writes less than what is buffered, the remainder stays in rx_buffer with no writable event armed. It is only flushed if another guest packet arrives and triggers the next call. If that partial write happens on the guest's last packets, nothing flushes it. The guest has already been ACKed for all of it, so from inside the jail the request looks fully sent and the client waits for a response that never comes.

Before

sequenceDiagram
    participant G as Guest
    participant N as nstun
    participant H as Host socket
    participant S as Server

    G->>N: last data segment
    N->>G: ACK for all of it
    N->>H: send()
    H-->>N: short write
    H->>S: first part only
    Note over N: tail kept in rx_buffer,<br/>EPOLLOUT not armed
    Note over H: becomes writable,<br/>nobody asked to be told
    Note over G: nothing left to send,<br/>waits for response
    Note over S: waits for rest of body
Loading

After

sequenceDiagram
    participant G as Guest
    participant N as nstun
    participant H as Host socket
    participant S as Server

    G->>N: last data segment
    N->>G: ACK for all of it
    N->>H: send()
    H-->>N: short write
    H->>S: first part
    rect rgba(46, 160, 67, 0.15)
        Note over N: tail kept in rx_buffer,<br/>EPOLLOUT armed
        H-->>N: EPOLLOUT (writable)
        N->>H: send() the tail
        H->>S: rest of body
        Note over N: rx_buffer empty,<br/>EPOLLOUT disarmed
    end
    S->>H: response
    H->>N: response
    N->>G: response
Loading

I have not added a test. I'm happy to add one if there is a preferred way to drive the host socket into a short write.

@google-cla
google-cla Bot commented Nov 11, 2026
Copy link
Copy Markdown

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

0