From mboxrd@z Thu Jan 1 00:00:00 1970 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 2DB2D495524 for ; Wed, 6 May 2026 16:56:07 +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=1778086571; cv=none; b=lcELQ5RIS58msqqZRfQ1L7sk4vyAlYWEb0xSF0p5H7ZZATl5TL+3ZmZbMbG/7FQfYnSdCOLneQungO+RDxhScr+EtWgbpEY9sq+Dp2R2RR29VlrFLnBGKemwPyUaG+sq9xRZuG2kDheuRkSaKbvT2/mdm1AkFhboOnTaOjK1kQ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778086571; c=relaxed/simple; bh=GZT5QDafmDQaFuy3H5Bd9tB26FM0kh2nZExuK4qFmb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CiS7voIK9LNzVH/q9XRzAmYbGHXW5MA7ckBCSi3KypGscgl5d8npfwRjsvqUwgjYIPhVXUiGJ6T/QPse+mclrTfcRCj8ELWSMXh5W9qRGf+GWrHKsGI9QZ3evmomv7PZ/gKumwcvFNOGPf2yxUoHZpFxlVpg3MikXUkNC1srLnE= 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=gIE4Qg7/; 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="gIE4Qg7/" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so94423245e9.0 for ; Wed, 06 May 2026 09:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778086566; x=1778691366; darn=vger.kernel.org; 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=gIE4Qg7/CdZnkfVt5lEdYOBPBqCrf+LUgyQNjks2AJWNLulIF1byo9vTCSd3sLsJpc CmRQI7mstZKHjdvgUFeqfORcftfRqvJqy6G6w2Lq4dhlizDIvDVLVTPrb8D342Q+NhbO tJCPoC0cJzK2BB41LYVmOyCVx5aCi1NoQFEzfQvAGb8M/rXNY9C3grUYSROrHe79lmiW Gpf7OBFgIpCRXnp/gDvMGvjyC+L71ql29ZfOQ8heoSVLSnMLe5SduIlYSiO3Sk12PZ8v TRQHUwDa+1NC4ay+GIqQPdjfCx3pBjycviWtc8ZNOCEVhjW5p93AnTiaz7CRG8F27uXG ukhQ== 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=qNOgnqw8KL/KcslIB7KW1LXPg8FGzSYjLta+5NKh5tg5bp6LSwFYFEfYfvgga4TJF3 Wyigv3nh9AffVXJYspbrEpnuW53t9nvRQS6ydcoF4qRQsizQWF4ruYb3CwyYFfEMyWeG zddQT/AiddRURLnVOnFRGbyD/WRL6kiTqsIlU0CXSDyrgO21ngEM2N9IPt7FNY+dF425 j0jKX92c7YyUdHEyulkLw8ODtiZvGpPIfGcvNjnczt1PX5tUo6FlTUMwIzbweYcoQZxJ FBRsJYvFT+yymfLXPaI7FJyp0rNsZYmR2leHXrCclM5P/5DNXZMaKuFldyTg4u1cLS2t gu7Q== X-Forwarded-Encrypted: i=1; AFNElJ9+0L/n8+UM7JohUyCUyyMUKOJ17UwuU1OjJ4EZweJ/+54PAZbZ9EzEp5HLj6LysQPV98gk0AQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9fP4f9+riCZIonhE5ms3tBfMD3rtSQ8yJjOKHf77tgtQQ3Vr0 Qz/zJKJvh3GhK/CzSr132auw+NGna9o2MBaRIAitq8bq7cCCnkYj+jUc X-Gm-Gg: AeBDieuNEqq8wzIu1IZEhlngoBzbD98xpSLMzbETglSge2GTzT8TgPKC+A4cR7YyYyM ICjcxVMp2UgIL7+o8DwRob3bwV+lCJsWF9TiHPkhbsSjlXRfuIY9CBdwc049FAD/54Ua2kroV/6 eaThg/owBrHOJzdeQ+vEJ9ayfKmBvaxOfBAvQNyQVkt/XE5ug4JfdXjhcBQ33JJxJpJVqQOBPC3 zZwKJjLB1GPSo99GSRPtBc7QgAGCnPpQTtpuRWGt5/5BetvvnXdnOy12WYwUS0YyDxZ7bVNu1nt Am8eNq/47EJgQ+RjLfahKxCVF5/uNR9W+twHz6A1XMc+8SfQ0LnhefdJ4g9IdqFnWuMZhNKKXFw hXTVdOEbDZmiSx0r5nTdhWsCY7Ghws8R+QVgHG80JWiUa7TLVTC01JWG3PRzF02f2YnTA9eGNPy R4JO4xqQQw56mSMqHdXineiZx6dhc1w+GthY7eF1ZfeHo4yGx4CvMJaP0BDMwVLpiZaA+aZ2x3j zD4FHYxYPyaGoTJt2o+V0DugkP0kPV8 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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 @@ #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)) static struct sock *__mptcp_tcp_fallback(struct mptcp_sock *msk) { @@ -388,6 +394,81 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, return -EOPNOTSUPP; } +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 = 0; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); + + if (level == SOL_IPV6 && ssk->sk_family != AF_INET6) + continue; + + ret = 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 = (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 == SOL_IP) + ret = ip_setsockopt(sk, level, optname, optval, optlen); +#if IS_ENABLED(CONFIG_IPV6) + else if (level == SOL_IPV6) + ret = ipv6_setsockopt(sk, level, optname, optval, optlen); +#endif + else + return -EOPNOTSUPP; + if (ret) + return ret; + + lock_sock(sk); + switch (optname) { + case IP_RECVERR: + val = inet_test_bit(RECVERR, sk); + break; + case IP_RECVERR_RFC4884: + val = inet_test_bit(RECVERR_RFC4884, sk); + break; +#if IS_ENABLED(CONFIG_IPV6) + case IPV6_RECVERR: + val = inet6_test_bit(RECVERR6, sk); + break; + case IPV6_RECVERR_RFC4884: + val = inet6_test_bit(RECVERR6_RFC4884, sk); + break; +#endif + default: + release_sock(sk); + return -EOPNOTSUPP; + } + + ret = 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, release_sock(sk); break; + case IPV6_RECVERR: + case IPV6_RECVERR_RFC4884: + ret = mptcp_setsockopt_recverr(msk, SOL_IPV6, optname, optval, optlen); + break; } 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); } return -EOPNOTSUPP; @@ -802,27 +890,6 @@ static int mptcp_setsockopt_first_sf_only(struct mptcp_sock *msk, int level, int return ret; } -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 = 0; - - mptcp_for_each_subflow(msk, subflow) { - struct sock *ssk = mptcp_subflow_tcp_sock(subflow); - - ret = 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 *msk, 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)); } return -EOPNOTSUPP; @@ -1487,6 +1560,12 @@ static int mptcp_getsockopt_v6(struct mptcp_sock *msk, 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)); } return -EOPNOTSUPP; -- 2.53.0