From nobody Mon May 25 03:32:23 2026 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 0FE423EDAB7 for ; Wed, 6 May 2026 17:01:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086880; cv=none; b=Ugy5o/M39cx37Y+rj3Sp/I4lluq7xXQxh3ogz0YldXs5S2QclC2x6pUrmlhOk+dEUuuC7vWVm9sZppii+zVjeAAeSmsco62RLuiDDKCV+if5dcFGlp3kGlRmgDDj8t4aOLHDRIGUhYIm5xcKw+oysEF1pBoc84HCw29kUxPcWsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086880; c=relaxed/simple; bh=I8c2mqrn+GbPusWKR9GgjeQNF+Oi6stveIzi8mTd7YI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RdLy5Ni5+GFgSj3Zmyn8ovmyBt5kpq+k5o94cAs8tGlRaRI7YqHglvYTgnDaQ6ro50FTdlTgVav+XI3MJWzbnkJ1x+fsfGizf9KBUd597rA7iboh5TTzgYuCQ+vQbgQmoqJtpE26Z6uae/z1HWFHYLcqnw3iZaOgtpOTDKQMf9Y= 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=Saq0GBF7; arc=none smtp.client-ip=209.85.208.51 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="Saq0GBF7" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-67c566cb519so8177533a12.3 for ; Wed, 06 May 2026 10:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778086876; x=1778691676; 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=lUpWtIZiW0hfUH+jamgfz3Eo7DhnYhBOXFc7dMF9+2g=; b=Saq0GBF7kZARYYKrpPrI2Vaq09tANr4vvLAqbw3id45VhDcoaEO3KCOPfSH9iueEJa s2pNnAN4mRqHQl41z+cKVBFoViLiLImSBDw76l4oom2f4xdXwxgDlJptb2OpnnoNuhbR CsDXaslCJL3zjhNIV3LfaS3xB7+bc5/Axr2XZEAgvCnxLcNO7nSr2Ln65/1U++1fU1cs aFCBlpCI5+lPlsNzMMVvw9AZ5fNHqB1W58LZE+INUnynxeQls/+DHOPohijfEGuHYvNN D8vN7SK9lkC6bl6gT6O445g4BsyAyIpRZGdvgTJRSm2Z1hqsNDYX8S3JNYKZ5zX60/iW UziQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778086876; x=1778691676; 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=lUpWtIZiW0hfUH+jamgfz3Eo7DhnYhBOXFc7dMF9+2g=; b=kEIRlM+7ZCuspNDjN0vlYk0d/ZxP/sLVLoEDoWAvs15yHbN+MlIYCBnY6QT9M6qCWU ruW5/aIUcYoh2gqSs1+rw7FZyk4TraiSriGJaspdFruDPMovORNDbM1EExzq01xHxWTV qma5+OSm06OZs2hTrB9Yfc79xm+x1SQGPoK9tYXDD3LEVL7fjwF7G7D9TD3N5c0/Q3H4 MDytC460Pjy/xDwInLeUYrLnyj6kgQAHoI4Q2fCy3Uz1295mVacPgoNo57kijjcg2C1K PX44nRQ1VRtYOzQ6HosAtjcXZDXMuHFtvXsdE/aLTvO4UoF1CNkEvvaH8YKRtOjHpqMi qErg== X-Gm-Message-State: AOJu0YwMFtjWRXrS+T3nmkvxDjh/+fUtduKW6g21z6ajDX7aYlG19RYt cfKeiyLyTl0kfeh5RHGtVpw3cvnVDtfq4pFKrQ51BbNge+eVeGxb4RKiLBMsIjStCl4= X-Gm-Gg: AeBDievccz8qBlNEbg0y3eIX19LQ8D+pajWK8rcRYumvSwK3yEnaVUPhbY2abgvCigQ I5xg8dTg2HH2/+RTZU/ZhD8uKlUFgLpYURDr3rWU36JtkrnnnG+hY9VDKpLt8Zj26u+Ko/6LPEV VVSKw4VpO+iDn3MzmOrcYIYIGuYHV/ofoXA85KJsJPaSGHtSf9kdYFKguTYql4vM3aXWehF1+g3 oEB+6tGxxmd0otBIDcX9gcJlSBC6ZYh/75b6ddioAcqgw+sS3Cj8VGMEvwb1mL4JR+44Nx8Ps8u fcXJO9RnwRfNQJpbUtmW3iHtK5ACcxqO4ruFz353w5skWyFAGf3uaKLHla8OBOXKWvs0RhEGWsv OmxbZBwdey1N4piFtrD0EdmSPTug/r1jsOP44s/IF2502Bvt1X0EdmT/LX22XzjWI7qnpyhAwZ+ yFyHOxpgfK4/eF0kQw7OmQit9aFKn2rqFcLoJxsl0myt7hBiCEWogUiiy4wPRvJ9RCF81m5EfNw DOy3vQBqsTpHDvIW5f9cg== X-Received: by 2002:a05:600c:3548:b0:487:1108:48b8 with SMTP id 5b1f17b1804b1-48e51e0a60fmr74441105e9.2.1778086564877; Wed, 06 May 2026 09:56:04 -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-48e538d2878sm94586715e9.15.2026.05.06.09.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 09:56:04 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Paolo Abeni , Mat Martineau , Geliang Tang , netdev@vger.kernel.org, David Carlier Subject: [PATCH mptcp-next v6 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Wed, 6 May 2026 17:55:53 +0100 Message-ID: <32ed11e8643124839d86e5dbd9f9429ddbed58a4.1778086500.git.devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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 1cf608e7357b..20c737b2e704 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) { @@ -1540,6 +1544,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); @@ -1586,9 +1593,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:23 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 340944A1381 for ; Wed, 6 May 2026 16:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086569; cv=none; b=leUCumtD1ZSlm7uwfHdZCh5YHUsO/gtjkB5f+F/MfD2Q28DC9YWFMD8nopuDbgsteki4n84BSyCd++hCczGRow9Uhzt3xdgJEMgHmEQ+j0Ge6LouPJgQhdmcRPhjtVfMC866Y9CGiAGbueCSz0uIMgKyIzAMudvaTcJC/0KI6mM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086569; c=relaxed/simple; bh=GZT5QDafmDQaFuy3H5Bd9tB26FM0kh2nZExuK4qFmb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ExkTYL5AmFTTMRZ7b/ONbzHH21AMsZJZ9wTFvR4sCn4E8LW1aDYfqNABcdpyOlngM4uGu4JyO2jM44VYBlkM2FgqOxbB3R1981MHv1QKXmslFHaqdgKtuSLuqa5p/aKMCam0xPB6NsrfE31gVkBJMfmDHHAP9coKji6b7vmWx9M= 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=LN8uahrK; arc=none smtp.client-ip=209.85.128.47 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="LN8uahrK" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-48896199cbaso58732145e9.1 for ; Wed, 06 May 2026 09:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778086566; x=1778691366; 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=w5Yf68IfJTVfs3CpXG+5aOQokgamkcBKH9LlSeuIq8Y=; b=LN8uahrKg424f0sHSCZPn+Rwng8BG2BDilY+p5+24fxzw1r2eW9yzToV0+U/MOJLz9 zVtCTOFbfbdjI4g2BiL5T9TKLbcThHj66yis/i/5UgENwdsXqYn/E2zHI5JCUicHqF50 m6GNxiKaevPfTo9siY3t9AdH5iMtp5g8CjO9DZ7fbVyITRovB9hez5TtGLqNyKH73hZs 4d6BUMtFHLIiWMuKAY0+cqgpT1ow88qx8wkwjDqQOkkgZ+v0tVs8w5SpyNu0bsH3rbcc aN5l+FlDjzuVry9dacXWC38deehvsftyqQbhOTOxG0Mg9i/YzDZG/shRXEqQJcc7JGvK vwCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778086566; x=1778691366; 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=w5Yf68IfJTVfs3CpXG+5aOQokgamkcBKH9LlSeuIq8Y=; b=HgbcT5Zf3FuR6iPLoHJArAJCWvoCRUzWwfv8LUw+BTC1kDmXMLFaf1qYvDvAd77jqY p5M+gQZWb2arFyIGFOS/ZMMbxuQLMSU7yhNMXh9YGbgyWMQagPe78W6CqPQFO4BehHCV dRnCtxmuPuJIdoGuNeAWEUURSw4pjonHbB3CREJyVfFyturqClfdpLggHThNgWuzZ29u ulSoHaNWwyoLz9QXZjcyfiWlkSVJW/cRMOBcpv0D063nFHd38NwdX6+0YLK7R1pkNrFZ Iqvs3QE3dU0q0QPpNrYd5NHu+C6LW+kRUhl7+YYoP3cA6mERwWXuLjKKNv8Nfeb7pp52 +M/g== X-Gm-Message-State: AOJu0YymyHhgl4Ok13ZrzRtVWPGP5uu0ZZCjjc6oArczjshkO9vQpyXu jY124DH0VHMNCfNO2cOtkIpHAL2vWAJQtsSS/5/q0uuQmK2j+7wVuzy2lf53OHADor0= X-Gm-Gg: AeBDievmdGwfsnD2qDnoxT9ySQ5ZoByEm5eSajJ4/GZzZlm9HSDf4whQGvbzxxtQDN0 FzOQrn6kInByY6T7W+DyL2dpBqC/kv2ZKsUQwkfPl8mIu4TQLRFgMn52wM3UVWCV7ZN/CZYoVPs U9+BlaKdzfFUWhStaTfSn2jYPhLCagY3h/ne3n7kQwEMc7FOoAfuuFv0ETYJJ1Pvcjm/8lQk5mP 2rMtsz9ur9jhhwiX/I5txWpxYVm7pjedPEJ9F6qJXvN7WVu7s2Tf12J4SQNu28tmd/lFMwg/k0S pjIWaECQ3nRsImvS8ls1xYApZz7XFY0JWkiYOkF+P/LHN2TzN4BoTarskvYtut6Y6KMdxpuc5Ji vo9t87IzYGQIeOYkTUSegkHPuJV62i4tjvBoeLGS9OrwpfxOcc1bNElC7uq93/wuBHGZ2XiiAne 13xErmYcBnTxbftf1galsAGeFWn2tijBF09l6nLWww7u/yqEgaN/WZFkIxtYN5DwjQO7sqsXMDc sbNIcS5Q7TVBV6WrFzD1caCswxHnbxj X-Received: by 2002:a05:600c:4f0c:b0:488:9fb7:376d with SMTP id 5b1f17b1804b1-48e51f59fc5mr69206555e9.28.1778086566396; Wed, 06 May 2026 09:56:06 -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-48e538d2878sm94586715e9.15.2026.05.06.09.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 09:56:06 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Paolo Abeni , Mat Martineau , Geliang Tang , netdev@vger.kernel.org, David Carlier Subject: [PATCH mptcp-next v6 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Wed, 6 May 2026 17:55:54 +0100 Message-ID: <6a28b1d7069ddeab82f22c42ddb28bbc90589492.1778086500.git.devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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 | 123 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 22 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 20c737b2e704..3046e9eb2c33 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) { @@ -388,6 +394,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) { @@ -430,6 +511,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; @@ -775,6 +860,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; @@ -802,27 +890,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) { @@ -1467,6 +1534,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; @@ -1487,6 +1560,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; --=20 2.53.0 From nobody Mon May 25 03:32:23 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 BEFF2407595 for ; Wed, 6 May 2026 16:56:09 +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=1778086571; cv=none; b=AoZeLzS/Jw4ymhkXo97XZe+C0jfQkNz+ORcfwpU6Ki4WZO4a1CASj8kca11rEuUKWuMjjyU+Gz69E78HiONdVq+TMgPN4h3gvJPRqZLDVXc5xpm1dxYzx6d5qSI6jwo2RAyo3GwZAKFDPUKPbYm8jzTEKvLU8SeNaPgBLkqGkwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086571; c=relaxed/simple; bh=EqNU8Yrd0TXiupxHPwzxKotS3UioELwzqEx0ic4rLgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G2ChT1/6r+g2QvLAko93mc4fyiohgW9Ge0SYVQFdMPFmCcd83uNgNTAF4sUvU7Fb+90aW2JhWjppUxnDoIfF4P3XK0fOZp1AXSlFRQO+mlUdH5A6i9DSxH3q0Yqzg6kDk77Gej+hijQ74OG0FjYiY+bPRwOsmaSBZFtpHrjBnc0= 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=nOEKt/Ke; 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="nOEKt/Ke" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so83844885e9.0 for ; Wed, 06 May 2026 09:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778086568; x=1778691368; 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=xzDki06gKQpjz5uZEWAJE/Td9F8aqZ6hehFHrs+9QQs=; b=nOEKt/Ke7RoWV4VdZoFU5iVa+wd+cxneb5AepoV/SnL/MQYFBuBxLRFa0XhYfWfVfa xGJ7rE0zFDQXkdJv6OXHQemF2+yfY3JsHKXWWwjbSITAdZJpeLWVt6H47bJKr81PpVRW zmQsypO0zYxbcGhiXFecZr+dkokYo4ZRHXYfNYmjia+P8XBpixZXjO7rcQ9tWGfd90Wo ci5FM/+jG8lv/6cuNITaISPW03e4MK9G88k5XRtjj74uDXugl+re/ZlZguFlWGcvLQo2 1Yt9/EORupPf7QI6+vMSdjcYPo+iOw47N37JxH6O1mkeL13ITp2ZKaKld2mBo160i8eu 50fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778086568; x=1778691368; 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=xzDki06gKQpjz5uZEWAJE/Td9F8aqZ6hehFHrs+9QQs=; b=X1f0SzRlzxwRjN7DIDiR1jJ58g002AsSsoGF4KZXB04rZ1psdHZ+wGBR7EHo3s6j4+ QMSAdaDJzJSQkcZIJNaDgzzRF0mJdC+qSGLisv4J8aBktwe+vFw+BxLMIzPSx6bnPdVk cPhEw0B2tHG0Qr86QfWThw+IdettKKdmUcd2Lt0B17K0P0jCn3M6mqrzNlf0RU6l/OJB GvhEH14YZQBtmlgMQYE8E8HqC2MZWtmzk5svXnQxsAuApjZYQykoSahp7bRsQV9T0oD7 yNMf2DqQXS+rm5y2vzYCeDiOGX1n4OiqmiyFXD5ET2baECUm/0PiRsMUvsVHRB/6fwrJ qORA== X-Gm-Message-State: AOJu0YwweuUB36mmwcHj535QMFJZswfKt9+iLtOcVqP2x3x8c6xyxm4r aXTkc12PM5690aywP+HmG9qgWGidrHDHb/wkmcpz7Zo9ocZWZK0Sv7OMOJmmM0aPs7g= X-Gm-Gg: AeBDieu82KKQROpnJ9E7V/vWS41YfqeMCfJDhf/pDUXBUG6P48xtgIy6MsB/P9NEW1q PYmrFfxmlDA4OpiYXtdDOwdxgb6T+l61CvVLrWfmYE50IDd9FrpcQsl5G0FH+1unU2iPM29kjLH 2pk+F0yu47U9Y7MqcofqjKX25SV/pycNZlxyP9wb7V04/aWStcVwH6s7UBsNtZj9KIzSHSH4qj0 BQ5qNx7O6zhraNb2/ziOfuYogW1gbrAHxI9W3SmnsYUhWt4fpaeKgd8XT++fO4Z464lk9oijz32 vZy15QkwnTTLUtw5IIjEeRFyf5Hn585ZnyfH4t8hjd/eRxC9/kH1Qj0lEXHyNY4MqV6zW7n5ipY KJ5td8GlahlqztUBwbjtLMbNHaC9FbBuR2upbNe/Pt9Io4vzjBXeoZypUvpTuRkJXHg8/rR5i8O XYSdkkwxEFxfoOjrpp859GY7+ykFDW9bUEUgVkQWStLlAEZXafgAMvCyjUkWjwWZYHvdQJcM19f 3XJ4MjucnXE5DXm5t+O4g== X-Received: by 2002:a05:600c:3e8d:b0:488:bc6a:528d with SMTP id 5b1f17b1804b1-48e51f40b12mr79389955e9.22.1778086567804; Wed, 06 May 2026 09:56:07 -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-48e538d2878sm94586715e9.15.2026.05.06.09.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 09:56:07 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Paolo Abeni , Mat Martineau , Geliang Tang , netdev@vger.kernel.org, David Carlier Subject: [PATCH mptcp-next v6 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Wed, 6 May 2026 17:55:55 +0100 Message-ID: <2b6d945e90f64cb8b18cf866faf8f1a66683152b.1778086500.git.devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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 | 74 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0db50e3715c3..203ee37f57e0 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,31 @@ 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; + 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)) + __mptcp_subflow_splice_errqueue(sk, ssk); + } + release_sock(sk); + + return ret; +} + static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags) { @@ -2295,9 +2357,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)) { @@ -4340,7 +4401,8 @@ 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)) mask |=3D EPOLLERR; =20 return mask; --=20 2.53.0 From nobody Mon May 25 03:32:23 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 741C94A1391 for ; Wed, 6 May 2026 16:56:11 +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=1778086572; cv=none; b=cubZOW48PlZ9oG6i+WW6MBOkUtuPPscHe1Slxxg7PDUd4TYqu++1aVxCmFXxpvWwUMdPbuKc+dChJoEwyjggxE3C7txyxpZH4eoX8EpXFd02kw/EFrHN4Cm7MY0U7AGBq4jqZTbTyaqf+GpdeYwclZu4qLCgZAed+JDAQp2tuTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086572; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IgvKlTrSh3y/aGPAo34hgb/oN8aQmoYZkqMJ1p3s+dDpDSr620uIB4DH2nrIcNJ5phb9MeWze56CEp2ZDj8XsuFHzZOe8F47nPsQUYTG0zts8YWbxcCDKFJHEUN8jb91kAl6AVSYVUloW1zLcX7LQ2agcnSsse9ZZJ0G4DQWhrc= 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=ju5G1RRD; 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="ju5G1RRD" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so65990255e9.2 for ; Wed, 06 May 2026 09:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778086570; x=1778691370; 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=ju5G1RRDJGOY9B8ABU4/MN/bYeEeb0NSL0iKATjIm53FKzkvpvUfuTlTWWN0VGsALa FJXEP/dqCeFfc8NQYHHqwbnT2cp2bOT31gKsQKobHH449n3iIfb+Z+H5y1CVD0THEvkq WlGyjdp22PgX+V7cQUIy8WKA2rJRSvhq+ZeZvNvIu4XX4tms2f3f9EjPID/Iv2InRBMd eiNCXnJ2OscgbXCyrQ3V6d/MxZTKJ0Qh+ykNC4umXq49mm5F9t0qcSzhWZm9CsPXBz0N Wmnz1DPnaGaaAO0huwrS+/jcgG68bfSlGT9mqlHNVCOttFOFGHvFIC3Qr5RhA0zu+i9u 5xWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778086570; x=1778691370; 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=l0Rwm3SD1nT0ynmIBKproqlkEGPsPEvo8HXF0Qvq+KnoIB+jVbVnNIs5BjZIdZhED4 EASajEAk3qX51Amfzg55CWAOFhAcNOeCBZZBtJqskG7wuhNxROdLWGPXdDa0wu84KId7 NI8Ox8hL91OXSMjRAiNF0eBpiwUoywFoYmtxOVH2C8QaWfG6dspuzxFFTAEWhgvsh7j1 fAHv97FuB2ZQXOZ5xWbtByjkGR6bBdhCP7ox/Hj6ZlzsUvqfeRAdjyAhveJkuCj3acF/ BLHJ1QK4D+lXnfXnhMHOLB9kJ7hPyUiTEer2O58ATiGHE4V8PBQy19ipDcy4Gp8q9n84 TLAw== X-Gm-Message-State: AOJu0YwbZhbw5CMX7DaCn88q6jOyx7vkhppDKkRmmAB5x/30d8mEuAIz HIjIDALYFjdYnLcwxNV0vku43kxTURsm1z9NeKgfymYrJN86Qu5cs8cdHGV2o5k77gw= X-Gm-Gg: AeBDieunyJpX+Z+fDCvjCHeLWo2P84P70DrdvptUrohK0uHSgjV5GJmvZr+hAcWmnku iUkYUxKX3gRjScJd1QxzNUbC9zXNZenK4YiSoTS+0HDcLZnpW3tu+MguSXn2+H0uxtdQHpYGkNw EKZdfKRcHoR6VxawlOpZhjlfJwDkgQ4eN89Pei7H4pDCs9MSONoFbzGcLdX8GIO8zkHcpijU/5U bgMCFnTNhMrzxjkcGRESfHzEplScXlVlXx3zmDi3/ptEuJmlulHihWKx/+uBwAd8kLsIDzUF3n+ 0t30IU8gY3y0PntM+LXHn0VRalo5e0F97ubcM75YrjCpzCiV0xdqyULNygxtVpTtxIcIbX3qDnW ZosSp1A7iahiXnnni6c4lIb5/pJaJDHPYNgQbw+xKNxv1Wnxczb0dpRWxhyiYx93r5SeQrbxQUb MtF/LgTTbF4nZn5qFwzOwdV4nDudrE21F/IP7fyo79qaMVgmXUgIYg3VgupX/YwuAVi8s5teyci /VLvETjA6LsNkkImLWH2g== X-Received: by 2002:a05:600c:1c26:b0:488:9439:880d with SMTP id 5b1f17b1804b1-48e51f5c282mr75087035e9.29.1778086569660; Wed, 06 May 2026 09:56:09 -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-48e538d2878sm94586715e9.15.2026.05.06.09.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 09:56:09 -0700 (PDT) From: David Carlier To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Paolo Abeni , Mat Martineau , Geliang Tang , netdev@vger.kernel.org, David Carlier Subject: [PATCH mptcp-next v6 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Wed, 6 May 2026 17:55:56 +0100 Message-ID: <2ca2480bd48417c6074f07728323a63862fa59e0.1778086500.git.devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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