Commit 5cb960a8 authored by David S. Miller's avatar David S. Miller

Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6

parents ceeff754 be4c798a
...@@ -290,12 +290,12 @@ int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, ...@@ -290,12 +290,12 @@ int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,
while (1) { while (1) {
const u8 len = dccp_ackvec_len(av, index); const u8 len = dccp_ackvec_len(av, index);
const u8 state = dccp_ackvec_state(av, index); const u8 av_state = dccp_ackvec_state(av, index);
/* /*
* valid packets not yet in av_buf have a reserved * valid packets not yet in av_buf have a reserved
* entry, with a len equal to 0. * entry, with a len equal to 0.
*/ */
if (state == DCCP_ACKVEC_STATE_NOT_RECEIVED && if (av_state == DCCP_ACKVEC_STATE_NOT_RECEIVED &&
len == 0 && delta == 0) { /* Found our len == 0 && delta == 0) { /* Found our
reserved seat! */ reserved seat! */
dccp_pr_debug("Found %llu reserved seat!\n", dccp_pr_debug("Found %llu reserved seat!\n",
...@@ -325,31 +325,6 @@ int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, ...@@ -325,31 +325,6 @@ int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,
return -EILSEQ; return -EILSEQ;
} }
#ifdef CONFIG_IP_DCCP_DEBUG
void dccp_ackvector_print(const u64 ackno, const unsigned char *vector, int len)
{
dccp_pr_debug_cat("ACK vector len=%d, ackno=%llu |", len,
(unsigned long long)ackno);
while (len--) {
const u8 state = (*vector & DCCP_ACKVEC_STATE_MASK) >> 6;
const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;
dccp_pr_debug_cat("%d,%d|", state, rl);
++vector;
}
dccp_pr_debug_cat("\n");
}
void dccp_ackvec_print(const struct dccp_ackvec *av)
{
dccp_ackvector_print(av->av_buf_ackno,
av->av_buf + av->av_buf_head,
av->av_vec_len);
}
#endif
static void dccp_ackvec_throw_record(struct dccp_ackvec *av, static void dccp_ackvec_throw_record(struct dccp_ackvec *av,
struct dccp_ackvec_record *avr) struct dccp_ackvec_record *avr)
{ {
......
...@@ -159,8 +159,8 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp) ...@@ -159,8 +159,8 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
} else if (ktime_us_delta(now, hctx->ccid3hctx_t_ld) } else if (ktime_us_delta(now, hctx->ccid3hctx_t_ld)
- (s64)hctx->ccid3hctx_rtt >= 0) { - (s64)hctx->ccid3hctx_rtt >= 0) {
hctx->ccid3hctx_x = hctx->ccid3hctx_x = min(2 * hctx->ccid3hctx_x, min_rate);
max(min(2 * hctx->ccid3hctx_x, min_rate), hctx->ccid3hctx_x = max(hctx->ccid3hctx_x,
scaled_div(((__u64)hctx->ccid3hctx_s) << 6, scaled_div(((__u64)hctx->ccid3hctx_s) << 6,
hctx->ccid3hctx_rtt)); hctx->ccid3hctx_rtt));
hctx->ccid3hctx_t_ld = now; hctx->ccid3hctx_t_ld = now;
...@@ -329,8 +329,14 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) ...@@ -329,8 +329,14 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
hctx->ccid3hctx_x = rfc3390_initial_rate(sk); hctx->ccid3hctx_x = rfc3390_initial_rate(sk);
hctx->ccid3hctx_t_ld = now; hctx->ccid3hctx_t_ld = now;
} else { } else {
/* Sender does not have RTT sample: X_pps = 1 pkt/sec */ /*
hctx->ccid3hctx_x = hctx->ccid3hctx_s; * Sender does not have RTT sample:
* - set fallback RTT (RFC 4340, 3.4) since a RTT value
* is needed in several parts (e.g. window counter);
* - set sending rate X_pps = 1pps as per RFC 3448, 4.2.
*/
hctx->ccid3hctx_rtt = DCCP_FALLBACK_RTT;
hctx->ccid3hctx_x = hctx->ccid3hctx_s;
hctx->ccid3hctx_x <<= 6; hctx->ccid3hctx_x <<= 6;
} }
ccid3_update_send_interval(hctx); ccid3_update_send_interval(hctx);
......
...@@ -14,14 +14,6 @@ module_param(tfrc_debug, bool, 0444); ...@@ -14,14 +14,6 @@ module_param(tfrc_debug, bool, 0444);
MODULE_PARM_DESC(tfrc_debug, "Enable debug messages"); MODULE_PARM_DESC(tfrc_debug, "Enable debug messages");
#endif #endif
extern int tfrc_tx_packet_history_init(void);
extern void tfrc_tx_packet_history_exit(void);
extern int tfrc_rx_packet_history_init(void);
extern void tfrc_rx_packet_history_exit(void);
extern int tfrc_li_init(void);
extern void tfrc_li_exit(void);
static int __init tfrc_module_init(void) static int __init tfrc_module_init(void)
{ {
int rc = tfrc_li_init(); int rc = tfrc_li_init();
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include <linux/types.h> #include <linux/types.h>
#include <asm/div64.h> #include <linux/math64.h>
#include "../../dccp.h" #include "../../dccp.h"
/* internal includes that this module exports: */ /* internal includes that this module exports: */
#include "loss_interval.h" #include "loss_interval.h"
...@@ -29,21 +29,19 @@ extern int tfrc_debug; ...@@ -29,21 +29,19 @@ extern int tfrc_debug;
#endif #endif
/* integer-arithmetic divisions of type (a * 1000000)/b */ /* integer-arithmetic divisions of type (a * 1000000)/b */
static inline u64 scaled_div(u64 a, u32 b) static inline u64 scaled_div(u64 a, u64 b)
{ {
BUG_ON(b==0); BUG_ON(b==0);
a *= 1000000; return div64_u64(a * 1000000, b);
do_div(a, b);
return a;
} }
static inline u32 scaled_div32(u64 a, u32 b) static inline u32 scaled_div32(u64 a, u64 b)
{ {
u64 result = scaled_div(a, b); u64 result = scaled_div(a, b);
if (result > UINT_MAX) { if (result > UINT_MAX) {
DCCP_CRIT("Overflow: a(%llu)/b(%u) > ~0U", DCCP_CRIT("Overflow: %llu/%llu > UINT_MAX",
(unsigned long long)a, b); (unsigned long long)a, (unsigned long long)b);
return UINT_MAX; return UINT_MAX;
} }
return result; return result;
...@@ -58,7 +56,14 @@ static inline u32 tfrc_ewma(const u32 avg, const u32 newval, const u8 weight) ...@@ -58,7 +56,14 @@ static inline u32 tfrc_ewma(const u32 avg, const u32 newval, const u8 weight)
return avg ? (weight * avg + (10 - weight) * newval) / 10 : newval; return avg ? (weight * avg + (10 - weight) * newval) / 10 : newval;
} }
extern u32 tfrc_calc_x(u16 s, u32 R, u32 p); extern u32 tfrc_calc_x(u16 s, u32 R, u32 p);
extern u32 tfrc_calc_x_reverse_lookup(u32 fvalue); extern u32 tfrc_calc_x_reverse_lookup(u32 fvalue);
extern int tfrc_tx_packet_history_init(void);
extern void tfrc_tx_packet_history_exit(void);
extern int tfrc_rx_packet_history_init(void);
extern void tfrc_rx_packet_history_exit(void);
extern int tfrc_li_init(void);
extern void tfrc_li_exit(void);
#endif /* _TFRC_H_ */ #endif /* _TFRC_H_ */
...@@ -661,7 +661,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p) ...@@ -661,7 +661,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
EXPORT_SYMBOL_GPL(tfrc_calc_x); EXPORT_SYMBOL_GPL(tfrc_calc_x);
/* /**
* tfrc_calc_x_reverse_lookup - try to find p given f(p) * tfrc_calc_x_reverse_lookup - try to find p given f(p)
* *
* @fvalue: function value to match, scaled by 1000000 * @fvalue: function value to match, scaled by 1000000
...@@ -676,11 +676,11 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue) ...@@ -676,11 +676,11 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue)
/* Error cases. */ /* Error cases. */
if (fvalue < tfrc_calc_x_lookup[0][1]) { if (fvalue < tfrc_calc_x_lookup[0][1]) {
DCCP_WARN("fvalue %d smaller than resolution\n", fvalue); DCCP_WARN("fvalue %u smaller than resolution\n", fvalue);
return tfrc_calc_x_lookup[0][1]; return TFRC_SMALLEST_P;
} }
if (fvalue > tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) { if (fvalue > tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) {
DCCP_WARN("fvalue %d exceeds bounds!\n", fvalue); DCCP_WARN("fvalue %u exceeds bounds!\n", fvalue);
return 1000000; return 1000000;
} }
......
...@@ -165,12 +165,12 @@ struct sock *dccp_create_openreq_child(struct sock *sk, ...@@ -165,12 +165,12 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
/* See dccp_v4_conn_request */ /* See dccp_v4_conn_request */
newdmsk->dccpms_sequence_window = req->rcv_wnd; newdmsk->dccpms_sequence_window = req->rcv_wnd;
newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr; newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
dccp_update_gsr(newsk, dreq->dreq_isr);
newdp->dccps_iss = dreq->dreq_iss;
dccp_update_gss(newsk, dreq->dreq_iss); dccp_update_gss(newsk, dreq->dreq_iss);
newdp->dccps_isr = dreq->dreq_isr;
dccp_update_gsr(newsk, dreq->dreq_isr);
/* /*
* SWL and AWL are initially adjusted so that they are not less than * SWL and AWL are initially adjusted so that they are not less than
* the initial Sequence Numbers received and sent, respectively: * the initial Sequence Numbers received and sent, respectively:
......
...@@ -107,9 +107,11 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, ...@@ -107,9 +107,11 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
* *
* CCID-specific options are ignored during connection setup, as * CCID-specific options are ignored during connection setup, as
* negotiation may still be in progress (see RFC 4340, 10.3). * negotiation may still be in progress (see RFC 4340, 10.3).
* The same applies to Ack Vectors, as these depend on the CCID.
* *
*/ */
if (dreq != NULL && opt >= 128) if (dreq != NULL && (opt >= 128 ||
opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1))
goto ignore_option; goto ignore_option;
switch (opt) { switch (opt) {
......
...@@ -508,6 +508,7 @@ void dccp_send_ack(struct sock *sk) ...@@ -508,6 +508,7 @@ void dccp_send_ack(struct sock *sk)
EXPORT_SYMBOL_GPL(dccp_send_ack); EXPORT_SYMBOL_GPL(dccp_send_ack);
#if 0
/* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */ /* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */
void dccp_send_delayed_ack(struct sock *sk) void dccp_send_delayed_ack(struct sock *sk)
{ {
...@@ -538,6 +539,7 @@ void dccp_send_delayed_ack(struct sock *sk) ...@@ -538,6 +539,7 @@ void dccp_send_delayed_ack(struct sock *sk)
icsk->icsk_ack.timeout = timeout; icsk->icsk_ack.timeout = timeout;
sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout); sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout);
} }
#endif
void dccp_send_sync(struct sock *sk, const u64 ackno, void dccp_send_sync(struct sock *sk, const u64 ackno,
const enum dccp_pkt_type pkt_type) const enum dccp_pkt_type pkt_type)
......
...@@ -42,7 +42,7 @@ static int bufsize = 64 * 1024; ...@@ -42,7 +42,7 @@ static int bufsize = 64 * 1024;
static const char procname[] = "dccpprobe"; static const char procname[] = "dccpprobe";
struct { static struct {
struct kfifo *fifo; struct kfifo *fifo;
spinlock_t lock; spinlock_t lock;
wait_queue_head_t wait; wait_queue_head_t wait;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment