sctp: implement prsctp TTL policy

prsctp TTL policy is a policy to abandon chunks when they expire
at the specific time in local stack. It's similar with expires_at
in struct sctp_datamsg.

This patch uses sinfo->sinfo_timetolive to set the specific time for
TTL policy. sinfo->sinfo_timetolive is also used for msg->expires_at.
So if prsctp_enable or TTL policy is not enabled, msg->expires_at
still works as before.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index d8e464aacb208f46317102027d5d09307666d9ba..6bcda715008e55456e3fa1abc978dccd0f2f8979 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -602,6 +602,16 @@ struct sctp_chunk {
        /* This needs to be recoverable for SCTP_SEND_FAILED events. */
        struct sctp_sndrcvinfo sinfo;
 
+       /* We use this field to record param for prsctp policies,
+        * for TTL policy, it is the time_to_drop of this chunk,
+        * for RTX policy, it is the max_sent_count of this chunk,
+        * for PRIO policy, it is the priority of this chunk.
+        */
+       unsigned long prsctp_param;
+
+       /* How many times this chunk have been sent, for prsctp RTX policy */
+       int sent_count;
+
        /* Which association does this belong to?  */
        struct sctp_association *asoc;
 

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 1eb94bf18ef443eb7cefdf000ac2404587151572..2698d122e2014f8af5753541538133f151d4afa7 100644 (file)
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
@@ -335,13 +335,27 @@ errout:
 /* Check whether this message has expired. */
 int sctp_chunk_abandoned(struct sctp_chunk *chunk)
 {
-       struct sctp_datamsg *msg = chunk->msg;
+       if (!chunk->asoc->prsctp_enable ||
+           !SCTP_PR_POLICY(chunk->sinfo.sinfo_flags)) {
+               struct sctp_datamsg *msg = chunk->msg;
+
+               if (!msg->can_abandon)
+                       return 0;
+
+               if (time_after(jiffies, msg->expires_at))
+                       return 1;
 
-       if (!msg->can_abandon)
                return 0;
+       }
 
-       if (time_after(jiffies, msg->expires_at))
+       if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) &&
+           time_after(jiffies, chunk->prsctp_param)) {
+               if (chunk->sent_count)
+                       chunk->asoc->abandoned_sent[SCTP_PR_INDEX(TTL)]++;
+               else
+                       chunk->asoc->abandoned_unsent[SCTP_PR_INDEX(TTL)]++;
                return 1;
+       }
 
        return 0;
 }

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 2e9223bb1b3a47386e8164a5a63400899fbf301f..7425f6c238889d8eb33edfb3f2e2eb7af39847e8 100644 (file)
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -316,6 +316,8 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
                packet->has_data = 1;
                /* timestamp the chunk for rtx purposes */
                chunk->sent_at = jiffies;
+               /* Mainly used for prsctp RTX policy */
+               chunk->sent_count++;
                break;
        case SCTP_CID_COOKIE_ECHO:
                packet->has_cookie_echo = 1;

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 0e3045ef57fa9a96b9a50042e9035947d1581cd6..2c431eef3a50eff3c4e9d7ab8a1feadadb75d6b8 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -711,6 +711,17 @@ nodata:
        return retval;
 }
 
+static void sctp_set_prsctp_policy(struct sctp_chunk *chunk,
+                                  const struct sctp_sndrcvinfo *sinfo)
+{
+       if (!chunk->asoc->prsctp_enable)
+               return;
+
+       if (SCTP_PR_TTL_ENABLED(sinfo->sinfo_flags))
+               chunk->prsctp_param =
+                       jiffies + msecs_to_jiffies(sinfo->sinfo_timetolive);
+}
+
 /* Make a DATA chunk for the given association from the provided
  * parameters.  However, do not populate the data payload.
  */
@@ -744,6 +755,7 @@ struct sctp_chunk *sctp_make_datafrag_empty(struct sctp_association *asoc,
 
        retval->subh.data_hdr = sctp_addto_chunk(retval, sizeof(dp), &dp);
        memcpy(&retval->sinfo, sinfo, sizeof(struct sctp_sndrcvinfo));
+       sctp_set_prsctp_policy(retval, sinfo);
 
 nodata:
        return retval;

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index c3167c43a9c13278cdc932bc3b03a4363200e134..08614296628a196dc28e99227631b70fd6f67f2f 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7099,7 +7099,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
 
                        if (cmsgs->srinfo->sinfo_flags &
                            ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
-                             SCTP_SACK_IMMEDIATELY |
+                             SCTP_SACK_IMMEDIATELY | SCTP_PR_SCTP_MASK |
                              SCTP_ABORT | SCTP_EOF))
                                return -EINVAL;
                        break;
@@ -7123,7 +7123,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
 
                        if (cmsgs->sinfo->snd_flags &
                            ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
-                             SCTP_SACK_IMMEDIATELY |
+                             SCTP_SACK_IMMEDIATELY | SCTP_PR_SCTP_MASK |
                              SCTP_ABORT | SCTP_EOF))
                                return -EINVAL;
                        break;