66a377c504
This fixes CCID3 to give much closer performance to RFC4342. CCID3 is meant to alter sending rate based on RTT and loss. The performance was verified against: http://wand.net.nz/~perry/max_download.php For example I tested with netem and had the following parameters: Delayed Acks 1, MSS 256 bytes, RTT 105 ms, packet loss 5%. This gives a theoretical speed of 71.9 Kbits/s. I measured across three runs with this patch set and got 70.1 Kbits/s. Without this patchset the average was 232 Kbits/s which means Linux can't be used for CCID3 research properly. I also tested with netem turned off so box just acting as router with 1.2 msec RTT. The performance with this is the same with or without the patch at around 30 Mbit/s. Signed off by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net>
148 lines
5 KiB
C
148 lines
5 KiB
C
/*
|
|
* net/dccp/ccids/ccid3.h
|
|
*
|
|
* Copyright (c) 2005-6 The University of Waikato, Hamilton, New Zealand.
|
|
*
|
|
* 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/
|
|
* or e-mail Ian McDonald - ian.mcdonald@jandi.co.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.
|
|
*/
|
|
#ifndef _DCCP_CCID3_H_
|
|
#define _DCCP_CCID3_H_
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/time.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tfrc.h>
|
|
#include "../ccid.h"
|
|
|
|
#define TFRC_MIN_PACKET_SIZE 16
|
|
#define TFRC_STD_PACKET_SIZE 256
|
|
#define TFRC_MAX_PACKET_SIZE 65535
|
|
|
|
/* Two seconds as per CCID3 spec */
|
|
#define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC)
|
|
|
|
#define TFRC_INITIAL_IPI (USEC_PER_SEC / 4)
|
|
|
|
/* In usecs - half the scheduling granularity as per RFC3448 4.6 */
|
|
#define TFRC_OPSYS_HALF_TIME_GRAN (USEC_PER_SEC / (2 * HZ))
|
|
|
|
/* In seconds */
|
|
#define TFRC_MAX_BACK_OFF_TIME 64
|
|
|
|
#define TFRC_SMALLEST_P 40
|
|
|
|
enum ccid3_options {
|
|
TFRC_OPT_LOSS_EVENT_RATE = 192,
|
|
TFRC_OPT_LOSS_INTERVALS = 193,
|
|
TFRC_OPT_RECEIVE_RATE = 194,
|
|
};
|
|
|
|
struct ccid3_options_received {
|
|
u64 ccid3or_seqno:48,
|
|
ccid3or_loss_intervals_idx:16;
|
|
u16 ccid3or_loss_intervals_len;
|
|
u32 ccid3or_loss_event_rate;
|
|
u32 ccid3or_receive_rate;
|
|
};
|
|
|
|
/** struct ccid3_hc_tx_sock - CCID3 sender half connection sock
|
|
*
|
|
* @ccid3hctx_state - Sender state
|
|
* @ccid3hctx_x - Current sending rate
|
|
* @ccid3hctx_x_recv - Receive rate
|
|
* @ccid3hctx_x_calc - Calculated send (?) rate
|
|
* @ccid3hctx_s - Packet size
|
|
* @ccid3hctx_rtt - Estimate of current round trip time in usecs
|
|
* @@ccid3hctx_p - Current loss event rate (0-1) scaled by 1000000
|
|
* @ccid3hctx_last_win_count - Last window counter sent
|
|
* @ccid3hctx_t_last_win_count - Timestamp of earliest packet
|
|
* with last_win_count value sent
|
|
* @ccid3hctx_no_feedback_timer - Handle to no feedback timer
|
|
* @ccid3hctx_idle - FIXME
|
|
* @ccid3hctx_t_ld - Time last doubled during slow start
|
|
* @ccid3hctx_t_nom - Nominal send time of next packet
|
|
* @ccid3hctx_t_ipi - Interpacket (send) interval
|
|
* @ccid3hctx_delta - Send timer delta
|
|
* @ccid3hctx_hist - Packet history
|
|
*/
|
|
struct ccid3_hc_tx_sock {
|
|
struct tfrc_tx_info ccid3hctx_tfrc;
|
|
#define ccid3hctx_x ccid3hctx_tfrc.tfrctx_x
|
|
#define ccid3hctx_x_recv ccid3hctx_tfrc.tfrctx_x_recv
|
|
#define ccid3hctx_x_calc ccid3hctx_tfrc.tfrctx_x_calc
|
|
#define ccid3hctx_rtt ccid3hctx_tfrc.tfrctx_rtt
|
|
#define ccid3hctx_p ccid3hctx_tfrc.tfrctx_p
|
|
#define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto
|
|
#define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipi
|
|
u16 ccid3hctx_s;
|
|
u8 ccid3hctx_state;
|
|
u8 ccid3hctx_last_win_count;
|
|
u8 ccid3hctx_idle;
|
|
struct timeval ccid3hctx_t_last_win_count;
|
|
struct timer_list ccid3hctx_no_feedback_timer;
|
|
struct timeval ccid3hctx_t_ld;
|
|
struct timeval ccid3hctx_t_nom;
|
|
u32 ccid3hctx_delta;
|
|
struct list_head ccid3hctx_hist;
|
|
struct ccid3_options_received ccid3hctx_options_received;
|
|
};
|
|
|
|
struct ccid3_hc_rx_sock {
|
|
struct tfrc_rx_info ccid3hcrx_tfrc;
|
|
#define ccid3hcrx_x_recv ccid3hcrx_tfrc.tfrcrx_x_recv
|
|
#define ccid3hcrx_rtt ccid3hcrx_tfrc.tfrcrx_rtt
|
|
#define ccid3hcrx_p ccid3hcrx_tfrc.tfrcrx_p
|
|
u64 ccid3hcrx_seqno_nonloss:48,
|
|
ccid3hcrx_ccval_nonloss:4,
|
|
ccid3hcrx_state:8,
|
|
ccid3hcrx_ccval_last_counter:4;
|
|
u32 ccid3hcrx_bytes_recv;
|
|
struct timeval ccid3hcrx_tstamp_last_feedback;
|
|
struct timeval ccid3hcrx_tstamp_last_ack;
|
|
struct list_head ccid3hcrx_hist;
|
|
struct list_head ccid3hcrx_li_hist;
|
|
u16 ccid3hcrx_s;
|
|
u32 ccid3hcrx_pinv;
|
|
u32 ccid3hcrx_elapsed_time;
|
|
};
|
|
|
|
static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
|
|
}
|
|
|
|
static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
|
|
}
|
|
|
|
#endif /* _DCCP_CCID3_H_ */
|