RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-01-12 01:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: fix long-lasting rcv timeouts upon lost sockets

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2022-08-15 20:23:37 +02:00 committed by Thomas Schoebel-Theuer
parent 19aea1fc59
commit bd0445ffce
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kernel/mars_net.c
View File

@ -694,16 +694,41 @@ int mars_recv_raw(struct mars_socket *msock, void *buf, int minlen, int maxlen)
struct socket *sock = msock->s_socket; struct socket *sock = msock->s_socket;
if (unlikely(!sock)) { if (unlikely(!sock)) {
MARS_WRN("#%d socket has disappeared\n", msock->s_debug_nr); MARS_WRN("#%d socket has disappeared\n",
msock->s_debug_nr);
status = -EIDRM; status = -EIDRM;
goto err; goto err;
} }
if (!mars_net_is_alive ||
if (!mars_net_is_alive || brick_thread_should_stop()) { brick_thread_should_stop()) {
MARS_WRN("#%d interrupting, done = %d\n", msock->s_debug_nr, done); MARS_WRN("#%d interrupting, done = %d\n",
msock->s_debug_nr, done);
status = -EIDRM; status = -EIDRM;
goto err; goto err;
} }
if (msock->s_connected) {
/* Do not try to drain too much TCP buffer when
* no ACK was yet received. It may be too early.
* Consequently, we shouod not overflow _our_
* send buffer until ACK will be received.
*/
if (unlikely(_socket_is_connecting(sock))) {
brick_msleep(sleeptime);
cond_resched();
if (sleeptime < 50)
sleeptime++;
continue;
}
/* This may be induced by RST / REJECT by firewalls,
* or some timeouts, etc.
*/
if (unlikely(_socket_not_connected(sock))) {
MARS_WRN("#%d socket was disconnected\n",
msock->s_debug_nr);
status = -EIDRM;
goto err;
}
}
if (minlen < maxlen) { if (minlen < maxlen) {
/* Use nonblocking reads to consume as much data /* Use nonblocking reads to consume as much data