From: <erik.hugne@ericsson.com>
To: <netdev@vger.kernel.org>, <jon.maloy@ericsson.com>
Cc: <ying.xue@windriver.com>, <paul.gortmaker@windriver.com>,
Erik Hugne <erik.hugne@ericsson.com>
Subject: [PATCH] tipc: flow control should not account for sk_rcvbuf
Date: Thu, 4 Oct 2012 11:14:27 +0200 [thread overview]
Message-ID: <1349342067-27586-1-git-send-email-erik.hugne@ericsson.com> (raw)
From: Erik Hugne <erik.hugne@ericsson.com>
The TIPC flow control is design around message count, and it should not
account for the sk_rcvbuf when enqueueing messages to the socket
receive queue.
This fixes a problem when the sk_add_backlog fails due to this check
and TIPC_ERR_OVERLOAD is reported back to the sender.
The sender would then drop it's side of the connection only, leaving
a stale connection on the other end.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
---
net/tipc/socket.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 09dc5b9..02fed90 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1269,10 +1269,8 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
if (!sock_owned_by_user(sk)) {
res = filter_rcv(sk, buf);
} else {
- if (sk_add_backlog(sk, buf, sk->sk_rcvbuf))
- res = TIPC_ERR_OVERLOAD;
- else
- res = TIPC_OK;
+ __sk_add_backlog(sk, buf);
+ res = TIPC_OK;
}
bh_unlock_sock(sk);
--
1.7.5.4
next reply other threads:[~2012-10-04 9:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 9:14 erik.hugne [this message]
2012-10-04 9:21 ` [PATCH] tipc: flow control should not account for sk_rcvbuf Eric Dumazet
2012-10-04 9:59 ` Erik Hugne
2012-10-04 10:26 ` Eric Dumazet
2012-10-04 12:12 ` Erik Hugne
2012-10-04 13:55 ` Eric Dumazet
2012-10-04 15:00 ` [PATCH v2] tipc: prevent dropped connections due to rcvbuf overflow erik.hugne
2012-10-04 19:55 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349342067-27586-1-git-send-email-erik.hugne@ericsson.com \
--to=erik.hugne@ericsson.com \
--cc=jon.maloy@ericsson.com \
--cc=netdev@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=ying.xue@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).