Skip to contentSkip to conversation

ccid3: Sanity-check RTT samples

PATCH In review Arnaldo Carvalho de Melo 1 participant 1 message Dec 10, 2006 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 15/22 ccid3: Sanity-check RTT samples

CCID3 performance depends much on the accuracy of RTT samples. If RTT samples grow too large, performance can be catastrophically poor.

To limit the amount of possible damage in such cases, the patch
* introduces an upper limit which identifies a maximum `sane' RTT value;
* uses a macro to enforce this upper limit.

Using a macro was given preference, since it is necessary to identify the calling function in the warning message. Since exceeding this threshold identifies a critical condition, DCCP_CRIT is used and not DCCP_WARN.

Many thanks to Ian McDonald for collaboration on this issue.

---
 net/dccp/ccids/ccid3.c |    4 +++-
 net/dccp/ccids/ccid3.h |   10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)
net/dccp/ccids/ccid3.c +3 -1
index 7618d51..122a716 100644
@@ -456,8 +456,9 @@ static void ccid3_hc_tx_packet_recv(stru
 				  r_sample, t_elapsed);
 		else
 			r_sample -= t_elapsed;
+		CCID3_RTT_SANITY_CHECK(r_sample);
 
-		/* Update RTT estimate by 
+		/* Update RTT estimate by
 		 * If (No feedback recv)
 		 *    R = R_sample;
 		 * Else
@@ -1000,6 +1001,7 @@ static void ccid3_hc_rx_packet_recv(stru
 				  r_sample, t_elapsed);
 		else
 			r_sample -= t_elapsed;
+		CCID3_RTT_SANITY_CHECK(r_sample);
 
 		if (hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA)
 			hcrx->ccid3hcrx_rtt = r_sample;
net/dccp/ccids/ccid3.h +10 -0
index da0ca3c..3fa0f69 100644
@@ -51,6 +51,16 @@ #define TFRC_OPSYS_HALF_TIME_GRAN  (USEC
 /* Parameter t_mbi from [RFC 3448, 4.3]: backoff interval in seconds */
 #define TFRC_T_MBI		   64
 
+/* What we think is a reasonable upper limit on RTT values */
+#define CCID3_SANE_RTT_MAX	   (4 * USEC_PER_SEC)
+
+#define CCID3_RTT_SANITY_CHECK(rtt) 			do {		   \
+		if (rtt > CCID3_SANE_RTT_MAX) {				   \
+			DCCP_CRIT("RTT (%ld) too large, substituting %ld", \
+				  rtt, CCID3_SANE_RTT_MAX);		   \
+			rtt = CCID3_SANE_RTT_MAX;			   \
+		} 					} while (0)
+
 enum ccid3_options {
 	TFRC_OPT_LOSS_EVENT_RATE = 192,
 	TFRC_OPT_LOSS_INTERVALS	 = 193,
Signature · 1 line
1.4.2.1.g3d5c