2005-08-10 03:14:34 +00:00
|
|
|
/*
|
|
|
|
* net/dccp/ccids/ccid3.c
|
|
|
|
*
|
2007-12-12 16:06:14 +00:00
|
|
|
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK
|
2007-05-28 15:23:29 +00:00
|
|
|
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
|
|
|
|
* Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz>
|
2005-08-10 03:14:34 +00:00
|
|
|
*
|
|
|
|
* An implementation of the DCCP protocol
|
|
|
|
*
|
|
|
|
* This code has been developed by the University of Waikato WAND
|
|
|
|
* research group. For further information please see http://www.wand.net.nz/
|
|
|
|
*
|
|
|
|
* This code also uses code from Lulea University, rereleased as GPL by its
|
|
|
|
* authors:
|
|
|
|
* Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon
|
|
|
|
*
|
|
|
|
* Changes to meet Linux coding standards, to make it meet latest ccid3 draft
|
|
|
|
* and to make it work as a loadable module in the DCCP stack written by
|
|
|
|
* Arnaldo Carvalho de Melo <acme@conectiva.com.br>.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
#include "../dccp.h"
|
|
|
|
#include "ccid3.h"
|
|
|
|
|
2007-10-24 12:46:58 +00:00
|
|
|
#include <asm/unaligned.h>
|
|
|
|
|
2006-11-20 20:28:09 +00:00
|
|
|
#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|
|
|
|
static int ccid3_debug;
|
|
|
|
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
|
2005-08-10 03:14:34 +00:00
|
|
|
#else
|
|
|
|
#define ccid3_pr_debug(format, a...)
|
|
|
|
#endif
|
|
|
|
|
2007-03-20 16:11:24 +00:00
|
|
|
/*
|
|
|
|
* Transmitter Half-Connection Routines
|
|
|
|
*/
|
2006-11-20 20:28:09 +00:00
|
|
|
#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|
2005-08-10 03:14:34 +00:00
|
|
|
static const char *ccid3_tx_state_name(enum ccid3_hc_tx_states state)
|
|
|
|
{
|
|
|
|
static char *ccid3_state_names[] = {
|
|
|
|
[TFRC_SSTATE_NO_SENT] = "NO_SENT",
|
|
|
|
[TFRC_SSTATE_NO_FBACK] = "NO_FBACK",
|
|
|
|
[TFRC_SSTATE_FBACK] = "FBACK",
|
|
|
|
[TFRC_SSTATE_TERM] = "TERM",
|
|
|
|
};
|
|
|
|
|
|
|
|
return ccid3_state_names[state];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-03-21 05:58:56 +00:00
|
|
|
static void ccid3_hc_tx_set_state(struct sock *sk,
|
|
|
|
enum ccid3_hc_tx_states state)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
enum ccid3_hc_tx_states oldstate = hctx->ccid3hctx_state;
|
|
|
|
|
|
|
|
ccid3_pr_debug("%s(%p) %-8.8s -> %s\n",
|
2005-08-27 06:51:58 +00:00
|
|
|
dccp_role(sk), sk, ccid3_tx_state_name(oldstate),
|
|
|
|
ccid3_tx_state_name(state));
|
2005-08-10 03:14:34 +00:00
|
|
|
WARN_ON(state == oldstate);
|
|
|
|
hctx->ccid3hctx_state = state;
|
|
|
|
}
|
|
|
|
|
2007-03-20 18:12:10 +00:00
|
|
|
/*
|
2007-11-20 19:33:17 +00:00
|
|
|
* Compute the initial sending rate X_init in the manner of RFC 3390:
|
|
|
|
*
|
|
|
|
* X_init = min(4 * s, max(2 * s, 4380 bytes)) / RTT
|
|
|
|
*
|
|
|
|
* Note that RFC 3390 uses MSS, RFC 4342 refers to RFC 3390, and rfc3448bis
|
|
|
|
* (rev-02) clarifies the use of RFC 3390 with regard to the above formula.
|
2007-03-20 18:12:10 +00:00
|
|
|
* For consistency with other parts of the code, X_init is scaled by 2^6.
|
|
|
|
*/
|
|
|
|
static inline u64 rfc3390_initial_rate(struct sock *sk)
|
|
|
|
{
|
2007-11-20 19:33:17 +00:00
|
|
|
const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
|
|
|
const __u32 w_init = min_t(__u32, 4 * hctx->ccid3hctx_s,
|
|
|
|
max_t(__u32, 2 * hctx->ccid3hctx_s, 4380));
|
2007-03-20 18:12:10 +00:00
|
|
|
|
2007-11-20 19:33:17 +00:00
|
|
|
return scaled_div(w_init << 6, hctx->ccid3hctx_rtt);
|
2007-03-20 18:12:10 +00:00
|
|
|
}
|
|
|
|
|
2006-11-27 22:31:33 +00:00
|
|
|
/*
|
2007-03-20 17:56:11 +00:00
|
|
|
* Recalculate t_ipi and delta (should be called whenever X changes)
|
2006-11-27 22:31:33 +00:00
|
|
|
*/
|
2007-03-20 17:56:11 +00:00
|
|
|
static inline void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hctx)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2006-12-10 02:02:12 +00:00
|
|
|
/* Calculate new t_ipi = s / X_inst (X_inst is in 64 * bytes/second) */
|
2007-04-20 20:02:55 +00:00
|
|
|
hctx->ccid3hctx_t_ipi = scaled_div32(((u64)hctx->ccid3hctx_s) << 6,
|
|
|
|
hctx->ccid3hctx_x);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-11-27 22:31:33 +00:00
|
|
|
/* Calculate new delta by delta = min(t_ipi / 2, t_gran / 2) */
|
2005-08-27 06:51:58 +00:00
|
|
|
hctx->ccid3hctx_delta = min_t(u32, hctx->ccid3hctx_t_ipi / 2,
|
|
|
|
TFRC_OPSYS_HALF_TIME_GRAN);
|
2007-03-20 17:49:20 +00:00
|
|
|
|
2007-03-20 18:04:30 +00:00
|
|
|
ccid3_pr_debug("t_ipi=%u, delta=%u, s=%u, X=%u\n",
|
2007-03-20 17:49:20 +00:00
|
|
|
hctx->ccid3hctx_t_ipi, hctx->ccid3hctx_delta,
|
2007-03-20 18:04:30 +00:00
|
|
|
hctx->ccid3hctx_s, (unsigned)(hctx->ccid3hctx_x >> 6));
|
2007-03-20 17:49:20 +00:00
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
2007-09-26 05:39:16 +00:00
|
|
|
|
2007-11-20 20:01:59 +00:00
|
|
|
static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hctx, ktime_t now)
|
|
|
|
{
|
|
|
|
u32 delta = ktime_us_delta(now, hctx->ccid3hctx_t_last_win_count);
|
|
|
|
|
|
|
|
return delta / hctx->ccid3hctx_rtt;
|
|
|
|
}
|
|
|
|
|
2007-09-26 05:39:16 +00:00
|
|
|
/**
|
|
|
|
* ccid3_hc_tx_update_x - Update allowed sending rate X
|
|
|
|
* @stamp: most recent time if available - can be left NULL.
|
|
|
|
* This function tracks draft rfc3448bis, check there for latest details.
|
2006-12-03 16:50:56 +00:00
|
|
|
*
|
2006-12-10 02:02:12 +00:00
|
|
|
* Note: X and X_recv are both stored in units of 64 * bytes/second, to support
|
|
|
|
* fine-grained resolution of sending rates. This requires scaling by 2^6
|
|
|
|
* throughout the code. Only X_calc is unscaled (in bytes/second).
|
|
|
|
*
|
|
|
|
*/
|
2007-09-26 05:39:16 +00:00
|
|
|
static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
|
2006-11-28 21:51:42 +00:00
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2007-03-20 18:19:07 +00:00
|
|
|
__u64 min_rate = 2 * hctx->ccid3hctx_x_recv;
|
2006-12-10 02:02:12 +00:00
|
|
|
const __u64 old_x = hctx->ccid3hctx_x;
|
2007-09-26 05:39:16 +00:00
|
|
|
ktime_t now = stamp? *stamp : ktime_get_real();
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-03-20 18:19:07 +00:00
|
|
|
/*
|
|
|
|
* Handle IDLE periods: do not reduce below RFC3390 initial sending rate
|
2007-11-20 20:01:59 +00:00
|
|
|
* when idling [RFC 4342, 5.1]. Definition of idling is from rfc3448bis:
|
|
|
|
* a sender is idle if it has not sent anything over a 2-RTT-period.
|
2007-03-20 18:19:07 +00:00
|
|
|
* For consistency with X and X_recv, min_rate is also scaled by 2^6.
|
|
|
|
*/
|
2007-11-20 20:01:59 +00:00
|
|
|
if (ccid3_hc_tx_idle_rtt(hctx, now) >= 2) {
|
2007-03-20 18:19:07 +00:00
|
|
|
min_rate = rfc3390_initial_rate(sk);
|
|
|
|
min_rate = max(min_rate, 2 * hctx->ccid3hctx_x_recv);
|
|
|
|
}
|
|
|
|
|
2006-12-03 16:53:07 +00:00
|
|
|
if (hctx->ccid3hctx_p > 0) {
|
2006-12-10 02:02:12 +00:00
|
|
|
|
2006-12-10 02:24:57 +00:00
|
|
|
hctx->ccid3hctx_x = min(((__u64)hctx->ccid3hctx_x_calc) << 6,
|
2007-03-20 18:19:07 +00:00
|
|
|
min_rate);
|
2006-12-10 02:24:57 +00:00
|
|
|
hctx->ccid3hctx_x = max(hctx->ccid3hctx_x,
|
|
|
|
(((__u64)hctx->ccid3hctx_s) << 6) /
|
2006-12-10 18:01:18 +00:00
|
|
|
TFRC_T_MBI);
|
2006-11-28 21:51:42 +00:00
|
|
|
|
2007-09-26 05:39:16 +00:00
|
|
|
} else if (ktime_us_delta(now, hctx->ccid3hctx_t_ld)
|
|
|
|
- (s64)hctx->ccid3hctx_rtt >= 0) {
|
2007-08-20 00:14:27 +00:00
|
|
|
|
2007-09-26 05:39:16 +00:00
|
|
|
hctx->ccid3hctx_x =
|
|
|
|
max(min(2 * hctx->ccid3hctx_x, min_rate),
|
|
|
|
scaled_div(((__u64)hctx->ccid3hctx_s) << 6,
|
|
|
|
hctx->ccid3hctx_rtt));
|
|
|
|
hctx->ccid3hctx_t_ld = now;
|
2006-12-10 02:00:14 +00:00
|
|
|
}
|
2005-08-27 21:18:18 +00:00
|
|
|
|
2007-03-20 17:49:20 +00:00
|
|
|
if (hctx->ccid3hctx_x != old_x) {
|
2007-03-20 18:04:30 +00:00
|
|
|
ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "
|
|
|
|
"X_recv=%u\n", (unsigned)(old_x >> 6),
|
|
|
|
(unsigned)(hctx->ccid3hctx_x >> 6),
|
|
|
|
hctx->ccid3hctx_x_calc,
|
|
|
|
(unsigned)(hctx->ccid3hctx_x_recv >> 6));
|
2007-03-20 17:49:20 +00:00
|
|
|
|
2007-03-20 17:56:11 +00:00
|
|
|
ccid3_update_send_interval(hctx);
|
2007-03-20 17:49:20 +00:00
|
|
|
}
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2006-11-28 21:22:33 +00:00
|
|
|
/*
|
2006-12-10 18:01:18 +00:00
|
|
|
* Track the mean packet size `s' (cf. RFC 4342, 5.3 and RFC 3448, 4.1)
|
|
|
|
* @len: DCCP packet payload size in bytes
|
2006-11-28 21:22:33 +00:00
|
|
|
*/
|
|
|
|
static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hctx, int len)
|
|
|
|
{
|
2007-03-20 17:56:11 +00:00
|
|
|
const u16 old_s = hctx->ccid3hctx_s;
|
|
|
|
|
2007-11-20 20:09:59 +00:00
|
|
|
hctx->ccid3hctx_s = tfrc_ewma(hctx->ccid3hctx_s, len, 9);
|
2007-03-20 17:56:11 +00:00
|
|
|
|
|
|
|
if (hctx->ccid3hctx_s != old_s)
|
|
|
|
ccid3_update_send_interval(hctx);
|
2006-11-28 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 02:07:37 +00:00
|
|
|
/*
|
2006-12-10 18:01:18 +00:00
|
|
|
* Update Window Counter using the algorithm from [RFC 4342, 8.1].
|
|
|
|
* The algorithm is not applicable if RTT < 4 microseconds.
|
2006-12-10 02:07:37 +00:00
|
|
|
*/
|
|
|
|
static inline void ccid3_hc_tx_update_win_count(struct ccid3_hc_tx_sock *hctx,
|
2007-06-16 16:34:02 +00:00
|
|
|
ktime_t now)
|
2006-12-10 02:07:37 +00:00
|
|
|
{
|
|
|
|
u32 quarter_rtts;
|
|
|
|
|
|
|
|
if (unlikely(hctx->ccid3hctx_rtt < 4)) /* avoid divide-by-zero */
|
|
|
|
return;
|
|
|
|
|
2007-06-16 16:34:02 +00:00
|
|
|
quarter_rtts = ktime_us_delta(now, hctx->ccid3hctx_t_last_win_count);
|
|
|
|
quarter_rtts /= hctx->ccid3hctx_rtt / 4;
|
2006-12-10 02:07:37 +00:00
|
|
|
|
|
|
|
if (quarter_rtts > 0) {
|
2007-06-16 16:34:02 +00:00
|
|
|
hctx->ccid3hctx_t_last_win_count = now;
|
2006-12-10 02:07:37 +00:00
|
|
|
hctx->ccid3hctx_last_win_count += min_t(u32, quarter_rtts, 5);
|
|
|
|
hctx->ccid3hctx_last_win_count &= 0xF; /* mod 16 */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
|
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)data;
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2006-11-28 20:34:34 +00:00
|
|
|
unsigned long t_nfb = USEC_PER_SEC / 5;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
bh_lock_sock(sk);
|
|
|
|
if (sock_owned_by_user(sk)) {
|
|
|
|
/* Try again later. */
|
|
|
|
/* XXX: set some sensible MIB */
|
2006-11-27 22:29:27 +00:00
|
|
|
goto restart_timer;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p, state=%s) - entry \n", dccp_role(sk), sk,
|
2005-08-10 03:14:34 +00:00
|
|
|
ccid3_tx_state_name(hctx->ccid3hctx_state));
|
2006-12-10 02:14:12 +00:00
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
switch (hctx->ccid3hctx_state) {
|
|
|
|
case TFRC_SSTATE_NO_FBACK:
|
2006-11-28 21:51:42 +00:00
|
|
|
/* RFC 3448, 4.4: Halve send rate directly */
|
2006-12-10 02:24:57 +00:00
|
|
|
hctx->ccid3hctx_x = max(hctx->ccid3hctx_x / 2,
|
|
|
|
(((__u64)hctx->ccid3hctx_s) << 6) /
|
|
|
|
TFRC_T_MBI);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p, state=%s), updated tx rate to %u "
|
|
|
|
"bytes/s\n", dccp_role(sk), sk,
|
2005-08-27 06:51:58 +00:00
|
|
|
ccid3_tx_state_name(hctx->ccid3hctx_state),
|
2006-12-10 02:02:12 +00:00
|
|
|
(unsigned)(hctx->ccid3hctx_x >> 6));
|
2006-11-27 22:29:27 +00:00
|
|
|
/* The value of R is still undefined and so we can not recompute
|
2007-12-20 21:59:39 +00:00
|
|
|
* the timeout value. Keep initial value as per [RFC 4342, 5]. */
|
2006-11-28 20:34:34 +00:00
|
|
|
t_nfb = TFRC_INITIAL_TIMEOUT;
|
2007-03-20 17:56:11 +00:00
|
|
|
ccid3_update_send_interval(hctx);
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
|
|
|
case TFRC_SSTATE_FBACK:
|
2005-08-27 06:51:58 +00:00
|
|
|
/*
|
2007-03-20 18:19:07 +00:00
|
|
|
* Modify the cached value of X_recv [RFC 3448, 4.4]
|
|
|
|
*
|
|
|
|
* If (p == 0 || X_calc > 2 * X_recv)
|
|
|
|
* X_recv = max(X_recv / 2, s / (2 * t_mbi));
|
|
|
|
* Else
|
|
|
|
* X_recv = X_calc / 4;
|
|
|
|
*
|
|
|
|
* Note that X_recv is scaled by 2^6 while X_calc is not
|
2005-08-27 06:51:58 +00:00
|
|
|
*/
|
2007-03-20 18:19:07 +00:00
|
|
|
BUG_ON(hctx->ccid3hctx_p && !hctx->ccid3hctx_x_calc);
|
|
|
|
|
|
|
|
if (hctx->ccid3hctx_p == 0 ||
|
|
|
|
(hctx->ccid3hctx_x_calc > (hctx->ccid3hctx_x_recv >> 5))) {
|
|
|
|
|
|
|
|
hctx->ccid3hctx_x_recv =
|
|
|
|
max(hctx->ccid3hctx_x_recv / 2,
|
|
|
|
(((__u64)hctx->ccid3hctx_s) << 6) /
|
|
|
|
(2 * TFRC_T_MBI));
|
|
|
|
} else {
|
|
|
|
hctx->ccid3hctx_x_recv = hctx->ccid3hctx_x_calc;
|
|
|
|
hctx->ccid3hctx_x_recv <<= 4;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
2007-03-20 18:19:07 +00:00
|
|
|
/* Now recalculate X [RFC 3448, 4.3, step (4)] */
|
2007-09-26 05:39:16 +00:00
|
|
|
ccid3_hc_tx_update_x(sk, NULL);
|
2005-08-27 23:11:28 +00:00
|
|
|
/*
|
|
|
|
* Schedule no feedback timer to expire in
|
2006-12-03 16:50:23 +00:00
|
|
|
* max(t_RTO, 2 * s/X) = max(t_RTO, 2 * t_ipi)
|
|
|
|
* See comments in packet_recv() regarding the value of t_RTO.
|
2005-08-27 23:11:28 +00:00
|
|
|
*/
|
2006-12-03 16:50:23 +00:00
|
|
|
t_nfb = max(hctx->ccid3hctx_t_rto, 2 * hctx->ccid3hctx_t_ipi);
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
2006-11-20 20:39:23 +00:00
|
|
|
case TFRC_SSTATE_NO_SENT:
|
2006-12-10 02:14:12 +00:00
|
|
|
DCCP_BUG("%s(%p) - Illegal state NO_SENT", dccp_role(sk), sk);
|
2006-11-20 20:39:23 +00:00
|
|
|
/* fall through */
|
|
|
|
case TFRC_SSTATE_TERM:
|
2005-08-10 03:14:34 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-11-27 22:29:27 +00:00
|
|
|
restart_timer:
|
|
|
|
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
2007-02-09 14:24:38 +00:00
|
|
|
jiffies + usecs_to_jiffies(t_nfb));
|
2005-08-10 03:14:34 +00:00
|
|
|
out:
|
|
|
|
bh_unlock_sock(sk);
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2006-11-27 14:26:03 +00:00
|
|
|
/*
|
|
|
|
* returns
|
|
|
|
* > 0: delay (in msecs) that should pass before actually sending
|
|
|
|
* = 0: can send immediately
|
|
|
|
* < 0: error condition; do not send packet
|
|
|
|
*/
|
2006-11-28 21:55:06 +00:00
|
|
|
static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2007-06-16 16:34:02 +00:00
|
|
|
ktime_t now = ktime_get_real();
|
|
|
|
s64 delay;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
/*
|
2006-11-27 14:26:57 +00:00
|
|
|
* This function is called only for Data and DataAck packets. Sending
|
|
|
|
* zero-sized Data(Ack)s is theoretically possible, but for congestion
|
|
|
|
* control this case is pathological - ignore it.
|
2005-08-10 03:14:34 +00:00
|
|
|
*/
|
2006-11-28 21:55:06 +00:00
|
|
|
if (unlikely(skb->len == 0))
|
2006-11-27 14:26:57 +00:00
|
|
|
return -EBADMSG;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
switch (hctx->ccid3hctx_state) {
|
|
|
|
case TFRC_SSTATE_NO_SENT:
|
2005-08-27 06:51:58 +00:00
|
|
|
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
2006-12-10 18:01:18 +00:00
|
|
|
(jiffies +
|
2007-02-09 14:24:38 +00:00
|
|
|
usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));
|
2005-08-10 03:14:34 +00:00
|
|
|
hctx->ccid3hctx_last_win_count = 0;
|
|
|
|
hctx->ccid3hctx_t_last_win_count = now;
|
2006-11-27 14:13:38 +00:00
|
|
|
|
|
|
|
/* Set t_0 for initial packet */
|
2005-08-10 03:14:34 +00:00
|
|
|
hctx->ccid3hctx_t_nom = now;
|
2007-03-20 18:31:56 +00:00
|
|
|
|
|
|
|
hctx->ccid3hctx_s = skb->len;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Use initial RTT sample when available: recommended by erratum
|
|
|
|
* to RFC 4342. This implements the initialisation procedure of
|
|
|
|
* draft rfc3448bis, section 4.2. Remember, X is scaled by 2^6.
|
|
|
|
*/
|
|
|
|
if (dp->dccps_syn_rtt) {
|
|
|
|
ccid3_pr_debug("SYN RTT = %uus\n", dp->dccps_syn_rtt);
|
|
|
|
hctx->ccid3hctx_rtt = dp->dccps_syn_rtt;
|
|
|
|
hctx->ccid3hctx_x = rfc3390_initial_rate(sk);
|
2007-08-20 00:14:52 +00:00
|
|
|
hctx->ccid3hctx_t_ld = now;
|
2007-03-20 18:31:56 +00:00
|
|
|
} else {
|
2007-11-20 19:33:17 +00:00
|
|
|
/* Sender does not have RTT sample: X_pps = 1 pkt/sec */
|
|
|
|
hctx->ccid3hctx_x = hctx->ccid3hctx_s;
|
2007-03-20 18:31:56 +00:00
|
|
|
hctx->ccid3hctx_x <<= 6;
|
|
|
|
}
|
|
|
|
ccid3_update_send_interval(hctx);
|
|
|
|
|
|
|
|
ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
|
|
|
case TFRC_SSTATE_NO_FBACK:
|
|
|
|
case TFRC_SSTATE_FBACK:
|
2007-06-16 16:34:02 +00:00
|
|
|
delay = ktime_us_delta(hctx->ccid3hctx_t_nom, now);
|
2007-03-20 17:49:20 +00:00
|
|
|
ccid3_pr_debug("delay=%ld\n", (long)delay);
|
2006-11-27 14:25:10 +00:00
|
|
|
/*
|
2006-12-10 18:01:18 +00:00
|
|
|
* Scheduling of packet transmissions [RFC 3448, 4.6]
|
2006-11-27 14:25:10 +00:00
|
|
|
*
|
|
|
|
* if (t_now > t_nom - delta)
|
|
|
|
* // send the packet now
|
|
|
|
* else
|
|
|
|
* // send the packet in (t_nom - t_now) milliseconds.
|
|
|
|
*/
|
2007-06-16 16:48:50 +00:00
|
|
|
if (delay - (s64)hctx->ccid3hctx_delta >= 1000)
|
2007-06-16 16:34:02 +00:00
|
|
|
return (u32)delay / 1000L;
|
2006-12-10 02:07:37 +00:00
|
|
|
|
2007-06-16 16:34:02 +00:00
|
|
|
ccid3_hc_tx_update_win_count(hctx, now);
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
2006-11-20 20:39:23 +00:00
|
|
|
case TFRC_SSTATE_TERM:
|
2006-12-10 02:14:12 +00:00
|
|
|
DCCP_BUG("%s(%p) - Illegal state TERM", dccp_role(sk), sk);
|
2006-11-27 14:26:03 +00:00
|
|
|
return -EINVAL;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2006-11-27 14:26:03 +00:00
|
|
|
/* prepare to send now (add options etc.) */
|
|
|
|
dp->dccps_hc_tx_insert_options = 1;
|
2006-12-10 02:08:09 +00:00
|
|
|
DCCP_SKB_CB(skb)->dccpd_ccval = hctx->ccid3hctx_last_win_count;
|
|
|
|
|
|
|
|
/* set the nominal send time for the next following packet */
|
2007-06-16 16:34:02 +00:00
|
|
|
hctx->ccid3hctx_t_nom = ktime_add_us(hctx->ccid3hctx_t_nom,
|
|
|
|
hctx->ccid3hctx_t_ipi);
|
2006-11-27 14:26:03 +00:00
|
|
|
return 0;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2006-12-10 18:01:18 +00:00
|
|
|
static void ccid3_hc_tx_packet_sent(struct sock *sk, int more,
|
|
|
|
unsigned int len)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-11-28 21:55:06 +00:00
|
|
|
ccid3_hc_tx_update_s(hctx, len);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-11-28 13:15:40 +00:00
|
|
|
if (tfrc_tx_hist_add(&hctx->ccid3hctx_hist, dccp_sk(sk)->dccps_gss))
|
[DCCP] ccid3: Perform history operations only after packet has been sent
This migrates all packet history operations into the routine
ccid3_hc_tx_packet_sent, thereby removing synchronization problems
that occur when, as before, the operations are spread over multiple
routines.
The following minor simplifications are also applied:
* several simplifications now follow from this change - several tests
are now no longer required
* removal of one unnecessary variable (dp)
Justification:
Currently packet history operations span two different routines,
one of which is likely to pass through several iterations of sleeping
and awakening.
The first routine, ccid3_hc_tx_send_packet, allocates an entry and
sets a few fields. The remaining fields are filled in when the second
routine (which is not within a sleeping context), ccid3_hc_tx_packet_sent,
is called. This has several strong drawbacks:
* it is not necessary to split history operations - all fields can be
filled in by the second routine
* the first routine is called multiple times, until a packet can be sent,
and sleeps meanwhile - this causes a lot of difficulties with regard to
keeping the list consistent
* since both routines do not have a producer-consumer like synchronization,
it is very difficult to maintain data across calls to these routines
* the fact that the routines are called in different contexts (sleeping, not
sleeping) adds further problems
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-12-10 02:09:21 +00:00
|
|
|
DCCP_CRIT("packet history - out of memory!");
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
struct ccid3_options_received *opt_recv;
|
2007-08-20 00:18:13 +00:00
|
|
|
ktime_t now;
|
2006-11-28 20:34:34 +00:00
|
|
|
unsigned long t_nfb;
|
2007-03-20 18:24:37 +00:00
|
|
|
u32 pinv, r_sample;
|
2005-08-27 06:51:58 +00:00
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
/* we are only interested in ACKs */
|
|
|
|
if (!(DCCP_SKB_CB(skb)->dccpd_type == DCCP_PKT_ACK ||
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_type == DCCP_PKT_DATAACK))
|
|
|
|
return;
|
|
|
|
|
|
|
|
opt_recv = &hctx->ccid3hctx_options_received;
|
|
|
|
|
|
|
|
switch (hctx->ccid3hctx_state) {
|
|
|
|
case TFRC_SSTATE_NO_FBACK:
|
|
|
|
case TFRC_SSTATE_FBACK:
|
2007-11-30 00:47:15 +00:00
|
|
|
now = ktime_get_real();
|
|
|
|
|
2007-11-28 13:15:40 +00:00
|
|
|
/* estimate RTT from history if ACK number is valid */
|
2007-11-30 00:47:15 +00:00
|
|
|
r_sample = tfrc_tx_hist_rtt(hctx->ccid3hctx_hist,
|
|
|
|
DCCP_SKB_CB(skb)->dccpd_ack_seq, now);
|
|
|
|
if (r_sample == 0) {
|
2007-11-28 13:15:40 +00:00
|
|
|
DCCP_WARN("%s(%p): %s with bogus ACK-%llu\n", dccp_role(sk), sk,
|
|
|
|
dccp_packet_name(DCCP_SKB_CB(skb)->dccpd_type),
|
|
|
|
(unsigned long long)DCCP_SKB_CB(skb)->dccpd_ack_seq);
|
2005-08-10 03:14:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-12-10 02:02:12 +00:00
|
|
|
/* Update receive rate in units of 64 * bytes/second */
|
2006-12-10 02:24:57 +00:00
|
|
|
hctx->ccid3hctx_x_recv = opt_recv->ccid3or_receive_rate;
|
|
|
|
hctx->ccid3hctx_x_recv <<= 6;
|
2006-12-03 16:50:56 +00:00
|
|
|
|
|
|
|
/* Update loss event rate */
|
|
|
|
pinv = opt_recv->ccid3or_loss_event_rate;
|
2006-12-10 01:59:14 +00:00
|
|
|
if (pinv == ~0U || pinv == 0) /* see RFC 4342, 8.5 */
|
2006-12-03 16:50:56 +00:00
|
|
|
hctx->ccid3hctx_p = 0;
|
2006-12-10 01:59:14 +00:00
|
|
|
else /* can not exceed 100% */
|
2006-12-10 18:01:18 +00:00
|
|
|
hctx->ccid3hctx_p = 1000000 / pinv;
|
2006-12-03 16:50:56 +00:00
|
|
|
/*
|
2007-11-30 00:47:15 +00:00
|
|
|
* Validate new RTT sample and update moving average
|
2006-12-03 16:50:56 +00:00
|
|
|
*/
|
2007-11-30 00:47:15 +00:00
|
|
|
r_sample = dccp_sample_rtt(sk, r_sample);
|
2007-11-20 20:09:59 +00:00
|
|
|
hctx->ccid3hctx_rtt = tfrc_ewma(hctx->ccid3hctx_rtt, r_sample, 9);
|
2006-12-03 16:50:56 +00:00
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
if (hctx->ccid3hctx_state == TFRC_SSTATE_NO_FBACK) {
|
2006-12-10 02:02:12 +00:00
|
|
|
/*
|
|
|
|
* Larger Initial Windows [RFC 4342, sec. 5]
|
|
|
|
*/
|
2007-03-20 18:12:10 +00:00
|
|
|
hctx->ccid3hctx_x = rfc3390_initial_rate(sk);
|
2007-08-20 00:16:35 +00:00
|
|
|
hctx->ccid3hctx_t_ld = now;
|
2006-11-28 21:51:42 +00:00
|
|
|
|
2007-03-20 17:56:11 +00:00
|
|
|
ccid3_update_send_interval(hctx);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-03-20 18:12:10 +00:00
|
|
|
ccid3_pr_debug("%s(%p), s=%u, MSS=%u, "
|
2007-03-20 18:24:37 +00:00
|
|
|
"R_sample=%uus, X=%u\n", dccp_role(sk),
|
2007-02-06 02:18:21 +00:00
|
|
|
sk, hctx->ccid3hctx_s,
|
2007-05-24 00:43:11 +00:00
|
|
|
dccp_sk(sk)->dccps_mss_cache, r_sample,
|
2006-12-10 02:02:12 +00:00
|
|
|
(unsigned)(hctx->ccid3hctx_x >> 6));
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-12-03 16:50:56 +00:00
|
|
|
ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);
|
|
|
|
} else {
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-12-10 02:00:14 +00:00
|
|
|
/* Update sending rate (step 4 of [RFC 3448, 4.3]) */
|
|
|
|
if (hctx->ccid3hctx_p > 0)
|
|
|
|
hctx->ccid3hctx_x_calc =
|
|
|
|
tfrc_calc_x(hctx->ccid3hctx_s,
|
|
|
|
hctx->ccid3hctx_rtt,
|
|
|
|
hctx->ccid3hctx_p);
|
2007-09-26 05:39:16 +00:00
|
|
|
ccid3_hc_tx_update_x(sk, &now);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-03-20 18:24:37 +00:00
|
|
|
ccid3_pr_debug("%s(%p), RTT=%uus (sample=%uus), s=%u, "
|
2006-12-10 18:01:18 +00:00
|
|
|
"p=%u, X_calc=%u, X_recv=%u, X=%u\n",
|
|
|
|
dccp_role(sk),
|
2007-03-20 18:24:37 +00:00
|
|
|
sk, hctx->ccid3hctx_rtt, r_sample,
|
2006-12-03 16:50:56 +00:00
|
|
|
hctx->ccid3hctx_s, hctx->ccid3hctx_p,
|
|
|
|
hctx->ccid3hctx_x_calc,
|
2006-12-10 02:24:57 +00:00
|
|
|
(unsigned)(hctx->ccid3hctx_x_recv >> 6),
|
2006-12-10 18:01:18 +00:00
|
|
|
(unsigned)(hctx->ccid3hctx_x >> 6));
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* unschedule no feedback timer */
|
|
|
|
sk_stop_timer(sk, &hctx->ccid3hctx_no_feedback_timer);
|
|
|
|
|
2005-08-29 05:15:54 +00:00
|
|
|
/*
|
2006-12-10 18:01:18 +00:00
|
|
|
* As we have calculated new ipi, delta, t_nom it is possible
|
|
|
|
* that we now can send a packet, so wake up dccp_wait_for_ccid
|
2005-08-29 05:15:54 +00:00
|
|
|
*/
|
|
|
|
sk->sk_write_space(sk);
|
2005-08-10 15:59:38 +00:00
|
|
|
|
2006-12-03 16:50:23 +00:00
|
|
|
/*
|
|
|
|
* Update timeout interval for the nofeedback timer.
|
|
|
|
* We use a configuration option to increase the lower bound.
|
2006-12-10 18:01:18 +00:00
|
|
|
* This can help avoid triggering the nofeedback timer too
|
|
|
|
* often ('spinning') on LANs with small RTTs.
|
2006-12-03 16:50:23 +00:00
|
|
|
*/
|
2006-11-27 22:32:37 +00:00
|
|
|
hctx->ccid3hctx_t_rto = max_t(u32, 4 * hctx->ccid3hctx_rtt,
|
2006-12-03 16:50:23 +00:00
|
|
|
CONFIG_IP_DCCP_CCID3_RTO *
|
2006-12-10 18:01:18 +00:00
|
|
|
(USEC_PER_SEC/1000));
|
2005-08-27 06:51:58 +00:00
|
|
|
/*
|
|
|
|
* Schedule no feedback timer to expire in
|
2006-12-03 16:50:23 +00:00
|
|
|
* max(t_RTO, 2 * s/X) = max(t_RTO, 2 * t_ipi)
|
2005-08-27 06:51:58 +00:00
|
|
|
*/
|
2006-12-03 16:50:23 +00:00
|
|
|
t_nfb = max(hctx->ccid3hctx_t_rto, 2 * hctx->ccid3hctx_t_ipi);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p), Scheduled no feedback timer to "
|
2006-12-10 18:01:18 +00:00
|
|
|
"expire in %lu jiffies (%luus)\n",
|
|
|
|
dccp_role(sk),
|
2006-12-10 02:14:12 +00:00
|
|
|
sk, usecs_to_jiffies(t_nfb), t_nfb);
|
|
|
|
|
|
|
|
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
2006-11-28 20:34:34 +00:00
|
|
|
jiffies + usecs_to_jiffies(t_nfb));
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
2007-03-07 20:53:48 +00:00
|
|
|
case TFRC_SSTATE_NO_SENT: /* fall through */
|
2006-11-27 14:28:48 +00:00
|
|
|
case TFRC_SSTATE_TERM: /* ignore feedback when closing */
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option,
|
2005-08-27 06:51:58 +00:00
|
|
|
unsigned char len, u16 idx,
|
|
|
|
unsigned char *value)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
|
|
|
int rc = 0;
|
2005-09-09 05:40:58 +00:00
|
|
|
const struct dccp_sock *dp = dccp_sk(sk);
|
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
struct ccid3_options_received *opt_recv;
|
2007-10-24 12:46:58 +00:00
|
|
|
__be32 opt_val;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
opt_recv = &hctx->ccid3hctx_options_received;
|
|
|
|
|
|
|
|
if (opt_recv->ccid3or_seqno != dp->dccps_gsr) {
|
|
|
|
opt_recv->ccid3or_seqno = dp->dccps_gsr;
|
|
|
|
opt_recv->ccid3or_loss_event_rate = ~0;
|
|
|
|
opt_recv->ccid3or_loss_intervals_idx = 0;
|
|
|
|
opt_recv->ccid3or_loss_intervals_len = 0;
|
|
|
|
opt_recv->ccid3or_receive_rate = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (option) {
|
|
|
|
case TFRC_OPT_LOSS_EVENT_RATE:
|
2005-09-09 23:01:25 +00:00
|
|
|
if (unlikely(len != 4)) {
|
2006-12-10 02:14:12 +00:00
|
|
|
DCCP_WARN("%s(%p), invalid len %d "
|
2006-11-20 20:39:23 +00:00
|
|
|
"for TFRC_OPT_LOSS_EVENT_RATE\n",
|
|
|
|
dccp_role(sk), sk, len);
|
2005-08-10 03:14:34 +00:00
|
|
|
rc = -EINVAL;
|
|
|
|
} else {
|
2007-10-24 12:46:58 +00:00
|
|
|
opt_val = get_unaligned((__be32 *)value);
|
|
|
|
opt_recv->ccid3or_loss_event_rate = ntohl(opt_val);
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p), LOSS_EVENT_RATE=%u\n",
|
2005-08-10 03:14:34 +00:00
|
|
|
dccp_role(sk), sk,
|
|
|
|
opt_recv->ccid3or_loss_event_rate);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TFRC_OPT_LOSS_INTERVALS:
|
|
|
|
opt_recv->ccid3or_loss_intervals_idx = idx;
|
|
|
|
opt_recv->ccid3or_loss_intervals_len = len;
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p), LOSS_INTERVALS=(%u, %u)\n",
|
2005-08-10 03:14:34 +00:00
|
|
|
dccp_role(sk), sk,
|
|
|
|
opt_recv->ccid3or_loss_intervals_idx,
|
|
|
|
opt_recv->ccid3or_loss_intervals_len);
|
|
|
|
break;
|
|
|
|
case TFRC_OPT_RECEIVE_RATE:
|
2005-09-09 23:01:25 +00:00
|
|
|
if (unlikely(len != 4)) {
|
2006-12-10 02:14:12 +00:00
|
|
|
DCCP_WARN("%s(%p), invalid len %d "
|
2006-11-20 20:39:23 +00:00
|
|
|
"for TFRC_OPT_RECEIVE_RATE\n",
|
|
|
|
dccp_role(sk), sk, len);
|
2005-08-10 03:14:34 +00:00
|
|
|
rc = -EINVAL;
|
|
|
|
} else {
|
2007-10-24 12:46:58 +00:00
|
|
|
opt_val = get_unaligned((__be32 *)value);
|
|
|
|
opt_recv->ccid3or_receive_rate = ntohl(opt_val);
|
2006-12-10 02:14:12 +00:00
|
|
|
ccid3_pr_debug("%s(%p), RECEIVE_RATE=%u\n",
|
2005-08-10 03:14:34 +00:00
|
|
|
dccp_role(sk), sk,
|
|
|
|
opt_recv->ccid3or_receive_rate);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2006-03-21 03:21:44 +00:00
|
|
|
static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2006-03-21 03:21:44 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid_priv(ccid);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
|
2007-11-28 13:15:40 +00:00
|
|
|
hctx->ccid3hctx_hist = NULL;
|
2008-01-24 05:20:07 +00:00
|
|
|
setup_timer(&hctx->ccid3hctx_no_feedback_timer,
|
|
|
|
ccid3_hc_tx_no_feedback_timer, (unsigned long)sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ccid3_hc_tx_exit(struct sock *sk)
|
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
ccid3_hc_tx_set_state(sk, TFRC_SSTATE_TERM);
|
|
|
|
sk_stop_timer(sk, &hctx->ccid3hctx_no_feedback_timer);
|
|
|
|
|
2007-11-28 13:15:40 +00:00
|
|
|
tfrc_tx_hist_purge(&hctx->ccid3hctx_hist);
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2007-03-20 16:11:24 +00:00
|
|
|
static void ccid3_hc_tx_get_info(struct sock *sk, struct tcp_info *info)
|
|
|
|
{
|
2007-09-26 14:24:28 +00:00
|
|
|
struct ccid3_hc_tx_sock *hctx;
|
2007-03-20 16:11:24 +00:00
|
|
|
|
|
|
|
/* Listen socks doesn't have a private CCID block */
|
|
|
|
if (sk->sk_state == DCCP_LISTEN)
|
|
|
|
return;
|
|
|
|
|
2007-09-26 14:24:28 +00:00
|
|
|
hctx = ccid3_hc_tx_sk(sk);
|
2007-03-20 16:11:24 +00:00
|
|
|
info->tcpi_rto = hctx->ccid3hctx_t_rto;
|
|
|
|
info->tcpi_rtt = hctx->ccid3hctx_rtt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
|
|
|
|
u32 __user *optval, int __user *optlen)
|
|
|
|
{
|
2007-09-26 14:24:28 +00:00
|
|
|
const struct ccid3_hc_tx_sock *hctx;
|
2007-03-20 16:11:24 +00:00
|
|
|
const void *val;
|
|
|
|
|
|
|
|
/* Listen socks doesn't have a private CCID block */
|
|
|
|
if (sk->sk_state == DCCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2007-09-26 14:24:28 +00:00
|
|
|
hctx = ccid3_hc_tx_sk(sk);
|
2007-03-20 16:11:24 +00:00
|
|
|
switch (optname) {
|
|
|
|
case DCCP_SOCKOPT_CCID_TX_INFO:
|
|
|
|
if (len < sizeof(hctx->ccid3hctx_tfrc))
|
|
|
|
return -EINVAL;
|
|
|
|
len = sizeof(hctx->ccid3hctx_tfrc);
|
|
|
|
val = &hctx->ccid3hctx_tfrc;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -ENOPROTOOPT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (put_user(len, optlen) || copy_to_user(optval, val, len))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-10 03:14:34 +00:00
|
|
|
/*
|
2007-03-20 16:11:24 +00:00
|
|
|
* Receiver Half-Connection Routines
|
2005-08-10 03:14:34 +00:00
|
|
|
*/
|
2007-12-06 15:18:11 +00:00
|
|
|
|
|
|
|
/* CCID3 feedback types */
|
|
|
|
enum ccid3_fback_type {
|
|
|
|
CCID3_FBACK_NONE = 0,
|
|
|
|
CCID3_FBACK_INITIAL,
|
|
|
|
CCID3_FBACK_PERIODIC,
|
|
|
|
CCID3_FBACK_PARAM_CHANGE
|
|
|
|
};
|
|
|
|
|
2006-11-20 20:28:09 +00:00
|
|
|
#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|
2005-08-10 03:14:34 +00:00
|
|
|
static const char *ccid3_rx_state_name(enum ccid3_hc_rx_states state)
|
|
|
|
{
|
|
|
|
static char *ccid3_rx_state_names[] = {
|
|
|
|
[TFRC_RSTATE_NO_DATA] = "NO_DATA",
|
|
|
|
[TFRC_RSTATE_DATA] = "DATA",
|
|
|
|
[TFRC_RSTATE_TERM] = "TERM",
|
|
|
|
};
|
|
|
|
|
|
|
|
return ccid3_rx_state_names[state];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-03-21 05:58:56 +00:00
|
|
|
static void ccid3_hc_rx_set_state(struct sock *sk,
|
|
|
|
enum ccid3_hc_rx_states state)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
enum ccid3_hc_rx_states oldstate = hcrx->ccid3hcrx_state;
|
|
|
|
|
|
|
|
ccid3_pr_debug("%s(%p) %-8.8s -> %s\n",
|
2005-08-27 06:51:58 +00:00
|
|
|
dccp_role(sk), sk, ccid3_rx_state_name(oldstate),
|
|
|
|
ccid3_rx_state_name(state));
|
2005-08-10 03:14:34 +00:00
|
|
|
WARN_ON(state == oldstate);
|
|
|
|
hcrx->ccid3hcrx_state = state;
|
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
static void ccid3_hc_rx_send_feedback(struct sock *sk,
|
|
|
|
const struct sk_buff *skb,
|
|
|
|
enum ccid3_fback_type fbtype)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
struct dccp_sock *dp = dccp_sk(sk);
|
2007-08-20 00:17:51 +00:00
|
|
|
ktime_t now;
|
2007-12-06 15:18:11 +00:00
|
|
|
s64 delta = 0;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
if (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_TERM))
|
|
|
|
return;
|
|
|
|
|
2007-08-20 00:15:37 +00:00
|
|
|
now = ktime_get_real();
|
2005-08-27 21:18:18 +00:00
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
switch (fbtype) {
|
|
|
|
case CCID3_FBACK_INITIAL:
|
2005-08-10 03:14:34 +00:00
|
|
|
hcrx->ccid3hcrx_x_recv = 0;
|
2007-12-06 15:18:11 +00:00
|
|
|
hcrx->ccid3hcrx_pinv = ~0U; /* see RFC 4342, 8.5 */
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
2007-12-06 15:18:11 +00:00
|
|
|
case CCID3_FBACK_PARAM_CHANGE:
|
|
|
|
/*
|
|
|
|
* When parameters change (new loss or p > p_prev), we do not
|
|
|
|
* have a reliable estimate for R_m of [RFC 3448, 6.2] and so
|
|
|
|
* need to reuse the previous value of X_recv. However, when
|
|
|
|
* X_recv was 0 (due to early loss), this would kill X down to
|
|
|
|
* s/t_mbi (i.e. one packet in 64 seconds).
|
|
|
|
* To avoid such drastic reduction, we approximate X_recv as
|
|
|
|
* the number of bytes since last feedback.
|
|
|
|
* This is a safe fallback, since X is bounded above by X_calc.
|
|
|
|
*/
|
|
|
|
if (hcrx->ccid3hcrx_x_recv > 0)
|
|
|
|
break;
|
|
|
|
/* fall through */
|
|
|
|
case CCID3_FBACK_PERIODIC:
|
|
|
|
delta = ktime_us_delta(now, hcrx->ccid3hcrx_tstamp_last_feedback);
|
|
|
|
if (delta <= 0)
|
|
|
|
DCCP_BUG("delta (%ld) <= 0", (long)delta);
|
|
|
|
else
|
|
|
|
hcrx->ccid3hcrx_x_recv =
|
|
|
|
scaled_div32(hcrx->ccid3hcrx_bytes_recv, delta);
|
2005-08-10 03:14:34 +00:00
|
|
|
break;
|
2007-12-06 15:18:11 +00:00
|
|
|
default:
|
2005-08-10 03:14:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
ccid3_pr_debug("Interval %ldusec, X_recv=%u, 1/p=%u\n", (long)delta,
|
|
|
|
hcrx->ccid3hcrx_x_recv, hcrx->ccid3hcrx_pinv);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2005-08-27 21:18:18 +00:00
|
|
|
hcrx->ccid3hcrx_tstamp_last_feedback = now;
|
2007-12-06 15:18:11 +00:00
|
|
|
hcrx->ccid3hcrx_last_counter = dccp_hdr(skb)->dccph_ccval;
|
2005-08-10 03:14:34 +00:00
|
|
|
hcrx->ccid3hcrx_bytes_recv = 0;
|
|
|
|
|
2005-09-09 05:30:07 +00:00
|
|
|
dp->dccps_hc_rx_insert_options = 1;
|
2005-08-10 03:14:34 +00:00
|
|
|
dccp_send_ack(sk);
|
|
|
|
}
|
|
|
|
|
2006-03-21 06:32:06 +00:00
|
|
|
static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2007-09-26 14:24:28 +00:00
|
|
|
const struct ccid3_hc_rx_sock *hcrx;
|
2006-03-21 03:23:32 +00:00
|
|
|
__be32 x_recv, pinv;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2005-09-09 23:01:25 +00:00
|
|
|
if (!(sk->sk_state == DCCP_OPEN || sk->sk_state == DCCP_PARTOPEN))
|
2006-03-21 06:32:06 +00:00
|
|
|
return 0;
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-09-26 14:24:28 +00:00
|
|
|
hcrx = ccid3_hc_rx_sk(sk);
|
2005-08-24 04:51:59 +00:00
|
|
|
|
|
|
|
if (dccp_packet_without_ack(skb))
|
2006-03-21 06:32:06 +00:00
|
|
|
return 0;
|
|
|
|
|
2005-08-24 04:51:59 +00:00
|
|
|
x_recv = htonl(hcrx->ccid3hcrx_x_recv);
|
|
|
|
pinv = htonl(hcrx->ccid3hcrx_pinv);
|
2006-03-21 06:32:06 +00:00
|
|
|
|
2007-12-08 18:26:59 +00:00
|
|
|
if (dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE,
|
2006-12-10 18:01:18 +00:00
|
|
|
&pinv, sizeof(pinv)) ||
|
2006-03-21 06:32:06 +00:00
|
|
|
dccp_insert_option(sk, skb, TFRC_OPT_RECEIVE_RATE,
|
2006-12-10 18:01:18 +00:00
|
|
|
&x_recv, sizeof(x_recv)))
|
2006-03-21 06:32:06 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2007-12-12 16:06:14 +00:00
|
|
|
/** ccid3_first_li - Implements [RFC 3448, 6.3.1]
|
|
|
|
*
|
|
|
|
* Determine the length of the first loss interval via inverse lookup.
|
|
|
|
* Assume that X_recv can be computed by the throughput equation
|
|
|
|
* s
|
|
|
|
* X_recv = --------
|
|
|
|
* R * fval
|
|
|
|
* Find some p such that f(p) = fval; return 1/p (scaled).
|
|
|
|
*/
|
|
|
|
static u32 ccid3_first_li(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
|
|
|
u32 x_recv, p, delta;
|
|
|
|
u64 fval;
|
|
|
|
|
|
|
|
if (hcrx->ccid3hcrx_rtt == 0) {
|
|
|
|
DCCP_WARN("No RTT estimate available, using fallback RTT\n");
|
|
|
|
hcrx->ccid3hcrx_rtt = DCCP_FALLBACK_RTT;
|
|
|
|
}
|
|
|
|
|
|
|
|
delta = ktime_to_us(net_timedelta(hcrx->ccid3hcrx_tstamp_last_feedback));
|
|
|
|
x_recv = scaled_div32(hcrx->ccid3hcrx_bytes_recv, delta);
|
|
|
|
if (x_recv == 0) { /* would also trigger divide-by-zero */
|
|
|
|
DCCP_WARN("X_recv==0\n");
|
|
|
|
if ((x_recv = hcrx->ccid3hcrx_x_recv) == 0) {
|
|
|
|
DCCP_BUG("stored value of X_recv is zero");
|
|
|
|
return ~0U;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fval = scaled_div(hcrx->ccid3hcrx_s, hcrx->ccid3hcrx_rtt);
|
|
|
|
fval = scaled_div32(fval, x_recv);
|
|
|
|
p = tfrc_calc_x_reverse_lookup(fval);
|
|
|
|
|
|
|
|
ccid3_pr_debug("%s(%p), receive rate=%u bytes/s, implied "
|
|
|
|
"loss rate=%u\n", dccp_role(sk), sk, x_recv, p);
|
|
|
|
|
|
|
|
return p == 0 ? ~0U : scaled_div(1, p);
|
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
2007-12-06 15:18:11 +00:00
|
|
|
enum ccid3_fback_type do_feedback = CCID3_FBACK_NONE;
|
|
|
|
const u32 ndp = dccp_sk(sk)->dccps_options_received.dccpor_ndp;
|
|
|
|
const bool is_data_packet = dccp_data_packet(skb);
|
|
|
|
|
|
|
|
if (unlikely(hcrx->ccid3hcrx_state == TFRC_RSTATE_NO_DATA)) {
|
|
|
|
if (is_data_packet) {
|
|
|
|
const u32 payload = skb->len - dccp_hdr(skb)->dccph_doff * 4;
|
|
|
|
do_feedback = CCID3_FBACK_INITIAL;
|
|
|
|
ccid3_hc_rx_set_state(sk, TFRC_RSTATE_DATA);
|
|
|
|
hcrx->ccid3hcrx_s = payload;
|
|
|
|
/*
|
|
|
|
* Not necessary to update ccid3hcrx_bytes_recv here,
|
|
|
|
* since X_recv = 0 for the first feedback packet (cf.
|
|
|
|
* RFC 3448, 6.3) -- gerrit
|
|
|
|
*/
|
2006-08-27 06:40:50 +00:00
|
|
|
}
|
2007-12-06 15:18:11 +00:00
|
|
|
goto update_records;
|
2006-08-27 06:40:50 +00:00
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
if (tfrc_rx_hist_duplicate(&hcrx->ccid3hcrx_hist, skb))
|
|
|
|
return; /* done receiving */
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
if (is_data_packet) {
|
|
|
|
const u32 payload = skb->len - dccp_hdr(skb)->dccph_doff * 4;
|
|
|
|
/*
|
|
|
|
* Update moving-average of s and the sum of received payload bytes
|
|
|
|
*/
|
|
|
|
hcrx->ccid3hcrx_s = tfrc_ewma(hcrx->ccid3hcrx_s, payload, 9);
|
|
|
|
hcrx->ccid3hcrx_bytes_recv += payload;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
/*
|
|
|
|
* Handle pending losses and otherwise check for new loss
|
|
|
|
*/
|
2007-12-12 16:06:14 +00:00
|
|
|
if (tfrc_rx_hist_loss_pending(&hcrx->ccid3hcrx_hist) &&
|
|
|
|
tfrc_rx_handle_loss(&hcrx->ccid3hcrx_hist,
|
|
|
|
&hcrx->ccid3hcrx_li_hist,
|
|
|
|
skb, ndp, ccid3_first_li, sk) ) {
|
|
|
|
do_feedback = CCID3_FBACK_PARAM_CHANGE;
|
|
|
|
goto done_receiving;
|
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
if (tfrc_rx_hist_new_loss_indicated(&hcrx->ccid3hcrx_hist, skb, ndp))
|
|
|
|
goto update_records;
|
2006-11-28 21:22:33 +00:00
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
/*
|
|
|
|
* Handle data packets: RTT sampling and monitoring p
|
|
|
|
*/
|
|
|
|
if (unlikely(!is_data_packet))
|
|
|
|
goto update_records;
|
2005-08-27 21:18:18 +00:00
|
|
|
|
2007-12-12 16:06:14 +00:00
|
|
|
if (!tfrc_lh_is_initialised(&hcrx->ccid3hcrx_li_hist)) {
|
2007-12-06 15:18:11 +00:00
|
|
|
const u32 sample = tfrc_rx_hist_sample_rtt(&hcrx->ccid3hcrx_hist, skb);
|
|
|
|
/*
|
|
|
|
* Empty loss history: no loss so far, hence p stays 0.
|
|
|
|
* Sample RTT values, since an RTT estimate is required for the
|
|
|
|
* computation of p when the first loss occurs; RFC 3448, 6.3.1.
|
|
|
|
*/
|
|
|
|
if (sample != 0)
|
|
|
|
hcrx->ccid3hcrx_rtt = tfrc_ewma(hcrx->ccid3hcrx_rtt, sample, 9);
|
2007-12-12 16:06:14 +00:00
|
|
|
|
|
|
|
} else if (tfrc_lh_update_i_mean(&hcrx->ccid3hcrx_li_hist, skb)) {
|
|
|
|
/*
|
|
|
|
* Step (3) of [RFC 3448, 6.1]: Recompute I_mean and, if I_mean
|
|
|
|
* has decreased (resp. p has increased), send feedback now.
|
|
|
|
*/
|
|
|
|
do_feedback = CCID3_FBACK_PARAM_CHANGE;
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
/*
|
|
|
|
* Check if the periodic once-per-RTT feedback is due; RFC 4342, 10.3
|
|
|
|
*/
|
|
|
|
if (SUB16(dccp_hdr(skb)->dccph_ccval, hcrx->ccid3hcrx_last_counter) > 3)
|
|
|
|
do_feedback = CCID3_FBACK_PERIODIC;
|
2006-03-04 01:54:46 +00:00
|
|
|
|
2007-12-06 15:18:11 +00:00
|
|
|
update_records:
|
|
|
|
tfrc_rx_hist_add_packet(&hcrx->ccid3hcrx_hist, skb, ndp);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
2007-12-12 16:06:14 +00:00
|
|
|
done_receiving:
|
2007-12-06 15:18:11 +00:00
|
|
|
if (do_feedback)
|
|
|
|
ccid3_hc_rx_send_feedback(sk, skb, do_feedback);
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
2006-03-21 03:21:44 +00:00
|
|
|
static int ccid3_hc_rx_init(struct ccid *ccid, struct sock *sk)
|
2005-08-10 03:14:34 +00:00
|
|
|
{
|
2006-03-21 03:21:44 +00:00
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid_priv(ccid);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
hcrx->ccid3hcrx_state = TFRC_RSTATE_NO_DATA;
|
2007-12-12 16:06:14 +00:00
|
|
|
tfrc_lh_init(&hcrx->ccid3hcrx_li_hist);
|
2007-12-06 15:18:11 +00:00
|
|
|
return tfrc_rx_hist_alloc(&hcrx->ccid3hcrx_hist);
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ccid3_hc_rx_exit(struct sock *sk)
|
|
|
|
{
|
2005-09-09 05:40:58 +00:00
|
|
|
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
ccid3_hc_rx_set_state(sk, TFRC_RSTATE_TERM);
|
|
|
|
|
2007-12-06 14:28:39 +00:00
|
|
|
tfrc_rx_hist_purge(&hcrx->ccid3hcrx_hist);
|
2007-12-12 16:06:14 +00:00
|
|
|
tfrc_lh_cleanup(&hcrx->ccid3hcrx_li_hist);
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
|
[DCCP]: Introduce dccp_get_info
And also hc_tx and hc_rx get_info functions for the CCIDs to fill in
information that is specific to them.
For now reusing struct tcp_info, later I'll try to figure out a better
solution, for now its really nice to get this kind of info:
[root@qemu ~]# ./ss -danemi
State Recv-Q Send-Q Local Addr:Port Peer Addr:Port
LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040
mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0
ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0
mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377
This, for instance, shows that we're not congestion controlling ACKs,
as the above output is in the ttcp receiving host, and ttcp is a one
way app, i.e. the received never calls sendmsg, so
ccid_hc_tx_send_packet is never called, so the TX half connection
stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated,
stays with the value set in ccid3_hc_tx_init, 4us, as show above in
milliseconds (0.004ms), upcoming patches will fix this.
rcv_rtt seems sane tho, matching ping results :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-08-24 04:52:35 +00:00
|
|
|
static void ccid3_hc_rx_get_info(struct sock *sk, struct tcp_info *info)
|
|
|
|
{
|
2007-09-26 14:24:28 +00:00
|
|
|
const struct ccid3_hc_rx_sock *hcrx;
|
[DCCP]: Introduce dccp_get_info
And also hc_tx and hc_rx get_info functions for the CCIDs to fill in
information that is specific to them.
For now reusing struct tcp_info, later I'll try to figure out a better
solution, for now its really nice to get this kind of info:
[root@qemu ~]# ./ss -danemi
State Recv-Q Send-Q Local Addr:Port Peer Addr:Port
LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040
mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0
ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0
mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377
This, for instance, shows that we're not congestion controlling ACKs,
as the above output is in the ttcp receiving host, and ttcp is a one
way app, i.e. the received never calls sendmsg, so
ccid_hc_tx_send_packet is never called, so the TX half connection
stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated,
stays with the value set in ccid3_hc_tx_init, 4us, as show above in
milliseconds (0.004ms), upcoming patches will fix this.
rcv_rtt seems sane tho, matching ping results :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-08-24 04:52:35 +00:00
|
|
|
|
2005-09-12 21:16:58 +00:00
|
|
|
/* Listen socks doesn't have a private CCID block */
|
|
|
|
if (sk->sk_state == DCCP_LISTEN)
|
|
|
|
return;
|
|
|
|
|
2007-09-26 14:24:28 +00:00
|
|
|
hcrx = ccid3_hc_rx_sk(sk);
|
2006-12-10 18:01:18 +00:00
|
|
|
info->tcpi_ca_state = hcrx->ccid3hcrx_state;
|
|
|
|
info->tcpi_options |= TCPI_OPT_TIMESTAMPS;
|
|
|
|
info->tcpi_rcv_rtt = hcrx->ccid3hcrx_rtt;
|
[DCCP]: Introduce dccp_get_info
And also hc_tx and hc_rx get_info functions for the CCIDs to fill in
information that is specific to them.
For now reusing struct tcp_info, later I'll try to figure out a better
solution, for now its really nice to get this kind of info:
[root@qemu ~]# ./ss -danemi
State Recv-Q Send-Q Local Addr:Port Peer Addr:Port
LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040
mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0
ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0
mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377
This, for instance, shows that we're not congestion controlling ACKs,
as the above output is in the ttcp receiving host, and ttcp is a one
way app, i.e. the received never calls sendmsg, so
ccid_hc_tx_send_packet is never called, so the TX half connection
stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated,
stays with the value set in ccid3_hc_tx_init, 4us, as show above in
milliseconds (0.004ms), upcoming patches will fix this.
rcv_rtt seems sane tho, matching ping results :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-08-24 04:52:35 +00:00
|
|
|
}
|
|
|
|
|
2005-09-18 07:19:32 +00:00
|
|
|
static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,
|
|
|
|
u32 __user *optval, int __user *optlen)
|
|
|
|
{
|
2007-09-26 14:24:28 +00:00
|
|
|
const struct ccid3_hc_rx_sock *hcrx;
|
2007-12-17 12:07:44 +00:00
|
|
|
struct tfrc_rx_info rx_info;
|
2005-09-18 07:19:32 +00:00
|
|
|
const void *val;
|
2007-02-09 14:24:38 +00:00
|
|
|
|
2005-09-18 07:19:32 +00:00
|
|
|
/* Listen socks doesn't have a private CCID block */
|
|
|
|
if (sk->sk_state == DCCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2007-09-26 14:24:28 +00:00
|
|
|
hcrx = ccid3_hc_rx_sk(sk);
|
2005-09-18 07:19:32 +00:00
|
|
|
switch (optname) {
|
|
|
|
case DCCP_SOCKOPT_CCID_RX_INFO:
|
2007-12-17 12:07:44 +00:00
|
|
|
if (len < sizeof(rx_info))
|
2005-09-18 07:19:32 +00:00
|
|
|
return -EINVAL;
|
2007-12-17 12:07:44 +00:00
|
|
|
rx_info.tfrcrx_x_recv = hcrx->ccid3hcrx_x_recv;
|
|
|
|
rx_info.tfrcrx_rtt = hcrx->ccid3hcrx_rtt;
|
|
|
|
rx_info.tfrcrx_p = hcrx->ccid3hcrx_pinv == 0 ? ~0U :
|
|
|
|
scaled_div(1, hcrx->ccid3hcrx_pinv);
|
|
|
|
len = sizeof(rx_info);
|
|
|
|
val = &rx_info;
|
2005-09-18 07:19:32 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -ENOPROTOOPT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (put_user(len, optlen) || copy_to_user(optval, val, len))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-21 03:21:44 +00:00
|
|
|
static struct ccid_operations ccid3 = {
|
2006-09-22 02:26:44 +00:00
|
|
|
.ccid_id = DCCPC_CCID3,
|
2007-12-14 01:33:25 +00:00
|
|
|
.ccid_name = "TCP-Friendly Rate Control",
|
2005-08-10 03:14:34 +00:00
|
|
|
.ccid_owner = THIS_MODULE,
|
2006-03-21 03:21:44 +00:00
|
|
|
.ccid_hc_tx_obj_size = sizeof(struct ccid3_hc_tx_sock),
|
2005-08-10 03:14:34 +00:00
|
|
|
.ccid_hc_tx_init = ccid3_hc_tx_init,
|
|
|
|
.ccid_hc_tx_exit = ccid3_hc_tx_exit,
|
|
|
|
.ccid_hc_tx_send_packet = ccid3_hc_tx_send_packet,
|
|
|
|
.ccid_hc_tx_packet_sent = ccid3_hc_tx_packet_sent,
|
|
|
|
.ccid_hc_tx_packet_recv = ccid3_hc_tx_packet_recv,
|
|
|
|
.ccid_hc_tx_parse_options = ccid3_hc_tx_parse_options,
|
2006-03-21 03:21:44 +00:00
|
|
|
.ccid_hc_rx_obj_size = sizeof(struct ccid3_hc_rx_sock),
|
2005-08-10 03:14:34 +00:00
|
|
|
.ccid_hc_rx_init = ccid3_hc_rx_init,
|
|
|
|
.ccid_hc_rx_exit = ccid3_hc_rx_exit,
|
|
|
|
.ccid_hc_rx_insert_options = ccid3_hc_rx_insert_options,
|
|
|
|
.ccid_hc_rx_packet_recv = ccid3_hc_rx_packet_recv,
|
[DCCP]: Introduce dccp_get_info
And also hc_tx and hc_rx get_info functions for the CCIDs to fill in
information that is specific to them.
For now reusing struct tcp_info, later I'll try to figure out a better
solution, for now its really nice to get this kind of info:
[root@qemu ~]# ./ss -danemi
State Recv-Q Send-Q Local Addr:Port Peer Addr:Port
LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040
mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0
ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0
mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377
This, for instance, shows that we're not congestion controlling ACKs,
as the above output is in the ttcp receiving host, and ttcp is a one
way app, i.e. the received never calls sendmsg, so
ccid_hc_tx_send_packet is never called, so the TX half connection
stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated,
stays with the value set in ccid3_hc_tx_init, 4us, as show above in
milliseconds (0.004ms), upcoming patches will fix this.
rcv_rtt seems sane tho, matching ping results :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-08-24 04:52:35 +00:00
|
|
|
.ccid_hc_rx_get_info = ccid3_hc_rx_get_info,
|
|
|
|
.ccid_hc_tx_get_info = ccid3_hc_tx_get_info,
|
2005-09-18 07:19:32 +00:00
|
|
|
.ccid_hc_rx_getsockopt = ccid3_hc_rx_getsockopt,
|
|
|
|
.ccid_hc_tx_getsockopt = ccid3_hc_tx_getsockopt,
|
2005-08-10 03:14:34 +00:00
|
|
|
};
|
2006-12-10 18:01:18 +00:00
|
|
|
|
2006-11-20 20:28:09 +00:00
|
|
|
#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|
2007-10-04 21:39:53 +00:00
|
|
|
module_param(ccid3_debug, bool, 0444);
|
2005-08-10 03:14:34 +00:00
|
|
|
MODULE_PARM_DESC(ccid3_debug, "Enable debug messages");
|
2006-11-20 20:28:09 +00:00
|
|
|
#endif
|
2005-08-10 03:14:34 +00:00
|
|
|
|
|
|
|
static __init int ccid3_module_init(void)
|
|
|
|
{
|
2007-12-06 14:28:13 +00:00
|
|
|
return ccid_register(&ccid3);
|
2005-08-10 03:14:34 +00:00
|
|
|
}
|
|
|
|
module_init(ccid3_module_init);
|
|
|
|
|
|
|
|
static __exit void ccid3_module_exit(void)
|
|
|
|
{
|
|
|
|
ccid_unregister(&ccid3);
|
|
|
|
}
|
|
|
|
module_exit(ccid3_module_exit);
|
|
|
|
|
2006-08-27 02:01:30 +00:00
|
|
|
MODULE_AUTHOR("Ian McDonald <ian.mcdonald@jandi.co.nz>, "
|
2005-08-27 06:51:58 +00:00
|
|
|
"Arnaldo Carvalho de Melo <acme@ghostprotocols.net>");
|
2005-08-10 03:14:34 +00:00
|
|
|
MODULE_DESCRIPTION("DCCP TFRC CCID3 CCID");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_ALIAS("net-dccp-ccid-3");
|