1 files changed, 134 insertions, 70 deletions

diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index e9615627dcd6..457dd3db7f41 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -27,7 +27,6 @@
  *
  * BUGS:
  * - sequence number wrapping
- * - jiffies wrapping
  */
 
 #include "../ccid.h"
@@ -36,8 +35,7 @@
 
 static int ccid2_debug;
 
-#undef CCID2_DEBUG
-#ifdef CCID2_DEBUG
+#ifdef CONFIG_IP_DCCP_CCID2_DEBUG
 #define ccid2_pr_debug(format, a...) \
         do { if (ccid2_debug) \
                 printk(KERN_DEBUG "%s: " format, __FUNCTION__, ##a); \
@@ -46,9 +44,7 @@ static int ccid2_debug;
 #define ccid2_pr_debug(format, a...)
 #endif
 
-static const int ccid2_seq_len = 128;
-
-#ifdef CCID2_DEBUG
+#ifdef CONFIG_IP_DCCP_CCID2_DEBUG
 static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
 {
         int len = 0;
@@ -71,8 +67,8 @@ static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
 
                         /* packets are sent sequentially */
                         BUG_ON(seqp->ccid2s_seq <= prev->ccid2s_seq);
-                        BUG_ON(seqp->ccid2s_sent < prev->ccid2s_sent);
-                        BUG_ON(len > ccid2_seq_len);
+                        BUG_ON(time_before(seqp->ccid2s_sent,
+                                           prev->ccid2s_sent));
 
                         seqp = prev;
                 }
@@ -84,16 +80,57 @@ static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
         do {
                 seqp = seqp->ccid2s_prev;
                 len++;
-                BUG_ON(len > ccid2_seq_len);
         } while (seqp != hctx->ccid2hctx_seqh);
 
-        BUG_ON(len != ccid2_seq_len);
         ccid2_pr_debug("total len=%d\n", len);
+        BUG_ON(len != hctx->ccid2hctx_seqbufc * CCID2_SEQBUF_LEN);
 }
 #else
 #define ccid2_hc_tx_check_sanity(hctx) do {} while (0)
 #endif
 
+static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hctx, int num,
+                                 gfp_t gfp)
+{
+        struct ccid2_seq *seqp;
+        int i;
+
+        /* check if we have space to preserve the pointer to the buffer */
+        if (hctx->ccid2hctx_seqbufc >= (sizeof(hctx->ccid2hctx_seqbuf) /
+                                        sizeof(struct ccid2_seq*)))
+                return -ENOMEM;
+
+        /* allocate buffer and initialize linked list */
+        seqp = kmalloc(sizeof(*seqp) * num, gfp);
+        if (seqp == NULL)
+                return -ENOMEM;
+
+        for (i = 0; i < (num - 1); i++) {
+                seqp[i].ccid2s_next = &seqp[i + 1];
+                seqp[i + 1].ccid2s_prev = &seqp[i];
+        }
+        seqp[num - 1].ccid2s_next = seqp;
+        seqp->ccid2s_prev = &seqp[num - 1];
+
+        /* This is the first allocation.  Initiate the head and tail.  */
+        if (hctx->ccid2hctx_seqbufc == 0)
+                hctx->ccid2hctx_seqh = hctx->ccid2hctx_seqt = seqp;
+        else {
+                /* link the existing list with the one we just created */
+                hctx->ccid2hctx_seqh->ccid2s_next = seqp;
+                seqp->ccid2s_prev = hctx->ccid2hctx_seqh;
+
+                hctx->ccid2hctx_seqt->ccid2s_prev = &seqp[num - 1];
+                seqp[num - 1].ccid2s_next = hctx->ccid2hctx_seqt;
+        }
+
+        /* store the original pointer to the buffer so we can free it */
+        hctx->ccid2hctx_seqbuf[hctx->ccid2hctx_seqbufc] = seqp;
+        hctx->ccid2hctx_seqbufc++;
+
+        return 0;
+}
+
 static int ccid2_hc_tx_send_packet(struct sock *sk,
                                    struct sk_buff *skb, int len)
 {
@@ -122,7 +159,7 @@ static int ccid2_hc_tx_send_packet(struct sock *sk,
                 }
         }
 
-        return 100; /* XXX */
+        return 1; /* XXX CCID should dequeue when ready instead of polling */
 }
 
 static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
@@ -150,10 +187,8 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
         dp->dccps_l_ack_ratio = val;
 }
 
