From nobody Sat May 30 15:33:27 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 888513921CC for ; Fri, 29 May 2026 17:45:31 +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=1780076732; cv=none; b=bSazXz68K/H2bsr3j7gfuydA/VdlQcL/Yv49U/SISShqEAz1Nt2HBcvjGJKetYTasCCqqY+S39H+kf7hlEx2IkSgOywlvz/joxHcm8Pwn+WxRfpGNkWt2JJ4RBb8nJO2Vyd/d1ONMUcYGAVhvmOMqx7NTfeyLn5/WjGLjcWm2F8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076732; c=relaxed/simple; bh=PJ89tchvDdk572/bznw24XqiiC6pPJVpO6DU6QBUReg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kQV17/GLLpO9oRx3M4mwTXFtF9ocycMbesxOCWJh6gBhrJn8lTZ1ehYhfzXkxVGiDQCgK7YBvSTzuDXooKHttzDaW7vjNn/wzBEV39X9XKmSLnxQvDvcQYFldsnqhLRQe48FWLRYs+4m31uZ8ay6ox8VVTGU33siVMdr5kHUzys= 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=jpPylCrb; 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="jpPylCrb" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4906238c62eso57540635e9.3 for ; Fri, 29 May 2026 10:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780076730; x=1780681530; 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=2tEwFdlK27fIl0TDlXr3cd18aseo5fOVuIOlraFSGQU=; b=jpPylCrb0/zRioKjd4bOFjjXHCMQobXdm0LUXqxYTp9S+7NSf4wuRf/SsiqiLJyzzx FigerCLYuavU8x+pcJAIPQPKQP5wY1ierBzBWdggO73MlZ6nsBT1pd0bLD5xvfxKPRGQ XIrpe9e0Tsw4LxFH2mAbBM2ZOun2IjDg6eImyeGQxbP9LZdu0kzc2VvqYoA+dqw6Jw9i vB/mxkj64ioMEcdJ5yGoacPa4iV0y2BdOpyQ5or3/wTAfK6XnQCMVafE/iH4IDP0bsyB 0eKwOWlYgkad/uGMZ3/ZYRL4HigghHKQ4fvOPnfw8CqVk0I/ng/xH1enQsmyxSaQf00Y 9bvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780076730; x=1780681530; 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=2tEwFdlK27fIl0TDlXr3cd18aseo5fOVuIOlraFSGQU=; b=XSkHQk+xqrI63FMFDEm6C8IOxVHkBYlW7sW9iVSS1BvjZ0oU8ZQF2Fwe3X3VMAwSeU uVx5/tK/kVRDMe7uq7KntIrIkXl+pk52PuJ5mZiUP23sTbBa2P2rFSTq3eAwsuzbl+0X ZpbZjuAFQSuSgr9IdXG3qPHZEkcD4z5GDx7NlFjQcik6gJ8s5+X1DpdpP3rQXlCgYlbw c4ej9Z672zeAdQaTpJqLELaQWl2k9CNAHVn4lOfj4FL8nckhhFFBYnVu54e4XOLebeQI +gIaWrLYzVnUnhOIg/jjgrnaMUr7MCwDKsZrsaBLQ+PEaqSCKrsoZgc+UJT0vBnbxANn 6WJg== X-Gm-Message-State: AOJu0YwPyaWJTTQqC5kjSLJV77KwFFL0TwJE9tGCiXp+OdACHApcuAvA SEQEEJSSIk7CkE1UnH4bxwLzH0IIOrqMcwOVNdA6mEW20MJze7Ubo0H35YgBjw== X-Gm-Gg: Acq92OF5aMPkeapzECx1IHUOC894yQZNCQrzs/KHIpMedbgnxLNj2vNupqbV6bY8J03 l473lIXLlROHQkPSrApvoKKSFhMCiQrgwVTdzjZryPJkih8YuWJG2ze2/821crlZu1pXAvHymNI U7L38crKNLYlGKkyeLiPQ8Maxf8ypPD9alwaVIK1TCtTvEEVizN4KJdTNLM90/WaZCvougxBl/r bmFyq0RakGDY+WI5MM3AdNS7x+d/PCB9rFMF2nXZFw9IOlsWURgvLpQ5uoJ4MNe9rIFsVh3ZLoy ZeOW5x5R8EJUKn+SRxoSlfr2FYKVHG+gI+oFWXXXeEghQ9pXRup4HaLuFRmmv73yB65StKjGZQv jDAwV9Z5okuPcbopIgUdXNyBhyOjSX5v8y/DBoB5+BfE6gpt1GALkzHz0jXTzHGEP/6CwjZBKm3 YTUgxPw7LwdaH9PJM9ceWbkJpN6oeDWVRGSGCAPyu/kEtCbqgXYwrFeEI1nJjQaPLzsfAbEQCj/ kcEiDWB/jjfA8kpoNaqfw== X-Received: by 2002:a05:600c:8b2e:b0:490:6237:5213 with SMTP id 5b1f17b1804b1-490a2941a84mr10073385e9.23.1780076729853; Fri, 29 May 2026 10:45:29 -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-4909c09ab75sm18738075e9.6.2026.05.29.10.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 10:45:29 -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 v10 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Fri, 29 May 2026 18:45:19 +0100 Message-ID: <20260529174524.260199-2-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260529174524.260199-1-devnexen@gmail.com> References: <20260529174524.260199-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 87b5796d0135..b9cac04a749a 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 Sat May 30 15:33:27 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 AF157370D6D for ; Fri, 29 May 2026 17:45:32 +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=1780076734; cv=none; b=oHeOk4R6rzQ5KL+F/WlqUIP402FVGhZZ1hk81UYo6VGwZ/FrbUcrkKGfo/NMcfG/BmIDV4Qwuo1x+7jBsFcn47B+gsOVj2y3KHDPHYbRf3afVF99JnrpkYerSFkxrOuLOrH/5QbOdgZ6sGcDb5PUW4e2ubIWdXYfl1L4RdVB7lU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076734; c=relaxed/simple; bh=CdqrNzJqljtnv5V0E0iWXUe0qiEWfFAC79g8Onrx+6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e5nm6e/6Rp9JuGeohpeAr2ibymf0y9UHclB/ganm9ubqSCkYf1xim/u0iNpDKWkq+lJ5/wp5zmqq+R5J5mY2Ii53F9+siapMQ2/UKi10smafdNvR55Zmmz9ljIYzuaCEGmxcT0U52Bis2Coh2Q1Neu0b4uQzrqKok0dynRD9q7U= 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=L++gRsAG; 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="L++gRsAG" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4908b92904fso27961135e9.0 for ; Fri, 29 May 2026 10:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780076731; x=1780681531; 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=f0l2a23bjsyhMnuZqOUF7QTbzTDrWowY//AfeLkvxiM=; b=L++gRsAGbn5CFyP0PDFWf8bDVJ1QiiJ7Mk3yfq0BFbZZBHx3B+g6zOljXYzI0cBZay tb4QG4CsaHHQ51dQlNqiYTcl113rTd4/XfU0fslxmBJNuyqCvOE88eqC/Q2mL6A6pYOD hzEgJH6eurmifpIhKBGKHvxQ0i8S0atB1BrwygBwc6ke548YDKfPb3dclbKIwpdv/B8Y 0ptIontIkS/6vD4MFm37Ia3H80QYNutGQe7efS6e89v6t6aJ0L2LsqhW5HwrZbBormUr cPlv39tq8lgMg1fQBWchSSyz1I0L/fI/1WPjcH6b1nJ5DCXWq76cy4lkO4AyiZJcCffl Nw8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780076731; x=1780681531; 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=f0l2a23bjsyhMnuZqOUF7QTbzTDrWowY//AfeLkvxiM=; b=I5MtIMC5AE4d0O+r6O7pRfio6ngq+ospAg84TRUK6M1U/EcIMjGOp5ehe+I+3dWDk2 fZcx0F7h+qaWiyBuDKlZeQ4unWWKaWkrSUFL5OQb99wvOOppoHDR+eUFmCvneWvg1jby 3p2cNBFmSMYuzoJq0IwTeEJOH0G6TKi6V6732ha1tTxtn51BbGbp7DiAwR+WL6rMyjX3 K6habmfVxdBTlJm8BvAqPkph4YZYt7onuIdYjI09RfN565QeH5M6qJWAIvol2hqFSPRg Ke+K/JaUY7IW54QffbyPdi+cRVs/iB+eFq8CCt7h2ZLYOk+jVyUGWOurh8d18d4umNAM w3SA== X-Gm-Message-State: AOJu0Yx5iyN4pAOCx6A+VUWEPbjZmdvISez4CNaOj1zFX6HCICe2HwDx i5V7wyxzTldGo48bc6u82TM8ZSyksh0eHjXevZmlHB07fMoNd4/aHx91oaU1TA== X-Gm-Gg: Acq92OHGFj5GWNGLCOe/FCJOPGpseKnxSKY7b/tAsZ8ddPeWhoyOfEVSBuRwsaetwbz 7JJvNE+lT6lcELwIX6ybg6Y2hRyQkysK7QnwQjnQdxKH3PktHCzBXc+3qHUXIGu886mJNma2vd4 vf6QN30t9tRvRBBc+zO2w4ErwjvchrSCLApDLOER7bXULUFLqyky4QucHRopTSUf77Kiybtxr4L yysvUewH7MM6R61GNyHMa4RGVhqn6aaIsJLdXcfJOw0SAY/cwWVBO4CoxD5O6IbrERyoiIF7M2p 0Jte5KumFC5bNwN5wc9yn5Y5n53AOBjUYiemYtBI/DkhTB7Ud6Eq/OmT0c5DEKl5XMgRnY4vRwE 0WSy3oqPm4VGMHXbq0lba8h5xri/C9SVhH3h3Xro0UfjzLHPgY7V7w+wYgTCxNkoiU4J0fY5rRL AhP6byytz/7yvqM0BMcD9R7UCyVeqhiPQi3JjnRMA5lQO7efKXU6XxUK9jIdXjYMKxHQy9I+7Xk DNzmtK8+Za89SZDObVbtQ== X-Received: by 2002:a05:600c:6b6a:b0:490:53d3:4753 with SMTP id 5b1f17b1804b1-490a2952f8fmr7201205e9.31.1780076731149; Fri, 29 May 2026 10:45:31 -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-4909c09ab75sm18738075e9.6.2026.05.29.10.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 10:45:30 -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 v10 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Fri, 29 May 2026 18:45:20 +0100 Message-ID: <20260529174524.260199-3-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260529174524.260199-1-devnexen@gmail.com> References: <20260529174524.260199-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: ipv6_setsockopt() on a sock with sk_family !=3D AF_INET6 returns an error, which would abort the loop and leave the remaining subflows desynchronised. This branch was unreachable before this patch (the only caller was TCP_MAXSEG, family-agnostic); it becomes live with the new IPV6_RECVERR / IPV6_RECVERR_RFC4884 caller and the v4-subflow-on-AF_INET6-msk case (v4 MP_JOIN, or userspace PM grafting a v4 subflow onto a v6 msk). Suggested-by: Paolo Abeni Assisted-by: Codex:gpt-5 Signed-off-by: David Carlier --- net/mptcp/sockopt.c | 138 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 116 insertions(+), 22 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b9cac04a749a..76ff3c41a481 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -8,6 +8,7 @@ =20 #include #include +#include #include #include #include @@ -19,7 +20,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 +399,85 @@ 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); + + /* SOL_IPV6 options on a v4 subflow (v4 MP_JOIN, or userspace PM + * grafting a v4 subflow onto an AF_INET6 msk) would otherwise + * abort the loop with -EAFNOSUPPORT from ipv6_setsockopt(). + */ + 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) { + if (sk->sk_family !=3D AF_INET6) + return -ENOPROTOOPT; + 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 + } + + 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 +520,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 +869,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 +899,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) { @@ -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,16 @@ 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: + if (sk->sk_family !=3D AF_INET6) + return -ENOPROTOOPT; + return mptcp_put_int_option(msk, optval, optlen, + inet6_test_bit(RECVERR6, sk)); + case IPV6_RECVERR_RFC4884: + if (sk->sk_family !=3D AF_INET6) + return -ENOPROTOOPT; + return mptcp_put_int_option(msk, optval, optlen, + inet6_test_bit(RECVERR6_RFC4884, sk)); } =20 return -EOPNOTSUPP; @@ -1601,6 +1687,14 @@ static void sync_socket_options(struct mptcp_sock *m= sk, struct sock *ssk) =20 src =3D READ_ONCE(inet_sk(sk)->inet_flags); =20 + /* RECVERR6 bits are only read on AF_INET6 sockets; copying them onto a + * v4 subflow is dead state and diverges from the SOL_IPV6 skip in + * mptcp_setsockopt_all_sf(). + */ + if (ssk->sk_family !=3D AF_INET6) + mask &=3D ~(BIT(INET_FLAGS_RECVERR6) | + BIT(INET_FLAGS_RECVERR6_RFC4884)); + for_each_set_bit(b, &mask, BITS_PER_LONG) assign_bit(b, &inet_sk(ssk)->inet_flags, src & BIT(b)); =20 --=20 2.53.0 From nobody Sat May 30 15:33:27 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.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 87DAB370D6D for ; Fri, 29 May 2026 17:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076736; cv=none; b=WFqQrKUQfQZZsRxB2zrgI4/5Fqf9mUx5fjDi+9O8aDN9mzyhXhmIriuQRX847l4jswOfAiYb99D+ijISNnAfalUSys5qltMw9+DIenVTft5mKAQzPbjw2mVQjj/rnw9CiT6wPr0rdbm3p4xXWGh6PmDfsj/1Q9ToccJMnYHD7ys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076736; c=relaxed/simple; bh=5zG3tbP3y6kSPc8+Mz0m9bYeQfIImw7t3Rg4zOHV/Ck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vCSyYn7eFGzVrpfKk7ha5IsZPnAlLsJDTbqi7GzkHF3edAR0OmFYeE77DNEdjpJ6EOETi0ZvJb9BbucrmC51b3pYE0ycaXvCZSJRKYurv8fJ5aoSNzfDFhgbTTj/vm2FN0WMaK6HvuH1lc4XxvwNoI5OmmM+kJBAlh6rwIajBsQ= 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=pzEGcMiu; arc=none smtp.client-ip=209.85.221.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="pzEGcMiu" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-45ee5cdbd28so1339315f8f.1 for ; Fri, 29 May 2026 10:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780076733; x=1780681533; 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=sVq8ui2ZRmskvyjGPcHjQQSg0JQ5DwT3moq8+SC7Q+A=; b=pzEGcMiuTZvkPsw4MGJPZDjpagTU5TgT7qaDq+x6ugwjgozBA2r/CJmuS8sFST5QGN Qb2hqa+KSByRMMKl9rBaV2+n+3553Y/vWzfSIDzBn+pBozW/vEaRD7T0+HGM1SCrezDy ia51jtoa0r+ewGaeZUjewUCOthvb7VHNA5tcV6nLXYdnUfpcr56GsywbfFpk95l/4Xwc WUK/i4m91YbyAO6mnUA2n44xD70dQNQP/oAqQ8CTaMIw6mnfogRcZY+o72zBQhSHL+21 pa9KPuLo8mHqbS/znqEBX1dJdm1f5ew9UK9pXIP5GluBC9H8NUU8U8LVjEDAmp1uIOU+ dfQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780076733; x=1780681533; 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=sVq8ui2ZRmskvyjGPcHjQQSg0JQ5DwT3moq8+SC7Q+A=; b=ETHixwT6DxdMHUVjE8X+DvCzVHAED5CxY84fiXFI1TBCOkrUouIAjbiSxurlLtGcVe VHKwhFcRNL60hBPvwVuKNW7PdA+RSqDg8KffQaFAee+iAeO+z8gRwgzRoUSmLkSQ1htk Av36Kt1IXWs0uKdVhBjXyg0naa3w+k4pl6PKeVwFt6+AzdK+TN0436LZ1omm2zCrtGrj 3zVRlLZ1REH+9Pz09Bo/kdX1MAzWNKOGnok/j5HCipDvbNQhwyFMDYi1xNL+k5TpdGSi tjp0OOK1/Afjb1huudnqt/pgZPK9PSovN0zbD0OBs7gbmwKDyXEdBOVHtUoQOh8DI8Ts xpxQ== X-Gm-Message-State: AOJu0YxtZY1aKoouL2FKSRkYs2prmUTBrcLEPvJyKXgzapeDgFGoR9NQ grtWHmMOqM2NYlNfSP6rzjghuZSGUA+zJLSufxMBei5Q/yAMGPhGkOz/2hMxZw== X-Gm-Gg: Acq92OESprJ/qZ6mamiU1sRxoq94B+Jv0vPDjCtRK9W9dbkaPQjgXJ4kDH3Gy+mScHa Cg+tY0Z4RVctiQ7ht8wk1f9Xm2mHu4f/70hY4SGXZIH468f+sRudbuYcnz4rUf1t6yTRPIlRBVB ZhHMJJlDgnqGC5ntZVLs5d5YdTBVZlJ36+4cKe9IH7f6FahOV+FDUyo51roNS0QSsrqpUghv/ad avBUtbJ/vyXzPuQqUVbJsCplrSJfVae8oYnYz1kI8CUFyERsuA1siobe/t7aulUIrFVhDU1v3XE 6zUTWD09ofY9RTZHH4PKpX2niUB4SXnmznmURThyy5K8qziGbQdEWHM3/YA8fcgGMAacfVuGGpb Uxa9IDAOXfUk3wcTwzKurlxN0hfwbO6VBLnZ8EglGUqE6rKFTtYODwY3bBEcTeaKFAyEyBtu12Z pSBguXx6CulM3AdS0ktHL4ZusWpvY18D+uHNiiz/ITV070K/cYMf2sevjT6R5McYd7V6z0M1AP1 GUEjvhOo293VNr/8uyZew== X-Received: by 2002:a05:600c:1d0f:b0:489:32b:ac0b with SMTP id 5b1f17b1804b1-490a2a22bb4mr6280055e9.6.1780076732680; Fri, 29 May 2026 10:45:32 -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-4909c09ab75sm18738075e9.6.2026.05.29.10.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 10:45:31 -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 v10 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Fri, 29 May 2026 18:45:21 +0100 Message-ID: <20260529174524.260199-4-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260529174524.260199-1-devnexen@gmail.com> References: <20260529174524.260199-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. MSG_ZEROCOPY completions carry an unpin/free obligation for userspace, so they are queued to the parent unconditionally and are never dropped, mirroring tcp's __msg_zerocopy_callback() which likewise bypasses sk_rcvbuf. Timestamping and local events instead go through sock_queue_err_skb() and are dropped under rmem pressure (sk_rmem_alloc + truesize >=3D sk_rcvbuf) on a full err queue, matching tcp's sk_rcvbuf-gated tx-timestamp path and ip_icmp_error() / ipv6_icmp_error(). The MSG_ERRQUEUE branch of mptcp_recvmsg() forwards to inet_recv_error() directly, and poll() advertises EPOLLERR purely on the parent's sk_err / sk_error_queue, matching tcp_poll(). Suggested-by: Paolo Abeni Signed-off-by: David Carlier --- net/mptcp/protocol.c | 68 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1d67728d4233..64c0e841b9b7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -829,21 +830,66 @@ 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; + } + /* MSG_ZEROCOPY completions carry an unpin/free obligation for + * userspace and must never be dropped. TCP's + * __msg_zerocopy_callback() queues them to sk_error_queue + * regardless of sk_rcvbuf; mirror that here rather than letting + * sock_queue_err_skb() drop them under receive-buffer pressure. + */ + if (SKB_EXT_ERR(skb)->ee.ee_origin =3D=3D SO_EE_ORIGIN_ZEROCOPY) { + skb_orphan(skb); + skb->sk =3D sk; + skb_queue_tail(&sk->sk_error_queue, skb); + moved =3D true; + continue; + } + if (sock_queue_err_skb(sk, skb)) { + kfree_skb(skb); + continue; + } + moved =3D true; + } + + return moved; +} + static bool __mptcp_subflow_error_report(struct sock *sk, struct sock *ssk) { + bool propagated =3D false; 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 @@ -853,11 +899,15 @@ 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 propagated =3D true; =20 - /* This barrier is coupled with smp_rmb() in mptcp_poll() */ - smp_wmb(); - sk_error_report(sk); - return true; +out: + if (report) { + /* This barrier is coupled with smp_rmb() in mptcp_poll() */ + smp_wmb(); + sk_error_report(sk); + } + return propagated; } =20 void __mptcp_error_report(struct sock *sk) @@ -2313,7 +2363,6 @@ 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); =20 @@ -4363,7 +4412,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 Sat May 30 15:33:27 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 6FE21391E7F for ; Fri, 29 May 2026 17:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076738; cv=none; b=f4natur8lLc4gE2RRjjGp+iyQpxIsjSIkqNZfitOLukTb+0Nbm7iw+EI5pltbEQsEYAnIVZnqNMhMFIszBH1D7YItamQ+6EtejrZ7OwUVwvi3CTxGk0MkF+RO1LPBrCazS4Xp5o62BZGplh5TpiZNPSAZBmi0jNLtgoa1zDJEu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780076738; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HIxVlSvT9SiJkndh1dI+KLT/R26WarztWZC9AoPeZvLoPZLMmlZUz3jfUrUNoQ9YKFfPvImSVV3OweffoZkeNtf5OB7hB+xM/3nDnru9AuxFbZh4OCux7Z1fkX9gsUzyEkAuxhsy2ByMZCE+ok/pfThruLBuTYljJw2MKBGUsc8= 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=dehapMrE; arc=none smtp.client-ip=209.85.128.50 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="dehapMrE" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48fde648a71so93949545e9.0 for ; Fri, 29 May 2026 10:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780076736; x=1780681536; 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=dehapMrEod4yQPedwi6wkMsO5R4UCxNPK0QUSNvmErNk/yPXXzP5zIA06qHUAr6DdE ZZz9LRHa1+LWm2CUl3sCl8paWQyhD82qdYaW9Sm05esWUQaf8Zfv3k5p4DYCfTSO76Eb YNHcIASJ9H70JtwD6w+w5ozNXVzljwnYIP3Nm2efGgZwVwtJC/EAxWPJ31ECyH3vePmK SE9Ka+cmMg5P2zGoVKQwEPnXDBY6cEe4QVh4iHSF31j8llx87+hDqh4rPJNSMZteW3zQ D4SMy3NT5xIHvDE/RVfNrn7sdWGpX/70f1MDmiC7gKkxv/RrSMrCCsqs/GaTIiTAVF0+ zeNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780076736; x=1780681536; 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=o7XD+CZMhLhF9UwJrjOkYmUEP8c48dLBFRN1IsWkoIgv9u611ub+upjJ8DEWyWbnxn uhSOOKns2g/f90xgfOTwRT5ZTCdA9uzGaqkthgLz0w0RT1rWr0tTrASAgDqBAiB6HF7o eh9JxFv0Gne00e8mpWHmdOV9Ig3b0uBCZkBnxM4Vc//josJ2wMY+05HA+5LSBUzlKOCr lY5YLqfhIhcOIsQ2UpXYZ8kf734+Mk+j0VDSjANkZu0IxywAug06miRaS5jwn+SBTAhD ffKh+0qncxdYN+Ie5NbqJ3fN0cU3MuzQ991LbuO0qP8kzF5QOj6iwlvYNZaZ89xFOX+T Nacg== X-Gm-Message-State: AOJu0YygfRcvA68rITTUzPSb9EofyR3jpkYecD9taAbDbNz9twdpGr6H eACCLzZqGGAPpJxsieloxx8dSxl8htKxsIzpZmYSFU2xFu8jQBTon/B0FR5vBw== X-Gm-Gg: Acq92OGXFAmyUDlbIifIImCKoBuDXA/NVUeSYbUTE97wmaVzip5U/nc7GZDFCIomcV2 aF3B+WuZ1VSk3cEch+xbrbnjyCo0LuOXWRVZLpYpKlsk6kf8iSioqRgUVJeM5jKdmMW+N5Q3o57 QEMOnH6fVcZLGkrzn/woA0E7Gujgcs7UjIF/EJ3lbAMmrZ620yqle3Bg3CAIha+Lyv6Pn/NqoZu DR7QwcJyDzjOy0KE5GcEdpHxyRdKY1WYd+E5JQH/V2nHswURXVfF/tuaQYyZTxjoXZSfzFngLW4 d6XJnClVV7YcAAOnR4Ym40EIJrzichwiyFZOyPKV4SBw3hT2sskBoODwqfJB7oAu6w40e/ZHtbq 39bvX9NsTgj9DTR+G75TgE/+9vFL5l/pf7Jqt5BnKZhMluYxxaMpf0FnoGf6405CPyfFeuFICR+ 4PeVbqXn/PSqboIrPrCMO3V5fXCYrSn8zcJPgBnkmfJ3ayCyBLeHWH1LUenJ2HNz2KOUnvlZGgj 0cZopAPS3lEKJrqxgGqnakXhzQgXbEV X-Received: by 2002:a05:600c:4753:b0:48f:e230:29f5 with SMTP id 5b1f17b1804b1-490a2a79df1mr5349135e9.16.1780076735668; Fri, 29 May 2026 10:45:35 -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-4909c09ab75sm18738075e9.6.2026.05.29.10.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 10:45:34 -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 v10 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Fri, 29 May 2026 18:45:22 +0100 Message-ID: <20260529174524.260199-5-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260529174524.260199-1-devnexen@gmail.com> References: <20260529174524.260199-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