Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ca4eb85 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dccp-fixes-around-rx_tstamp_last_feedback' 



Eric Dumazet says:

====================
net: dccp: fixes around rx_tstamp_last_feedback

This patch series fix some issues with rx_tstamp_last_feedback.

- Switch to monotonic clock.
- Avoid potential overflows on fast hosts/networks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e020797b 0ce4e70f

net/dccp/ccids/ccid3.c

+9 −7
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk, 
{

	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);

	struct dccp_sock *dp = dccp_sk(sk);

	ktime_t now = ktime_get_real();

	ktime_t now = ktime_get();

	s64 delta = 0;



	switch (fbtype) {
@@ -625,15 +625,14 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk, 
	case CCID3_FBACK_PERIODIC:

		delta = ktime_us_delta(now, hc->rx_tstamp_last_feedback);

		if (delta <= 0)

			DCCP_BUG("delta (%ld) <= 0", (long)delta);

		else

			delta = 1;

		hc->rx_x_recv = scaled_div32(hc->rx_bytes_recv, delta);

		break;

	default:

		return;

	}



	ccid3_pr_debug("Interval %ldusec, X_recv=%u, 1/p=%u\n", (long)delta,

	ccid3_pr_debug("Interval %lldusec, X_recv=%u, 1/p=%u\n", delta,

		       hc->rx_x_recv, hc->rx_pinv);



	hc->rx_tstamp_last_feedback = now;
@@ -680,7 +679,8 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb) 
static u32 ccid3_first_li(struct sock *sk)

{

	struct ccid3_hc_rx_sock *hc = ccid3_hc_rx_sk(sk);

	u32 x_recv, p, delta;

	u32 x_recv, p;

	s64 delta;

	u64 fval;



	if (hc->rx_rtt == 0) {
@@ -688,7 +688,9 @@ static u32 ccid3_first_li(struct sock *sk) 
		hc->rx_rtt = DCCP_FALLBACK_RTT;

	}



	delta  = ktime_to_us(net_timedelta(hc->rx_tstamp_last_feedback));

	delta = ktime_us_delta(ktime_get(), hc->rx_tstamp_last_feedback);

	if (delta <= 0)

		delta = 1;

	x_recv = scaled_div32(hc->rx_bytes_recv, delta);

	if (x_recv == 0) {		/* would also trigger divide-by-zero */

		DCCP_WARN("X_recv==0\n");