-static void ccid2_change_cwnd(struct sock *sk, int val)
+static void ccid2_change_cwnd(struct ccid2_hc_tx_sock *hctx, int val)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
-
         if (val == 0)
                 val = 1;
 
@@ -164,6 +199,17 @@ static void ccid2_change_cwnd(struct sock *sk, int val)
         hctx->ccid2hctx_cwnd = val;
 }
 
+static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val)
+{
+        ccid2_pr_debug("change SRTT to %ld\n", val);
+        hctx->ccid2hctx_srtt = val;
+}
+
+static void ccid2_change_pipe(struct ccid2_hc_tx_sock *hctx, long val)
+{
+        hctx->ccid2hctx_pipe = val;
+}
+
 static void ccid2_start_rto_timer(struct sock *sk);
 
 static void ccid2_hc_tx_rto_expire(unsigned long data)
@@ -193,11 +239,11 @@ static void ccid2_hc_tx_rto_expire(unsigned long data)
         ccid2_start_rto_timer(sk);
 
         /* adjust pipe, cwnd etc */
-        hctx->ccid2hctx_pipe = 0;
+        ccid2_change_pipe(hctx, 0);
         hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd >> 1;
         if (hctx->ccid2hctx_ssthresh < 2)
                 hctx->ccid2hctx_ssthresh = 2;
-        ccid2_change_cwnd(sk, 1);
+        ccid2_change_cwnd(hctx, 1);
 
         /* clear state about stuff we sent */
         hctx->ccid2hctx_seqt    = hctx->ccid2hctx_seqh;
@@ -232,13 +278,14 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, int len)
 {
         struct dccp_sock *dp = dccp_sk(sk);
         struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_seq *next;
         u64 seq;
 
         ccid2_hc_tx_check_sanity(hctx);
 
         BUG_ON(!hctx->ccid2hctx_sendwait);
         hctx->ccid2hctx_sendwait = 0;
-        hctx->ccid2hctx_pipe++;
+        ccid2_change_pipe(hctx, hctx->ccid2hctx_pipe + 1);
         BUG_ON(hctx->ccid2hctx_pipe < 0);
 
         /* There is an issue.  What if another packet is sent between
@@ -251,15 +298,23 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, int len)
         hctx->ccid2hctx_seqh->ccid2s_seq   = seq;
         hctx->ccid2hctx_seqh->ccid2s_acked = 0;
         hctx->ccid2hctx_seqh->ccid2s_sent  = jiffies;
-        hctx->ccid2hctx_seqh = hctx->ccid2hctx_seqh->ccid2s_next;
 
-        ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd,
-                       hctx->ccid2hctx_pipe);
+        next = hctx->ccid2hctx_seqh->ccid2s_next;
+        /* check if we need to alloc more space */
+        if (next == hctx->ccid2hctx_seqt) {
+                int rc;
+
+                ccid2_pr_debug("allocating more space in history\n");
+                rc = ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, GFP_KERNEL);
+                BUG_ON(rc); /* XXX what do we do? */
 
-        if (hctx->ccid2hctx_seqh == hctx->ccid2hctx_seqt) {
-                /* XXX allocate more space */
-                WARN_ON(1);
+                next = hctx->ccid2hctx_seqh->ccid2s_next;
+                BUG_ON(next == hctx->ccid2hctx_seqt);
         }
+        hctx->ccid2hctx_seqh = next;
+
+        ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd,
+                       hctx->ccid2hctx_pipe);
 
         hctx->ccid2hctx_sent++;
 
@@ -295,7 +350,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, int len)
         if (!timer_pending(&hctx->ccid2hctx_rtotimer))
                 ccid2_start_rto_timer(sk);
 
