From nobody Sat Feb 7 05:48:33 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:956b:0:0:0:0:0 with SMTP id y98csp4485059jah; Tue, 2 Nov 2021 13:49:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhK9hsnJHXSWWtEcs+qJLfdPwbD8hcb4YKIFG/mnfpvfsi0xtT7X+cfWY8U6bPPxGYh2wS X-Received: by 2002:a17:90a:1a4c:: with SMTP id 12mr9595237pjl.175.1635886151908; Tue, 02 Nov 2021 13:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635886151; cv=none; d=google.com; s=arc-20160816; b=JiQOAHeOz//Zp5BNpKtZ8MUhmfMm08xix5+rSYNa0C+m7gWQm5VvlR3Wd9If5Ot83K TAWRL6QYjH9GEyT+MmfyoSHW+LGxUXd+9yPd6P43uskGVRsXPiHHA0lH11jOPL5D8Mt/ SHnm8l8msObBfYCFzTdQS9c56+OUclSFsfq6fIB8SQq40BkBPXe1zKLJbczK5EdV6M9J 7Wy7HuCKOn3AH5hzK4tlDbfnLpfB8N9hO3bVdeT58IcLf9T9/qk+ypn/1bvHoeCE71pR dBj3EuMiwpUc5AyP145tOOW/ikYG6CMZ72wxUDtoZr0zE/nUPZWfJkcdnCjy25ckfEXr 12Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=rr3Q/ANp+LjbMnLpx/zhMI1DcfYVKztRSE3NmIZ31Qo=; b=UI8KyvmkCMBUY+2BRtubbjjD6Deh5XL8tIddKAOvxRPXFC973OoFqEwzOmwEE2t4i3 Sy4gKUIu/qXtDoxLBuxISso/cOjS/uL4hoWnA0lufZVo54pVZZzgn3yX7biWbSkeM0s6 smkUGYm8RYohNF3Ch3O3+hjQIOiF09h/28YpXdWAFN8aFS6/3erpsTKisDr3W+2lO0b8 WpPBtYfElrBRQGqJnqkg/iPzKbRuv6YNnvuJuJzbDD0ZW2d70GTWCM1vkDKwRH1ZSYTr ctNEWr65enLqhxlKI84fhrmov1A1AaeeOXtUL9boX3WYA3mqvv/hPIcE2ydg+/qxZ43E vvEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g9NWUff8; spf=pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id q78si84565pfc.57.2021.11.02.13.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Nov 2021 13:49:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g9NWUff8; spf=pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 210D03E0F44 for ; Tue, 2 Nov 2021 20:49:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1EE442CA2; Tue, 2 Nov 2021 20:49:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50B1C2C99 for ; Tue, 2 Nov 2021 20:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635886147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rr3Q/ANp+LjbMnLpx/zhMI1DcfYVKztRSE3NmIZ31Qo=; b=g9NWUff8EwPzIziUuQt2hYQtAnGBoo4kqiv52tNgs1sYnnU6lAKkV51V4O+yqf0OOLizct 15KFvzFBCIoQFz8ZMyqPozD7r0zzuXZ9WMne7IYmQDzHJ67fudAq7FGSbqbO/Nqprd0p7x bgln6Td8d1/8Ahf/m51l7qtyQuSGXKw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-43dQ-FSJPxCSFFpDAiYp5A-1; Tue, 02 Nov 2021 16:49:06 -0400 X-MC-Unique: 43dQ-FSJPxCSFFpDAiYp5A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88F8187D541 for ; Tue, 2 Nov 2021 20:49:05 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id F22F960CC4 for ; Tue, 2 Nov 2021 20:49:04 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-net 1/2] mptcp: fix delack timer Date: Tue, 2 Nov 2021 21:48:58 +0100 Message-Id: <1429df0f9272607ebd8658d9f73e9fbad9165907.1635885975.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Dumazet To compute the rtx timeout schedule_3rdack_retransmission() does multiple things in the wrong way: srtt_us is measures in usec/8 and the timeout itself is an absolute vale. Fixes: ec3edaa7ca6ce02f ("mptcp: Add handling of outgoing MP_JOIN requests") Signed-off-by: Eric Dumazet Reviewed-by: Mat Martineau @linux.intel.com> --- commit message typos added by me --- net/mptcp/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 7c3420afb1a0..2ca077fdf10a 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -434,9 +434,10 @@ static void schedule_3rdack_retransmission(struct sock= *sk) =20 /* reschedule with a timeout above RTT, as we must look only for drop */ if (tp->srtt_us) - timeout =3D tp->srtt_us << 1; + timeout =3D usecs_to_jiffies(tp->srtt_us >> (3-1)); else timeout =3D TCP_TIMEOUT_INIT; + timeout +=3D jiffies; =20 WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER); icsk->icsk_ack.pending |=3D ICSK_ACK_SCHED | ICSK_ACK_TIMER; --=20 2.26.3