From nobody Mon May 25 03:32:48 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF7BF1E520A for ; Sat, 9 May 2026 21:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361419; cv=none; b=LJrw1kc+rgSwebR+LxbtE7D+ZWLZL9geFGd7SdaSDVqw0gSc5aSzuOu+aVdTBB1rHOyB81Q2vLBQcZhbm52kd/jAPk+sSEw4uG776AwSjAfjfIiO3zij5bdg74c8jLJv2LI6CJ7lUrKcmYbn0RFQp8Wmkup/i5GvaN9wDiP63X0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361419; c=relaxed/simple; bh=Sr/T7GvcsHsaQO9riUBQ40Z8DddjgvIxd4KTbNGuNtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h+Kb+SoY/siOQ6P+C8UV4WDU3qHzNS0os5E0rGv3Ao7tyH45Tfv0InKjh1aFvUPlYyErqHmecaY05CVH/Mtlrq8Aq4ckJrQ8N7hJZz0WbP1ZHRlKy8xP7BvqxLOJdIpQLPsyD2HsRDa8HZR86BmR6VXed6aRW6jsC72cb+Dq+QU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VVq4dL4k; arc=none smtp.client-ip=209.85.128.45 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) header.d=gmail.com header.i=@gmail.com header.b="VVq4dL4k" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso40023575e9.1 for ; Sat, 09 May 2026 14:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778361416; x=1778966216; 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; bh=bzPsY7doH4GjtK6Hi7+WAg2sO8REMIej2hWIo24QxhE=; b=VVq4dL4kvw+GXNhhXxXwOrvdbX7PaW6AAh0ABTOwBEDuSD648B8M/6oxWy+afxDY6J 5AKNE7e8hB1hixZY0W7IL0eIMPJMU6WdsqXJ1AOFIBIbGuwO98hW/tJVnav9knTrgIrv coJgWtKd/m33RX7iDbk+MIQ2VUwNtk6kk4Ia2q0wmLT0OovMhcf5nd7XXkazTF0h5UUF HFk8U6UYIOv4BxtuDjlwTaLA/cMrB+4ERENeIwECzGfFHHl6DlsTyTCxYxaJ7SAqDWjh gGevkWlNq1+4kgOgjAVStJyNVDTUDQGO+0jjd2JeI+MgQhQqoKsE9OF6RCDxbho4OBGX SfRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778361416; x=1778966216; 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; bh=bzPsY7doH4GjtK6Hi7+WAg2sO8REMIej2hWIo24QxhE=; b=ikRpyVai8NfqQ037vdZkdUSb5UdsxIaRDeU8hEyHtxOKD+hUxKtezPUtNNFCyhPHom 6ANSGGGyrGoLgtwpSwjySCgrZHgMjWGQ/9DnOSDvS89yqRRKbmnbUnfFewROeWgxf9OX dQALeGI15tUuZXxP7ajfda2Sn1Yuwk1nLBYgWgqNoSI5aLAtBfPdHESkqV4aeWie0NVt B4pNPPBDK58aDu8ApsxYdrOP1/j1xdBwEXV1fiGo3fAT4tGX5IOMIq2KNmaVcaDFna4a wx9PhS0uwkGLX+3Y7YwgHsQ2pJaYl5rerEMhlUvYd7Ev8OZW5PTajDUERv4z63gMfJAF BHmA== X-Gm-Message-State: AOJu0YxwwMqwGx0HeDsXBlCDbFzXSBBI158rnTYzxch2iKf+QnEwi2ht 6dF9l1Tas/8KQWlnP/hM+FbIDKRSQRuaWOFueB1fV1xoJr6wem9qqRXe5wKFWV05hR8= X-Gm-Gg: Acq92OH48lV2U3VO1kUIX8XrNquAqUOtFU2hVaefFHfULG4n5exgK9axDHGZeOkpLJq lS0JsnvyzytI1zQq8b6Tl2Z7hjJTFSVXx5BdElz/Q1XRS7thNQvNLrlQBbJE8bW1gObW/bkV69R MjFbBtpnHoUA04ShW/yv/RSRgOMYayxONrzZqtFB6n+f+OM3sOj6FZlqEQr7NtW9yvcSMKpozP6 WCQPs1hqVv3NRdEEQje+ui5y2BBlpMyRE6cE10wmZ66YPcwUlJBQwPVMsImsB0cgIpDnNs1xti2 xPpemL1wGDlC4x2StP+IqKL5An+EYflA4Rp8Rl+cjJcSVhCTj4N0G81V8lXRUlyaAoTTdQiTmY8 yEKPq/yZgU696sm9ExtP/fF0/HoFU6Z+tvnTc3fo0HrRaX146/x94SW7JQPCoJpNG0adkG8JvZs KkZt0Hs7/ISgvboo/GAnPqbG8hI1ooswIW0VVlJTTeGigtVyMlF3xNu+/6pbgofrDiDER6cG1nk x0ffNcXbI4= X-Received: by 2002:a05:600c:3e10:b0:485:3cef:d6ea with SMTP id 5b1f17b1804b1-48e5e0089e0mr198478485e9.13.1778361415557; Sat, 09 May 2026 14:16:55 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6d89af2esm30110455e9.0.2026.05.09.14.16.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 14:16:55 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, pabeni@redhat.com, David Carlier Subject: [PATCH mptcp-next v7 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Sat, 9 May 2026 22:16:44 +0100 Message-ID: <20260509211651.104934-2-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509211651.104934-1-devnexen@gmail.com> References: <20260509211651.104934-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce MPTCP_INET_FLAGS_MASK and replace the per-flag inet_assign_bit() calls in sync_socket_options() with a loop driven by the mask that calls assign_bit() per set bit, preserving the per-bit atomicity of the original. Further flags propagated by MPTCP can be added by extending the mask rather than touching the call site. No functional change. Suggested-by: Paolo Abeni Signed-off-by: David Carlier --- net/mptcp/sockopt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 1544e3563852..114436d2e401 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -16,6 +16,10 @@ =20 #define MIN_INFO_OPTLEN_SIZE 16 #define MIN_FULL_INFO_OPTLEN_SIZE 40 +#define MPTCP_INET_FLAGS_MASK \ + (BIT(INET_FLAGS_TRANSPARENT) | \ + BIT(INET_FLAGS_FREEBIND) | \ + BIT(INET_FLAGS_BIND_ADDRESS_NO_PORT)) =20 static struct sock *__mptcp_tcp_fallback(struct mptcp_sock *msk) { @@ -1546,6 +1550,9 @@ static void sync_socket_options(struct mptcp_sock *ms= k, struct sock *ssk) { static const unsigned int tx_rx_locks =3D SOCK_RCVBUF_LOCK | SOCK_SNDBUF_= LOCK; struct sock *sk =3D (struct sock *)msk; + unsigned long mask =3D MPTCP_INET_FLAGS_MASK; + unsigned long src; + int b; bool keep_open; =20 keep_open =3D sock_flag(sk, SOCK_KEEPOPEN); @@ -1592,9 +1599,11 @@ static void sync_socket_options(struct mptcp_sock *m= sk, struct sock *ssk) tcp_sock_set_keepcnt(ssk, msk->keepalive_cnt); tcp_sock_set_maxseg(ssk, msk->maxseg); =20 - inet_assign_bit(TRANSPARENT, ssk, inet_test_bit(TRANSPARENT, sk)); - inet_assign_bit(FREEBIND, ssk, inet_test_bit(FREEBIND, sk)); - inet_assign_bit(BIND_ADDRESS_NO_PORT, ssk, inet_test_bit(BIND_ADDRESS_NO_= PORT, sk)); + src =3D READ_ONCE(inet_sk(sk)->inet_flags); + + for_each_set_bit(b, &mask, BITS_PER_LONG) + assign_bit(b, &inet_sk(ssk)->inet_flags, src & BIT(b)); + WRITE_ONCE(inet_sk(ssk)->local_port_range, READ_ONCE(inet_sk(sk)->local_p= ort_range)); } =20 --=20 2.53.0 From nobody Mon May 25 03:32:48 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 727BD1E520A for ; Sat, 9 May 2026 21:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361421; cv=none; b=NeIDCWqTTGEEPjv9ghqbzYB8nLROd12yAIxgrdXUczla04bDNYiH2tfdZ7GyrCx34DL2euBCmjnowQ6nI+mFdLIdx/vCaCPOthIvsxOTbhrlZFQU/e5pd2XWI/swcPKLWAi08HqBkQH7gw8MbFlCm7f4YBUoJJVW5Ov0LdTJ1wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361421; c=relaxed/simple; bh=pUthHQqsJaiRKRrCIAVZjiacspE0mlEOLD59Gv5HEkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p0BfjVLS6m//ODjnjKQ47eSMiOlds0ptW3cWwbjMYKYS6llybSsbfDGo+9o/9XiOTjFKmMThzBsh16SFP2SG8yPqHMdXsABrZeqmFVVtR88eIpg4jiImD27y/EO+sVrE+qZfutVuba90hRdw4lNTHzjkconUg7YgYJl7ybbLuok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LVOyiQku; arc=none smtp.client-ip=209.85.128.41 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) header.d=gmail.com header.i=@gmail.com header.b="LVOyiQku" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-48a7fe4f40bso34256515e9.0 for ; Sat, 09 May 2026 14:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778361417; x=1778966217; 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; bh=snwsgZrtGDoz0Pqqz1w9HFQtwim/+rA4FFV46ZVGsFk=; b=LVOyiQkuzL6M7m7Ee9zJlEROiU2YcpvbAweExK6jqjb6xF949rt3f2y6BoKiTjPftE ii+516Fcd4I0k8U9JCpVD16FDM97rOm9ZML6Vq/akJde13tuMveO0MjR8CdgPu5WBX/l S54RClTanaES3nuKLrdxCtB4nTk91EA74MHlhLS/2/UfxmwQ3kmhAHO1JjV4g30tX2z9 6gWrResHIpeHOucdY416Qx3IYN8B082subMGelr2hJW0dLUHqpfQQXVovSIjdPCtWSmH A5tlcQV5CEeUBU1JkaV8FIYhZh6kgh9pCIgLhNT+BUxEbTVBrogboawkuEO/dvSqHBoD zmKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778361417; x=1778966217; 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; bh=snwsgZrtGDoz0Pqqz1w9HFQtwim/+rA4FFV46ZVGsFk=; b=evu4F2s+ghB9gQQocMD0dJtPDMR2rXdshSj1f68W4IlwBIrL0t2x6VVknwS2YBh3Z9 sfoefVbPY1ooi3K06j4bVv7kSNQvkG8AnceVTCBoZwBJRFcRB8CqeVS5Sc991W7WcCK7 +mwzK6+tFWVFyS21fszyGypQAflkBngDIIy5MS1OkZzE3tKbfRXgvMIpaZXNjKnxc3jV q4//6oclTld2NuzT73mjgNai2q9eECjNVoWvQ761C7YESl2HSP8YSdz58Qd6mn6kE1Nr vZGm9PMKQzsyKKikvax4uZ1PlGMwDz7/R1LnsvzI2v3DdE5bClWI0jMbqeIn+5FF1FmK MNpg== X-Gm-Message-State: AOJu0YwHsjnOdp5KLw/ZQcmMps2g3yRREtAcbwHFXrkfx9IBLmj2Db2Z y/aPfzZAqfn5Nz2SsF0t0XYIyIfUy1Pylu0bZVRuOu1wcJbziJbjOSQaNPTzR2Ys5S4= X-Gm-Gg: Acq92OFY7pp7VpICEJNNHmCTrl6x3/L4ahU8BVcDFjQCjk/ov+LZXzSUGZGNckuZrU3 sRdZUGS6RsCnZ8YaYUG4n1SUhcxjiLBavpH4bFCDGzrrlq68UouMJ+IlzbEh4yjRzBtq1IpHPuG dGeg7uiWePJkI1+IvEdnmyudZJtei/Ng2DbB3RSHYekfe1lhbFN52Ka98ekxNiES2TPY2tlgJSL yExpcdwzNa8YFghLUi28lRfNVI+6J1SfWzd7ofzr/IPYLDI/UeD8Qb503Cs8hdaQHBPfArnn813 gaU0fd6vw8gxZbKK/JoAf0aOiwwQqSKhtgkBbbz/rOGdCThmQ5EsXAv0JifCRIlcs8vk654ooWM QeGL0j1apMGogvS7Q8ya3FsTjdhOiEDyPBXNxn/ejkIw0Mk8JWu2LYW7Sp2DUuHnTlebH7m2hPV oRxiKXBZBlXn/kTzEqBR3V4Sjg9XcXf4mbjfTsZlgfqdyRTwXvzca/uCNeBUcU9UhVZiv3hEQBy /yg6kqY8FM= X-Received: by 2002:a05:600c:3151:b0:48a:7605:751e with SMTP id 5b1f17b1804b1-48e51e0837amr276137205e9.4.1778361417277; Sat, 09 May 2026 14:16:57 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6d89af2esm30110455e9.0.2026.05.09.14.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 14:16:56 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, pabeni@redhat.com, David Carlier Subject: [PATCH mptcp-next v7 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Sat, 9 May 2026 22:16:45 +0100 Message-ID: <20260509211651.104934-3-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509211651.104934-1-devnexen@gmail.com> References: <20260509211651.104934-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Propagate IP_RECVERR/IP_RECVERR_RFC4884 and IPV6_RECVERR/IPV6_RECVERR_RFC4884 from the MPTCP socket to existing and future subflows. mptcp_setsockopt_recverr() snapshots optval into a local int, applies it to the parent socket via ip_setsockopt() / ipv6_setsockopt(), bumps msk->setsockopt_seq, and forwards to every subflow via mptcp_setsockopt_all_sf(). Newly-joining subflows pick up the four RECVERR bits through sync_socket_options() now that MPTCP_INET_FLAGS_MASK covers them. mptcp_setsockopt_all_sf() skips IPv4 subflows when called with SOL_IPV6 to avoid the -ENOPROTOOPT that ip_setsockopt() returns on level mismatch in AF_INET6 msks carrying IPv4 subflows. Suggested-by: Paolo Abeni Assisted-by: Codex:gpt-5 Signed-off-by: David Carlier --- net/mptcp/sockopt.c | 133 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 109 insertions(+), 24 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 114436d2e401..fbbd1692af7e 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -8,6 +8,8 @@ =20 #include #include +#include +#include #include #include #include @@ -19,7 +21,11 @@ #define MPTCP_INET_FLAGS_MASK \ (BIT(INET_FLAGS_TRANSPARENT) | \ BIT(INET_FLAGS_FREEBIND) | \ - BIT(INET_FLAGS_BIND_ADDRESS_NO_PORT)) + BIT(INET_FLAGS_BIND_ADDRESS_NO_PORT) | \ + BIT(INET_FLAGS_RECVERR) | \ + BIT(INET_FLAGS_RECVERR_RFC4884) | \ + BIT(INET_FLAGS_RECVERR6) | \ + BIT(INET_FLAGS_RECVERR6_RFC4884)) =20 static struct sock *__mptcp_tcp_fallback(struct mptcp_sock *msk) { @@ -394,6 +400,81 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_so= ck *msk, int optname, return -EOPNOTSUPP; } =20 +static int mptcp_setsockopt_all_sf(struct mptcp_sock *msk, int level, + int optname, sockptr_t optval, + unsigned int optlen) +{ + struct mptcp_subflow_context *subflow; + int ret =3D 0; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (level =3D=3D SOL_IPV6 && ssk->sk_family !=3D AF_INET6) + continue; + + ret =3D tcp_setsockopt(ssk, level, optname, optval, optlen); + if (ret) + break; + } + + if (!ret) + sockopt_seq_inc(msk); + + return ret; +} + +static int mptcp_setsockopt_recverr(struct mptcp_sock *msk, int level, + int optname, sockptr_t optval, + unsigned int optlen) +{ + struct sock *sk =3D (struct sock *)msk; + int val, ret; + + /* Let ip_setsockopt() / ipv6_setsockopt() validate optval and optlen + * (so 1-byte boolean writes keep the same ABI as plain TCP) and update + * the parent's RECVERR bit. Re-read that bit under lock_sock() and + * push it to the subflows: concurrent setsockopt callers cannot leave + * parent and subflows desynchronized this way. + */ + if (level =3D=3D SOL_IP) + ret =3D ip_setsockopt(sk, level, optname, optval, optlen); +#if IS_ENABLED(CONFIG_IPV6) + else if (level =3D=3D SOL_IPV6) + ret =3D ipv6_setsockopt(sk, level, optname, optval, optlen); +#endif + else + return -EOPNOTSUPP; + if (ret) + return ret; + + lock_sock(sk); + switch (optname) { + case IP_RECVERR: + val =3D inet_test_bit(RECVERR, sk); + break; + case IP_RECVERR_RFC4884: + val =3D inet_test_bit(RECVERR_RFC4884, sk); + break; +#if IS_ENABLED(CONFIG_IPV6) + case IPV6_RECVERR: + val =3D inet6_test_bit(RECVERR6, sk); + break; + case IPV6_RECVERR_RFC4884: + val =3D inet6_test_bit(RECVERR6_RFC4884, sk); + break; +#endif + default: + release_sock(sk); + return -EOPNOTSUPP; + } + + ret =3D mptcp_setsockopt_all_sf(msk, level, optname, + KERNEL_SOCKPTR(&val), sizeof(val)); + release_sock(sk); + return ret; +} + static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -436,6 +517,10 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk,= int optname, =20 release_sock(sk); break; + case IPV6_RECVERR: + case IPV6_RECVERR_RFC4884: + ret =3D mptcp_setsockopt_recverr(msk, SOL_IPV6, optname, optval, optlen); + break; } =20 return ret; @@ -781,6 +866,9 @@ static int mptcp_setsockopt_v4(struct mptcp_sock *msk, = int optname, return mptcp_setsockopt_sol_ip_set(msk, optname, optval, optlen); case IP_TOS: return mptcp_setsockopt_v4_set_tos(msk, optname, optval, optlen); + case IP_RECVERR: + case IP_RECVERR_RFC4884: + return mptcp_setsockopt_recverr(msk, SOL_IP, optname, optval, optlen); } =20 return -EOPNOTSUPP; @@ -808,27 +896,6 @@ static int mptcp_setsockopt_first_sf_only(struct mptcp= _sock *msk, int level, int return ret; } =20 -static int mptcp_setsockopt_all_sf(struct mptcp_sock *msk, int level, - int optname, sockptr_t optval, - unsigned int optlen) -{ - struct mptcp_subflow_context *subflow; - int ret =3D 0; - - mptcp_for_each_subflow(msk, subflow) { - struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); - - ret =3D tcp_setsockopt(ssk, level, optname, optval, optlen); - if (ret) - break; - } - - if (!ret) - sockopt_seq_inc(msk); - - return ret; -} - static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -932,8 +999,11 @@ int mptcp_setsockopt(struct sock *sk, int level, int o= ptname, if (level =3D=3D SOL_IP) return mptcp_setsockopt_v4(msk, optname, optval, optlen); =20 - if (level =3D=3D SOL_IPV6) + if (level =3D=3D SOL_IPV6) { + if (sk->sk_family !=3D AF_INET6) + return -ENOPROTOOPT; return mptcp_setsockopt_v6(msk, optname, optval, optlen); + } =20 if (level =3D=3D SOL_TCP) return mptcp_setsockopt_sol_tcp(msk, optname, optval, optlen); @@ -1473,6 +1543,12 @@ static int mptcp_getsockopt_v4(struct mptcp_sock *ms= k, int optname, case IP_LOCAL_PORT_RANGE: return mptcp_put_int_option(msk, optval, optlen, READ_ONCE(inet_sk(sk)->local_port_range)); + case IP_RECVERR: + return mptcp_put_int_option(msk, optval, optlen, + inet_test_bit(RECVERR, sk)); + case IP_RECVERR_RFC4884: + return mptcp_put_int_option(msk, optval, optlen, + inet_test_bit(RECVERR_RFC4884, sk)); } =20 return -EOPNOTSUPP; @@ -1493,6 +1569,12 @@ static int mptcp_getsockopt_v6(struct mptcp_sock *ms= k, int optname, case IPV6_FREEBIND: return mptcp_put_int_option(msk, optval, optlen, inet_test_bit(FREEBIND, sk)); + case IPV6_RECVERR: + return mptcp_put_int_option(msk, optval, optlen, + inet6_test_bit(RECVERR6, sk)); + case IPV6_RECVERR_RFC4884: + return mptcp_put_int_option(msk, optval, optlen, + inet6_test_bit(RECVERR6_RFC4884, sk)); } =20 return -EOPNOTSUPP; @@ -1537,8 +1619,11 @@ int mptcp_getsockopt(struct sock *sk, int level, int= optname, =20 if (level =3D=3D SOL_IP) return mptcp_getsockopt_v4(msk, optname, optval, option); - if (level =3D=3D SOL_IPV6) + if (level =3D=3D SOL_IPV6) { + if (sk->sk_family !=3D AF_INET6) + return -ENOPROTOOPT; return mptcp_getsockopt_v6(msk, optname, optval, option); + } if (level =3D=3D SOL_TCP) return mptcp_getsockopt_sol_tcp(msk, optname, optval, option); if (level =3D=3D SOL_MPTCP) --=20 2.53.0 From nobody Mon May 25 03:32:48 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03A47239567 for ; Sat, 9 May 2026 21:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361422; cv=none; b=bZX/Yl7vq3V4l4DKQpPypO950QbAftZ0UQjEpPlzAwqjI3BnnAtT/tLFBqvX1Qqje/bQx53enUWveAlVrIH13vJ7YOmBx0wm2lFXCbrzYiOuO8D2J0APyvE/nfrlbUdYmMD9iqwxy2Od+R1MYGSRDQf4yEN3bdDNzqIF/2Y7uME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361422; c=relaxed/simple; bh=RbFVPj4U5mRWz/DTX94xA8FaAzlhmwcWMgMW/PQXMg0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JuRLqAi3pQfP6XuvhZkCt+6U50RbB67m+jo3U+LiFo294bzcfj4xVLB42ytxhxd8ANKr1zOVHZJcei6GTGg0m4y9XN8d8EWtk0cXhU+uiRWj2B7XeWb8bHVZtW9MIQfpjyPLXoL41AhU3W4be3WP2x+CfOWtm6JdPoh0DPHN8ZM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mmC94/+M; arc=none smtp.client-ip=209.85.128.42 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) header.d=gmail.com header.i=@gmail.com header.b="mmC94/+M" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48d102471a4so30499825e9.2 for ; Sat, 09 May 2026 14:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778361419; x=1778966219; 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; bh=Z9cFyvegcIIfQGaI2bqMmk5HjxopCH8Nip+wOVOpZcw=; b=mmC94/+MuykOkO1EOLf5TOaCf2mPww4wFrouXPHD6MPIw1jEZuudM95qqcPDti73+F cZQpdvXyA+33+rAJG3eDKo09071l726tTNRVUuUq45YGt5xgmjchcI5O3TWARRXq/MiY K1M5E0PDcjUT23kLTTvmHAU+4EJa0oXjmYqL+r08DZwP/kn5QYAwdXqsqx22yzfGnJ/q 7bLFbx0rKbh5Jjyabny8JdWnAZVaKAtNFL8SpP2uNIPvoylH/bkcoshWeT3J7VBOjvB9 Y92yjMpuD6b4piKhFHZkZObqdROvJgPVa6rpjPw2b1oiwKGwRL6JR3AcXOzpSXPEw5fu BBBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778361419; x=1778966219; 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; bh=Z9cFyvegcIIfQGaI2bqMmk5HjxopCH8Nip+wOVOpZcw=; b=ZJME6ITdAMGOhekRnoU2PuYfsPTmm6Toe7+8cMdrgeTFstomZVH4/sKX8xFwhGoYMT f/7k0zH82B/cQ1ZDlzAe2nPl5Voj7ZANWx5puNVNYkosXgc7d0fTdX2vSZETcPWPGqkE 6c5ymsPYW7XLWBg26qhZb+VagMeQbXdyJ6zHAX7wyvV0Urr1fuGR629UAktpz4XBTIW7 t5v3E5QE2kx6I6/NvphEW9aKPB7HUye6qAMlclZmpKnvxwGHmbgCRoLUTBGDxwxxY1AC uV1EpxQTBle/Kpb380+oq+zX0k8P+gcv15PVM3UQY+NBDk+fhrFUOGqNNNrmq4BT0XaW +iiw== X-Gm-Message-State: AOJu0YylvQAc6Ew/rnZqepOBVICKSZYeS4OtNNwUR5SWhcTNgoAKU4BO 1Q+S6symrd4uLpo/5S9PXb7UlOoXWVtkoa3qGOa3XrMor/Z7YTBM0+t1hTShpgEbj/I= X-Gm-Gg: Acq92OH76xT7Z6MuZZDkxjDEH3EKC2zFjDqSYF53+JEsGOKm9G1nDDmGke48mzBg6TE 3uFxff1q14PXwFU1T6siVzeqOxJ95QJgw5Tj+B28m1thZqZYDQ58DSq1r4IDChZQ+ZW7+61VTq7 yzmEyJi9aWUWNtpOqz1xKqVe24Kuy4se4+uQspMUMcFz/ypkkn2XuzjtDtjYXuV95u/WCp55vwL HGP41r/pQ2Olngn+zjzHwKvF50NFjKVEl5dO9BndoX47cAlokoqf7yGXcPsiiwOdmVMFkhNaS0D 8XPXpgOR0ytxziZkShCGcwOTXHHn5oO6NTy1luvHnRycZLWdR3uUpnlV9e4qzP91fGIk2+3/9dE wdIIUPRNwffYtCIAPcYM2N1OU6Ry05WcZIk6c1z7OEkqJXOekQyiSXEOOmV8EFuXtsSoBAzB0Q4 oBEoKR8J4rHuBhg2dZ57Rui+iz5ptJv059eeUU8IOrT1NyGKXZgwerx0s9wTUYmeJXb0WkuEC3P KRRBWwN+AE= X-Received: by 2002:a05:600c:45c5:b0:48e:526e:1040 with SMTP id 5b1f17b1804b1-48e676b45eamr127681835e9.23.1778361419142; Sat, 09 May 2026 14:16:59 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6d89af2esm30110455e9.0.2026.05.09.14.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 14:16:57 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, pabeni@redhat.com, David Carlier Subject: [PATCH mptcp-next v7 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Sat, 9 May 2026 22:16:46 +0100 Message-ID: <20260509211651.104934-4-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509211651.104934-1-devnexen@gmail.com> References: <20260509211651.104934-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Splice pending err skbs from each subflow's error queue onto the parent msk's error queue at error-report time, so poll() and recvmsg(MSG_ERRQUEUE) on the parent socket observe TX timestamps and MSG_ZEROCOPY completion notifications through the standard inet ABI. The splice filters by SO_EE_ORIGIN: TIMESTAMPING / ZEROCOPY / LOCAL events forward to the parent because they are tied to user-handed data, not to a specific path; subflow-level ICMP errors are dropped because the legacy RECVERR ABI cannot meaningfully convey their per-subflow peer identity to single-path-aware userspace. Such events will be carried by a future MPTCP_RECERR channel. mptcp_recv_error() retries the splice on the pull side: if sock_queue_err_skb() previously failed under rmem pressure, the skb stays on the subflow queue, and the next recvmsg(MSG_ERRQUEUE) splices it once the parent's queue has been drained. Suggested-by: Paolo Abeni Signed-off-by: David Carlier --- net/mptcp/protocol.c | 92 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 93e7a42fc65c..53abb8dc2c0f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -815,21 +816,52 @@ static bool __mptcp_ofo_queue(struct mptcp_sock *msk) return moved; } =20 +static bool mptcp_errqueue_skb_forwardable(const struct sk_buff *skb) +{ + u8 origin =3D SKB_EXT_ERR(skb)->ee.ee_origin; + + return origin =3D=3D SO_EE_ORIGIN_TIMESTAMPING || + origin =3D=3D SO_EE_ORIGIN_ZEROCOPY || + origin =3D=3D SO_EE_ORIGIN_LOCAL; +} + +static bool __mptcp_subflow_splice_errqueue(struct sock *sk, struct sock *= ssk) +{ + struct sk_buff *skb; + bool moved =3D false; + + while ((skb =3D skb_dequeue(&ssk->sk_error_queue))) { + if (!mptcp_errqueue_skb_forwardable(skb)) { + kfree_skb(skb); /* path-specific (ICMP) =E2=80=94 belongs in MPTCP_REC= ERR */ + continue; + } + if (sock_queue_err_skb(sk, skb)) { + skb_queue_head(&ssk->sk_error_queue, skb); + break; + } + moved =3D true; + } + + return moved; +} + static bool __mptcp_subflow_error_report(struct sock *sk, struct sock *ssk) { int ssk_state; + bool report; int err; =20 + report =3D __mptcp_subflow_splice_errqueue(sk, ssk); + /* only propagate errors on fallen-back sockets or * on MPC connect */ if (sk->sk_state !=3D TCP_SYN_SENT && !__mptcp_check_fallback(mptcp_sk(sk= ))) - return false; + goto out; =20 err =3D sock_error(ssk); if (!err) - return false; - + goto out; /* We need to propagate only transition to CLOSE state. * Orphaned socket will see such state change via * subflow_sched_work_if_closed() and that path will properly @@ -839,6 +871,11 @@ static bool __mptcp_subflow_error_report(struct sock *= sk, struct sock *ssk) if (ssk_state =3D=3D TCP_CLOSE && !sock_flag(sk, SOCK_DEAD)) mptcp_set_state(sk, ssk_state); WRITE_ONCE(sk->sk_err, -err); + report =3D true; + +out: + if (!report) + return false; =20 /* This barrier is coupled with smp_rmb() in mptcp_poll() */ smp_wmb(); @@ -2286,6 +2323,35 @@ static unsigned int mptcp_inq_hint(const struct sock= *sk) return 0; } =20 +static int mptcp_recv_error(struct sock *sk, struct msghdr *msg, int len) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + bool moved =3D false; + int ret; + + /* Drain the parent first: a previous splice may have failed under + * rmem pressure and the skb stayed on a subflow. Freeing space here + * lets the splice below succeed; sock_queue_err_skb() then re-asserts + * EPOLLERR so userspace knows to drain again on the next poll. + */ + ret =3D inet_recv_error(sk, msg, len); + + lock_sock(sk); + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (!skb_queue_empty_lockless(&ssk->sk_error_queue)) + moved |=3D __mptcp_subflow_splice_errqueue(sk, ssk); + } + release_sock(sk); + + if (ret =3D=3D -EAGAIN && moved) + ret =3D inet_recv_error(sk, msg, len); + + return ret; +} + static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags) { @@ -2295,9 +2361,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, int target; long timeo; =20 - /* MSG_ERRQUEUE is really a no-op till we support IP_RECVERR */ if (unlikely(flags & MSG_ERRQUEUE)) - return inet_recv_error(sk, msg, len); + return mptcp_recv_error(sk, msg, len); =20 lock_sock(sk); if (unlikely(sk->sk_state =3D=3D TCP_LISTEN)) { @@ -4298,6 +4363,19 @@ static __poll_t mptcp_check_writeable(struct mptcp_s= ock *msk) return 0; } =20 +static bool mptcp_subflow_errqueue_pending(const 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 (!skb_queue_empty_lockless(&ssk->sk_error_queue)) + return true; + } + return false; +} + static __poll_t mptcp_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait) { @@ -4341,7 +4419,9 @@ static __poll_t mptcp_poll(struct file *file, struct = socket *sock, =20 /* This barrier is coupled with smp_wmb() in __mptcp_error_report() */ smp_rmb(); - if (READ_ONCE(sk->sk_err)) + if (READ_ONCE(sk->sk_err) || + !skb_queue_empty_lockless(&sk->sk_error_queue) || + mptcp_subflow_errqueue_pending(msk)) mask |=3D EPOLLERR; =20 return mask; --=20 2.53.0 From nobody Mon May 25 03:32:48 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3899332907 for ; Sat, 9 May 2026 21:17:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361423; cv=none; b=TZ3P5zzy4y+nhJi3byvSkjb6bhaXnhU/0f5J/9YvowzgKZPcs0mdZLyckw7tKtCxzA0R2buvY2xtaK0ZCKyo/UNqoMFuKO2cRNytg9e0eAMo+R9Vr+3zAXMdZS0BZ6yTtrHrdy5A7oH/a9MnhIOA8KXZb1U8AcuijT3Onc9TUwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778361423; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FrAArkM2Bf3cFlYGHsTH5Rc2P2m4FFIL5jNLAWEQTgGL2bzQE+VtDZCnViRCsPAAil2IKGGF8uaLYKPD5NuYHcF1gtHR4jAMIDSJV+fWcW1Frpg8paMD271RcqrmCQpQ8PgNSnRqUfl7cnl4jMXgOkRF6HG+Zhqnw3xK0A5bmQk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Zb4zUXIF; arc=none smtp.client-ip=209.85.128.43 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) header.d=gmail.com header.i=@gmail.com header.b="Zb4zUXIF" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4891d7164ddso18097215e9.3 for ; Sat, 09 May 2026 14:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778361420; x=1778966220; 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; bh=+lXcg061bbhFrI0v23H2NQAB6iGsZBPcokYpsEnhLcE=; b=Zb4zUXIFbG367XrK3T4vS1m5QW/IPgZT072LywgQ1Ps+Mgt1jfg5iT+sk5KQtHE5Bb nZOQWNKWrjRxWt7b02TDnR6nI87wNJgP4uadkxPo/NGPfLzUvA4Wmz37di++/bBNU4iR zkajg/FrXiaFEBqvfhMa51WGUuXY0m/UYcB4kuMFrbGZxzdsxsfpS9B63QpP3s6eJESA g5OlpJeEbQ6xN1805IBFkzGE+7FjHJk+OUHDD0+bYKdVIZxh2QffztPXL2/AWIkXIsCX 3LVQeK+miUKWSTpDtYkiX0YyMEj4ma5+TZ+lnC92VNEgXMfat/HbW+Ge34UaFAf+fwwO YQdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778361420; x=1778966220; 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; bh=+lXcg061bbhFrI0v23H2NQAB6iGsZBPcokYpsEnhLcE=; b=BDwfcc45n31ZaEqFO9GartQrlEowG0DKoOv0UcM9KOw0BjDGjgFP2TMFnddBcoHvfm G4cVeEQtWa75T2nCm+xYtxMQFDCTeivtTo+8U+Yjs0uOQHWdx+BMdc9K80Wq6iGaVkJE +FL9mJmf7etByZaPLU3KhQcNaE0RL+oFvxUau0l+pKK1dv7vzc4xPAI4QEChGvrjTRVz K9XZPS86Qxcb6NAh3txr9LDqtP0UWFn/ujEQkaLzuQTcpetJzLSZ0xAGUxmOI53p/lkx p3xl27tkwBnSbjNJ8QPxaJcmTVc2ZZX7os2i9Twe+0mzLYCj6ldYQXUNREtTzZzpqMcu Fhjg== X-Gm-Message-State: AOJu0YwdlzMvN5t5XW7QAcjWIFyKsAvTZFgYC4g73YNk6tZfWACaFnEm BBbD4ez4m+qz03TLbf3VPYVjL33z7XwM6FI9WXl1Pjk6UF7CzCTd9g4hnVjtqMQIkeQ= X-Gm-Gg: Acq92OETFZsD8ed3knmUwtRjlZyF6FS0IZ1JD8xXJblB+npFOYIDGukcXx+Dv9fmyL4 7wUu+6hSwZewLspxxWFgvV51awjfDYXt4KC3gTAw7troyKOvDPU764C1ParvfrP+KhH7wm1TnU1 8HFwkUgy0nzeF3sNV4nlo7YTWLuyQA1ANTRTJcxHlBGvRyO95psBb05SBUh1pVHrSMcYTo/e3eD g5puFiwdJZgJgZuhr9NENZS2m+7FtkolQgcVyf7K84CKbExlNGJmBj3NeHw9/Sr1s7Isj1IfU+K 0WxJOSyiPJe8JzoTNdiTvG4FIqV1li07nIfGMubs+DOl7Af5xLk8tUW6Gat1z5UUPpTE7iWeWo3 0fUqM9OBbF3i0ArPWB2u+WlIwepJxgpD9yk8qjmwhYLUCSWBkvJHWvflr30kLecjVRITqILuyOt CwQFrUhPKXqnGbCPiEXTvfCN7qxZlBPXjoPZ8f1zsgmNmj/sLPPDFdfr4qBQUbC2txbGSxK9fM7 hsGctmwdQk= X-Received: by 2002:a05:600c:c107:b0:48a:52d4:888c with SMTP id 5b1f17b1804b1-48e51e0bb23mr209403535e9.3.1778361420019; Sat, 09 May 2026 14:17:00 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6d89af2esm30110455e9.0.2026.05.09.14.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 14:16:59 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, pabeni@redhat.com, David Carlier Subject: [PATCH mptcp-next v7 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Sat, 9 May 2026 22:16:47 +0100 Message-ID: <20260509211651.104934-5-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509211651.104934-1-devnexen@gmail.com> References: <20260509211651.104934-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Exercise setsockopt/getsockopt of IP_RECVERR and IPV6_RECVERR on the MPTCP parent socket, including the empty-errqueue EAGAIN contract on MSG_ERRQUEUE|MSG_DONTWAIT. End-to-end errqueue delivery (ICMP, TX timestamps, zerocopy) depends on subflow-side producers that are out of scope for this series and will be covered by follow-up work. Assisted-by: Codex:gpt-5 Signed-off-by: David Carlier --- .../selftests/net/mptcp/mptcp_sockopt.c | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index b6e58d936ebe..95bb2cc8e2ff 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -769,6 +769,60 @@ static void test_ip_tos_sockopt(int fd) xerror("expect socklen_t =3D=3D -1"); } =20 +static void test_ip_recverr_sockopt(int fd) +{ + struct iovec iov =3D { + .iov_base =3D &(char){ 0 }, + .iov_len =3D 1, + }; + struct msghdr msg =3D { + .msg_iov =3D &iov, + .msg_iovlen =3D 1, + }; + int one =3D 1, zero =3D 0, val =3D -1; + socklen_t s =3D sizeof(val); + int level, optname, r; + + switch (pf) { + case AF_INET: + level =3D SOL_IP; + optname =3D IP_RECVERR; + break; + case AF_INET6: + level =3D SOL_IPV6; + optname =3D IPV6_RECVERR; + break; + default: + xerror("Unknown pf %d\n", pf); + } + + r =3D setsockopt(fd, level, optname, &one, sizeof(one)); + if (r) + die_perror("setsockopt recverr on"); + + r =3D getsockopt(fd, level, optname, &val, &s); + if (r) + die_perror("getsockopt recverr on"); + if (s !=3D sizeof(val) || val !=3D one) + xerror("recverr on mismatch val=3D%d len=3D%u", val, s); + + r =3D recvmsg(fd, &msg, MSG_ERRQUEUE | MSG_DONTWAIT); + if (r !=3D -1 || errno !=3D EAGAIN) + xerror("expected empty errqueue to return EAGAIN, ret=3D%d errno=3D%d", = r, errno); + + r =3D setsockopt(fd, level, optname, &zero, sizeof(zero)); + if (r) + die_perror("setsockopt recverr off"); + + val =3D -1; + s =3D sizeof(val); + r =3D getsockopt(fd, level, optname, &val, &s); + if (r) + die_perror("getsockopt recverr off"); + if (s !=3D sizeof(val) || val !=3D zero) + xerror("recverr off mismatch val=3D%d len=3D%u", val, s); +} + static int client(int pipefd) { int fd =3D -1; @@ -787,6 +841,7 @@ static int client(int pipefd) } =20 test_ip_tos_sockopt(fd); + test_ip_recverr_sockopt(fd); =20 connect_one_server(fd, pipefd); =20 --=20 2.53.0