From: Wei Yongjun <yjwei@cn•fujitsu.com>
To: David Miller <davem@davemloft•net>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
lksctp <linux-sctp@vger•kernel.org>
Subject: [PATCH net-next-2.6 6/8] sctp: teach CACC algorithm about removed transports
Date: Tue, 19 Apr 2011 13:13:56 +0800 [thread overview]
Message-ID: <4DAD1A14.9060603@cn.fujitsu.com> (raw)
In-Reply-To: <4DAD18AB.3040401@cn.fujitsu.com>
From: Vlad Yasevich <vladislav.yasevich@hp•com>
When we have have to remove a transport due to ASCONF, we move
the data to a new active path. This can trigger CACC algorithm
to not mark that data as missing when SACKs arrive. This is
because the transport passed to the CACC algorithm is the one
this data is sitting on, not the one it was sent on (that one
may be gone). So, by sending the original transport (even if
it's NULL), we may start marking data as missing.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp•com>
Signed-off-by: Wei Yongjun <yjwei@cn•fujitsu.com>
---
net/sctp/outqueue.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index bf92a5b..7812772 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -131,7 +131,8 @@ static inline int sctp_cacc_skip_3_1_d(struct sctp_transport *primary,
static inline int sctp_cacc_skip_3_1_f(struct sctp_transport *transport,
int count_of_newacks)
{
- if (count_of_newacks < 2 && !transport->cacc.cacc_saw_newack)
+ if (count_of_newacks < 2 &&
+ (transport && !transport->cacc.cacc_saw_newack))
return 1;
return 0;
}
@@ -618,9 +619,12 @@ redo:
/* If we are retransmitting, we should only
* send a single packet.
+ * Otherwise, try appending this chunk again.
*/
if (rtx_timeout || fast_rtx)
done = 1;
+ else
+ goto redo;
/* Bundle next chunk in the next round. */
break;
@@ -1683,8 +1687,9 @@ static void sctp_mark_missing(struct sctp_outq *q,
/* SFR-CACC may require us to skip marking
* this chunk as missing.
*/
- if (!transport || !sctp_cacc_skip(primary, transport,
- count_of_newacks, tsn)) {
+ if (!transport || !sctp_cacc_skip(primary,
+ chunk->transport,
+ count_of_newacks, tsn)) {
chunk->tsn_missing_report++;
SCTP_DEBUG_PRINTK(
--
1.6.5.2
next prev parent reply other threads:[~2011-04-19 5:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 5:07 [PATCH net-next-2.6 0/8] sctp: some cleanup and tiny fix for add/del ip Wei Yongjun
2011-04-19 5:09 ` [PATCH net-next-2.6 1/8] sctp: delete unused macro definition of sctp_chunk_is_control Wei Yongjun
2011-04-19 5:19 ` [PATCH net-next-2.6 1/8 v2] " Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:11 ` [PATCH net-next-2.6 2/8] sctp: fix the comment of sctp_sf_violation_paramlen() Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:11 ` [PATCH net-next-2.6 3/8] sctp: use common head of addr parameter to access member in addr-unrelated code Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:12 ` [PATCH net-next-2.6 4/8] sctp: kill abandoned SCTP_CMD_TRANSMIT command Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:13 ` [PATCH net-next-2.6 5/8] sctp: use memdup_user to copy data from userspace Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:13 ` Wei Yongjun [this message]
2011-04-20 4:47 ` [PATCH net-next-2.6 6/8] sctp: teach CACC algorithm about removed transports David Miller
2011-04-19 5:14 ` [PATCH net-next-2.6 7/8] sctp: Allow bindx_del to accept 0 port Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:15 ` [PATCH net-next-2.6 8/8] sctp: Release all routes when processing acks ADD_IP or DEL_IP Wei Yongjun
2011-04-20 4:47 ` David Miller
2011-04-19 5:31 ` [PATCH net-next-2.6 0/8] sctp: some cleanup and tiny fix for add/del ip Shan Wei
2011-04-19 8:10 ` Nicolas Dichtel
2011-04-19 8:18 ` Wei Yongjun
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=4DAD1A14.9060603@cn.fujitsu.com \
--to=yjwei@cn$(echo .)fujitsu.com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-sctp@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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