From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.43 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336855; b=WseR9l8uw3YnWQSz+Gcq/F0MACnCKqDshNi8Zlg7/bj6Cnbk5oT5QlTwhQ/eXndxGus7 APZYuMCFloV+D5xkjgOMBP9xUMRr2SrZW3isW2Vya8MgMPBDOW6ItcUpyk0OMwNvM7rPt gjNRkdx9tMALqyc/L8ECHkmq+o7ZBYVOxQhaNKHt6AS5JTz4UoIl6zClG8PC/rB8wwS/+ WIUTuUQjWZJ3BRk97p0WuHbdnHvnSb+0RTcys0YYDH+YtjOr9rcnQ1wGm9uqbF5lladPR hxcIOBZxvVUhTA62oHyDwCxXzaBLnAgzS07uqtyyqW6aluQEF/WsiRvjisGi0Gp4Uzw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336855; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=lvLN24gtIiDD108HbQ1hU9mpKtt6mQ07/LEzVwndxzA=; b=pSgW3vtqag9Fyf6LRvfoDRtA44KMzLfLnZK+Xv2KeFJ/koc4sYtRDzPHCykJKXsfM7MC WHfYNFSubzgncqcKIfOLp/pJqlooqEaspczibtkyu6xqKdviUgRjy+ZFsaeOPz/KHYnnM W8gRRtaW/tSALuCRhR/HiKoRXKvMkzjtfR9RQybWPZT0l0gnZ3M/gaA10kGXpJja2vBQ3 wnd6dvo/MAt8qP8dJKSMxwZQkC+NqNK58IdGmnrX5PoBZXMKPBxXr9stQen98P6w2IIU7 YHfLTCMq06HxAPgtGRLmpnYIwGRdUh47cKAcqdFJxj08SyNLTsmArQzKZ8LaxeHDkEQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ADK+2ZWj; arc=none smtp.remote-ip=74.125.82.43 Received: from mail-dl1-f43.google.com (mail-dl1-f43.google.com [74.125.82.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CC4C606A31E for ; Fri, 30 Oct 2026 05:07:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0CC4C606A31E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ADK+2ZWj Received: by mail-dl1-f43.google.com with SMTP id a92af1059eb24-19305bcb72cso207427c88.1 for ; Thu, 29 Oct 2026 22:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336854; x=1793941654; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lvLN24gtIiDD108HbQ1hU9mpKtt6mQ07/LEzVwndxzA=; b=ADK+2ZWjZckbVoFGJVq9s+ISfHLPEs/RYoKRXL6y3h4daJK2pD5Ixdv/xiSETdemOv 29pR/jlLE20nKZxQdSWWdwJzCa0mwTI5CSk2ekQ58D+IuTIdMWgVcwuFRnKTECX/OnPs 1rgwpHGe/tvA0kYc1kgPLte8p0KK7H0FZ8J31JUR+TIZeMGnMxo7B2/esyygjzEMlL+J TDX4BPA1xsusPSCRIFytV9FRsvyw8QlEG4FldMe0ldWQWk5lOXTICDcNEPgydTfQYEsX lCwPTLFbQyOatZGhcxhyeKkr+tEPxOSC65p4IkjHbKYdOroH+jS9VNdPInMR+AzgPm5K 6+VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336854; x=1793941654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=lvLN24gtIiDD108HbQ1hU9mpKtt6mQ07/LEzVwndxzA=; b=BPCiUIOl9DBbQLjQc3/Q4bO4gW2oi63wsfH1DzpJcIYzeFi33TzMxZFkWAF1SYr+o4 lkA3HszOwFpoDQgUbv956qZ9YRal8C0IX2/bODfsLWL7ZfBnwzdhAkr4xjVPu0Z9dV12 JNWxqrZQsJN7cx4POk6zHSHpJuhh0H7OELeEKnIW3wswbEJXWItUVESt7mq5Ihcngjwh y1/nD/w1DUMPAYK0vEqA4KQLeUWuprVrJwNeovPN4ogodG17WQ8xuBEbwtfn+RWp9Riy dXtNsPpj5mzTRs5yrj94O+60UrsZ79izmFFn7hWkYuPsQlRUuGdlGmNLz+nIY9oMZk3+ tsLQ== X-Gm-Message-State: AFq9FYKIT31xbXvhGn3umB40qHq0hBMyZGfBahdYSmm8ndGj8r9cC2we /ja9IqJHwM7Tbjhqs0K/E82/Uw8SqI/GPk++CFHm1UDh4tfuDCqpWucQBExDjQ== X-Gm-Gg: AYBFou20GhwcZEO1tejA7i1Jnx03TvOyAxNnTuCGfrF8qxtQhaVeVarz4sxNLfG/Azu oGZnKfKxihPkjDm2P0XVeZR5x0BGoNL4PcxSMhe/hmvUO+jJCXfUfWvr1EEwxUrs3LEVW1jqV2A gZJSWS1oVZvgYtsOAdMtRgKuJxSSrHgzMTT9IfRjB062k1ZWyORrztmKdNzQsTkfZU8TCFHIUh1 kac+zxaOLecNMLp/c7YtA3x/UhZvsUJeHE4JDgO7pvS45Ur6zA30+MkvDDsgahS3MRu3GHUcPjo lcq/7TciyAYee7cv9uWGX+GPAJS8iu1hmCuonXrcIMXl/xG+f+gfd8BHXG0JmKqua/dzp96hrqD zG1XUlbOm21xAqLmaZPK4hYW2+Wy0nmLyzYyf/si7bXQpoyt0JbDc0xjPkrvHJZW/glVBWFCw4r jX3+giG5k2xd3zXtaqguI18jKEF86gIPcLNxvXUPw9OnGhJDISocD9iYeoRH9kvJxqYlWU3B35p OJoj2n+u5t3E62rqw8yVMy5lDbv+JhqQQD+Foaj/B+/jVoI4yMqEeI42Y61mhYJ6aa0IDW57kZI j4tXCe7tr7Pi73ivPVEIXb1coNTWClKqf2VyhsEA5HOFKzGUqZsqTqVH4rrbwk9OfAo3h9ESNrI sErSnRoxti9ec7bXF7IjNidV7oU9gD2KBV9oV3V1htm4n+TYZjSF6sINytxrJ7XjQjRDulpaA3P EqvAQ2SOLsIgoHHDGmy4QO X-Received: by 2002:a05:701b:2087:10b0:143:7001:7645 with SMTP id a92af1059eb24-1ac5d889adcmr1746759c88.47.1793336853864; Thu, 29 Oct 2026 22:07:33 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:33 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 1/6] selftests: mptcp: connect: retry write() on EAGAIN Date: Fri, 30 Oct 2026 05:07:22 +0000 Message-Id: <20261030050727.3534304-2-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mptcp_connect treats any write() error as fatal. But write() can fail with EAGAIN even after poll() said the socket was writable: the MPTCP send buffer shrinks when a subflow is closed. The tool then exits and the transfer fails on both sides. Instead, go back to poll() and wait for more space. If a poll timeout is set, still fail after as many 1 ms retries as the timeout in ms: poll() does not check every cause of EAGAIN. Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Anil Kaushik --- Notes: v13: - say how many retries are done with a poll timeout v6: - the comment says the limit only applies with a poll timeout (netdev Sashiko) v5: - no change v4: - count the EAGAIN retries, not ms (Sashiko) - no limit when there is no poll timeout, -t 0 (Sashiko) v3: - do not wait forever on EAGAIN (Sashiko) - wrap lines over 80 columns v2: - Fixes tag .../selftests/net/mptcp/mptcp_connect.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index 178d98d91fea..49017d00ab69 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -638,6 +638,7 @@ static int copyfd_io_poll(int infd, int peerfd, int out= fd, .events =3D POLLIN | POLLOUT, }; unsigned int total_wlen =3D 0, total_rlen =3D 0; + int eagain_cnt =3D 0; =20 set_nonblock(peerfd, true); =20 @@ -711,6 +712,22 @@ static int copyfd_io_poll(int infd, int peerfd, int ou= tfd, =20 bw =3D do_rnd_write(peerfd, winfo->buf + winfo->off, winfo->len); if (bw < 0) { + /* POLLOUT does not guarantee that + * the next write will not block: + * the MPTCP send buffer can shrink + * in between, e.g. when a subflow + * is closed. Wait for more space, + * but not forever if a poll timeout + * is set: poll() does not check + * every cause of EAGAIN. + */ + if (errno =3D=3D EAGAIN && + (poll_timeout < 0 || + ++eagain_cnt <=3D poll_timeout)) { + usleep(1000); + continue; + } + /* expected reset, continue to read */ if (cfg_rcv_trunc && (errno =3D=3D ECONNRESET || @@ -723,6 +740,7 @@ static int copyfd_io_poll(int infd, int peerfd, int out= fd, return 111; } =20 + eagain_cnt =3D 0; winfo->off +=3D bw; winfo->len -=3D bw; total_wlen +=3D bw; --=20 2.25.1 From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336857; b=KQ0o+muWgqRiBlvBbIW5BoFYnPBJoHhJamjVYVfHnwLZkzDxeJJjUqX1d/gS6xsOIZHV ayNAhMJe4Wy+KcUXe9Qp7r++UbOtWeCE1jLtJdeMx3Ugo2XoC2cTBApwtAMvO8ubtV1B4 KBM72cy3gIYyJzqppSSWba2incQ8T1QEPAZy4TqpYKGwHspYGutWb7kVtayUoQA2/cbPX 5QPPx1llt49LDBNte/Gz/XvhLJ0SwC13tU0xiZjWlplwUGVPOAr+HMfkaoyJr1J4K3yAl Fo6HnxLEDQ9uoQYnG7UMFEAQwTQyPzpYOUoKcdyR9R47RVN24FGajFxKgGHklwD/jNw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336857; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=RhdWlyO5Sam//srEVeWFrjzifW9W6rttgI3RE0aHgEU=; b=eTAdZJTKEz2nx578eiB06x7ayyniertjy30O/9u49XET8Eg3aoPyN4KoYVCyLdgL1xiT ATREA5KCYLVFMeKrivHSM7+lpEpTMVEcjIeptQAqr+INwJSMIEQDCmseLEfqzctXxpwTO JOhrMbgK5eHvGHD0toH1DUKid1UhHeIn+a4YWLNN/qSY73U1L87g0nSVuC4le2ZBn2gWs mpnA5zvU6d0/d/yGTuLecq83n4MIO3lghQ+qJm/cNYsQ0kO1Y0iegN9KDAZX2N1OlL61R L7ZuYqKqDo3aTD8H349uezOVtQnD7L+T7YM6BJxoj/rtGLZo6GhOUdu35Qnil8e1Ang== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=GXXLj0Uk; arc=none smtp.remote-ip=74.125.82.49 Received: from mail-dl1-f49.google.com (mail-dl1-f49.google.com [74.125.82.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CEA1606A31C for ; Fri, 30 Oct 2026 05:07:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3CEA1606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=GXXLj0Uk Received: by mail-dl1-f49.google.com with SMTP id a92af1059eb24-15ea896ddc8so506483c88.0 for ; Thu, 29 Oct 2026 22:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336856; x=1793941656; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RhdWlyO5Sam//srEVeWFrjzifW9W6rttgI3RE0aHgEU=; b=GXXLj0Ukg9bzL5Iwp0/+B22kCD3YHv9U3bn9ypE70YmBlXnREm1Al0JntQjYNh11MA paHNhlfNy2E2TgSeJbrKA/8TmFTSs77QzVnelbE6iy0QidR/bulK0u2opj9/2AtRpl/+ F6d4lh46bAiy1lf6a2UZL+nYTGQV81xLKIAyA5GENm2vsyNk7UXh51hqNeWe3EvZpgHQ 16QkXsY+i4M950B8StMKvoBdq+lCeOb8IVM2fFH6OBUM3Ndey5tNhEWAR9lDznfYGzI/ Ds0lRUTqJXBEp78vQilThJGhu3ie/LHjjIh/m9ACA6FmXxQcU2m4uHI4B6xffAI1TV9U MM7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336856; x=1793941656; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=RhdWlyO5Sam//srEVeWFrjzifW9W6rttgI3RE0aHgEU=; b=g1uQ2UqpEpEVx8TH5TM/sxB38x3pAfVivKeNt3H+0q/NI6zLHatApUX77zxMML2rlL RsXmckWKOS84gXwTeu9V1hJCjYUNK/Glxh4UZG5MT4/WRx5AUlhAZYqqnjfJkSZ/YeU4 4EqSENUVGtddcKAUhrtPzhNgGkbBV1IuMd0UadGtNtcPDT7h8ypfAfNNQlzucUlvOFrz JR19TgnFLyMdWTmeDYmkcw+5KeAfX9zvcHjcf6X900XuJSa+wQNJbliznxfTTigGUGLH w9SdobR1C6YaeKjoZT//n/UR4o7IW2qa5HUCWeVDkh4ZpfOpu7MLKmNoSMfdvS07RgsC 16lw== X-Gm-Message-State: AFq9FYLhCjhcPR+fwlw7PCalMvWxU43EzOArJ2z5MhHvCvPkWTZbYHSa kBflL700XyewRkK30ua1gNX9IvY6tNwlEX2Um6YkccchpL61lCznyhiXq3Rc6Q== X-Gm-Gg: AYBFou3N8e1rIAPS7wYqvKVHlCwJbovSJgsuI9D66Y/uPZc4npD9Qsr1awwrBYPgSoG zIuSw+LFBCJt950+nRNhmXGhyYJAiyeQKbNaVcR0VPQcfzclyiN8gUDRXnBSeg+BJDS8XCYCwtm 0SxIfHPn8zRdGNEt95SUTa3zkqOn49vsCj3KAFtIwBR/NV9VpvbWNo6fCvh6VXCKAoludc1NtoU BwfhFzvniC/4XdWCUy25+gjfJZ8kVzFGuI9mTpIMCi5nGmvI12UsozBittk0kSuaQmbIsBTzwqd DTfj3NImMTBSBFFMrAtx4JlLBtud0sWQG603kg8ONg/CvfgOpDQDuBv1DXIIHCIG0PbXFPli1GL jtAFkN7MN+wipz/XMgpJsKH16EhkkK3FLYnUgD28nqMDuiV/kpg6MMlIIauczuQtUhq6lJj5zoL H/eSmRCknTLlmd+tKyy+OEYAOgGdat8ey5ZkVvM72pyz3RrHrazSR0vekNEe5tAMWD8w4Yp7W7L GfqdOBOa1x3hC+Yc4P6rDLU5Pw6iodS1MyryNaT1EELqrQUPTIpdoXucLr6En9hiWlbFFlz2st0 JohZpcegaDW7pUG/FX+maHi+1cgtqnRsenNOSpLZ4bkN+kH/3QXLDRD2X1Yjp2BorF1vYTLuQH9 ca90ibKkznRGaWf9K1yHlg+t3gXjEIKXUowQOXJJ18SVuBxhsVQRDRzb3+q6Rerx6nk+takTOow == X-Received: by 2002:a05:701a:c907:b0:1a7:7160:ffc8 with SMTP id a92af1059eb24-1ac5a2a156amr1569757c88.10.1793336856098; Thu, 29 Oct 2026 22:07:36 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:35 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 2/6] netlink: specs: mptcp: add the subflow-retries attribute Date: Fri, 30 Oct 2026 05:07:23 +0000 Message-Id: <20261030050727.3534304-3-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It will be used by the in-kernel PM to set the number of SYN retransmissions of a subflow re-created after a timeout, with the other limits: add it to the set-limits and get-limits commands. The uapi header and the generated files are updated with ynl-regen. Signed-off-by: Anil Kaushik --- Notes: v9: - after a timeout, not any error, and about 4 hours with the default RTO settings v8: - the default is the maximum, MAX_TCP_SYNCNT (127) (Matthieu) v7: - the doc gives the default value (netdev Sashiko) v6 (netdev Sashiko): - the policy checks the maximum value, 127 (MAX_TCP_SYNCNT) - the doc says the value works like TCP_SYNCNT v5: - new, split from the retry patch (Matthieu) Documentation/netlink/specs/mptcp_pm.yaml | 13 +++++++++++++ include/uapi/linux/mptcp_pm.h | 1 + net/mptcp/mptcp_pm_gen.c | 10 ++++++---- net/mptcp/mptcp_pm_gen.h | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netl= ink/specs/mptcp_pm.yaml index 39f3facc38e5..690d3c5dfdd2 100644 --- a/Documentation/netlink/specs/mptcp_pm.yaml +++ b/Documentation/netlink/specs/mptcp_pm.yaml @@ -196,6 +196,16 @@ attribute-sets: name: addr-remote type: nest nested-attributes: address + - + name: subflow-retries + type: u32 + checks: + max: 127 + doc: | + SYN retries of a subflow re-created after a timeout, like the + TCP_SYNCNT socket option, so with tcp_syn_linear_timeouts on top. + The default is the maximum, MAX_TCP_SYNCNT (127), about 4 hours + with the default RTO settings. 0 to not re-create it. - name: event-attr enum-name: mptcp-event-attr @@ -327,6 +337,7 @@ operations: attributes: - rcv-add-addrs - subflows + - subflow-retries - name: get-limits doc: Get protocol limits @@ -337,10 +348,12 @@ operations: attributes: - rcv-add-addrs - subflows + - subflow-retries reply: attributes: - rcv-add-addrs - subflows + - subflow-retries - name: set-flags doc: Change endpoint flags diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h index fe9863d75350..43e9643deda9 100644 --- a/include/uapi/linux/mptcp_pm.h +++ b/include/uapi/linux/mptcp_pm.h @@ -102,6 +102,7 @@ enum { MPTCP_PM_ATTR_TOKEN, MPTCP_PM_ATTR_LOC_ID, MPTCP_PM_ATTR_ADDR_REMOTE, + MPTCP_PM_ATTR_SUBFLOW_RETRIES, =20 __MPTCP_ATTR_AFTER_LAST }; diff --git a/net/mptcp/mptcp_pm_gen.c b/net/mptcp/mptcp_pm_gen.c index c180930a8e0e..e2d4af1bc1d5 100644 --- a/net/mptcp/mptcp_pm_gen.c +++ b/net/mptcp/mptcp_pm_gen.c @@ -44,15 +44,17 @@ const struct nla_policy mptcp_pm_flush_addrs_nl_policy[= MPTCP_PM_ENDPOINT_ADDR + }; =20 /* MPTCP_PM_CMD_SET_LIMITS - do */ -const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLO= WS + 1] =3D { +const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLO= W_RETRIES + 1] =3D { [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_SUBFLOW_RETRIES] =3D NLA_POLICY_MAX(NLA_U32, 127), }; =20 /* MPTCP_PM_CMD_GET_LIMITS - do */ -const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR_SUBFLO= WS + 1] =3D { +const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR_SUBFLO= W_RETRIES + 1] =3D { [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_SUBFLOW_RETRIES] =3D NLA_POLICY_MAX(NLA_U32, 127), }; =20 /* MPTCP_PM_CMD_SET_FLAGS - do */ @@ -127,7 +129,7 @@ const struct genl_ops mptcp_pm_nl_ops[11] =3D { .validate =3D GENL_DONT_VALIDATE_STRICT, .doit =3D mptcp_pm_nl_set_limits_doit, .policy =3D mptcp_pm_set_limits_nl_policy, - .maxattr =3D MPTCP_PM_ATTR_SUBFLOWS, + .maxattr =3D MPTCP_PM_ATTR_SUBFLOW_RETRIES, .flags =3D GENL_UNS_ADMIN_PERM, }, { @@ -135,7 +137,7 @@ const struct genl_ops mptcp_pm_nl_ops[11] =3D { .validate =3D GENL_DONT_VALIDATE_STRICT, .doit =3D mptcp_pm_nl_get_limits_doit, .policy =3D mptcp_pm_get_limits_nl_policy, - .maxattr =3D MPTCP_PM_ATTR_SUBFLOWS, + .maxattr =3D MPTCP_PM_ATTR_SUBFLOW_RETRIES, }, { .cmd =3D MPTCP_PM_CMD_SET_FLAGS, diff --git a/net/mptcp/mptcp_pm_gen.h b/net/mptcp/mptcp_pm_gen.h index b9280bcb43f5..5b4dee8a0a34 100644 --- a/net/mptcp/mptcp_pm_gen.h +++ b/net/mptcp/mptcp_pm_gen.h @@ -23,9 +23,9 @@ extern const struct nla_policy mptcp_pm_get_addr_nl_polic= y[MPTCP_PM_ATTR_TOKEN + =20 extern const struct nla_policy mptcp_pm_flush_addrs_nl_policy[MPTCP_PM_END= POINT_ADDR + 1]; =20 -extern const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR= _SUBFLOWS + 1]; +extern const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR= _SUBFLOW_RETRIES + 1]; =20 -extern const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR= _SUBFLOWS + 1]; +extern const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR= _SUBFLOW_RETRIES + 1]; =20 extern const struct nla_policy mptcp_pm_set_flags_nl_policy[MPTCP_PM_ATTR_= ADDR_REMOTE + 1]; =20 --=20 2.25.1 From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.54 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336859; b=NJXPAGkngOJ27wgAAaiyrjOaMzDdI8gXsmZdj8C3dZhF1edegXfPpX6XtQW4vrFUSX3n J6OHxH46RjqLJw5cCHWe++uCkBjTdx76W9IBW2pJqk74Woks5f5suqPvhwpT+QTb3tc04 FuG4P5z1gQpOiFo6FDyBPIjCkM1f6hBBCLa3q5x5UCk6572BcIZMmoj561aJ0WJJQYkgP iLLdPD94HhAeDiXfiBhVe3iI9PPoh1fTofnRsHM3atUjR6dM6UaB3FwziI01rJFwjugLa qmRhRwMvKNvmP38mMVRrhpwe8IpH+JssdhmmLJXO9dJ6SNHnXm9Or3uT4NRqvIiuT9g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336859; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=GMa51ST4XjCQkd4qYSnBFNlKaUJYxzH2Que0Zxlz+Ok=; b=23M8+dnL8IgiHqx8u43XifD/spc3Afd1fazXJ6O+KWTpnG6FiF55BaG3wDqEGnplmgoE ebmD4RelZdouN2MNRUfyEhdwvbA4gYQMtJtha4Xb6F9cPFxWngS8i+0wi4Ser3ilD7GYW /j7PyF0YjrhxR3k2sV5gu9ETPfPI1o4g6bfH/ix47zUj+ujzjfinGlaJ5YlyN1lkt7ZE5 zM2QU0QoJ5tXoqe8wbG3EXyJDrRJxHQot4OL/uVIR0Fi/X5L37dIydE6seVpPIPs7HHDC dREj+xPhdXA9BrU2gbNQcV7Ez929vQLTfZIU6t3UF4k7MCdOLdocOc07NG7+lxgnKVA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ALQJbIS8; arc=none smtp.remote-ip=74.125.82.54 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1122A606A31C for ; Fri, 30 Oct 2026 05:07:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1122A606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ALQJbIS8 Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-1931ff67a29so940198c88.1 for ; Thu, 29 Oct 2026 22:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336858; x=1793941658; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=GMa51ST4XjCQkd4qYSnBFNlKaUJYxzH2Que0Zxlz+Ok=; b=ALQJbIS8r07ntk6frUtW2nR5dZ+u1svtPGgUxEWrVTuQRxjU9+gngN3BpatHVUqnaj znv9ctbfS5+dOJWPHeA/GNNaV7HDqJFMpUtoia96qDik+3XLO82WwAWHLr98ERFtsw1d nzKlF7B0PM9039eoBra+9cMu7IqEvW/eT1uQc8lJ1tho/5Q30bBCuUEmA6nTLkN1LY2y 6CcxVHz1KXH8ryJMTy7IXti7X3fcrSNmp4ngcIa4HXg8NRutHH2Cc/RXKeC89RdC/6mO T7AcoQM+jq4T6X02fmaCW1ujv3m4vWCpMCmD5o+PNViYPc5KMv3x5MFqC1ushqOGFM/i zHag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336858; x=1793941658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=GMa51ST4XjCQkd4qYSnBFNlKaUJYxzH2Que0Zxlz+Ok=; b=KH5eSNmIVtJU38Ec7ebUB2Op7Lsg6kcRmnwYCfcJxT+KL2vo9+Qtm6UX/AmVC5R5FW DXSVXIiaTBRdfozZWCzw1Etqsz0XkWnZXwMtMsjXNxOack7ESmpKMvMhu9cKVxGAFaoh A3xo1gJsWF5GkoW7npDdeWeK9xhcys8L0Gp157ZLdVQBSZ6zwstGN97fARYGrVN8NI6U A2SRNvjvlLxIWfLydoM1dTQdpm4u5mKJmY/tNSgQioASbOfEaKv7sSx7o1gdDoa+oXgL zp41+1MNA5/i3uK1UI2Jdhk6DxDmTPdhWvgjNNJtf1rH3oK76QAXQSSF28ToySM4oAck WAkg== X-Gm-Message-State: AFq9FYIbo1KzAv0KxZIc7VhCKqcvldEI2LdTkgYEirZf7lYP3k+eLal9 s5EAojC2qWK8YD9FwCI6NDwX3JMSKl3hq+xfpFT6hjeq4vcdD3+5AfYMj4FK2g== X-Gm-Gg: AYBFou0SbKKGUfziPy7+Zg5fbYToeQRgFM6+1bx5lT6WwBQebLHULoLFYDSzIpAfs/h 8sErp86zv70IaiO+OU7Wo9LV8Hmrnz3MRmVk3IgaTcFhu4aagkuYSConahkWG0AcoDQqbX32mFh QMu74iMIHzfroQME5Fk8O+z/fjIhWqqhBYFgInsNnFlm3FS9JfU+Sk8Y9FwEVMcrmB4RWbidfDT BxxBOEbiXRMywOgB3vtQAxOnVBexlK8sMBSBLFPgNZU/CFz88y3Ld+dQ1cVJ8OiHuES0MQKfLYQ LqK/sagYwrOgGRqvOdv2HFrPnWEKsW/GD1w+ySuI2F3h2OTQ/xaHIhR/tfDsquGWNQLlygxkJ2i aezHDLxaM+IYWOiA4xhkwkDmd3H5vvNq1RG3yzdWc9ECxbHIqqowKU+gnHKZ2aCCCLjuv3zY0Bz OuABD8W1KY5RSajNFKwLyjz8NUFdvl65k60UBsUvoJGCv+BZQL/8+D3Qd3dsmMvvTsfSnnyUwH5 zE2w4/G6eVo6Rh+aUgjiAFYPHn8XcaLclfESSvgRXuFBRj8XTcyL1yDF7++W4t/dDAgwICl6e7z v3ZnStDjqsfPD0IUysvwJzz3Y6HBqiEyxLGbYJKVxGiWmrtkTxu6o6FJ8IW/Yv7fEIl4hAlsOmi Py3QFYw2Hi34aRKD0gQ+cnOjDsmahhrT2Qa/3BbekIKpzX1kin31IgSbgPKhxPdOLU/K7D6ee0A == X-Received: by 2002:a05:7022:1117:b0:195:49ee:94c7 with SMTP id a92af1059eb24-1ac5a0b579emr1648343c88.8.1793336857996; Thu, 29 Oct 2026 22:07:37 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:37 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 3/6] mptcp: pm: in-kernel: add the subflow-retries limit Date: Fri, 30 Oct 2026 05:07:24 +0000 Message-Id: <20261030050727.3534304-4-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A new limit for the in-kernel PM, set and read with the other limits: the number of SYN retries of a subflow re-created after a timeout, like the TCP_SYNCNT socket option. The default is the maximum, MAX_TCP_SYNCNT (127), about 4 hours, and 0 to not re-create it. The netlink policy checks this maximum value. It is also exposed in struct mptcp_info, in place of the reserved field. The next patch uses it. Signed-off-by: Anil Kaushik --- Notes: v9: - MAX_TCP_SYNCNT instead of 127 for the default - after a timeout, not any error v8: - the default is the maximum, 127, about 4 hours (Matthieu) v6: - the netlink policy checks the maximum, no more parse_limit() change (netdev Sashiko) - the limit works like TCP_SYNCNT, say so (netdev Sashiko) v5: - new, split from the retry patch (Matthieu) - the limit is also in struct mptcp_info (Matthieu) include/uapi/linux/mptcp.h | 2 +- net/mptcp/pm_kernel.c | 23 ++++++++++++++++++++++- net/mptcp/protocol.h | 1 + net/mptcp/sockopt.c | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 72a5d030154e..d7e3f359773d 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -72,7 +72,7 @@ struct mptcp_info { __u8 mptcpi_subflows_total; __u8 mptcpi_endp_laminar_max; __u8 mptcpi_endp_fullmesh_max; - __u8 reserved; + __u8 mptcpi_limit_subflow_retries; __u32 mptcpi_last_data_sent; __u32 mptcpi_last_data_recv; __u32 mptcpi_last_ack_recv; diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index d3014bf57bf3..7fb4c7874340 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -25,6 +25,7 @@ struct pm_nl_pernet { u8 endp_fullmesh_max; u8 limit_add_addr_accepted; u8 limit_extra_subflows; + u8 limit_subflow_retries; u8 next_id; DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); }; @@ -96,6 +97,14 @@ u8 mptcp_pm_get_limit_extra_subflows(const struct mptcp_= sock *msk) } EXPORT_SYMBOL_GPL(mptcp_pm_get_limit_extra_subflows); =20 +u8 mptcp_pm_get_limit_subflow_retries(const struct mptcp_sock *msk) +{ + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + + return READ_ONCE(pernet->limit_subflow_retries); +} +EXPORT_SYMBOL_GPL(mptcp_pm_get_limit_subflow_retries); + static bool has_subflow_daddr(const struct mptcp_sock *msk, const struct mptcp_addr_info *daddr) { @@ -1419,7 +1428,8 @@ static int parse_limit(struct genl_info *info, int id= , unsigned int *limit) int mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *inf= o) { struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); - unsigned int rcv_addrs, subflows; + unsigned int rcv_addrs, subflows, retries; + struct nlattr *attr; int ret; =20 spin_lock_bh(&pernet->lock); @@ -1433,8 +1443,13 @@ int mptcp_pm_nl_set_limits_doit(struct sk_buff *skb,= struct genl_info *info) if (ret) goto unlock; =20 + /* the maximum, MAX_TCP_SYNCNT, is checked by the policy */ + attr =3D info->attrs[MPTCP_PM_ATTR_SUBFLOW_RETRIES]; + retries =3D nla_get_u32_default(attr, pernet->limit_subflow_retries); + WRITE_ONCE(pernet->limit_add_addr_accepted, rcv_addrs); WRITE_ONCE(pernet->limit_extra_subflows, subflows); + WRITE_ONCE(pernet->limit_subflow_retries, retries); =20 unlock: spin_unlock_bh(&pernet->lock); @@ -1464,6 +1479,10 @@ int mptcp_pm_nl_get_limits_doit(struct sk_buff *skb,= struct genl_info *info) READ_ONCE(pernet->limit_extra_subflows))) goto fail; =20 + if (nla_put_u32(msg, MPTCP_PM_ATTR_SUBFLOW_RETRIES, + READ_ONCE(pernet->limit_subflow_retries))) + goto fail; + genlmsg_end(msg, reply); return genlmsg_reply(msg, info); =20 @@ -1618,6 +1637,8 @@ static int __net_init pm_nl_init_net(struct net *net) =20 /* Cit. 2 subflows ought to be enough for anybody. */ pernet->limit_extra_subflows =3D 2; + /* the maximum: about 4 hours with the default RTOs */ + pernet->limit_subflow_retries =3D MAX_TCP_SYNCNT; pernet->next_id =3D 1; spin_lock_init(&pernet->lock); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3be60da12924..4aa4aedb2ba7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1266,6 +1266,7 @@ u8 mptcp_pm_get_endp_laminar_max(const struct mptcp_s= ock *msk); u8 mptcp_pm_get_endp_fullmesh_max(const struct mptcp_sock *msk); u8 mptcp_pm_get_limit_add_addr_accepted(const struct mptcp_sock *msk); u8 mptcp_pm_get_limit_extra_subflows(const struct mptcp_sock *msk); +u8 mptcp_pm_get_limit_subflow_retries(const struct mptcp_sock *msk); =20 /* called under PM lock */ static inline void __mptcp_pm_close_subflow(struct mptcp_sock *msk) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 922f6ae5c80c..d3c4abf59ec5 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1075,6 +1075,8 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, str= uct mptcp_info *info) mptcp_pm_get_endp_laminar_max(msk); info->mptcpi_endp_fullmesh_max =3D mptcp_pm_get_endp_fullmesh_max(msk); + info->mptcpi_limit_subflow_retries =3D + mptcp_pm_get_limit_subflow_retries(msk); } =20 if (__mptcp_check_fallback(msk)) --=20 2.25.1 From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.44 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336862; b=WonxmFNf8HAsVY8zCs/CZ8MFRyCZVcf86uf36bsvq0HLXoALUQCFtwL9GB3m6SWniFIV O/3I8Eq71xw9rsXBXHl7xTCf5EmiFJqUqe1K1i6bt4wOAbttECirjZnqpWYiSSOr7L53t EZm4Owkvz8ElJ+sXlBMXEr3QLVcl8JRyzA0xN0d2IhIxOvYNv7ZovyYEgOAi6qrRMb6sS 5wdgEg9T7YctFD2s9343P2z/t5xHJFyLeAHymeottcB9ccjWB4ZXR5rdYmTOyvE/vn0NP BBvbvt2+/7oq606lYKKnNPF8/4bjwg4vRoZ5hvQt43l+x+pqsh87SE/bslkMj6YiN4g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336862; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=+0+Q1Wn5ZkOJjk1DObUihLoQRiZ7BLC/vng+yUAHMt4=; b=qZvcf/3FzUCYZTON1HPViDgRZByvr6SrxxhPzplKm/h5+6CM/TPFJlmOV5ZbSY2JkORf Qt2+Mvg7CVpePCgpaOCZMfOMbugl17bArJC2HTZgxrcnjc7OUDRkxsByQtlqVbzumCvRQ oSm7vG4VR4EBVVdoMTuk0VuBxeNpjmy+13LLSf7l9nS7ukA3aXWt8OzylGEGFC9u5jRLr HYYLcqeVH0QleLPK6HSiv3VSp7vYkkIQk6G+bpFE0yIBicwadqdcKf9VuTw/U48KCcK4N Qm1ENziIAJCBZsYgEvPWtV4A4z/R+51bYKZaA7kD6srZtLWfBck0yY/9ZwwJtmdH3mw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=VoEnsDC5; arc=none smtp.remote-ip=74.125.82.44 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E92D606A31C for ; Fri, 30 Oct 2026 05:07:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4E92D606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=VoEnsDC5 Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-1a2761c69fbso788432c88.0 for ; Thu, 29 Oct 2026 22:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336860; x=1793941660; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+0+Q1Wn5ZkOJjk1DObUihLoQRiZ7BLC/vng+yUAHMt4=; b=VoEnsDC5rJa6VUSyHz7wIRV8MO3OjeETEs77m1QOaU9x7P0OkcINRDjiAgMl4CFEH5 ZEaU83JR24XPkSo9MWEYavsCK9S002tHtVU2uFYUBw384/tx4FuJnEMJX7l7A/rfsoHm 9CSpe1HavffhSFWntWOsLdpsFic/hE2cLlGXW39ca74wls2lzFnsJdFwyFk3lOGHjMsN 2kIacgGVxWvNFuo7hN4MjnJElBjnYGLezKVPNy+hdkYWbzB18n/op0/2cH5YIDpDuB45 IowqVo0ig7Im+vPiLX0ewBSg/QyeCK6+w86GhDQqfkTFu9ll2Yq/bZ6dm8cSCunhCTpr VJqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336860; x=1793941660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=+0+Q1Wn5ZkOJjk1DObUihLoQRiZ7BLC/vng+yUAHMt4=; b=F1jH4R4A49NdqH7V/0b0j0Unal5katW+mlaMOBAMXlBhKwL8zy3g64BJWe8lQxxnAP TelWzbuIaQIoEBGi/5inwUh9TK5A5IF8n8OunvOcyDAjbVllDdJKR+60fdYM0XYwiE1x QhwLbBlmwCC8Ej8jLscQ0WcvzhpnYBIclsPFH3t3opxnYMVx08Bcu4ic7GTD+m6qef/+ PnH+GbaRJeWygJ0bZ9/yOTcgRYo1rt/kRZ32Yw4OdclJt8r+Adn15LBwyJBs5ZyFr/5S KYH1J0b46TR4zkEQrtnneS0bwfJb14ebPwC1ypnl/R68GWW4ZNXKaf/Ge/WaGIy0aVtP at9g== X-Gm-Message-State: AFq9FYL2ZsL62lJ66jwudI/4wYhkLX9QW0+51RmnZoeu0PR/OzN8pzLS zXfL19o4JUatFv5J0r9qzqpzYX7xbWux5DKPtN+sa0ox7SXoCC1ETKep2rM9TA== X-Gm-Gg: AYBFou0uXwvzmjmhEYt32VYbOYtZMJTtOXPkB5N7PuHnlPLyQKfcNU32PoTHsVU93dP 3oejUpQZAnIHm5pOtqr5X/Ob4h/1uuFciqhH0187mhB24lJwwlnoIt5ZjPslrl8bQlFsQrRJnZY y0hWCdGvCjGBi5VmZBrDErGZxUWgY2D4n/jTLuUCQByk31RH198xbSniHBNL+RXF6CrEHiChekd G9+KATV/on58SwUIvCXtj3YbhTRdQj9WGYWJM3CPfZvPI5vd6oRoF7xMWzKN4sd7a771vNLH3qY TVnfDKrZi+76OSZEcghfUgBbTQkvOAdbNNhL9zuULaZgLAakYh4R1QlV/GLfUAgblJVkS7/8JpB ElRKU6WG+B3aGB2AQUad/KQET8Lrp2DipfgBM7e7wz63PnDS5XV2ix7cfxt3fYcFLzaZcHdyNar bLuD8RSn7g/n9/FInYbU2thxDy4CPgFa019RcR7529dz+0ESU8PxgY6A2+lw61yIFMhTeNJ+BfJ d18JluVI/3Wug3oL3z1xiOtpl3kGzAi1o00z3uy5cCJMak0bKmCcHxTUHEN41Ksb/8dRwoXXG7s UOqpGTFhSGfmSIY6XImAXa9awIgJ3TbFtOWDybASrzxfMm+kC2BRip67a+PS2gqtBv/f0/VTLbL KyFtDzmTwG4hCi2OxBYxzQTp2YDE2Fm4oW0lMgF+DdNg4Zd+m54N+ybYe2ms/E6jRZLaDXHSuFA == X-Received: by 2002:a05:701b:428f:10b0:19b:98bc:326f with SMTP id a92af1059eb24-1ac5aa5d85bmr1959005c88.18.1793336860018; Thu, 29 Oct 2026 22:07:40 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:39 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 4/6] mptcp: pm: in-kernel: retry subflows closed after an error Date: Fri, 30 Oct 2026 05:07:25 +0000 Message-Id: <20261030050727.3534304-5-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With the in-kernel PM, a subflow closed after an error, e.g. a timeout when a path silently drops packets, is never re-created, even once the path works again. For example, with a main link and a backup link, connections move to the backup after an outage but never come back. When TCP gives up on an established subflow created by this side, after a retransmission or keepalive timeout, whatever ICMP error was received from the path before, the PM now creates a new one with the same addresses. Its SYN retries, set like TCP_SYNCNT by the subflow-retries limit, space out the attempts. This is a single connection attempt: an ICMP error, or a local error when connecting, ends it, and it is not retried again. It is also closed if the MPTCP socket is closed in the meantime. This is only done while another subflow can send data: otherwise the connection is closed after the close timeout, as before. The re-created subflows not fully established yet are closed when no other subflow can send data anymore, or when the MPTCP socket is shut down for writing or closed, unless they got fully established in between. A closed one gets an MPTCP_EVENT_SUB_CLOSED event, like a join that fails, also when the MPTCP socket is closed. Once it is established, it is handled like any other subflow. Re-creating the initial subflow uses one of the additional subflows allowed by the limits. A subflow reset by the peer, or by anything on the path, is not re-created: the path works, and re-creating it right away could loop. A subflow that never got established is not re-created either: the PM keeps trying the next endpoints, as before. A re-created subflow takes the place of the closed one in the subflows limit: while it is connecting, an endpoint not used yet is only tried if the limit allows one more subflow. Subflows aborted locally, also by MPTCP, or using an address that has been removed are not retried. TCP only closes a subflow after tcp_retries2 retransmissions, about 15 minutes by default. A subflow that only receives data never gets an error: the application has to enable TCP keepalive on the MPTCP socket, which MPTCP applies to all the subflows. Both are documented in mptcp.rst. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/440 Signed-off-by: Anil Kaushik --- Notes: v13: - close again all the re-created subflows not fully established when no other subflow can send data, not only the ones still connecting: a joined one waiting for the 4th ACK could keep the connection open forever (sashiko.dev) - __mptcp_close_ssk() checks fully_established again under the ssk lock, and keeps a subflow that got fully established in between (netdev Sashiko on v11) - say that a re-created subflow keeps its place in the subflows limit, before an endpoint not used yet (netdev Sashiko on v12) - __mptcp_close_ssk() cleans the msk backlog only with MPTCP_CF_PUSH again: a re-created subflow it closes is not fully established, so it has no data there - say that only a shutdown for writing closes them, and that they get a SUB_CLOSED event v12: - when no other subflow can send data, only close the re-created subflows still connecting: a joined one is fully established soon, and stop once one got established (netdev Sashiko) - a subflow in CLOSE_WAIT does not keep the re-created ones open either: one helper for both checks (netdev Sashiko) - mptcp.rst: the initial subflow is not re-created if the peer does not accept joins to its initial address (netdev Sashiko) v11: - re-create a subflow only while another subflow can send data: the close timeout is then handled as before, no more re-arming nor stopping it (sashiko.dev) - close the re-created subflows not established yet from the worker, or when the msk is shut down or closed, never while iterating on the subflows: mptcp_close_ssk() only schedules the worker (sashiko.dev) - also close them once the msk is no longer established, whatever their TCP state, also when a DATA_FIN is handled outside the worker (sashiko.dev) - SUB_CLOSED event for them while the msk is established, like mptcp_close_ssk(): they can have been joined already - another subflow in CLOSE_WAIT, being closed, does not count as one that can send data v10: - keep the connection when the close timeout expires if a re-created subflow connected in the meantime: an active join does not stop the timer, mptcp_finish_join() returns early for it (sashiko.dev) - close the re-created subflows still connecting once the msk is no longer established, after a DATA_FIN or a shutdown(), when no other subflow is left: they cannot join anymore, and would keep the msk around (sashiko.dev) v9: - every timeout is retried, whatever ICMP error TCP reports for it, the last one received, see tcp_write_err(): resets, local aborts and MPTCP protocol errors are excluded instead of listing the timeout errors, so IPv4 and IPv6 behave the same (netdev Sashiko) - mptcp.rst: 0 does not re-create the subflows (netdev Sashiko) - the re-created subflows closed with the msk get no SUB_CLOSED event, like the other subflows closed with it - if no other subflow can send data, the close timeout still applies: creating the new subflow no longer keeps the connection open for the whole SYN retries - doc and commit message: a single connection attempt, ended by an ICMP error or a local connect error - __mptcp_close_ssk() always cleans the msk backlog of the closed subflow: a re-created subflow closed with the msk can have been established in between, with data in the backlog (netdev Sashiko). It is still closed without MPTCP_CF_PUSH, which would re-send all the pending data - tcp_sock_set_syncnt(), without the ssk lock v8: - mptcp.rst gives the default, 127, about 4 hours - close the re-created subflows still connecting before __mptcp_wr_shutdown() disconnects them, and also the already disconnected ones, e.g. after shutdown(SHUT_WR) (sashiko.dev) - mptcp.rst: the initial subflow on the client side, the subflows limit, and only one attempt (netdev Sashiko) v7: - only after a path error, a retransmission or keepalive timeout: a reset from the peer or the path could make it loop (netdev Sashiko) - retry and no_retry are bools under the msk socket lock, in the padding after close_event_done, not bits next to the reset ones (netdev Sashiko) - mark all the subflows using a removed address, whatever their state (netdev Sashiko) - doc: tcp_retries2, and keepalive for a subflow that only receives data (Abdul Wasey's tests) - not retried after a reset by MPTCP itself, even with an old sk_err left by IP_RECVERR (netdev Sashiko) - close the re-created subflows still connecting without MPTCP_CF_PUSH: they never carried data (netdev Sashiko) v6 (netdev Sashiko): - only re-create subflows that were established: the PM still tries the next endpoints when one never gets established - only once TCP closed the subflow, to read its reset flags safely - removed addresses, also the remote ones and the local ID 0: the dead subflows are marked in mptcp_pm_rm_addr_or_subflow(), instead of looking up the endpoint v5 (Matthieu): - split in 4 patches - reverse xmas tree in mptcp_pm_kernel_retry_check() - "in-kernel" in the subject, like the other in-kernel PM patches - close the re-created subflows still connecting when the socket is closed (Matthieu: closing the socket during a retry) v4 (Matthieu): - netlink limit, on by default, instead of the sysctl - one new subflow per failure, its SYN retries set from the limit: no socket reuse, no attempts counter, no 60s check - no MIB counter - not retried if the endpoint was removed, instead of the pm.c change - called through pm.c - new bit in the subflow context, no new hole - commit message: MP_RST, not any RST (Sashiko) v3 (Sashiko): - no retry after MP_RST without the T flag, local abort or EBADMSG - no retry on a removed endpoint or address - use only request_bkup for the backup flag v2: - use the subflow sockets, no list or timer - code moved to pm_kernel.c Documentation/networking/mptcp.rst | 21 +++++ net/mptcp/pm.c | 39 ++++++++ net/mptcp/pm_kernel.c | 137 +++++++++++++++++++++++++++++ net/mptcp/protocol.c | 77 +++++++++++++++- net/mptcp/protocol.h | 50 +++++++++++ 5 files changed, 323 insertions(+), 1 deletion(-) diff --git a/Documentation/networking/mptcp.rst b/Documentation/networking/= mptcp.rst index b6753ffb9c9a..0d8fac8813a9 100644 --- a/Documentation/networking/mptcp.rst +++ b/Documentation/networking/mptcp.rst @@ -73,6 +73,27 @@ To be able to use multiple IP addresses on a host to cre= ate multiple *subflows* addresses can be used. This can be configured with ``ip mptcp endpoint`` f= or example. =20 +When TCP gives up on an established subflow created by this host, after a +retransmission or keepalive timeout, the in-kernel path manager creates it +again, with the ``subflow-retries`` limit as its number of SYN retries, li= ke +``TCP_SYNCNT``: 127 by default, about 4 hours, and 0 to not re-create it. = This +is done for the additional subflows, and for the initial one on the client= side: +the new subflow then takes one of the additional subflows allowed by the +``subflows`` limit. It keeps this place while it is being created again: an +endpoint not used yet is only tried if the ``subflows`` limit allows one m= ore +subflow. The initial one is not created again if the peer does not accept = joins +to its initial address. This is a single connection attempt: an ICMP error= , or a +local error when connecting, ends it, and it is not created again. This is= only +done while another subflow can send data: otherwise the connection is clos= ed +after ``close_timeout``, as before, and the subflows being re-created are = closed +too. A subflow reset by the peer, or by anything on the path, is not creat= ed +again either. TCP only gives up on a subflow after ``tcp_retries2`` +retransmissions, about 15 minutes by default: shorter outages are handled = by TCP +itself. A subflow that only receives data does not notice that its path st= opped +working: the application should then enable TCP keepalive on the MPTCP soc= ket +(``SO_KEEPALIVE``, ``TCP_KEEPIDLE``, ``TCP_KEEPINTVL`` and ``TCP_KEEPCNT``= ), +which MPTCP applies to all its subflows. + Packet Scheduler ---------------- =20 diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index d7c5b50b34cc..2bb08be95cd1 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -694,6 +694,26 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *ms= k, spin_unlock_bh(&pm->lock); } =20 +/* Called with the msk socket lock held, before closing a subflow: true if + * it has to be re-created once closed, see mptcp_pm_subflow_retry(). + */ +bool mptcp_pm_subflow_retry_check(struct mptcp_sock *msk, + const struct mptcp_subflow_context *subflow, + struct mptcp_pm_retry *retry) +{ + if (!mptcp_pm_is_kernel(msk)) + return false; + + return mptcp_pm_kernel_retry_check(msk, subflow, retry); +} + +void mptcp_pm_subflow_retry(struct mptcp_sock *msk, + const struct mptcp_pm_retry *retry) +{ + if (mptcp_pm_is_kernel(msk)) + mptcp_pm_kernel_retry(msk, retry); +} + void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr) { @@ -762,6 +782,24 @@ static void mptcp_pm_add_addr_send_ack(struct mptcp_so= ck *msk) mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK); } =20 +/* A subflow using a removed address must not be re-created, whatever its + * state, e.g. closed by TCP but not collected yet, see + * mptcp_pm_kernel_retry_check(). + */ +static void mptcp_pm_rm_no_retry(struct mptcp_subflow_context *subflow, + enum linux_mptcp_mib_field rm_type, u8 rm_id) +{ + u8 id; + + if (rm_type =3D=3D MPTCP_MIB_RMADDR) + id =3D READ_ONCE(subflow->remote_id); + else + id =3D subflow_get_local_id(subflow); + + if (id =3D=3D rm_id) + subflow->no_retry =3D true; +} + static void mptcp_pm_rm_addr_or_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list, enum linux_mptcp_mib_field rm_type) @@ -794,6 +832,7 @@ static void mptcp_pm_rm_addr_or_subflow(struct mptcp_so= ck *msk, int how =3D RCV_SHUTDOWN | SEND_SHUTDOWN; u8 id =3D subflow_get_local_id(subflow); =20 + mptcp_pm_rm_no_retry(subflow, rm_type, rm_id); if ((1 << inet_sk_state_load(ssk)) & (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING | TCPF_CLOSE)) continue; diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index 7fb4c7874340..f06b24a9cd53 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1610,6 +1610,143 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_so= ck *msk) return true; } =20 +/* TCP gave up on the path: after a retransmission, keepalive or user + * timeout, sk_err is ETIMEDOUT, or the last ICMP error received from the + * path, see tcp_write_err(). The other errors on an established subflow + * are not path failures: a reset, from the peer or from anything on the + * path (ECONNRESET, or EPIPE in CLOSE_WAIT, see tcp_reset()), a local + * abort (ECONNABORTED), or an MPTCP protocol error (EBADMSG). + */ +static bool mptcp_pm_retry_path_error(int err) +{ + switch (err) { + case ECONNRESET: + case EPIPE: + case ECONNABORTED: + case EBADMSG: + return false; + } + + return true; +} + +static bool mptcp_pm_retry_other_subflow(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + + mptcp_for_each_subflow(msk, subflow) { + if (mptcp_subflow_can_send(subflow)) + return true; + } + + return false; +} + +/* Called with the msk socket lock held, before the subflow is closed */ +bool mptcp_pm_kernel_retry_check(struct mptcp_sock *msk, + const struct mptcp_subflow_context *subflow, + struct mptcp_pm_retry *retry) +{ + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + struct sock *sk =3D (struct sock *)msk; + int err; + + /* Only once TCP closed it: the acquire in inet_sk_state_load() makes + * sure sk_err and the resetting flag checked below are the ones of + * this close. + */ + if (inet_sk_state_load(ssk) !=3D TCP_CLOSE) + return false; + + err =3D READ_ONCE(ssk->sk_err); + retry->syn_retries =3D mptcp_pm_get_limit_subflow_retries(msk); + if (!retry->syn_retries || !err || sk->sk_state !=3D TCP_ESTABLISHED || + __mptcp_check_fallback(msk)) + return false; + + /* mptcp_close_ssk() will not handle it again, e.g. the initial + * subflow, kept in the list once closed + */ + if (subflow->close_event_done || READ_ONCE(subflow->local_id) < 0) + return false; + + /* Only a path that worked is tried again. If a subflow never got + * established, the PM moves on to the next endpoints instead, and a + * re-created subflow that cannot connect is not retried again: its SYN + * retransmissions already spaced out the tries. + */ + if (!READ_ONCE(subflow->fully_established)) + return false; + + /* its address has been removed, see mptcp_pm_rm_addr_or_subflow() */ + if (subflow->no_retry) + return false; + + /* Only while another subflow can send data: without one, the + * connection is closed after the close timeout, as before, see + * __mptcp_close_ssk(). + */ + if (!mptcp_pm_retry_other_subflow(msk)) + return false; + + /* Only when the path stopped working. A reset, from the peer or from + * anything on the path, means the path works: re-creating the subflow + * right away could loop. Not after a reset by MPTCP itself either, with + * mptcp_subflow_reset(), whatever sk_err says. + */ + if (!mptcp_pm_retry_path_error(err) || subflow->resetting) + return false; + + /* Only re-create subflows initiated by this side: MP_JOIN ones, or the + * initial one on the client side. + */ + if (!subflow->request_join && + (subflow->mp_join || READ_ONCE(msk->pm.server_side))) + return false; + + mptcp_remote_address((struct sock_common *)ssk, &retry->remote); + retry->remote.id =3D READ_ONCE(subflow->remote_id); + if (!retry->remote.id && READ_ONCE(msk->pm.remote_deny_join_id0)) + return false; + + mptcp_local_address((struct sock_common *)ssk, &retry->local.addr); + retry->local.addr.port =3D 0; + retry->local.addr.id =3D subflow_get_local_id(subflow); + retry->local.flags =3D subflow->request_bkup ? + MPTCP_PM_ADDR_FLAG_BACKUP : 0; + retry->local.ifindex =3D ssk->sk_bound_dev_if; + + return true; +} + +/* Called with the msk socket lock held, after the subflow has been closed= */ +void mptcp_pm_kernel_retry(struct mptcp_sock *msk, + const struct mptcp_pm_retry *retry) +{ + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + bool allowed; + + spin_lock_bh(&msk->pm.lock); + allowed =3D msk->pm.extra_subflows < + mptcp_pm_get_limit_extra_subflows(msk); + if (allowed) + msk->pm.extra_subflows++; + spin_unlock_bh(&msk->pm.lock); + + if (!allowed || + __mptcp_subflow_connect(sk, &retry->local, &retry->remote)) + return; + + /* the new subflow is the last one */ + subflow =3D list_last_entry(&msk->conn_list, struct mptcp_subflow_context, + node); + /* from 1 to MAX_TCP_SYNCNT, see mptcp_pm_kernel_retry_check() */ + tcp_sock_set_syncnt(mptcp_subflow_tcp_sock(subflow), + retry->syn_retries); + subflow->retry =3D true; +} + /* Called under PM lock */ void __mptcp_pm_kernel_worker(struct mptcp_sock *msk) { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 02a4f479d9d8..cb1350ba1a41 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -736,6 +736,10 @@ static void mptcp_check_data_fin(struct sock *sk) if (!__mptcp_check_fallback(msk)) mptcp_send_ack(msk); mptcp_close_wake_up(sk); + + /* not always called from the worker, which closes them */ + if (mptcp_retry_subflows_stale(msk)) + mptcp_schedule_work(sk); } } =20 @@ -2637,6 +2641,7 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) =20 /* flags for __mptcp_close_ssk() */ #define MPTCP_CF_PUSH BIT(1) +#define MPTCP_CF_RETRY BIT(2) =20 /* be sure to send a reset only if the caller asked for it, also * clean completely the subflow status when the subflow reaches @@ -2695,6 +2700,26 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, * subflow close. */ lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + + /* a re-created subflow, see mptcp_close_retry_subflows(): the ssk lock + * defers the 4th ACK, so it cannot get fully established meanwhile + */ + if (flags & MPTCP_CF_RETRY) { + if (READ_ONCE(subflow->fully_established)) { + release_sock(ssk); + return; + } + + /* like mptcp_close_ssk(): it can have joined already */ + if (sk->sk_state =3D=3D TCP_ESTABLISHED && + !subflow->close_event_done) { + subflow->close_event_done =3D true; + mptcp_event(MPTCP_EVENT_SUB_CLOSED, msk, ssk, + GFP_KERNEL); + } + mptcp_pm_subflow_check_next(msk, subflow); + } + subflow->closing =3D 1; =20 if (flags & MPTCP_CF_PUSH) @@ -2788,6 +2813,34 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, } } =20 +/* Re-created subflows not established yet are useless once the msk is + * closed or shut down for writing, or no other subflow can send data, see + * mptcp_retry_subflows_stale(). Not called while iterating on the subflow= s. + */ +static void mptcp_close_retry_subflows(struct sock *sk, bool stale) +{ + struct mptcp_subflow_context *subflow, *tmp; + struct mptcp_sock *msk =3D mptcp_sk(sk); + + mptcp_for_each_subflow_safe(msk, subflow, tmp) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (!subflow->retry || READ_ONCE(subflow->fully_established)) + continue; + + /* another one got established in the meantime */ + if (stale && !mptcp_retry_subflows_stale(msk)) + break; + + /* Checked again under the ssk lock: it is kept if it got fully + * established in between. Otherwise, it has no data in the msk + * backlog, and the MPTCP retransmissions cover what it sent. No + * need to push the pending data again. + */ + __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_RETRY); + } +} + void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow) { @@ -2806,6 +2859,12 @@ void mptcp_close_ssk(struct sock *sk, struct sock *s= sk, mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow); =20 __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH); + + /* the caller can iterate on the subflows: the worker closes the + * re-created ones + */ + if (mptcp_retry_subflows_stale(mptcp_sk(sk))) + mptcp_schedule_work(sk); } =20 static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu) @@ -2823,6 +2882,8 @@ static void __mptcp_close_subflow(struct sock *sk) mptcp_for_each_subflow_safe(msk, subflow, tmp) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); int ssk_state =3D inet_sk_state_load(ssk); + struct mptcp_pm_retry retry; + bool do_retry; =20 if (ssk_state !=3D TCP_CLOSE && (ssk_state !=3D TCP_CLOSE_WAIT || @@ -2834,7 +2895,10 @@ static void __mptcp_close_subflow(struct sock *sk) if (!skb_queue_empty_lockless(&ssk->sk_receive_queue)) continue; =20 + do_retry =3D mptcp_pm_subflow_retry_check(msk, subflow, &retry); mptcp_close_ssk(sk, ssk, subflow); + if (do_retry) + mptcp_pm_subflow_retry(msk, &retry); } =20 } @@ -3185,6 +3249,9 @@ static void mptcp_worker(struct work_struct *work) if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags)) __mptcp_close_subflow(sk); =20 + if (mptcp_retry_subflows_stale(msk)) + mptcp_close_retry_subflows(sk, true); + if (mptcp_close_tout_expired(sk)) { struct mptcp_subflow_context *subflow, *tmp; =20 @@ -3516,6 +3583,9 @@ bool __mptcp_close(struct sock *sk, long timeout) goto cleanup; } =20 + /* before __mptcp_wr_shutdown() disconnects them */ + mptcp_close_retry_subflows(sk, false); + if (mptcp_data_avail(msk) || timeout < 0 || (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)) { /* If the msk has read data, or the caller explicitly ask it, @@ -4140,7 +4210,12 @@ static void mptcp_shutdown(struct sock *sk, int how) { pr_debug("sk=3D%p, how=3D%d\n", sk, how); =20 - if ((how & SEND_SHUTDOWN) && mptcp_close_state(sk)) + if (!(how & SEND_SHUTDOWN)) + return; + + /* before the state change and __mptcp_wr_shutdown(), as on close */ + mptcp_close_retry_subflows(sk, false); + if (mptcp_close_state(sk)) __mptcp_wr_shutdown(sk); } =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4aa4aedb2ba7..f160e9ac7892 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -610,6 +610,8 @@ struct mptcp_subflow_context { bool close_event_done; /* has done the post-closed part, * protected by msk socket lock */ + bool retry; /* re-created after an error, msk lock */ + bool no_retry; /* uses a removed address, msk lock */ u32 lent_mem_frag; u32 remote_nonce; u32 local_nonce; @@ -919,6 +921,37 @@ static inline bool __mptcp_subflow_active(struct mptcp= _subflow_context *subflow) return __tcp_can_send(mptcp_subflow_tcp_sock(subflow)); } =20 +/* Can send data, and is not being closed, e.g. in CLOSE_WAIT */ +static inline bool mptcp_subflow_can_send(struct mptcp_subflow_context *su= bflow) +{ + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + return __mptcp_subflow_active(subflow) && + inet_sk_state_load(ssk) =3D=3D TCP_ESTABLISHED; +} + +/* Re-created subflows not established yet, while no other subflow can send + * data, or once the msk is no longer established: they cannot join anymor= e, + * see mptcp_finish_join(), or must not keep the connection open. + */ +static inline bool mptcp_retry_subflows_stale(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + bool retry =3D false; + + mptcp_for_each_subflow(msk, subflow) { + if (sk->sk_state =3D=3D TCP_ESTABLISHED && + mptcp_subflow_can_send(subflow)) + return false; + + retry |=3D subflow->retry && + !READ_ONCE(subflow->fully_established); + } + + return retry; +} + void mptcp_subflow_set_active(struct mptcp_subflow_context *subflow); =20 bool mptcp_subflow_active(struct mptcp_subflow_context *subflow); @@ -1139,6 +1172,18 @@ void mptcp_pm_subflow_established(struct mptcp_sock = *msk); bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk); void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct mptcp_subflow_context *subflow); + +struct mptcp_pm_retry { + struct mptcp_pm_local local; + struct mptcp_addr_info remote; + u8 syn_retries; +}; + +bool mptcp_pm_subflow_retry_check(struct mptcp_sock *msk, + const struct mptcp_subflow_context *subflow, + struct mptcp_pm_retry *retry); +void mptcp_pm_subflow_retry(struct mptcp_sock *msk, + const struct mptcp_pm_retry *retry); void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr); void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, @@ -1260,6 +1305,11 @@ void __init mptcp_pm_userspace_register(void); void __init mptcp_pm_nl_init(void); void mptcp_pm_worker(struct mptcp_sock *msk); void __mptcp_pm_kernel_worker(struct mptcp_sock *msk); +bool mptcp_pm_kernel_retry_check(struct mptcp_sock *msk, + const struct mptcp_subflow_context *subflow, + struct mptcp_pm_retry *retry); +void mptcp_pm_kernel_retry(struct mptcp_sock *msk, + const struct mptcp_pm_retry *retry); u8 mptcp_pm_get_endp_signal_max(const struct mptcp_sock *msk); u8 mptcp_pm_get_endp_subflow_max(const struct mptcp_sock *msk); u8 mptcp_pm_get_endp_laminar_max(const struct mptcp_sock *msk); --=20 2.25.1 From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.46 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336863; b=Xs+qAaxZiLQUmVd8Wm8cqjEL1HtItsSQrQlR1pp3ZTU0olEMW9DfQ7B3QOmght0TCrhM wFtHHYfcL8Q5bo6Mv1VFV4UVEU65OcvyL8VTKHBUpM5nCriBW6LaxlRUD8yZyx7CCWE4m 980JvozEZ+tjLruDF7oIxgBuZ0EN7TAhXEpFjQzah0CDUnQSdzHmFx9cHPr5O3C2sTLfv PWQ+B0zChj86VSX88IS1kuPRjSqhpecV2Z7uZz0lfeC82hMBuf+azzKt7YuCdv2xVl2jR NEFPTZ7QHA4Dy24lGLupghkZvD76PZd9tywBlT+GueM2hzOpJwhqD68GKIz+Wr0bHZw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336863; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=bk08wlQLOckMDa/tQlUY0Gs+7pq28CqTbcZ5/8r0npg=; b=y4XP4SNXkf63Kk2L/cOU9KFvM457vN6IA8Sb1G2LGXAG3D3/2EynJP2ylg+5IxbVXIWl mUSVCGNVbh/lhSs9IC/HfVihqh85GVljLuLUSykg696Lt0MPtVw8E5HFzlUqx6X4PC++e gSTCegyZmYHBzrGITO9YVtMO9ebn+NuqP+RM6Hi4k2Lx1b383s+zSTnsYqCPcZ5MiIFEP ZhLGR2tlRCUas1rSqSdenC4BVS4zG8DlUt2GO62kdXf7QgIbR7fnmmgDvSsdlRuXVlelq 3DueSPsMMK3rvAalG3vfztbM5qrVB2jsYHyuo760nm1EGF138cek8o+G74Bo+SrGutg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=eQG5YLie; arc=none smtp.remote-ip=74.125.82.46 Received: from mail-dl1-f46.google.com (mail-dl1-f46.google.com [74.125.82.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F5A0606A31C for ; Fri, 30 Oct 2026 05:07:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2F5A0606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=eQG5YLie Received: by mail-dl1-f46.google.com with SMTP id a92af1059eb24-170135e43c7so425153c88.0 for ; Thu, 29 Oct 2026 22:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336862; x=1793941662; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bk08wlQLOckMDa/tQlUY0Gs+7pq28CqTbcZ5/8r0npg=; b=eQG5YLiemcyD7gynS3XoDDdULao3locHDmnrjG4et+2MjK2TgMvkAQrG9QLoWTjkVW paQa9x766enbRtr1ES2XUBgwtw6dkysWFI+eKFaWmTxtGZSnw4c9zEF06aFX6jjhneSQ eLT/IEu3OY2Xr2GAut6XRd9RvA8dplmGeYr0+3PMIUjAjD0jQYkJUPl+5cHintRFVYmo ZLfapipm8xNh3CcogXTVolyfpoZ1fD3mKfzs91GqZ+m33n3HNZTDxE3yVn5vENJXfhQM jslvQ6eh5W+XZVtPK7zUGqYsfuJoV/z/dcgudq6tP24oW/qDTEijCD26svya+HVLY3X6 p+ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336862; x=1793941662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=bk08wlQLOckMDa/tQlUY0Gs+7pq28CqTbcZ5/8r0npg=; b=pMtJRuu2tIpwPC8/BAYvPWdOpUpNSon+g+M2E+Uz1NQl4xiyY9b3lNs9qr6C8Xbksr DkCQ87J0eGQ82LsdnIl9N6I3Q+5LNQuNkKTt4S4L3IomEqYAEtleZUv4A1v0ltzsUI8+ dRevMuVo9HxPGHMXlDwQRy2ClIf1ub23irn+xebAhQIUgvvTtX3EFpFwsO0bVBNUwMWd agXg+xscEu3zRIkuoML5wFEhqYqgMEA+krZz8pRqdcQPaL9Qak/4MbITZ0sDOMfidRce nZ/aAZhip2WePattDs5qY92sx/E1CaeC7i7Ssyf28Mf8tW0TLzHjalLks4xc6Gwkv1nX dsGg== X-Gm-Message-State: AFq9FYI4gZc58E2OMkUjP0vTkor1p2yyXhXj3NakWzHnwzR80CK2X9p+ TIBgpZGtBWGtd5JA2Jwb2ZQntx6d9mzyUCIFWtN5FhAzROfawmDyOleXGMa1bQ== X-Gm-Gg: AYBFou26sjdL2UgbQ6Wod8+qHp5r5Hx+mqt02oe6HJ0A5bafDhw3I25ljRjfMaDl/po 1plHNa/CpUSoDokhl1njjpeBnfW/L4mb6fzyfiNo60eDfhBDUBiZo6wTv3YREUEp/hTGqgkXLx9 3XUfEGFYPlz6qBk1zs4V2KHNL//mbVcHj8zDFX7t6GZPKilGSw7y5mAcv0Dm4NUzU9rpJqiiAjP 27Pimlk0iR0w0nluxeIwCIw2OdtcXULOq1Xrb5kt5JFzwoxqS4On2kjeGOEhz/tRX6a9o/Ri2+7 weuMraskHiWMpp7/kuI6Mq1ZQN+YZvBroRNROgPvl4TNzARdt5rCpGOY1llaSXNVhvrHnkpXNpV d1hQ0p++KeeFTZau84AKves3fwRAbxR7yNebYVEgWwpoWqpiSBYk1r/naZzdPMgaSwmlCbhcadc 1ovZi8W9NSBvGO1Rq/YFka6+yfGsdgmfgVZfpsqvmFz6xkPCMN17IS9EuZf2YpQa9bcNYvybbSj XZgO/F0GjUsRls17esUnjXZeZ/td/ol0kf3Mmf6tCdsQYUKdXaNCzD4AfVfgAALu9BH5C9kYZCV iruezbIoN2SizIFihZ5yB+wVVsOW4cAygIk4KR54n5b9+++p1IfvHtTqANPFlmD/LdH9L2F30w9 nlQsIdaamXdcQRaIPgon6zHFa8RCCIiE9eS/Ib0kzLpFZei4D1ocTPJ9gvqo7zkDjPO5GAiv6iA == X-Received: by 2002:a05:7022:628a:b0:1a4:c892:b130 with SMTP id a92af1059eb24-1ac5b9cb62dmr2225730c88.15.1793336861983; Thu, 29 Oct 2026 22:07:41 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:41 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 5/6] selftests: mptcp: pm_nl_ctl: support the subflow-retries limit Date: Fri, 30 Oct 2026 05:07:26 +0000 Message-Id: <20261030050727.3534304-6-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 'pm_nl_ctl limits' can now set the subflow-retries limit with a third value, and shows it when the kernel supports it. pm_netlink.sh checks its default value, that a value above the maximum is refused, that it can be set, and that it is kept when only the other limits are set. This is only done with pm_nl_ctl for the moment: iproute2 does not support this limit yet. Signed-off-by: Anil Kaushik --- Notes: v13: - get_limits_nb only reads the two limits set_limits restores v12: - check the limit is kept when only the other limits are set (netdev Sashiko) v9: - try the value above the maximum after setting 0, not the default value, which is also the maximum: a refused value is then told apart from a clamped one (netdev Sashiko) v8: - the default value is now 127 v7: - also check that the maximum value, 127, is accepted (netdev Sashiko) v5: - new (Matthieu) .../testing/selftests/net/mptcp/pm_netlink.sh | 55 ++++++++++++++++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 34 +++++++++--- 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 21bfe1311f11..80e100d105a2 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -46,15 +46,20 @@ trap cleanup EXIT =20 mptcp_lib_ns_init ns1 =20 +# $3: subflow retries, only shown by pm_nl_ctl, if supported format_limits() { local accept=3D"${1}" local subflows=3D"${2}" + local retries=3D"${3}" =20 if mptcp_lib_is_ip_mptcp; then # with a space at the end printf "add_addr_accepted %d subflows %d \n" "${accept}" "${subflows}" else printf "accept %d\nsubflows %d\n" "${accept}" "${subflows}" + if [ -n "${retries}" ]; then + printf "subflow_retries %d\n" "${retries}" + fi fi } =20 @@ -71,7 +76,23 @@ get_limits_nb() { ip -n "${ns1}" mptcp limits | awk '{ print $2" "$4 }' else ip netns exec "${ns1}" ./pm_nl_ctl limits | \ - awk '{ printf "%s ", $2 }' + awk 'NR <=3D 2 { printf "%s ", $2 }' + fi +} + +# The subflow retries limit is only set and shown with pm_nl_ctl for now. +# Prints its default value if it is supported. +get_default_retries() { + if mptcp_lib_is_ip_mptcp; then + return + fi + + if ip netns exec "${ns1}" ./pm_nl_ctl limits | + grep -q "^subflow_retries"; then + echo 127 + elif mptcp_lib_expect_all_features; then + # missing feature: the defaults limits check will fail + echo 127 fi } =20 @@ -154,8 +175,10 @@ mptcp_lib_subtests_last_ts_reset check "show_endpoints" "" "defaults addr list" =20 default_limits=3D"$(get_limits)" +default_retries=3D"$(get_default_retries)" if mptcp_lib_expect_all_features; then - check "get_limits" "$(format_limits 0 2)" "defaults limits" + check "get_limits" "$(format_limits 0 2 "${default_retries}")" \ + "defaults limits" fi =20 add_endpoint 10.0.1.1 @@ -224,7 +247,33 @@ check "get_limits" "${default_limits}" "subflows above= hard limit" =20 set_limits ${max_limits} ${max_limits} flush_endpoint ## to make sure it doesn't affect the limits -check "get_limits" "$(format_limits ${max_limits} ${max_limits})" "set lim= its" +max_limits_out=3D"$(format_limits ${max_limits} ${max_limits} \ + "${default_retries}")" +check "get_limits" "${max_limits_out}" "set limits" + +if [ -n "${default_retries}" ]; then + ip netns exec "${ns1}" ./pm_nl_ctl limits ${max_limits} ${max_limits} 0 + check "get_limits" "$(format_limits ${max_limits} ${max_limits} 0)" \ + "set subflow retries" + + # not given: unchanged + set_limits ${max_limits} ${max_limits} + check "get_limits" "$(format_limits ${max_limits} ${max_limits} 0)" \ + "subflow retries kept" + + # not from the default: a refused value differs from a clamped one + ip netns exec "${ns1}" ./pm_nl_ctl limits ${max_limits} ${max_limits} \ + 128 2>/dev/null + check "get_limits" "$(format_limits ${max_limits} ${max_limits} 0)" \ + "subflow retries above hard limit" + + ip netns exec "${ns1}" ./pm_nl_ctl limits ${max_limits} ${max_limits} \ + 127 + check "get_limits" "$(format_limits ${max_limits} ${max_limits} 127)" \ + "set max subflow retries" + ip netns exec "${ns1}" ./pm_nl_ctl limits ${max_limits} ${max_limits} \ + "${default_retries}" +fi =20 flush_endpoint add_endpoint 10.0.1.1 diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 78180da1efcc..41467b997018 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -39,7 +39,7 @@ static void syntax(char *argv[]) fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [po= rt ] [token ] [rip ] [rport ]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); - fprintf(stderr, "\tlimits [ ]\n"); + fprintf(stderr, "\tlimits [ []]\n"); fprintf(stderr, "\tevents\n"); fprintf(stderr, "\tlisten \n"); exit(0); @@ -1217,6 +1217,7 @@ int flush_addrs(int fd, int pm_family, int argc, char= *argv[]) static void print_limits(struct nlmsghdr *nh, int pm_family, int total_len) { struct rtattr *attrs; + const char *name; uint32_t max; =20 for (; NLMSG_OK(nh, total_len); nh =3D NLMSG_NEXT(nh, total_len)) { @@ -1235,13 +1236,22 @@ static void print_limits(struct nlmsghdr *nh, int p= m_family, int total_len) while (RTA_OK(attrs, len)) { int type =3D attrs->rta_type; =20 - if (type !=3D MPTCP_PM_ATTR_RCV_ADD_ADDRS && - type !=3D MPTCP_PM_ATTR_SUBFLOWS) + switch (type) { + case MPTCP_PM_ATTR_RCV_ADD_ADDRS: + name =3D "accept"; + break; + case MPTCP_PM_ATTR_SUBFLOWS: + name =3D "subflows"; + break; + case MPTCP_PM_ATTR_SUBFLOW_RETRIES: + name =3D "subflow_retries"; + break; + default: goto next; + } =20 memcpy(&max, RTA_DATA(attrs), 4); - printf("%s %u\n", type =3D=3D MPTCP_PM_ATTR_SUBFLOWS ? - "subflows" : "accept", max); + printf("%s %u\n", name, max); =20 next: attrs =3D RTA_NEXT(attrs, len); @@ -1254,15 +1264,17 @@ int get_set_limits(int fd, int pm_family, int argc,= char *argv[]) char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + 1024]; - uint32_t rcv_addr =3D 0, subflows =3D 0; + uint32_t rcv_addr =3D 0, subflows =3D 0, retries =3D 0; int cmd, len =3D sizeof(data); struct nlmsghdr *nh; int off =3D 0; =20 /* limit */ - if (argc =3D=3D 4) { + if (argc =3D=3D 4 || argc =3D=3D 5) { rcv_addr =3D atoi(argv[2]); subflows =3D atoi(argv[3]); + if (argc =3D=3D 5) + retries =3D atoi(argv[4]); cmd =3D MPTCP_PM_CMD_SET_LIMITS; } else { cmd =3D MPTCP_PM_CMD_GET_LIMITS; @@ -1287,6 +1299,14 @@ int get_set_limits(int fd, int pm_family, int argc, = char *argv[]) memcpy(RTA_DATA(rta), &subflows, 4); off +=3D NLMSG_ALIGN(rta->rta_len); =20 + if (argc =3D=3D 5) { + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_SUBFLOW_RETRIES; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &retries, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } + /* do not expect a reply */ len =3D 0; } --=20 2.25.1 From nobody Thu Nov 5 07:28:48 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.44 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793336865; b=ExIRMI2RbYmx/elNJyvm2RNDaU8Cps0WYeJpkwJrlXtUdkb2wsaw1kERpjWRI2FSskud x5r1Y4Y7rElnw4XOIQuprXDQxKI39EM0jeiW/yipkASfMF7vHk4y9Vp9RNr1hC1gyei76 qEFEi9HYZ/4LjCYsxdninvTGpGo4Ms7wjEi3xd2p1v1YM6m/twnKd30VO37dGkJEsTh8H 8aaC01NmCwpF7kyABWpq+Wcvy1oIo2d4MyXMoEl6Y359q1oieOqHFD1HN8UiQtqWoaeUy 45BD+YibK5ZVDvqet8V4NMObT5D7jJzQ59jWKDmi1elZz2dUWu0XFyd4HnOcpExUYhA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793336865; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=41Gu3hhgFwfLuKBWlioZ/UlHeon4Tav4wHrt2Tw4BFo=; b=Gqqrs+PdSJ/7ASllIW8HXw1auKeKFFVq5uglRL6S98MCBnPxtAvChr3dolXakRzsqrX5 oAAU84oAarXGDLqWVcNuH83XunuOSCPhObffZ+EZ8dg4nHNIKBHsY+7QuBypWu6EfroVn e6R6enabpbZKfIRegoWNewQdgTPSN8LXDQoBPmQzzsFcw1KsGiu9bqDyeSuNjh1wg1Mw3 kR3T+T3YNnteC4QuBoY4SIVt8Dh6bk3E+64w7evz4Rcw9kC3x/3fzMEQc3I5yTM1dkxVk XvpyO3MzDiTxm1mk5yKTzLIqGh3yqKJs+B5EG/RfnKnLCy0THYzppW8h1dUPiqDiP8A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ow06valr; arc=none smtp.remote-ip=74.125.82.44 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 381CE606A31C for ; Fri, 30 Oct 2026 05:07:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 381CE606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ow06valr Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-1846bc43c28so341987c88.0 for ; Thu, 29 Oct 2026 22:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793336864; x=1793941664; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=41Gu3hhgFwfLuKBWlioZ/UlHeon4Tav4wHrt2Tw4BFo=; b=ow06valrianWP0aDanMtLemsxoKigTLWjGODCqweYWbd8jr1/NFsRdPxNLfmMTuey2 5b9dNQRQV/8RqXfW0vQ4jDGZMhBXtRh2Bmj6MBcE3O+IrkCtln6nu47Rv/JW/igKdPnt 2pvBRErlNgOWdgoS3puD+Ehn8cqK/3RUDf480b4jrozxhcac2x0oMiVO690WPEA7iyde j5/YDbXk7usUpHxJ3CjPmEZQLJoDfwoB+NdCqDvnzhiBjqp37ROgS3rTW53KA6v7Stz1 lKgKLBT7CL4tlnXz9EtMMa22AOuOt5LVancEx7YBVia3tf66+0ig3sYHr+KTsT1pcWBn ydmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793336864; x=1793941664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=41Gu3hhgFwfLuKBWlioZ/UlHeon4Tav4wHrt2Tw4BFo=; b=ei4GzesQwwHhL5WkmESv1bpkNU+/vX7LrdZ5Wtz89Wdm3/JKIYbHyI7VfR6u+exLj0 YB+BKPBiMGpNX1wkPH6zKTTvG3427rAsBPjXv2SDQ8eL73iegGwZx+Xt6te6b1q93fyp QaS6HoXlDuwbIPBseAk9TD9zBaP1OiTaNRR3AZ6mFtS+kBYdziDmx/azmX3FxnTuleXg tT1oEszWxTSoOUVMj4P3en+2jqpyRcXA8VGGY6vEPfQPSOLmHZ/4FEC7Qv5Q4sswv1+Q ghiFhVAgYM2qsnCaMadUPPcTSjXsy0lDOZ5QE3sQXTSg8doDKEzykrj8z2s+/TOOwQSY Lhhg== X-Gm-Message-State: AFq9FYIpsCqwBU7DFgao1dNnJP9JWD2Gt34xo9+IoGc4NZKaaYQDaYEu Li+cTFbh9mqRtlgN4cD79SEuabOIM+xrboijvRgJ2l/fROw/9XHwHAAhJCh+9A== X-Gm-Gg: AYBFou1peNJZDG86VMrdk6MHM36r+d47IiRiLdcQUza/FhYBTrdoH5McMQ1fQCC84yr kuYy6+6pfK0n6Odzvu7BZOtzEyoxuws4klXUK6m0GyIm8lGqO6rn5ItOFo7LeLJYz6CbBPOsYv/ qrhg56Bli6j/Cg7R2c6cBA7l1QevSno0DFTqVb/oxdSc72GgTvUKnPv6PIHCni0MeZCapeJ/XX0 NFmfihzJUGoAhcohiMUsCl9ujjPJzLA+QU7HtPTY86dd6vDOKyI76FPr4Nndb66yYai7CWC/Tq4 P5TxmUz0NF6DUxb8ojgysrXR/hi9vD1jrqKsg4/TTWovWOZuqo7tUtgxMM9sArONHsOVsXkZHiK 7ww3Qai92ZMreU2MNdWe5gNFYaMcN7m0+u34pRIyyIeUCjT5yJMO5Asg7+rvFOvUu1dGzNTpTYL x7hoOjMzdAp4HDHGdozC6qPsnFV5AAM4Uupx6AS4hMcEWWAT/oON0BUAINGYBylapY+lgyHJfu9 gdJL0qGFJ5KYjG2HvLb5dkLgB9TjcMtRG4/2lyQZ/5zDYkPTh2BKjMw4y9phSveGRo/TrU7w66J 4dyN3mLLgdFAoydf6qvBbydqqSJrsZkOdhoq9aZgVJqeu3xRGyEHb3zzvPs+CPeFDFjEAr8q7gu +11gkAsF7USv34aAq6+ulhSfB9zVRnP6mGrnE+D8aXt7VcN8lVeaD7cxXNtuWxDtZ4kfi164gdQ == X-Received: by 2002:a05:701b:2302:b0:182:9071:3249 with SMTP id a92af1059eb24-1ac5de53bdemr1385164c88.30.1793336864060; Thu, 29 Oct 2026 22:07:44 -0700 (PDT) Received: from ramen-dev-security-2.asia-south1-c.c.ramen-dev-345017.internal (90.156.200.35.bc.googleusercontent.com. [35.200.156.90]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1b38ac58sm3512702c88.23.2026.10.29.22.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 22:07:43 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v13 6/6] selftests: mptcp: join: validate subflow retry after link failure Date: Fri, 30 Oct 2026 05:07:27 +0000 Message-Id: <20261030050727.3534304-7-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> References: <20261030050727.3534304-1-anilkaushikwireless@gmail.com> X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Test the subflow-retries limit, with its default value, and a long connection in the background: drop the packets the client sends from the additional subflow address with netfilter, without bringing the link down, until the subflow is closed and re-created. Let them through again once the SYN of the new subflow has been retransmitted more times than tcp_syn_retries allows, and check the subflow comes back from the same address. Then do the same with the initial subflow. A second test closes the connection while a subflow is being re-created, and checks the netlink events. Only the client sends data: the server reads it all first, in sendfile mode, and keeps its side open. The client gets a big MPTCP send buffer compared to its subflows, and both paths are blocked: the data left in it is never sent, nor the DATA_FIN, so only the close of the MPTCP socket can stop the subflow being re-created. Only the client is closed: it has nothing left to read, so the connection is not closed with a fastclose, which would reset all the subflows anyway. The check is skipped if a fastclose happens. The big files used for the long connection are emptied at the end. A third test checks the only subflow is not re-created: there is no other subflow to send data. The tests are skipped if pm_nl_ctl does not show the new limit, or if the filter rules cannot be set. Signed-off-by: Anil Kaushik --- Notes: v13: - wait for the SUB_CLOSED event before stopping the listener (netdev Sashiko on v12) - the first test stops if no additional subflow got established, the third one waits for the SUB_CLOSED event, and say why the tcp_wmem min value is above the max v12: - wait for the client side of a re-created subflow to be fully established before going on: the close would close it too otherwise (netdev Sashiko) - the third test only checks the subflow is not re-created, say only that (netdev Sashiko) v11: - the third test checks the only subflow is not re-created, and the path-back test is gone: a subflow is only re-created while another one can send data - the close test keeps the initial subflow while checking: without the fix, it would no longer pass when the initial subflow closes after a few retransmissions; a SUB_CLOSED event for the re-created subflow v10: - new test: the path of the only subflow comes back before the close timeout, and the connection stays open (sashiko.dev) The path comes back as soon as the subflow is re-created, with a 30s close timeout, longer than the SYN backoff, and its transfer has a longer poll timeout, with no data at all while the only path is blocked: both are needed on a slow debug kernel v9: - wait for absolute counter values, read before blocking the path, or 0 and 1 in the new netns: the subflow can be re-created before a later read (netdev Sashiko) - check that the connection is established before blocking it, in the close test and the new one (netdev Sashiko) - the close test blocks the other path too, with a big msk send buffer: the pending data and the DATA_FIN no longer close the subflow being re-created, only the close of the MPTCP socket can. Checked: both the close test and the new test fail without their fix - new test: the only subflow is re-created, and the connection is still closed after the close timeout - $sinfail as the server input, kill errors ignored, clearer failure message, $cout and $sout emptied too - the server of the second test reads all the data from the client first, in sendfile mode, instead of blocking on a FIFO in poll mode: the client always has data in flight (netdev Sashiko) v8: - comment in run_tests() matching the new condition (netdev Sashiko) - a separate test closes the connection while a subflow is re-created: the server sends nothing but keeps its side open, and only the client is closed, so there is no fastclose, which would reset all the subflows anyway; the check is skipped if one happens (netdev Sashiko) v7 (netdev Sashiko): - the test_linkfail=3D1/2 modes regenerate the shared files when they are empty, e.g. when running link_failure_tests() twice - read the MP_JOIN ACK counter before letting the packets through, and do not compare the ports, they can be reused v6 (Sashiko): - use the slowwait helpers from net/lib.sh - longer first wait, while the 128 MB files are created - skip if the filter rules cannot be set, check each drop rule (netdev Sashiko) - empty the big files at the end, cinsent too, keep the variables (netdev Sashiko) v5 (Matthieu): - skipped if pm_nl_ctl does not show the new limit - wait for the SYN retransmissions instead of a sleep, with tcp_syn_linear_timeouts=3D0 - helper for the check after the close - slower links with short queues, so the transfer lasts the whole test on any machine, longer timeout (killed at the end) v4: - default limit, no sysctl or MIB counter - more SYN retransmissions than tcp_syn_retries - close the connection while a subflow is re-created - check the netlink events - check the waits and the new subflow port, remove the big files at the end (Sashiko) v3: - check the subflow address, create the files before the background job v2: - one test, with netfilter .../testing/selftests/net/mptcp/mptcp_join.sh | 350 +++++++++++++++++- 1 file changed, 342 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c3ccce96b45b..00190a9ffc12 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -52,6 +52,7 @@ nr_blank=3D6 # These var are used only in some tests, make sure they are not already set unset FAILING_LINKS unset test_linkfail +unset server_in unset addr_nr_ns1 unset addr_nr_ns2 unset cestab_ns1 @@ -1038,7 +1039,12 @@ do_transfer() fi =20 extra_srv_args=3D"$extra_args $extra_srv_args" - if [ "$test_linkfail" -gt 1 ];then + if [ -n "${server_in}" ]; then + # the server reads all the data from the client before sending + # this file: it does not block on its input + extra_srv_args=3D"$extra_srv_args -m sendfile" + listener_in=3D"${server_in}" + elif [ "$test_linkfail" -gt 1 ]; then listener_in=3D"${sinfail}" fi ip netns exec ${listener_ns} \ @@ -1135,9 +1141,9 @@ run_tests() cinfail=3D$(mktemp) fi make_file "$cinfail" "client" $size - # create the input file for the failure test when - # the first failure test run - elif [ "$test_linkfail" -ne 0 ] && [ -z "$cinfail" ]; then + # create the input file for the failure test, when + # it is missing or has been emptied + elif [ "$test_linkfail" -ne 0 ] && [ ! -s "$cinfail" ]; then # the client file must be considerably larger # of the maximum expected cwin value, or the # link utilization will be not predicable @@ -1146,23 +1152,27 @@ run_tests() size=3D$((size*8192)) size=3D$((size + ( RANDOM % 8192) )) =20 - cinfail=3D$(mktemp) + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi make_file "$cinfail" "client" $size fi =20 - if [ "$test_linkfail" -gt 2 ]; then + if [ "$test_linkfail" -gt 2 ] && [ -z "${server_in}" ]; then size=3D$test_linkfail =20 if [ -z "$sinfail" ]; then sinfail=3D$(mktemp) fi make_file "$sinfail" "server" $size - elif [ "$test_linkfail" -eq 2 ] && [ -z "$sinfail" ]; then + elif [ "$test_linkfail" -eq 2 ] && [ ! -s "$sinfail" ]; then size=3D$((RANDOM%16)) size=3D$((size+1)) size=3D$((size*2048)) =20 - sinfail=3D$(mktemp) + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi make_file "$sinfail" "server" $size fi =20 @@ -2151,6 +2161,203 @@ wait_attempt_fail() return 1 } =20 +# $1: timeout in seconds ; $2: ns ; $3: counter ; $4: increment, 1 by defa= ult +wait_counter_inc() +{ + slowwait_for_counter "${1}" "${4:-1}" \ + mptcp_lib_get_counter "${2}" "${3}" >/dev/null +} + +# $1: timeout ; $2: ns ; $3: counter ; $4: value to reach +wait_counter_ge() +{ + slowwait "${1}" until_counter_is ">=3D ${4}" \ + mptcp_lib_get_counter "${2}" "${3}" >/dev/null +} + +# $1: client address ; prints the local address and port of its subflow +sf_from() +{ + ip netns exec $ns2 ss -tnH state established src "${1}" | + awk '{ print $3; exit }' +} + +# the client got the 4th ACK of the MP_JOIN +sf_fully_established() +{ + ip netns exec $ns2 ss -tniH state established src "${1}" | + grep -q "tcp-ulp-mptcp flags:[A-Za-z]*e" +} + +has_subflow_retries() +{ + ip netns exec $ns2 ./pm_nl_ctl limits | grep -q "^subflow_retries" +} + +# the client packets are dropped with rules in this chain +init_nft_filter() +{ + init_nftables + if ! ip netns exec $ns2 nft list chain ip filter OUTPUT \ + &>/dev/null; then + mark_as_skipped "unable to set the filter rules" + return 1 + fi +} + +# $1: client address +nft_drop_from() +{ + ip netns exec $ns2 nft add rule ip filter OUTPUT ip saddr "${1}" drop +} + +# $1: client address to block +# +# The link stays up, but the client packets from this address are dropped: +# the subflow using it is closed after a few retransmissions, and re-creat= ed. +# The packets go through again once the SYN has been retransmitted more ti= mes +# than tcp_syn_retries allows: the new subflow still connects thanks to the +# subflow-retries limit. +sf_retry_after_block() +{ + local before ack_rx syn_tx + + before=3D$(sf_from "${1}") + + print_check "subflow from ${1}" + if [ -z "${before}" ]; then + fail_test "no established subflow from ${1} before the block" + return + fi + + # read before the block: the subflow can be re-created right after it + syn_tx=3D$(mptcp_lib_get_counter $ns2 "MPTcpExtMPJoinSynTx") + if ! nft_drop_from "${1}"; then + fail_test "unable to drop the packets from ${1}" + return + fi + if ! wait_counter_ge "${timeout_poll}" $ns2 "MPTcpExtMPJoinSynTx" \ + $((syn_tx + 1)); then + ip netns exec $ns2 nft flush chain ip filter OUTPUT + fail_test "subflow from ${1} not re-created" + return + fi + # tcp_syn_retries=3D1: one more retransmission than allowed + if ! wait_counter_inc "${timeout_poll}" \ + $ns2 "TcpExtTCPSynRetrans" 2; then + ip netns exec $ns2 nft flush chain ip filter OUTPUT + fail_test "SYN from ${1} not retransmitted enough" + return + fi + # read before the flush: the next SYN can be sent right after it + ack_rx=3D$(mptcp_lib_get_counter $ns1 "MPTcpExtMPJoinAckRx") + ip netns exec $ns2 nft flush chain ip filter OUTPUT + + if ! wait_counter_ge "${timeout_poll}" $ns1 "MPTcpExtMPJoinAckRx" \ + $((ack_rx + 1)); then + fail_test "re-created subflow from ${1} not established" + return + fi + + # before a close, which would close it too if not fully established + if ! slowwait "${timeout_poll}" sf_fully_established "${1}"; then + fail_test "no fully established subflow from ${1}" + else + print_ok + fi +} + +# $1: ns ; prints the number of MP_FASTCLOSE sent and received +fastclose_nr() +{ + local tx rx + + tx=3D$(mptcp_lib_get_counter "${1}" "MPTcpExtMPFastcloseTx") + rx=3D$(mptcp_lib_get_counter "${1}" "MPTcpExtMPFastcloseRx") + echo $((${tx:-0} + ${rx:-0})) +} + +no_sf_connecting() +{ + ! ip netns exec $ns2 ss -tnH state syn-sent | grep -q . +} + +# The client has nothing left to read: it closes the connection without a +# fastclose, which would reset all the subflows anyway. +kill_client() +{ + local pid + + for pid in $(ip netns pids $ns2); do + if [ "$(cat "/proc/${pid}/comm" 2>/dev/null)" =3D mptcp_connect ] + then + kill "${pid}" 2>/dev/null + fi + done +} + +# $1: why the subflow is not being re-created before the close, if it is n= ot +# $2: number of MP_FASTCLOSE before the close +chk_no_sf_connecting() +{ + local closed + + print_check "no subflow connecting after close" + if [ -n "${1}" ]; then + fail_test "${1}" + return + fi + + # closed with the MPTCP socket + slowwait "${timeout_poll}" no_sf_connecting + closed=3D$? + if [ "$(fastclose_nr $ns2)" -gt "${2}" ]; then + print_skip "closed with a fastclose, resetting all the subflows" + elif [ "${closed}" -eq 0 ]; then + print_ok + else + fail_test "subflow still connecting after close" + fi +} + +# Slow links with short queues: the transfer lasts the whole test on any +# machine, and the blocked subflow always has data in flight. +sf_retry_init() +{ + local i + + for i in 1 3; do + tc -n $ns1 qdisc add dev ns1eth$i root netem \ + rate 4mbit limit 30 delay 1ms + tc -n $ns2 qdisc add dev ns2eth$i root netem \ + rate 4mbit limit 30 delay 1ms + done + ip netns exec $ns2 sysctl -q net.ipv4.tcp_retries2=3D3 + ip netns exec $ns2 sysctl -q net.ipv4.tcp_syn_retries=3D1 + ip netns exec $ns2 sysctl -q net.ipv4.tcp_syn_linear_timeouts=3D0 + pm_nl_set_limits $ns1 0 4 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + # created here, not in the background job, for cleanup() + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi +} + +sf_retry_cleanup() +{ + ip netns exec $ns2 nft flush chain ip filter OUTPUT + # big files: empty them, the next tests write their own content + : > "$cinfail" + : > "$sinfail" + : > "$cinsent" + : > "$cout" + : > "$sout" +} + set_userspace_pm() { local ns=3D$1 @@ -2585,6 +2792,133 @@ link_failure_tests() chk_stale_nr $ns2 1 -1 2 chk_link_usage $ns2 ns2eth3 $cinsent 50 fi + + # subflows closed after a silent link failure, then re-created: the + # additional one, then the initial one + if reset_with_events "subflow retry after link failure" && + continue_if has_subflow_retries && init_nft_filter; then + sf_retry_init + # killed at the end: the timeout only stops a stuck test + { timeout_test=3D600 test_linkfail=3D131072 \ + run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null + local tests_pid=3D$! + + # the 128 MB files are created first, that can take a while + if wait_counter_ge $((timeout_poll * 4)) \ + $ns1 "MPTcpExtMPJoinAckRx" 1; then + sf_retry_after_block 10.0.3.2 + sf_retry_after_block 10.0.1.2 + else + print_check "additional subflow" + fail_test "no additional subflow before the blocks" + fi + mptcp_lib_kill_group_wait $tests_pid + kill_events_pids + + join_syn_tx=3D3 chk_join_nr 3 3 3 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 3 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 2 error 2 + sf_retry_cleanup + fi + + # close the connection while a subflow is being re-created + if reset_with_events "subflow retry, close while connecting" && + continue_if has_subflow_retries && init_nft_filter; then + sf_retry_init + # A big msk send buffer, compared to the subflow ones: when the + # client is closed, some data is not given to any subflow yet, + # so the DATA_FIN, which would also close the subflow being + # re-created, is not sent. The min value is above the max on + # purpose: __mptcp_sync_sndbuf() adds it to the subflow ones. + ip netns exec $ns2 sysctl -q \ + net.ipv4.tcp_wmem=3D"1048576 65536 262144" + # The server reads until the client closes, and sends nothing: + # the client has nothing to read, and the connection stays + # established. The transfer is stopped on purpose, its result + # is not checked. + : > "$sinfail" + { timeout_test=3D600 test_linkfail=3D131072 server_in=3D"$sinfail" \ + run_tests $ns1 $ns2 10.0.1.1 >/dev/null & } 2>/dev/null + local tests_pid=3D$! + + local not_ready=3D"" syn_tx + if ! wait_counter_ge $((timeout_poll * 4)) \ + $ns1 "MPTcpExtMPJoinAckRx" 1; then + not_ready=3D"no additional subflow before the block" + else + # read before the block: the subflow can be re-created + # right after it + syn_tx=3D$(mptcp_lib_get_counter $ns2 \ + "MPTcpExtMPJoinSynTx") + if ! nft_drop_from 10.0.3.2; then + not_ready=3D"unable to drop the packets" + elif ! wait_counter_ge "${timeout_poll}" \ + $ns2 "MPTcpExtMPJoinSynTx" $((syn_tx + 1)); then + not_ready=3D"no subflow re-created before close" + fi + fi + # Block the other path too, so this data is never sent: only + # the close of the MPTCP socket can then stop the subflow being + # re-created. The initial subflow is no longer closed after a + # few retransmissions: that would close it too. + ip netns exec $ns2 sysctl -q net.ipv4.tcp_retries2=3D15 + if [ -z "${not_ready}" ] && ! nft_drop_from 10.0.1.2; then + not_ready=3D"unable to drop the packets" + fi + local fc_before + fc_before=3D$(fastclose_nr $ns2) + kill_client + chk_no_sf_connecting "${not_ready}" "${fc_before}" + mptcp_lib_kill_group_wait $tests_pid + # the listener could be stopped before it got the last event + wait_event ns2 MPTCP_LIB_EVENT_SUB_CLOSED 2 + kill_events_pids + + join_syn_tx=3D2 chk_join_nr 1 1 1 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 1 + # the re-created subflow, closed with the MPTCP socket + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 2 error 1 + sf_retry_cleanup + fi + + # the only subflow is not re-created + if reset_with_events "subflow retry, no other subflow" && + continue_if has_subflow_retries && init_nft_filter; then + sf_retry_init + pm_nl_flush_endpoint $ns2 + { timeout_test=3D600 test_linkfail=3D131072 \ + run_tests $ns1 $ns2 10.0.1.1 >/dev/null & } 2>/dev/null + local tests_pid=3D$! + + print_check "not re-created" + if ! wait_counter_ge $((timeout_poll * 4)) \ + $ns1 "MPTcpExtMPCapableACKRX" 1; then + fail_test "connection not established" + elif ! nft_drop_from 10.0.1.2; then + fail_test "unable to drop the packets" + elif ! wait_counter_ge "${timeout_poll}" \ + $ns2 "TcpExtTCPAbortOnTimeout" 1; then + fail_test "subflow not closed" + else + # the worker decides right after it reports the close + wait_event ns2 MPTCP_LIB_EVENT_SUB_CLOSED 1 + sleep 1 + local syn_tx + syn_tx=3D$(mptcp_lib_get_counter $ns2 \ + "MPTcpExtMPJoinSynTx") + if [ "${syn_tx}" !=3D 0 ]; then + fail_test "subflow re-created" + else + print_ok + fi + fi + mptcp_lib_kill_group_wait $tests_pid + kill_events_pids + + join_syn_tx=3D0 chk_join_nr 0 0 0 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 1 error 1 + sf_retry_cleanup + fi } =20 add_addr_timeout_tests() --=20 2.25.1