From nobody Thu Nov 5 07:28:36 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.175 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793019233; b=reSMP5SKLkVCSDSGP0DHiSnEU06uKPmq5P1irjGbjVxQ6ZBXOW0EzTlpDrBTlspGffIv aGhwjTko/1r4jMvsz5/ZdMbw99baXAYZMgoS27QGxKVWGDZ39zGh70kEJ0BWO8l5ejuci ZPKDVNi8+tH7UxFGBf44rLR176vhTJ3xxLiMTdkNx2KOi4q2PtAHKyf7/ZY8obNVBflIo s81lx4CxGQ3bLnawjYp58b5B8P4UTP7XjxHxgf29Ls4q0Q9lvHRVtCJSKa2gwBJC7JntJ yLEq2AOpJOfupuHGKv7Y+K3XKruwzMoxisbzg04rMlB9Wf83vviaDxHx+WMR0omqvlQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019233; 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=XwlldahLZl6u6KBDX9l7n8vOmnvTZvhZdUFA/a8ErDA=; b=dv6T4DxZVEKuvSGxVVqD5/f0AdJOnJGPNJ3l4LUjEneOtk05uTGg6+ff7JOMov7WFmrV UwFpD7PREyvlb3SyyfRQ8SmeBXLm1AF+4sxLwmfGRjUZIcKv9sMVAq51Phd6p3UwWmNgr ena+0zqpjBoa7ennzRzBWP72xOoXG84cXDR9vWxj4F1yhYXOv+RmL0KFyqZRQMbCUe+b4 rOx8K1w3NHHo4m/7vt55NRIj4Z3IpScnT5GlsCnX377/z3Mf98Z7ahNXC6x8hGARGzD2+ 35AOQbnWlJXlHza8C5KkBNrJH3knMJaxRd7nha1UcAkX2Z4DT1niJROrRPTWRfjBXAQ== 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=20251104 header.b="iGJvNAa/"; arc=none smtp.remote-ip=74.125.82.175 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 DADC4606A31E for ; Mon, 26 Oct 2026 12:53:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org DADC4606A31E 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=20251104 header.b=iGJvNAa/ Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-369f3e9e431so599114eec.1 for ; Mon, 26 Oct 2026 05:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019232; x=1793624032; 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=XwlldahLZl6u6KBDX9l7n8vOmnvTZvhZdUFA/a8ErDA=; b=iGJvNAa/WowBH9X56D5SqbF8AQJKvgMBV6o1NO24Xf2qg8hdmLhTT41lTK/FGjwjch pBJEb6La3cSdhcYHCjJFVMpXJ4j7uRDk1jjnrQXN6cdFnEEZmcV80GiQxNIExxO3aMuL FmlR5ZM/hs53HOFxnsNKJCMm2aWaIOJrzBmuK8eDKPG47fbNcy9a3P5QxkdPZdbQMx36 CZdDg05TnaNUIs60RronK1VIO5cjKFJT2dR3xqF4DRIN7oc2r3FGmSNmoaxyy+F/BXfg z5OftO1AxJNNQA3+pxeVMmLTP/iSQFUNUZkAulKiw/SYY/xow9Um4Xiu+CMdTHgjg16M kfww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019232; x=1793624032; 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=XwlldahLZl6u6KBDX9l7n8vOmnvTZvhZdUFA/a8ErDA=; b=GDfC7PH1jv9x8ynVQtykUmKi6qjot82HpEQNY5W41oyZMqdis8mMF4lNhtQMZTM793 cpm3aQKduKPcM78HQjU0ovyFMjSWltOxCjo67OzVZrOOge/pcxyYUEu7Sn/sFsXPUDeI KluhbgUIf6zQfMOhZr0XJcMmZFoeVYWzPez8uBoUlbH/rwoFnlkLoYcW0Fdh3wGwkRXz BQ5ZhIbaWs1V8i0tLumdoOjHjYZzd6Sv+nwK9mD32C3lg4XY43njwRfawApFuz9kgJUh STgmGRo0c6moyHVXnAiXSY/cjcL07TzFKBks7oOPZ184+Yz/yXrMnFnokCBw8qPvQUJC HeeA== X-Gm-Message-State: AFq9FYJGEFhds3/+2ZyKjNVK4JsUimLtB+dTQwzffglNLCclqWVoPLl5 msiPCIqiG4d8JQK1g/0ZWKOvaGocQmA22l26BVSrT6FCVK010xz3NjqjDSud1g== X-Gm-Gg: AYBFou3yAeNelss47d6U64xOJiNwlvjHCQvDvl5idXVsnDysjzavh9yc2GUHAUgrp7e 6b40SKNuMTtMuDPgUzeUhorKKvy6gzJIjtkKD4bmfKWpa23BnD1PyyTosCPKdyUsgcJI0bNPioc GSGrE1GMgTMzl8NaEbu7YiR5RrvSULqlOnLWj81Ij+9tna+w2Omwck/6l9wxqDnF5Lhog8Tz0Aj 34SwUxQWQLVAi7JuY3e8L4fSTKGk1/Q+LvVzC7UzUCdo9SNYrYfDa4Ysp0KLHtQBN7nwnaLkDxV ZDYxqGxeYtBuKZHOqqx7BLGXjVqe3C/qoyLsFw9D4Sz0bAo93lYQzT8QmZV6SDqZTABp8c6/ptv QG0U+w9iLB3e39f2pmRRHUMIKGxOKfrIQRe/18hfYdv4UsztCtLEw55Kx1InqYyMX4QaO9Xlcf2 6pE2L+F9AEgk3Q1Le4fapQ6IpFcKzK78+RfgJ9GllLygPlv/pynY8Gfgku9doaSGTRaEZDU8lnd h2JnYefOn9MQmxhv+RwwMku+zyKNjdDmbqg1Z0MGZvopwF4bVdV/SI/IfdDPhE30RXh7zSbFdmA qwZByN93YD2Wrw5C9r1d2a9vtCDaVzOCvcLaTU+Zjmzn1X+yU2QPNyMYybueSyvNP7Ruet4C5tK lC9KBCx4vtI94yq3OWG/SwrUW X-Received: by 2002:a05:7301:2f0b:b0:351:606f:2832 with SMTP id 5a478bee46e88-369e875a232mr9901090eec.3.1793019231698; Mon, 26 Oct 2026 05:53:51 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:53:51 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 1/6] selftests: mptcp: connect: retry write() on EAGAIN Date: Mon, 26 Oct 2026 12:53:40 +0000 Message-Id: <20261026125345.3019372-2-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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 retries, 1ms apart: poll() does not check every cause of EAGAIN. Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Anil Kaushik --- Notes: 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:36 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.174 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793019235; b=JSoEWLoMNVQ8DMElsYwRAjSwRcETbdIvfk68V44A0VELQ/lNsG8dI/jl4BFNrqaxAmlh L1A/ohK97GjOr+oYCtR1CJm5O4bUhZd2c9xX9iFyDY+Skw+qjEuI9XL96A78pepbqVuqA c9m/rcvyaMRB+xebcvpDbWXFnUtlICUG8fa0gT6ykU0jlKci+EHRrWWlW2oKeloY4l+Te CkstaNbjJ4DWhUD79o/9c2RXvq5rmPCg0Ds9FyL5VCNczLDJsC2mrhVYE1+/W/UsKJEa+ tS9GDKtcVZ9cGAZ0R/LoUYjDZICccNSINJNp+JbE7fUEP1jBqB7Bt/0Wi0JYo5YXohg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019235; 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=iDN++p14xQSZ6pzcX6z+WwUfA66bIS1157r+pMeRjm+wIKlA7500rp+0ooEPzosTO/Un 1q0RW8GE3kgO+0+qNK+7Ui3ePxYC3r7tGhRGdMQ8uEvpzDnKl9esOxzy5qw9z9ZcmvqWR kzZDUw7KJfK2tj6QMeJlbSQ8dahTvDuyT2KjHxhDLhkUrnF1cPu/W+Agh2RG1zU/n2o1r oiy3E+c3+XKIVhl92MGH5q1trs/ldfrlWYOSJLCdjLzXQbb1OfLfKvyb3u3zXN9/RWFbn nmY3rT7dhPafNqwJuTx5GAAGrIpCU7ikKEti43FvOqqPvJIr/7mN5NGaPHFdW16i6uw== 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=20251104 header.b=ZaLrsBWe; arc=none smtp.remote-ip=74.125.82.174 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 239F7606A31B for ; Mon, 26 Oct 2026 12:53:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 239F7606A31B 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=20251104 header.b=ZaLrsBWe Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-35c76e9614aso4769727eec.0 for ; Mon, 26 Oct 2026 05:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019234; x=1793624034; 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=ZaLrsBWe4ZDDtfbdx/KjUX7w5S7YJojhTbRfYVP1B2V5HMoPLViIfLEp9K6DIQ1g1S W3Zv7pnJypmOB94MlTrlS0IpGE0jxf160WtKfSq581wLtlzkckngK66A8/69wooRsQTG ROM1wxRVJPmfRlATKmyyoR0P5NMztcnuNxvddc0XsdETRmO0fP+ld3gwmISMoj9rJWAO iHngK8Wd78BY2X5N+npKc/0Lh1Mj/ovimYfJEDM5QS7ga8hJSjZN6DBy0lwTHnednuvb DjlZsDNTiqZcath86Q7qQPYCALsCeHR2fce4D1ny1pxcp40nsan7+qnQvwMxMxUlai6P 7Ofw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019234; x=1793624034; 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=P9HSlFWBC0naResfCEg8rMyDlS9ZoYtYNOHvNhQhkH4BI+fTL4OHij/n/IVaW/uQqV DPMtzfa/h/OolVsu/qBwUoAAuK2Zx3xLDCzRPRxjAgnL8d1zQJvDjcdpF0eThKs9XoCJ f50yroBxb/i9DITH0WvcxlhcjCZ8gcPVoObW+U8t/YnzDaLwZQYPY7FfZk54wCC8vmuV AwD9LbnOBsAR2SgLxs2Bv3Rm+Iww9ZWU6vafcnuO5Xd4GVx55Yx/teH8RDAS4mzyQZEu oI14RFNe3KPjCZVX8K8xCNhuulBVhou2j0F7zgQBdmPWd4HASjbzYFNcOcE/QU98OdxM jQ7A== X-Gm-Message-State: AFq9FYI2wRRBLuc6qu194v5GdupwgLxPIEZF6iCL89dFzv6LXa3oyw6S 7LKMbhzitA/4+1k/iGSy9HNhjanu+gFBgit2WTvRhMPwy0y2yV5c9uwyMLHLzw== X-Gm-Gg: AYBFou0+pghY8qC/1Z4RBWXvWKhGxKXSQTl3j6OMtSaPZaNg7a4xod/Rct5fwyrHAmd J0d8cWVFgFBvixy60DYW6LZTEE4UKpBq1uS4oom6PL5WYzubIWyOXPvfMl9+2rPBkccXYCHmi2i UeCJ0j8jKHEAyODBoZtN0pcim6w1YfpjQP8UDYyKCvadHGzulbmyZ4KDXb7F2DCcOR/WvKf0550 gjCscFoTfC46odfPGj8TN9p7bRMPcYCPgd0OuOFkmoVuMtx7SBwZqFn3amfbQVpZppJkh3ccqm8 ZCmrSOz2Iqzs4RqFG+b9giaDeoWCHPB8Xbwgo+w57zvliifleGYckQtEYAb6ic/QZg7ANjwHAGW wI421u51QO+HxXPj5uQHyGry2OctthRr9HqZY/nroj4ZLA9pk6NRDqngl40PY9WaSNUfnPRzcAj GSrzhknLfpMFj5M6zPMNMt+u+FYSNikYrMFcdPdno4PbdN8W8oLs6xVldKekN4vG8MrVJte+Opg I6XS/wxnmv078P3f73jMS+BaAEaK12PLFmVzJWV7v2wXwqE+D7TQKeNdQV52lnQj9mGBj0OwVB5 vR0nwf+OIwQ2SChVaxAzt9DirR3z17ItaiEObmw7OIgfK/w/6HC8m+Cp+sOX6Sv11Oan4+idR6r HwJS570Yv++NJQj3OsvvBmvsv X-Received: by 2002:a05:693c:68d2:b0:369:f3c4:e1fa with SMTP id 5a478bee46e88-369f3c4e87bmr6835424eec.24.1793019233603; Mon, 26 Oct 2026 05:53:53 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:53:53 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 2/6] netlink: specs: mptcp: add the subflow-retries attribute Date: Mon, 26 Oct 2026 12:53:41 +0000 Message-Id: <20261026125345.3019372-3-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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:36 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.175 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793019237; b=PFgFWfQHDk0XUHWC4Rb7ShXidc8pUeoe4mmpcchvESabjNqRTM/Dd8yfzgu1pgNJjJRH pr/og+eV8052RRby2O0sm8ymhYO4oaLSidkU8uzVxWntBoxG+y/EtG/z7aBo6WFiXSKzl RtquEMx12y2H+92TyyEKa7cUGokwp/UnB7NS+HDmw1y7NBS1kzLaaIXWolkCxhmKKCg07 YMBTm2aIqfx8ZZKUO6T/0cpvm/ywDtV4BsOmvdJlx8ExG8FcgxuumNP02QeXzLRk/s/mH FULZ+I5j+QYNY8SndoBhm96qb9AhniK2cahkUInGFzrUOyU2lSycL5thO4bVpeKl2ug== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019237; 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=JH2JJp8rtzS86C5UWVRhrvPUEj/ugpvFkh2u0VzHhb4FDPqYJSIEcK28lmW0syjvWtxn ZNiifo6BQjLi9QNT3/OxDtj79qYBs1njOscNPF/xMSwZpXzGTitw68ILWpwuayRo/KGn/ lzSVnm2MW9yGS/QQzVAv0usXF96+7aRzNxDP4gYth5v1/v4tv5xls32LjIaih5ZtQP/n5 qK1dXlfYE1ykhhWWAz0IVo/EqSTJcPs0jbbIg2bEmPezpdygs3ApurO2Df5U95t6KNyhu bXtyUlKxLwFCg0U8tBBZJ7xHAv34xqBLLNhh9X8aX536R0Cgxm6Tfvy0VBuqHTwZRuQ== 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=20251104 header.b=Xwl8Wk+O; arc=none smtp.remote-ip=74.125.82.175 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 ED133606A31D for ; Mon, 26 Oct 2026 12:53:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org ED133606A31D 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=20251104 header.b=Xwl8Wk+O Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-35943f55c06so4064413eec.0 for ; Mon, 26 Oct 2026 05:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019236; x=1793624036; 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=Xwl8Wk+ORljhkZ6BjysuNwdccLKsAeaEreIelzbGQ57SyMRoU0URKMdoIvoJSZhkCn ChGUf7QKylA73xhxFmRvZS72QxEyxNmMrI/2Ulq0sS/XQHaA+gTHA3I/Eag3OdA9cUMs 7raqKCTJ2amAOpU3oWij8dDR19nTV9lTTkYQj3sRtyaB10lLV12tPoZt1Alz3XDfZlmr ORvOVHv0r9s4HEpqNi3/3+oEu+ZF77gvhIZkq1MtmPD7FU15PSZmIDco2aexWgt/mIxe r5sT7hhg2kh+lD+KW4uIsGK9MsebAmayv+OWwwFqVrGQhosPyRwZKmdsyopIs6AgxgLM NzXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019236; x=1793624036; 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=xdSQ3Lw4YE8cvIf6Qes4ItwiYAwXmHNL04CsAkyxxGHtbDNatudhXruTDnbrUSDrWo MSD2M+HMi/+gcXQQ9sGGq87FSWD5GbJU2Q1dH5tf3klDF2H2UOqK2LRf4CiJ3YaPPTku SuZ/CeuEmtk68G8hOKNxswbmY4atvR6lLq542vygp48mfCjsKsvMfw53tGTXQTiSizF8 Levj2qOB6uoFIbt/tRjUznVfr5FwqGJwSiY6igzEeXGODQxb6pb1kBJfr4ST1hWeBqXJ 04Jy7I9olElUKFEve+o0ZNtnmhAp6hEbbdvq7gq05De3m5h9YU1jLgIOLs99MCsan1kK xMlw== X-Gm-Message-State: AFq9FYLWQlEuqlHgrIJBVd13DXLBH2afQ3GPg+CACyF0gR6JlyQxgpVs s8El7kdzlb2cklFbV+YI5z723WTOxLTnRSzAs0by5c5LE1rv4kmh1RIKeFn9/Q== X-Gm-Gg: AYBFou2nA4YW8sBeZQCnqj6DUP/VBSeuMMWO7TvJsChHdVAaHO27bUWzANoD9hEpwnR 8JtEFn/QtlfirMLbDTjq9tLCuSl1ILdLPHelKnB4WXS1K0rgaLKpZxnnAc7bO2T9vy3fPO6p7h9 gFbPwuHIaGGH0jkVUtXIvP3b80J6XEkltbBo+dMLp91MGcxu5aIkXiBTKqq5GHYWkiE3WgmR4Si oiuU64Mz1QA8iv9I4VUl+EgzbuN8tZmecWZd4d8BFbHeLxyEO2zPtOUEd5iTG493o3iHjtA6Z47 D45fMO0NezkeK4oWysP5KLlQyPQK5z1DpdQc6Tsydq8NKX3BLfnGbQx+ZDs0w76BHy6W/UQHosv hzKassXDoIstqCxE6pHRMU+o++Qh7eoMm3I/kWzUna+BcHy/hdOAn1CgvxJBIYypx8NQGUi84fN iuDnJ7m6ShJBwyrLzq4atE1likmrZIdASCG+wkWekmPXib2w34iPl6ptX+WIZ/Vj8ms2/sYMM3E pDhpE8VbJgdZyKZqIWChhLhVaJZBOavqkOZEcLFB7Q5bAWRCDpxDwdQkP6YxFgCGKEWK5AAxx1F pZ5F3K7rbiHMvBn7180j348bA+aWviDJrmCyW7LmzyYY+XwyEs8TK3w2iWKXCglTlvW6BqmFcpb fFGR5PoSXC7NYXXO3CgRctfSC X-Received: by 2002:a05:7300:ea83:b0:369:f3a3:fad6 with SMTP id 5a478bee46e88-369f3a3ff8bmr6774603eec.4.1793019235683; Mon, 26 Oct 2026 05:53:55 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:53:55 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 3/6] mptcp: pm: in-kernel: add the subflow-retries limit Date: Mon, 26 Oct 2026 12:53:42 +0000 Message-Id: <20261026125345.3019372-4-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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:36 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.174 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793019240; b=l2E5rp+XY0DIzniEjysIsXUZLPFg/mH2F6UUff5TCLs9QakBBfTDda4aDIwUgHvfb+vs 8IxjfaUJtXkf6X3/X6YpuQFbGiFy2oR/AIJUeWZ/yDjw2b8s0ZUBRN8HHdPPbZ+FqlSmT 12s83t5HJQXSvqW5PLvn2o6wCaSc6P8ouqigaN+YkVQ+5OuVO9ibi+VhpMMGSIqboiUgC n62d0IfSMeNWImqYasHUMCF1AMsnuf7qszu6P6iAwIdb0yj21aJs5t34DSlFieYBV0UCh jkDyooYeP2BV0IzMWuei64mUObGvp9fRF4xFckp/FK+78BjwJKhn9tHf+XTqOONZxwQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019240; 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=4/Q1njHMfIpbXDt94CuhZMJcpDU2tZZHWJFRlFTKIz0=; b=qBkMrtxZ/sZvCrt1e1D9wDRyfuq0XMT3O743nblE0orpn7RLsWHslLyjBRPF+POOahi/ RDyBdSt+iF2MOEkvnFmYyJQ5d0V4CDim1KLqMBxsuPZuLBDfIXepyJ+FPSQwUmM0ABhst 5cDI9UzS6SA89kXeeh5uib8cwow0fjuwgAJtXPZsKDq0RAtj9ULsA4WNxycwDeGWE2Pi3 Z1FlZMuCfz67jbfe3pXNORmgm3mOzUaZTvfGGWfKdRakU2LNVO3ZOXiHxhSfbRpgxnH2z vB/0/5MsuwXYV/jxN5XrzMoB38nsXho0jDnjxkuNsNaxKZd4ddkmKewbTMhnvPLiVjw== 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=20251104 header.b=ZcUj9BtS; arc=none smtp.remote-ip=74.125.82.174 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 55273606A31D for ; Mon, 26 Oct 2026 12:53:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 55273606A31D 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=20251104 header.b=ZcUj9BtS Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-33fb4680717so5338153eec.1 for ; Mon, 26 Oct 2026 05:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019238; x=1793624038; 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=4/Q1njHMfIpbXDt94CuhZMJcpDU2tZZHWJFRlFTKIz0=; b=ZcUj9BtSwkxGVjX+tYRX2b6f2S5gp7fj87ME1Opbs8/qkfq2jhnldEVx2Wu0ZV6IGG VFOesqgB6DE5U/8KQbbM7tpHP5mFUegYNgspWcgSu0PfWjfPwfxEah0nyxttbU/eHIy/ /Q0FIFVvEczUZWW2x/eu+g4E8Emj2scxWoMWasR6gMyjLLazfCkaReuWtZY9hncdc+h/ trpgZYY9ZqgcCQv3rtqoEIr0W6OYr/xWGtphaFLW5YRmrwRzf2n4JfnJd7AbKnj3Jt1k TGpbwvbjtdLexVRigedgDB90rwxs4E/hQwRcrnYoc5Xnyr8+2de6fPjTgtQGBySWeYR/ Gt0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019238; x=1793624038; 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=4/Q1njHMfIpbXDt94CuhZMJcpDU2tZZHWJFRlFTKIz0=; b=ZZomfCU+HgduIl6u9c+6dXUDZCZJUbPRT8Oxc9QKTauvPeQhZX4ox3ezqA1igDqLV0 0LP/mD3lw7/ZoMHk4AntUfCDcN+G7klydTwuUkVl1i6z87IP/pF4g4w+0H4qCVop1QRl 1Xgwm3D3Qmm+Atmco3Mu6nkpgv7NqJLGBNAOg/b2Vt5fX07jss73JLi+jq3FuY5njY7y DdTwW0h9bKfIz3/lwpX4deIJooIhJfi+vvgzwH8OBmW626g3p2SqjkJR7FohYBh+bbuC Wnu25VTUxX2PIQPb7Tg5+dBoqxx1xWoz4RkgNX8mdrCYHVxRY9wNtI8YeoNa+tQ2VYtt gkUQ== X-Gm-Message-State: AFq9FYK0gyQwO4O/yYvKUdX7/zGu1MY+qXnk3k+8xT3P1MwnJjZhj7wn hl6tV4zB0h4EfJVHuyw56GcVBZiBAvBbmKC1j3vz7G/5/yEyRLp1gS3XH+YKQQ== X-Gm-Gg: AYBFou3jP5kB3skT5SNC4QGz97J9b+zovnl1r8hq0xTEFQOzVa9cVGkikKhQFZSfNmo yfKMt42hn/iuBRhyd1LphqcHxXIHRelTqMdnMbmIbN50PdfF16pmmz92EMlGfp+n96u7Q+Od6cD ZaNQi4H6QHInqUvN1hC1Bo5Z4j/CREsvrzQfLT4MvlEQGeSHmm2WKRkPGx8Tu5cYo7hJYR5EOT+ BTF8bmYUehQblhu6CB89uLfnqq5wOTdV+td7o81SufrgbPy5M3Xa0bd5JdFMBoKDU569bVcjxGz N95jkUtKcenQcG0Ld04WmXn6b4gwGIQ3spyp/UoPzAyypbQQwqN+1c119afPHj0e37RrfMwmS/N O/LdSOGXfJlVEXMVK9rG0Chl7Kdy6Edoib9VdMOKLOzGx4mFKuLomb7VGI3VrSu6Ki/Kj0H9BwK k91jT9tN6o1PSiBfz3ZVnh84IRE1rwjj1UHCOgRVPP7A8lxvHwh21X8cMYRar+LzZU4rmjS8p+7 +QL0kq4+mCNz5y4+wbCH8uf8nQiX7xbAbzIbu5x/oDakixgGoXs/hjkbI3F4241CPl9JvvHQwiX U0I3yBITSe4fptNnQnJpzieNJw4Be13m+PKn8E+HlG1bY9QJTO8l9f4DqUxq2vRJc/MzfnOfpeL 9ral/QguEFD3ZeBh7TeQ11OHi X-Received: by 2002:a05:693c:69db:b0:369:8d31:a902 with SMTP id 5a478bee46e88-369e836af38mr10478284eec.2.1793019237742; Mon, 26 Oct 2026 05:53:57 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:53:57 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 4/6] mptcp: pm: in-kernel: retry subflows closed after an error Date: Mon, 26 Oct 2026 12:53:43 +0000 Message-Id: <20261026125345.3019372-5-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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 established yet are closed when no other subflow can send data anymore, or when the MPTCP socket is shut down or 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. __mptcp_close_ssk() now always cleans the references to the closed subflow in the MPTCP backlog, not only with MPTCP_CF_PUSH: a re-created subflow closed with the MPTCP socket can get established in between. The other paths without MPTCP_CF_PUSH have already purged the backlog. 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. 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: 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 | 18 ++++ net/mptcp/pm.c | 39 ++++++++ net/mptcp/pm_kernel.c | 141 +++++++++++++++++++++++++++++ net/mptcp/protocol.c | 68 +++++++++++++- net/mptcp/protocol.h | 41 +++++++++ 5 files changed, 304 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/mptcp.rst b/Documentation/networking/= mptcp.rst index b6753ffb9c9a..72a91aeed9c6 100644 --- a/Documentation/networking/mptcp.rst +++ b/Documentation/networking/mptcp.rst @@ -73,6 +73,24 @@ 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. 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..8c54edb1d5f7 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1610,6 +1610,147 @@ 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; +} + +/* Another subflow can send data, and is not being closed, e.g. in CLOSE_W= AIT */ +static bool mptcp_pm_retry_other_subflow(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (__mptcp_subflow_active(subflow) && + inet_sk_state_load(ssk) =3D=3D TCP_ESTABLISHED) + 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..9a32c908ea98 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 @@ -2697,8 +2701,11 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); subflow->closing =3D 1; =20 - if (flags & MPTCP_CF_PUSH) - mptcp_cleanup_ssk_backlog(sk, ssk); + /* also without MPTCP_CF_PUSH: a re-created subflow closed with the msk + * can have been established in between, see + * mptcp_close_retry_subflows() + */ + mptcp_cleanup_ssk_backlog(sk, ssk); =20 /* Borrow the fwd allocated page left-over; fwd memory for the subflow * could be negative at this point, but will be reach zero soon - when @@ -2788,6 +2795,39 @@ 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, 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) +{ + 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; + + /* 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); + } + + /* Checked without the ssk lock: it can have been established + * in between. __mptcp_close_ssk() cleans its data in the msk + * backlog, and the MPTCP retransmissions cover what it sent. + * No need to push the pending data again. + */ + mptcp_pm_subflow_check_next(msk, subflow); + __mptcp_close_ssk(sk, ssk, subflow, 0); + } +} + void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow) { @@ -2806,6 +2846,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 +2869,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 +2882,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 +3236,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); + if (mptcp_close_tout_expired(sk)) { struct mptcp_subflow_context *subflow, *tmp; =20 @@ -3516,6 +3570,9 @@ bool __mptcp_close(struct sock *sk, long timeout) goto cleanup; } =20 + /* before __mptcp_wr_shutdown() disconnects them */ + mptcp_close_retry_subflows(sk); + 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 +4197,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); + if (mptcp_close_state(sk)) __mptcp_wr_shutdown(sk); } =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4aa4aedb2ba7..245d3d24ae2e 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,28 @@ static inline bool __mptcp_subflow_active(struct mptcp= _subflow_context *subflow) return __tcp_can_send(mptcp_subflow_tcp_sock(subflow)); } =20 +/* 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_active(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 +1163,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 +1296,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:36 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=1793019245; b=3i1XNmG4mSZqHuJP/3ZB6UnIoFvogxWeSyPVBwD5QGKq7DiLO6/+q6iXUEwPH+tdS7wu MTh4oViKKaiiGeRRXrIDrPRGnk7c0BijKe3eKAs5QOBKigMLxEoob2WDA0nk1v4oPIq/R xbtKvyTtqXDPz2Q+mo1HiBHCS9tzsrRT7nQhzguBhstqMj/kJLs1o0f2ZJto+88PCUGbz unongRYzrPO5X5KXl7rGqKIxDTTj0mZ+UzL/B+HvJ8BrwqTO2O8tUB/IF8Fzz/KPbWMXp 1lD3ekAzPa7/JOtScPBEnGOIdFVtLXOFq2oBfKbC7quyUcpIA55KKYXg68WwH+Lv4Tw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019245; 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=17GOmCrtuAsxF144oT296XUfRZYmIcuHgGJDCaIHaZY=; b=EvwfwxxafNoRM/dyTaGYpHUuDc/hk70PKgGjdhl1clS2Ab85hNJq3fkDVLgjxdADWA5m OfVd3EX9BqWC0qHWPx0u7fKYFSP2xcUeeYvBk81PhWRPShKZ8FbFszdAiy9vO0YgXm7p5 zf3QOFBDCJEwBrCnQimnuobRSC6gzJgKNo5Jvs5oX40BpeZqT53gj0BFhlwO729qTX/Fb 5J9Ph8/Hr6cCbw/bx2DwncfnGvS1HHyssd47l1u8KXiWxUffdoqglaezb8rHTwnnkJ6sS nuZ5p+Bn05madtntX5RYAJquYj+KRjOdy5PV9JacVaOKWs56pKsapo6driCJBoCIZPA== 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=20251104 header.b="Hc3GDB/n"; 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 C6B38606A31B for ; Mon, 26 Oct 2026 12:54:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C6B38606A31B 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=20251104 header.b=Hc3GDB/n Received: by mail-dl1-f43.google.com with SMTP id a92af1059eb24-1931ff67a29so473979c88.1 for ; Mon, 26 Oct 2026 05:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019244; x=1793624044; 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=17GOmCrtuAsxF144oT296XUfRZYmIcuHgGJDCaIHaZY=; b=Hc3GDB/nevcyaU3k7oiNcBjcGnseeaH2aTG3YaR0Q4rY+fp2Z6QXeKW+esyb5JR+b0 g0yCUJu8TP+4IHkvAfCu6zCymCeGtvqx4vyaJp0+HTVq2OB9xNLvYhCs5/L44oh+6HEz tBsLnPodRjSTWnkzOP5AJj24iBPU9qAc2T2RG5IazJ4zaInc3wtYFBv3FgSzOCjapHQB jxZew2MyEjhstF9/OX88ai7Uhx/xinJitv7w2Fdhv7w6fubR/tESGNP9I+QnnXj4STMF FVmHtNLdgjRg17UWcfaZBdrlHcH6E9Zw57NRm02CebbLs2C1cBa/qPr2F7L+qYEJOrz1 BoGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019244; x=1793624044; 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=17GOmCrtuAsxF144oT296XUfRZYmIcuHgGJDCaIHaZY=; b=l1vDsqK8lgVEP1DfuqOrTqbwRVqjtNlAU5R7hChh6sdkIMpQY1ostnzS6ZSf+cTzCH U21YEuM5er98SGpREtynPdzur59WmgwpjXGPNWXBYWk1JWo9+InsXLT79HZZc8yWq3CR tIOrmlE9iaj+/JXagZ8y9WUwmW6er2JYYoJxctWftoKZNUAUseDXwidjsjUThwY8+NyG hqUMnt1CIS/JOE7GP5sbLEH325IpUANa7ntAcKnDHvZIiuXUN9qPmi3UbdSktaJG0vpj YC3mpnOU6XI/3if7ZYegwW3Ij+jFppjH6AuwojGc/fOItZG9YFXHrS8ILIZglAklrWrd Vc4A== X-Gm-Message-State: AFq9FYLT/1Cj46MooIvrNTVk11fva3aXs2ForW/iYV86c3pHiZcsUiBE D2m7oPDMDAXuvCz2hneIA/Su4ShAbF5GUSi2KdgoKvr1ozljs6IuxPgBVC+Vqg== X-Gm-Gg: AYBFou27GNXymKz1nYFUzPmtyGmHboMw7H+iZjoYjKA2y25TAKCdmw3+kkAcamwHWiw MuNY4miVFEtn7LcQI7kGziMq/rngx5o8622B+5+/GH/HgZ5E/HBrukxu4dEQEx32GIMQQy9qFdk Xm14OKXITrhE6vAoXX0hGvSpMJ04e6rmwGvjMrof/bWgCIIkljH+DUhjfaj41k5AGRSFRhfyUbB x2Uoit7c3QDqZ+99QObW7ayG7I649nEnzX9FYmcoLFM9O/vB2ou6qadMFxjIqMacYrfH00TZn0D U4kWxRuTs84eEKw04nxVlnzHZYpyswCz474Mf9J1X7u9Vvy+38+cp+0tH9Hgf9AiBBYBo9JEm/j OPkXpm+avM1whYaBaZYcLh8M67JzatNMN1DWLxjnMxbshbXumZ7jHIKuXQXV6oijz8CeUjG3tVV mNI+0c4RqK5YWXphECxPNlM2dhh4JUKBdRTDf1xhuAHWlctNkKi81dyhGsZHukRavpgt58zVZwY pBo2Zz+6GoWwWQ0mSU/2thzECKiGd2qC6Yxfgyg/kzbF9VRqUPeuYR2ZTBCwRX+U/ccLAn94epP Rkg3q9AR6MY10VB9EJjY/sJ17MdUwzC1kwIL9qrJ33m5PPHHruAb10iuzHLIshM6OElwawiM39t YVT8tw+KclPM2f61bqNy69Bu0 X-Received: by 2002:a05:7300:106:b0:35e:d765:77d2 with SMTP id 5a478bee46e88-369e8629ed9mr11370543eec.41.1793019239699; Mon, 26 Oct 2026 05:53:59 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:53:59 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 5/6] selftests: mptcp: pm_nl_ctl: support the subflow-retries limit Date: Mon, 26 Oct 2026 12:53:44 +0000 Message-Id: <20261026125345.3019372-6-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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, and that it can be 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: 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 | 48 ++++++++++++++++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 34 ++++++++++--- 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 21bfe1311f11..9a6209181962 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 @@ -75,6 +80,22 @@ get_limits_nb() { fi } =20 +# 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 +} + format_endpoints() { mptcp_lib_pm_nl_format_endpoints "${@}" } @@ -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,28 @@ 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 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:36 2026 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793019247; b=gKdWpxwhUh35gstxvw6ERv9AWNBWUsdHefZ34ZqH+2QU32Lklp2j0kbVpiMM/twLWBgQ IiVUrWx+m7zyTYm3i1hmK078aipnq7xLum5s5FUNsOgH9Ca84jvfKpTFzxRRcWAnGEJTR GdlXsqnijr/59GfEc1ccTzpd4HHDhQ7K8oGb9/NSxg9KYK6TIPDDI8QpdSUkNtXqU3R0n fBv4VKams8MplaC9/5DsAVIKxCuhU67byTsE0pwsIvhQx1OEsaQ457Iw6E73W65z0GuY2 tu2sBPEfwS+yD8LNfbR32C216SisV/apL/oJB4hU7+oDA0UhTpd17ZG3lZNqPAnzu7A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793019247; 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=4gudKkBewUOwXDFxWqeYu6z3g8UsbfH6jnuy3GVkaIU=; b=AvsqsmtUFfBJpxZXK+rwVkyEfMr0YSTAqqSQdigxvWlhdccixBoccVWABPUge4avVK/C NBmH76KqelROjRk6Umg96OYp0kLoh2sqIuhA+FskFjqTOsmkRRHIn76Et/zqksDlKSCsQ zbcpjv/cy2sNl7KU75XYdEDqk6tyCxkM0gRG+ga9OebEdRvzBUeoDhjUM/e3klk3Z4oT9 kREmhHIMXt/4DxVfFI1oix+vwni2U/TyZ6HpYuguchbcal9a9l5gWZvymEI2xNQ9iMNOn V174TybRaYuG+BhhvkGoKmITUenyyX3GdL+qvYdV2NQPbhs7deAmzQmX09GdyK06bSg== 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=20251104 header.b=Rr5Bh5dm; arc=none smtp.remote-ip=74.125.82.172 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.172]) (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 A7A01606A31A for ; Mon, 26 Oct 2026 12:54:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A7A01606A31A 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=20251104 header.b=Rr5Bh5dm Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-3645f0f3fcdso5578448eec.0 for ; Mon, 26 Oct 2026 05:54:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793019246; x=1793624046; 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=4gudKkBewUOwXDFxWqeYu6z3g8UsbfH6jnuy3GVkaIU=; b=Rr5Bh5dmQa/RZdGQAJN7y0pnic42d8ZJaNYOR/FOo31ZaZwUNgG0kC3O0yQ6TViKVj WQsIQtiF5PswVO940HU4syzJI+CPveD8guAeg3IeuNfHUJhplgoNyNBFrX8sweafkuB6 2322m39MGxYNP1fNZ+M5ndKeYvX7lLxxWLCuLfSn3yOwmd9ufIVT398fnLHxJzkPJvmk IQko36bGtfHCG+mXQwOKbKSmdOae440f3TXGMp2novbRi8bZjMJu/OxDeotXY1Xr2iPF GPegoJCL4vF1iXf5VuOFqTboTSjXY8kX5MKX/ha1N5wWoC4RRrRW3aEzC42DYGvp7ECI Xnvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793019246; x=1793624046; 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=4gudKkBewUOwXDFxWqeYu6z3g8UsbfH6jnuy3GVkaIU=; b=P+i65jyIKGvvDBp1YK88jyrRTOeGatY3IQ72w6ty6XFflTGrkNG+0jjOBdBF5LqDaE /j172TRP2BMToYCKVDEb0f+Caw5Q+80WA4mHCAZ36Wev0p3xc2ZeOxKLj2+PKX3WSzM4 6/K3D1gozaE/eByaNLuubZsYpFaf4KXqy0NAjfb9oixINDOmsR5aowZvvxrYEJQP9kkP 8jRDZVcmwn/th/eTC0tfaCgSqVJPX/6dVLCDiI4O7y7wKxlQ18QyzUtlF/tH38zpDZqC IXJ2wEQMgRdfFKRKKtRNhlw5RBzpG7sBepnAmhMVtTfQl3drnVaaPp8/+9f2H+1mJm+X iRWg== X-Gm-Message-State: AFq9FYKlG/tzgHbiu9tm7aZHU9PBPbkGtakkqz/HAWaa+RoO083JKQ93 1oAepAl0NgzQVzejpeLD5OX4IvCJT4qAkstW51+1muf2GiaMK6a0DFB9Xe2MLA== X-Gm-Gg: AYBFou2KedL0HA333slml7I+2wYenxOU+VMEYZQkeftxgIFCTTaANN3rgLUUmq01nRg yTzPdnoG09I+n4cysVvyVdU4iOzqAViHgMrwqkbJlTyVMZ4N9r5fVYcXh8e98nVap0rXYgKjgGc I+0M3JOnF060zMoJShr6rrvXIFGN9Xe3IRrsCHOLDcUrQIsz/waS7zAxslvGXnFUuQOUeDcjqhG KyHAJ4MfGwOePevcqsBQvxmve6HeHNfvkUanl8NZe/ZvO5k0/ZG3agJ8S5TLxMtJfKojSgaZ2bo 243f3+dGTVdpxNYCbRz9U/AiIndTMHih5i8Y40SAAwL+uevFoc/cNsJc5gLQfb6IGghCCz4Jb1B BNt7cAv7+1QsRsceN5t6BFmktWBViqxVCNTQnHAshEDPEHwylW071uRKtFH2v+SGTo2oSgNJxTj BSSpaDtIEMkEl5AyIpAkDqEANtG8e9s2VGHJWWoPp1VCN3B651RLzVDdBBjojgVXxnxhFPYFQUR wPfisPi0YsE1zEwGXr894CkeAgMXjPaFRJrBGuhFjamBx0V+2n/n6+SS19VPjVEdecdTJL247w3 GfTXQkIgDNi3vuxi0SBTGriThK9SVfsdyMbvALUomvxfDUTtTGRsU9zjqp8yCJZL0CSdDrNHbjJ irLjXa9KtMrqM9a24Pv3Icp9G X-Received: by 2002:a05:7300:c8c4:b0:367:6d85:29ef with SMTP id 5a478bee46e88-369e861b789mr11126757eec.27.1793019245344; Mon, 26 Oct 2026 05:54:05 -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 5a478bee46e88-369f4164886sm18377923eec.7.2026.10.26.05.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:54:04 -0700 (PDT) From: Anil Kaushik To: mptcp@lists.linux.dev Cc: Anil Kaushik Subject: [PATCH mptcp-next v11 6/6] selftests: mptcp: join: validate subflow retry after link failure Date: Mon, 26 Oct 2026 12:53:45 +0000 Message-Id: <20261026125345.3019372-7-anilkaushikwireless@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261026125345.3019372-1-anilkaushikwireless@gmail.com> References: <20261026125345.3019372-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: without another subflow to send data, the connection is closed after the close timeout, as before. 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: 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 | 335 +++++++++++++++++- 1 file changed, 327 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..93a42bb06c69 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,195 @@ 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 }' +} + +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 + + if [ -z "$(sf_from "${1}")" ]; then + fail_test "no 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 +2784,126 @@ 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 + wait_counter_ge $((timeout_poll * 4)) \ + $ns1 "MPTcpExtMPJoinAckRx" 1 + sf_retry_after_block 10.0.3.2 + sf_retry_after_block 10.0.1.2 + 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. + 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 + 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: the connection is closed after the + # close timeout, as before + 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 TCP closed the subflow + sleep 2 + 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