Skip to content

net/usrsock: Fix EPIPE loop by clearing POLLIN on remote close #17877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
13627105546 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

net/usrsock: Fix EPIPE loop by clearing POLLIN on remote close #17877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc331f8
usrsock: Avoid frequent POLLIN when remote close during accept.
13627105546 Aug 26, 2025
c0f8f68
usrsock: Check RECVFROM_AVAIL before setting POLLIN in pollsetup.
13627105546 Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions net/usrsock/usrsock_accept.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ int usrsock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
{
ninfo("usockid=%d; remote closed (EOF).\n", conn->usockid);

conn->flags &= ~USRSOCK_EVENT_RECVFROM_AVAIL;
ret = -EPIPE;
goto errout_free_conn;
}
Expand Down
16 changes: 14 additions & 2 deletions net/usrsock/usrsock_poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ static uint32_t poll_event(FAR struct net_driver_s *dev,

/* Remote closed. */

eventset |= (POLLHUP | POLLIN);
eventset |= POLLHUP;
if (flags & USRSOCK_EVENT_RECVFROM_AVAIL)
{
ninfo("socket recv avail.\n");

eventset |= POLLIN;
}
}
else
{
Expand Down Expand Up @@ -217,7 +223,13 @@ static int usrsock_pollsetup(FAR struct socket *psock,

/* Remote closed. */

eventset |= (POLLHUP | POLLIN);
eventset |= POLLHUP;
if (conn->flags & USRSOCK_EVENT_RECVFROM_AVAIL)
{
ninfo("socket recv avail.\n");

eventset |= POLLIN;
}
}
else
{
Expand Down
Loading