-#ifdef CCID2_DEBUG
+#ifdef CONFIG_IP_DCCP_CCID2_DEBUG
         ccid2_pr_debug("pipe=%d\n", hctx->ccid2hctx_pipe);
         ccid2_pr_debug("Sent: seq=%llu\n", seq);
         do {
@@ -398,7 +453,7 @@ static inline void ccid2_new_ack(struct sock *sk,
                         /* increase every 2 acks */
                         hctx->ccid2hctx_ssacks++;
                         if (hctx->ccid2hctx_ssacks == 2) {
-                                ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd + 1);
+                                ccid2_change_cwnd(hctx, hctx->ccid2hctx_cwnd+1);
                                 hctx->ccid2hctx_ssacks = 0;
                                 *maxincr = *maxincr - 1;
                         }
@@ -411,26 +466,28 @@ static inline void ccid2_new_ack(struct sock *sk,
                 hctx->ccid2hctx_acks++;
 
                 if (hctx->ccid2hctx_acks >= hctx->ccid2hctx_cwnd) {
-                        ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd + 1);
+                        ccid2_change_cwnd(hctx, hctx->ccid2hctx_cwnd + 1);
                         hctx->ccid2hctx_acks = 0;
                 }
         }
 
         /* update RTO */
         if (hctx->ccid2hctx_srtt == -1 ||
-            (jiffies - hctx->ccid2hctx_lastrtt) >= hctx->ccid2hctx_srtt) {
-                unsigned long r = jiffies - seqp->ccid2s_sent;
+            time_after(jiffies, hctx->ccid2hctx_lastrtt + hctx->ccid2hctx_srtt)) {
+                unsigned long r = (long)jiffies - (long)seqp->ccid2s_sent;
                 int s;
 
                 /* first measurement */
                 if (hctx->ccid2hctx_srtt == -1) {
                         ccid2_pr_debug("R: %lu Time=%lu seq=%llu\n",
                                        r, jiffies, seqp->ccid2s_seq);
-                        hctx->ccid2hctx_srtt = r;
+                        ccid2_change_srtt(hctx, r);
                         hctx->ccid2hctx_rttvar = r >> 1;
                 } else {
                         /* RTTVAR */
                         long tmp = hctx->ccid2hctx_srtt - r;
+                        long srtt;
+
                         if (tmp < 0)
                                 tmp *= -1;
 
@@ -440,10 +497,12 @@ static inline void ccid2_new_ack(struct sock *sk,
                         hctx->ccid2hctx_rttvar += tmp;
 
                         /* SRTT */
-                        hctx->ccid2hctx_srtt *= 7;
-                        hctx->ccid2hctx_srtt >>= 3;
+                        srtt = hctx->ccid2hctx_srtt;
+                        srtt *= 7;
+                        srtt >>= 3;
                         tmp = r >> 3;
-                        hctx->ccid2hctx_srtt += tmp;
+                        srtt += tmp;
+                        ccid2_change_srtt(hctx, srtt);
                 }
                 s = hctx->ccid2hctx_rttvar << 2;
                 /* clock granularity is 1 when based on jiffies */
@@ -479,13 +538,29 @@ static void ccid2_hc_tx_dec_pipe(struct sock *sk)
 {
         struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
 
-        hctx->ccid2hctx_pipe--;
+        ccid2_change_pipe(hctx, hctx->ccid2hctx_pipe-1);
         BUG_ON(hctx->ccid2hctx_pipe < 0);
 
         if (hctx->ccid2hctx_pipe == 0)
                 ccid2_hc_tx_kill_rto_timer(sk);
 }
 
+static void ccid2_congestion_event(struct ccid2_hc_tx_sock *hctx,
+                                   struct ccid2_seq *seqp)
+{
+        if (time_before(seqp->ccid2s_sent, hctx->ccid2hctx_last_cong)) {
+                ccid2_pr_debug("Multiple losses in an RTT---treating as one\n");
+                return;
+        }
+
+        hctx->ccid2hctx_last_cong = jiffies;
+
+        ccid2_change_cwnd(hctx, hctx->ccid2hctx_cwnd >> 1);
+        hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd;
+        if (hctx->ccid2hctx_ssthresh < 2)
+                hctx->ccid2hctx_ssthresh = 2;
+}
+
 static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 {
         struct dccp_sock *dp = dccp_sk(sk);
@@ -496,7 +571,6 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
         unsigned char veclen;
         int offset = 0;
         int done = 0;
-        int loss = 0;
         unsigned int maxincr = 0;
 
         ccid2_hc_tx_check_sanity(hctx);
@@ -582,15 +656,16 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                          * run length
                          */
                         while (between48(seqp->ccid2s_seq,ackno_end_rl,ackno)) {
-                                const u8 state = (*vector &
-                                                  DCCP_ACKVEC_STATE_MASK) >> 6;
+                                const u8 state = *vector &
+                                                 DCCP_ACKVEC_STATE_MASK;
 
                                 /* new packet received or marked */
                                 if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED &&
                                     !seqp->ccid2s_acked) {
                                         if (state ==
                                             DCCP_ACKVEC_STATE_ECN_MARKED) {
-                                                loss = 1;
+                                                ccid2_congestion_event(hctx,
+                                                                       seqp);
                                         } else
                                                 ccid2_new_ack(sk, seqp,
                                                               &maxincr);
@@ -642,7 +717,13 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                 /* check for lost packets */
                 while (1) {
                         if (!seqp->ccid2s_acked) {
-                                loss = 1;
+                                ccid2_pr_debug("Packet lost: %llu\n",
+                                               seqp->ccid2s_seq);
+                                /* XXX need to traverse from tail -> head in
+                                 * order to detect multiple congestion events in
+                                 * one ack vector.
+                                 */
+                                ccid2_congestion_event(hctx, seqp);
                                 ccid2_hc_tx_dec_pipe(sk);
                         }
                         if (seqp == hctx->ccid2hctx_seqt)
@@ -661,53 +742,33 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                 hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqt->ccid2s_next;
         }
 
-        if (loss) {
-                /* XXX do bit shifts guarantee a 0 as the new bit? */
-                ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd >> 1);
-                hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd;
-                if (hctx->ccid2hctx_ssthresh < 2)
-                        hctx->ccid2hctx_ssthresh = 2;
-        }
-
         ccid2_hc_tx_check_sanity(hctx);
 }
 
 static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
 {
         struct ccid2_hc_tx_sock *hctx = ccid_priv(ccid);
-        int seqcount = ccid2_seq_len;
-        int i;
 
-        /* XXX init variables with proper values */
-        hctx->ccid2hctx_cwnd      = 1;
-        hctx->ccid2hctx_ssthresh  = 10;
+        ccid2_change_cwnd(hctx, 1);
+        /* Initialize ssthresh to infinity.  This means that we will exit the
+         * initial slow-start after the first packet loss.  This is what we
+         * want.
+         */
+        hctx->ccid2hctx_ssthresh  = ~0;
         hctx->ccid2hctx_numdupack = 3;
+        hctx->ccid2hctx_seqbufc   = 0;
 
         /* XXX init ~ to window size... */
-        hctx->ccid2hctx_seqbuf = kmalloc(sizeof(*hctx->ccid2hctx_seqbuf) *
-                                         seqcount, gfp_any());
-        if (hctx->ccid2hctx_seqbuf == NULL)
+        if (ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, GFP_ATOMIC) != 0)
                 return -ENOMEM;
 
-        for (i = 0; i < (seqcount - 1); i++) {
-                hctx->ccid2hctx_seqbuf[i].ccid2s_next =
-                                        &hctx->ccid2hctx_seqbuf[i + 1];
-                hctx->ccid2hctx_seqbuf[i + 1].ccid2s_prev =
-                                        &hctx->ccid2hctx_seqbuf[i];
-        }
-        hctx->ccid2hctx_seqbuf[seqcount - 1].ccid2s_next =
-                                        hctx->ccid2hctx_seqbuf;
-        hctx->ccid2hctx_seqbuf->ccid2s_prev =
-                                        &hctx->ccid2hctx_seqbuf[seqcount - 1];
-
-        hctx->ccid2hctx_seqh     = hctx->ccid2hctx_seqbuf;
-        hctx->ccid2hctx_seqt     = hctx->ccid2hctx_seqh;
         hctx->ccid2hctx_sent     = 0;
         hctx->ccid2hctx_rto      = 3 * HZ;
-        hctx->ccid2hctx_srtt     = -1;
+        ccid2_change_srtt(hctx, -1);
         hctx->ccid2hctx_rttvar   = -1;
         hctx->ccid2hctx_lastrtt  = 0;
         hctx->ccid2hctx_rpdupack = -1;
+        hctx->ccid2hctx_last_cong = jiffies;
 
         hctx->ccid2hctx_rtotimer.function = &ccid2_hc_tx_rto_expire;
         hctx->ccid2hctx_rtotimer.data     = (unsigned long)sk;
@@ -720,10 +781,13 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
 static void ccid2_hc_tx_exit(struct sock *sk)
 {
         struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        int i;
 
         ccid2_hc_tx_kill_rto_timer(sk);
-        kfree(hctx->ccid2hctx_seqbuf);
-        hctx->ccid2hctx_seqbuf = NULL;
+
+        for (i = 0; i < hctx->ccid2hctx_seqbufc; i++)
+                kfree(hctx->ccid2hctx_seqbuf[i]);
+        hctx->ccid2hctx_seqbufc = 0;
 }
 
 static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)