From nobody Mon Feb 9 03:14:07 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:956b:0:0:0:0:0 with SMTP id y98csp293771jah; Thu, 28 Oct 2021 06:08:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOuECJqOeg7Z/3dXP9Ai4kDhnIAaER3TXovx4115ILC3a6KkYzsh+AcSTH0EoQGPULR+Ns X-Received: by 2002:aca:3555:: with SMTP id c82mr8342153oia.29.1635426528698; Thu, 28 Oct 2021 06:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635426528; cv=none; d=google.com; s=arc-20160816; b=NfDtDu+fLEZST2/F7twTbRQC/DN5s5bXM8nBOiJjuSOlDe0kckobNvhVCGiYQA8XM3 qUflpdQVPArN68s9Vv8ZzjDOTx4BteKO91VqZepDVi/1TTcdi1nnmMnSlCq5sm7CG/Fu KovrVazilLcOypZ7uv6vpMEJP9/3zLkXoCo94mfHLsHSt4WSSylaS2AguuOEr0eh8T/I wQtddi0K3X+qqy51HfehCEkNRBhPc7XvSnLrw0jSGuQca6wbZIpv8RYRdGAFgJ7b63iQ XjllSm+s//9DYZjeS7vEySz9QmcwZf0S+BoF8Fv2Upbt+S5ys+DzW8FXi7uVGQZguy+4 4LDQ== 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=oqJmOXQJgdGlxJF0fJEfIeg/KvywkkxkT464zJL0R4w=; b=VFv7wBhxmY/UTst4KBAVMfHu8nsE8aS6KZHmyLgkhorcxCHAHKPCD796szA8E5QHqH IFm/Xd4Fvjku4XRsCMOIzRJLpW1l3IoCObC0lptprSlbJSNEw6xZK8ztMjEWICY1Df0I q8dAdAdnsc458BRDkTpgy0IGeSskc/gJ+NzoVlNCHwTx5jSOs2FPI1WNOGYGNQKsrP+Y f5JZrv9CyLNl0CxKIH8iqpHL3p4RN+zly2OCJb4pDbh+dowk27dHCuoR0KCQCsVhssLQ xq0sMDy4Gy3YJBRUu1wvcevzlVrK2nAvVUlNjf2WqmcyD3utQ0zuWcch62Faxo/QZ5uR buwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J0ye6ltn; spf=pass (google.com: domain of mptcp+bounces-2309-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2309-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id h6si3326417ooj.15.2021.10.28.06.08.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Oct 2021 06:08:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2309-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J0ye6ltn; spf=pass (google.com: domain of mptcp+bounces-2309-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2309-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 6CFCC1C0AB4 for ; Thu, 28 Oct 2021 13:08:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F05752C83; Thu, 28 Oct 2021 13:08:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.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 E81282C87 for ; Thu, 28 Oct 2021 13:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635426523; 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=oqJmOXQJgdGlxJF0fJEfIeg/KvywkkxkT464zJL0R4w=; b=J0ye6ltnG33rs5CcVMX6ydHL2a67/O+tU0/XZfM6m8N2v8uh2p3uH8b9XQhKET5fK07jdp erzt2ILTaR58hI9gTC6TK/jkPD8sKznCHnexF5Fe6rbmzNi2on7Qv0z8AsJYWNJWB5e7mq mN7+PBCdQA6WTxMHDFQJDqn6ibwFpFY= 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-359-iH8LFPq5MmKbLxI0CXgQqQ-1; Thu, 28 Oct 2021 09:08:41 -0400 X-MC-Unique: iH8LFPq5MmKbLxI0CXgQqQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 057BFBBF10 for ; Thu, 28 Oct 2021 13:08:41 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FE5D19D9F for ; Thu, 28 Oct 2021 13:08:40 +0000 (UTC) From: Paolo Abeni To: mptcp Subject: [PATCH mptcp-net 1/2] mptcp: fix delack timer Date: Thu, 28 Oct 2021 15:08:32 +0200 Message-Id: <9f483991d5eb9d42d142fb887a2940664fcb1041.1635426465.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.84 on 10.5.11.23 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 --- 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 422f4acfb3e6..465d4143d555 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