mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
[DCCP] CCID2: Initial CCID2 (TCP-Like) implementation
Original work by Andrea Bittau, Arnaldo Melo cleaned up and fixed several issues on the merge process. For now CCID2 was turned the default for all SOCK_DCCP connections, but this will be remedied soon with the merge of the feature negotiation code. Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrea Bittau
committed by
David S. Miller
David S. Miller
parent
aa5d7df3b2
commit
2a91aa3967
@@ -314,9 +314,9 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
|
||||
|
||||
/* initial values for each feature */
|
||||
#define DCCPF_INITIAL_SEQUENCE_WINDOW 100
|
||||
/* FIXME: for now we're using CCID 3 (TFRC) */
|
||||
#define DCCPF_INITIAL_CCID 3
|
||||
#define DCCPF_INITIAL_SEND_ACK_VECTOR 0
|
||||
/* FIXME: for now we're using CCID 2 (TCP-Like) */
|
||||
#define DCCPF_INITIAL_CCID 2
|
||||
#define DCCPF_INITIAL_SEND_ACK_VECTOR 1
|
||||
/* FIXME: for now we're default to 1 but it should really be 0 */
|
||||
#define DCCPF_INITIAL_SEND_NDP_COUNT 1
|
||||
|
||||
@@ -430,6 +430,8 @@ struct dccp_sock {
|
||||
struct timeval dccps_timestamp_time;
|
||||
__u32 dccps_timestamp_echo;
|
||||
__u32 dccps_packet_size;
|
||||
__u16 dccps_l_ack_ratio;
|
||||
__u16 dccps_r_ack_ratio;
|
||||
unsigned long dccps_ndp_count;
|
||||
__u32 dccps_mss_cache;
|
||||
struct dccp_options dccps_options;
|
||||
|
||||
@@ -24,6 +24,10 @@ config INET_DCCP_DIAG
|
||||
def_tristate y if (IP_DCCP = y && INET_DIAG = y)
|
||||
def_tristate m
|
||||
|
||||
config IP_DCCP_ACKVEC
|
||||
depends on IP_DCCP
|
||||
def_bool N
|
||||
|
||||
source "net/dccp/ccids/Kconfig"
|
||||
|
||||
menu "DCCP Kernel Hacking"
|
||||
|
||||
@@ -1,6 +1,34 @@
|
||||
menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
|
||||
depends on IP_DCCP && EXPERIMENTAL
|
||||
|
||||
config IP_DCCP_CCID2
|
||||
tristate "CCID2 (TCP) (EXPERIMENTAL)"
|
||||
depends on IP_DCCP
|
||||
select IP_DCCP_ACKVEC
|
||||
---help---
|
||||
CCID 2, TCP-like Congestion Control, denotes Additive Increase,
|
||||
Multiplicative Decrease (AIMD) congestion control with behavior
|
||||
modelled directly on TCP, including congestion window, slow start,
|
||||
timeouts, and so forth [RFC 2581]. CCID 2 achieves maximum
|
||||
bandwidth over the long term, consistent with the use of end-to-end
|
||||
congestion control, but halves its congestion window in response to
|
||||
each congestion event. This leads to the abrupt rate changes
|
||||
typical of TCP. Applications should use CCID 2 if they prefer
|
||||
maximum bandwidth utilization to steadiness of rate. This is often
|
||||
the case for applications that are not playing their data directly
|
||||
to the user. For example, a hypothetical application that
|
||||
transferred files over DCCP, using application-level retransmissions
|
||||
for lost packets, would prefer CCID 2 to CCID 3. On-line games may
|
||||
also prefer CCID 2.
|
||||
|
||||
CCID 2 is further described in:
|
||||
http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid2-10.txt
|
||||
|
||||
This text was extracted from:
|
||||
http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
|
||||
|
||||
If in doubt, say M.
|
||||
|
||||
config IP_DCCP_CCID3
|
||||
tristate "CCID3 (TFRC) (EXPERIMENTAL)"
|
||||
depends on IP_DCCP
|
||||
@@ -15,10 +43,15 @@ config IP_DCCP_CCID3
|
||||
suitable than CCID 2 for applications such streaming media where a
|
||||
relatively smooth sending rate is of importance.
|
||||
|
||||
CCID 3 is further described in [CCID 3 PROFILE]. The TFRC
|
||||
congestion control algorithms were initially described in RFC 3448.
|
||||
CCID 3 is further described in:
|
||||
|
||||
This text was extracted from draft-ietf-dccp-spec-11.txt.
|
||||
http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid3-11.txt.
|
||||
|
||||
The TFRC congestion control algorithms were initially described in
|
||||
RFC 3448.
|
||||
|
||||
This text was extracted from:
|
||||
http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
|
||||
|
||||
If in doubt, say M.
|
||||
|
||||
|
||||
@@ -2,4 +2,8 @@ obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o
|
||||
|
||||
dccp_ccid3-y := ccid3.o
|
||||
|
||||
obj-$(CONFIG_IP_DCCP_CCID2) += dccp_ccid2.o
|
||||
|
||||
dccp_ccid2-y := ccid2.o
|
||||
|
||||
obj-y += lib/
|
||||
|
||||
838
net/dccp/ccids/ccid2.c
Normal file
838
net/dccp/ccids/ccid2.c
Normal file
File diff suppressed because it is too large
Load Diff
69
net/dccp/ccids/ccid2.h
Normal file
69
net/dccp/ccids/ccid2.h
Normal file
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* net/dccp/ccids/ccid2.h
|
||||
*
|
||||
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
|
||||
*
|
||||
* 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_CCID2_H_
|
||||
#define _DCCP_CCID2_H_
|
||||
|
||||
struct ccid2_seq {
|
||||
u64 ccid2s_seq;
|
||||
unsigned long ccid2s_sent;
|
||||
int ccid2s_acked;
|
||||
struct ccid2_seq *ccid2s_prev;
|
||||
struct ccid2_seq *ccid2s_next;
|
||||
};
|
||||
|
||||
/** struct ccid2_hc_tx_sock - CCID2 TX half connection
|
||||
*
|
||||
* @ccid2hctx_ssacks - ACKs recv in slow start
|
||||
* @ccid2hctx_acks - ACKS recv in AI phase
|
||||
* @ccid2hctx_sent - packets sent in this window
|
||||
* @ccid2hctx_lastrtt -time RTT was last measured
|
||||
* @ccid2hctx_arsent - packets sent [ack ratio]
|
||||
* @ccid2hctx_ackloss - ack was lost in this win
|
||||
* @ccid2hctx_rpseq - last consecutive seqno
|
||||
* @ccid2hctx_rpdupack - dupacks since rpseq
|
||||
*/
|
||||
struct ccid2_hc_tx_sock {
|
||||
int ccid2hctx_cwnd;
|
||||
int ccid2hctx_ssacks;
|
||||
int ccid2hctx_acks;
|
||||
int ccid2hctx_ssthresh;
|
||||
int ccid2hctx_pipe;
|
||||
int ccid2hctx_numdupack;
|
||||
struct ccid2_seq *ccid2hctx_seqbuf;
|
||||
struct ccid2_seq *ccid2hctx_seqh;
|
||||
struct ccid2_seq *ccid2hctx_seqt;
|
||||
long ccid2hctx_rto;
|
||||
long ccid2hctx_srtt;
|
||||
long ccid2hctx_rttvar;
|
||||
int ccid2hctx_sent;
|
||||
unsigned long ccid2hctx_lastrtt;
|
||||
struct timer_list ccid2hctx_rtotimer;
|
||||
unsigned long ccid2hctx_arsent;
|
||||
int ccid2hctx_ackloss;
|
||||
u64 ccid2hctx_rpseq;
|
||||
int ccid2hctx_rpdupack;
|
||||
int ccid2hctx_sendwait;
|
||||
};
|
||||
|
||||
struct ccid2_hc_rx_sock {
|
||||
int ccid2hcrx_data;
|
||||
};
|
||||
|
||||
#endif /* _DCCP_CCID2_H_ */
|
||||
@@ -1081,6 +1081,7 @@ int dccp_v4_init_sock(struct sock *sk)
|
||||
dp->dccps_mss_cache = 536;
|
||||
dp->dccps_role = DCCP_ROLE_UNDEFINED;
|
||||
dp->dccps_service = DCCP_SERVICE_INVALID_VALUE;
|
||||
dp->dccps_l_ack_ratio = dp->dccps_r_ack_ratio = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user