From nobody Mon Jun 8 17:44:59 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 29EF232143D for ; Wed, 27 May 2026 14:07:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890851; cv=none; b=j7LZbyl9OZN9ts6iK4uhwk9dqw2hvooEz2m+UPz2SWgUc49XqUN1l0qvvy1ZBqNLawfgkjMB3dtkK3b8rhE4K/eaZ+6NgjlyvHiFyItx9WzC2Yp48W8xutrov7j9dzyQ+tSv4tjE8qCGEiG1EK2banQ/SDelDxTWXtH97WlKWdA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890851; c=relaxed/simple; bh=PJ89tchvDdk572/bznw24XqiiC6pPJVpO6DU6QBUReg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s8i+4vJcP1JeSfY196ZEXzQ+UzbHTDpjjnALjl0QeVMKQcLmu7g7HDzk5fsoMEFhE6jZxeej8iV8WZGiVA0C5NyUwertD74dp8dQDH5Bu9Fh9/bF1jGe9tbXtEeY4fO05TKJlqiYEB/qvYGqBtky6V0uAJAbSmirhXF4hvaCIO0= 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=lvFN4bgW; arc=none smtp.client-ip=209.85.128.53 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="lvFN4bgW" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso61014615e9.0 for ; Wed, 27 May 2026 07:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779890848; x=1780495648; 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=lvFN4bgWEof0sncZ457xUdFm68WuqA05GRQeVf6em5hz8Mg3Bc14in4PM+mu8Ne9dy 9yX3Bi7AjqdSuax7esViWjuxwdPfcsH2fwYe6JoD+ByyrdR3BByJYTACEIra6OOSYGv5 /Dikw3ef0rjWJP0exMBfjVOEbAW0ZlCA/zrmTQLtK1qh4TXRUNzFG1JmdgACndy44qjw bIhnhBZOqCvyZMbr7MpNWuJ1Sy6jhdzYhwd3I8TM3IssE2NxjwozTcfK0hAFN0hbGTDl QStNkHlsSmFK/Ues14Z6F23kY4TPSYdC7kXSWEYDwx4AvoBan/ozvMaqFdici0oqcH4V X9aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779890848; x=1780495648; 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=fkJ5Urjqr3/z+6WtZkZZZb5Ng26pVAFJe5cGE0Utc1ylAvMjRRazvHyk924WG+xFFe coaY9bvtEOgNKtnAuZIpE6z4zrYugsLkSWOn74tcM4k6+JW/+qcGQ+dVRMiCwtd/9MxS rFmau0jvigHFfiUJWg3d7GaSF8SZ2vPWVynbD8YHLJK+GhZDIeCTua5yK6dgPJCDTjp4 rNYplUiSElz4FYB4NvTE9S7a3TbKvPBRfeY9Fn83azrsIRHZpZ4TkJIFJIanHlBGJead IG05RJHnVk5FyL83YmP2vBnKq7Px1A+PFaQSy0f+innJYSnw3ID805fyzXCX/P2DoSDB 0CTA== X-Gm-Message-State: AOJu0YxDnhTvMhA0v8tdEVoAO8mCUIAcyp/PLQNDvRDNVjdg1TkBs91/ 2ut8W1GzjVcAAFUnVozPLVpyr1Zm0NcEIpH57euvR1kPuS4hSOE516f6dBdkl0L/ X-Gm-Gg: Acq92OFwa5/ejOk2gQDrU/Ev96/j89hfpCfRlv0rquIDAWok7UHvREU5YWFhy+6h03F ZCmTdiQytHnxV8/VPt70iR3MAVFdpQEyShP2fFpN6hMk8scgr1XKokYJ5S6ZhZoD20aVhXKzCsb 8Jq9zSmaH+SfOWML+MH+8exGZzlIm0+oWm3FUk+6z2d/qV0kJs6P7otPexQCTNNZz/7Qpx3rTd5 0GGt5Ec1g64GTDYWlNAXEEFOjL+8YdSzqfb4n6rmL6dlDL5Hz4HHxXdJxI+kKRCsDAhlaPCgLBq KU3iaqYNpjckUuwcIIvl5RP3HW+W16doOoDc1YumyPSsdO0G/IJ0ztuF4MaRPTr4VNCwYNwk9Uq aq4nKu8vWKSLiQgxGZcB0LpfK7IPuKiPiFxePblxtalWWRahNgCb17JQ666EN1nNyg1xJc8qSMU N7HyQx+rHZcF8wQIxdHBDt8gfTTCvC6iFyNHmkAP8DDrydX83L25UXQx6qvbszSg1C1Y5fJkqCV 1eBA+JzQpA= X-Received: by 2002:a05:600c:8484:b0:490:3b87:be0e with SMTP id 5b1f17b1804b1-490428e3362mr398352325e9.29.1779890848423; Wed, 27 May 2026 07:07:28 -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-4907e6c7433sm19579085e9.8.2026.05.27.07.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 07:07:28 -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 v8 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Wed, 27 May 2026 15:07:15 +0100 Message-ID: <711f55e31538b177ba58d7a1e29b47bcb2dd7c24.1779890764.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 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 Mon Jun 8 17:44:59 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 4F19A3264E4 for ; Wed, 27 May 2026 14:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890853; cv=none; b=cmipG5lEZrLc6I5E4HHjbjLZ/0q3fluwHzmApv7/yzxxCVNa5sNK4XknoU2vXjQjYpJ+cQshslQHWDmgC/kj5XYcaYjuFjyMKk/KsPXVbhVqOQFXVwvWZWtijw2tP9WBDOQ/ASc7G+5Jt45qhYs6pxP4Sb6yU5b4Sh4gNWZc0SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890853; c=relaxed/simple; bh=Tx/zb9pg36aBzy2Rzy5NBmpqSk3pVmY/Ufp9Kga3Gx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WIrERreWEHKxwsOe3gHn4OBHEd2M24DnqE7LBaytbVKpOca1OScuB1rohtmHfF7acEyBHyzbsJ6gwHmpiIdKBlrk20dqEFCjmRJ5xSLXWHcH3gOxQBapZBAAatr/ms9yj1LKZvHVmI45ludzoBY247Ot10hsy9djHykT7W2NaVQ= 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=VYeK8lfh; arc=none smtp.client-ip=209.85.128.44 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="VYeK8lfh" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4903d730b1fso52503985e9.2 for ; Wed, 27 May 2026 07:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779890850; x=1780495650; 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=qzaPU68M0pQLuUxyxSThxVxiz6eq+D2nBzZtqTTvNa0=; b=VYeK8lfh0DqsOLLh8ODVxTXj5ptJvxpWrOprB7MF20gHqZnUz/KgHZNWUG4YcHxSS/ JqDMhkPcge8THI5PyNL4X86E8H6pCGT7F7iEAGcQZJh4h4TTKDaYAjszF9i500Wx6onr JrCgYlZRXFMdA+70f6DFEwE1zA3lKd1X2EJeyLYkGLvSpETpCzN32qfH8sMpoK6oo5UO 8O1r7T0L8H+ALcZxaAbNQnO+QxyNS0bVRUPK5xHSd8f7pWmMISs5quXq0EQ2bPgl2aP+ 0Y1PiZ1jCiWCYpU6GnWZfCUrF7bhxlbI9Chh7nyhoa1zh/2ZBk0q7opM7n0NehmMrLnH EnFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779890850; x=1780495650; 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=qzaPU68M0pQLuUxyxSThxVxiz6eq+D2nBzZtqTTvNa0=; b=N4t6rOXpSvO18splOvBoNp8BSOS5QONrBFFlvemTmlFp+H2G7T1jdXvnxqb9Ufyy7u M4ngkvPt75vkbZh7UNj0ksAW527ZiHWpTBubeSxNmOgwZsdvL+eFe9OkGQTXh0LSsO90 Ldn9jjkki8yuX7Hy7ebr/+m2LhbUtmA0xXABxRwhxBpyIoN08ul6dDgspP733OK/4c5Z iAZcxPGrweDjAmxZr4mk++0FUe+PzJIYrfATgcOsZPstiz4GDqkOOVL9NgXFbalSmIEs 0+WxVobOyT13CGWJVuodR7zFVqmBQIU0BbTGOEy8366u4MZRKrqKlMn8+2JY+rJHyu9m Fv8g== X-Gm-Message-State: AOJu0YwrEZeiUHzOnvSm6SLZsO3VZ1C90/DJk96gXoTwXVTCEt1qovEz haQ6ps4PWUSPWNTXlGULPq1OgZ05/IgZt/JnBTteoPlgV5jL5tYP9InGgdyk4bJc X-Gm-Gg: Acq92OE8ENnzs6bhwGKYp9803AeCynaiVv8KVZdoEqAnYtY8LWoaOM9fMWl9ylqTUnQ bbU7rEJl+9aqrmmxjex4CFRp7LMUgsU9+zt74oe+eUr1ynCx0/0WaTToOgUvG/oL9zTXZDXJtTr ouO8xtlcK5Rmk8iPYhlETH8bjFyYXC6vg7zE8MTyRgn0LMDXq/21nWBTZTUfYuJe/gc3PPriis7 o/52g932MSo9Z6pTazMR9u7xkgJli8orv1zyYCKARHldzmAeL3UfEo5GBdLA82Mz3r4I3R73P2t SrABDJ4ohmkAyt4HZJCsbXtqXdx7IGDP7Ef/aq1B4CaUO69mhj8Pur51fdtyQ2zqjarTpfbOjD+ e7aDODgSPQSKIX3VrEyhZpNACsWXlVLdGPQhFdA2WkUCkQ+6TMkhtjAFk7G/DY/GrtGY2fVZa3g OpqVTGnR1g/RDG7ZDBaRH0HJ95yfNDO+No/vNfozsDaWIkk1j8N5hKD09m6oqEiAC/oIzR3IrFH ZxrolqP8/w= X-Received: by 2002:a05:600c:a402:b0:488:9bf8:7f17 with SMTP id 5b1f17b1804b1-490425ad10cmr316187545e9.14.1779890849432; Wed, 27 May 2026 07:07: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-4907e6c7433sm19579085e9.8.2026.05.27.07.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 07:07: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 v8 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Wed, 27 May 2026 15:07:16 +0100 Message-ID: <46f02f1f3bbc5ebd9a06efd88edc1361b8e6fa13.1779890764.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: 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 | 123 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 22 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b9cac04a749a..28229fe3eeca 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,82 @@ 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) + 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 +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) { @@ -1473,6 +1540,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 +1566,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 Jun 8 17:44:59 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 8971D33F582 for ; Wed, 27 May 2026 14:07:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890854; cv=none; b=W/emUjYh5GuE2G5AjMiSD8rgimm6igFhFf+UpJP/qLJUdoU2VERHgPNF76fxBNU1HZyJjJZ0RhXAhWiKtBz0sT6kUAvNwizvRdDgCKe1jo3r28J4d24ALOlTIWTbT4X4fYpsNo2BVXUCOZv4vcwvVjtUGPrX2ciQOfAw096NmFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890854; c=relaxed/simple; bh=y4Hi+B/oPNnwyj2kymAAUR35f8vMo9o3TVl7jTlMcUc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VJZhlaXBn7RqQRF+iDku6U+RmIEz1Ad8P85cJQ6IygkqS4h/R/10Sc4wZ9SlnJKZWuSWGMViTTYvHUATAF/O33ngYZznNZI9s4CBc/NkggbKCof+gu2cwjX8HzeZH28plknfq/wCU2/mihmkbDfwS2PmcxDOT6AR2eVFipGYeZA= 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=bHT4GaIO; arc=none smtp.client-ip=209.85.128.49 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="bHT4GaIO" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4904127c32cso35191045e9.2 for ; Wed, 27 May 2026 07:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779890851; x=1780495651; 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=6tBv7uNxGxBOrtzkZW/MXuikDFXopXk6ognc/bf7eJ8=; b=bHT4GaIOJWkv9eHDqq3/AMMUxg7OPq6LvNjtzfGebk0uVxsHMAwPDk5hPvJbIvPDQ2 kLYDzqX0SwFt3XCTHviagz5aQ3/DzqFeOBi7m89bUYW4/lCdjbM6K1BmkQ6fziQJw15n zhx5bp6k4nSCOYlNT4eiR4f9BH5JHJAFzNzw/IkEFTC37rZAMfmZwU+xliGFb/7jsiHZ qo7i25J2N7OCBBDMoBHWkZfm5NkIz79QCGQlWISCsJy6wud3vI379uJQwA6wWujA78nJ dib63amhXDdREPPw9SHpgR6zJLOZNKc+mDUJlb4vYnoptdsbX4AyC28LepqmZrwQEAJL +3iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779890851; x=1780495651; 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=6tBv7uNxGxBOrtzkZW/MXuikDFXopXk6ognc/bf7eJ8=; b=N7MRI3C1UP4+0oLwRrcbbVpNwJ+ogCnt01M+IhRYmciUFxyj9wr24hMEtRMf0ikkqz rQNyOvpougICTbDD2YZl1DIlWt87xBhqzQUdLACHB0wc2F+f/jPvZp9bYKkrd60GBZV6 96S0/YW3MO+w7qBaIPh6ICaySPPF+QZHW9u2eRkpCKL/hzPotnD3aNHH1KtYSudXx/GT I+P/oYkDRnwjr0+igX+X1DVGhnwHATTZhQcjDInFL1/pm70jXHSCfn3R3ITuXVDGcLTF 2aQlGRcotBYGHCsO5caAVUfR0ic7zHQ9iooQf3L6kVxqFjOrugvJyfWEntH3UUvgRg7/ YnHw== X-Gm-Message-State: AOJu0YyRGgNG1PIOf/F0fxcV19qb3vSMnzK36jg0hVTUYoVJcq2/KaiU 5eBpxzoKvMnpNNpZd+UIhBkiupJEdjucwOxwWEIhE49Jmsx1Db1cjtR7ociEh2aV X-Gm-Gg: Acq92OGiC1ALUx4f8iACOhdFaDkfmVShB51999XDy/BDGztWCvWb6HanMJYHhpklAbc cw0MI3xvYd7O3HG8ventpQnCpZOhxwBt5l6QmJkMKRI9GNuYRjxn2Q7Uc+fdFWOUB4bkK2B50Iw H99/TYXKfDdJcl1uyescQC75dyD5wHpFM5SvaN/uYfMFgJj0FHmxQVHcfN6ffKbVeoegMnvjUus LD8VcbIwLdLp/X4k/VyLLONswFKl+772WhGRmCJdJHGgpWd84gkFbxmwq0QkIpj8malQkUJboeh zohssNipHpKmiaWXdA3/0Cn6263t5Gkr6iEbiNoUTJCOh0Fs3qoZX2tZWqKkCYDcSLuGNV7nhoK 8I4x9ghU6ngMCVWCo2p7PP8Z1zLwG8PirA55dg1rFMuAkXxDYilBHEWtk3hLTpLtjPrHSG86p7C 7A22ZiWpGmIhOyDlvgvcy2NWwnqFlSIFJmOrrMdwAFKVB5MTxYoXPJz8UT5V6DeHcCkvb0CVcY8 13VlVdDSVs= X-Received: by 2002:a05:600c:45ce:b0:490:5cd8:d213 with SMTP id 5b1f17b1804b1-4905cd8d33emr235242445e9.15.1779890850474; Wed, 27 May 2026 07:07:30 -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-4907e6c7433sm19579085e9.8.2026.05.27.07.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 07:07: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 v8 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Wed, 27 May 2026 15:07:17 +0100 Message-ID: <512d13271d40a72b1e0007cf595cbf3bee6dd4b7.1779890764.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. When sock_queue_err_skb() fails on the parent under rmem pressure (sk_rmem_alloc + truesize >=3D sk_rcvbuf), the splice drops the offending skb, matching the behaviour of ip_icmp_error() / ipv6_icmp_error() on a full err queue. Userspace expecting MSG_ZEROCOPY completion notifications must size SO_RCVBUF accordingly. 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 | 47 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1d67728d4233..28403fbdc994 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,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)) { + kfree_skb(skb); + continue; + } + 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 @@ -853,6 +885,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(); @@ -2313,7 +2350,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 +4399,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 Jun 8 17:44:59 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 3984B3264E4 for ; Wed, 27 May 2026 14:07:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890854; cv=none; b=Svqd3yBLGVVMl7C+Yy0f6HHxZ8BF1ZB1jwmwu/6ZoTkI1/a6mRwjyCnmMbF6mN+etdR9Ft2r+lcoKYDqC11W7c4ns69pO+AUzn7OLDBPvUlcH3nB5M0tV20b5giTMqNsZXcE4x0lP30zjGIjjrdUSBdEIPORCY46oCq23jdwSbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779890854; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rUultlXOg+AGajd7NabjhvlYfu2Gqi5kDoFOp/UCE6YGZavVjXgEzbhAqUYhgUWqzyOKb2DFmjdJsfWEP9yWoP9v6hDsq+q3ntfCud2UFuUpkjghGWzqCYrBWNn69zaGbYMQPaxtZ1PTO3tpU68G5XYlLz7FUOyKjR3kG7VLd84= 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=BVGhCFVn; arc=none smtp.client-ip=209.85.128.48 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="BVGhCFVn" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-48d146705b4so124828045e9.3 for ; Wed, 27 May 2026 07:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779890852; x=1780495652; 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=BVGhCFVnjjHr1MA80DmxUtUBdxngcxhC4tQavCipxE6Kk9feQqtYf7DmOFIJ05jatH tr67wi27m838UGzwpqZIIg8xnOCKoKC6/IU2oGY4dT9Y8zrLgjzzwaju98kDLTnFO7Ic E/TzhMwCu/UR9fAoDyXrr2DdHMYMEkitzCrSCQHqee091jq4p38euhiXOyYXIqydVt+z 1cD8kwMIDUpGGdjR70PMKD0rLkebL4ZtuWU+cTg+/g8tIEA4LB8gVibU8hysqjTOinpP qFiUMvXdaNRAG5MSOkWjc3mhjLYYWnbxCbFDonNc+FrXIPGysbciew7qoEpgUUI9iC3N 83bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779890852; x=1780495652; 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=QJ0gGgN5rn3Jik4J8GPJb4NYGKa1ZmrZGc6zhiz7auW7adNL4A8AGNkx6hgrEWoSjz tp4k1bvvsbZGgiaXDHikPJoQfcc5OTxph3dU0XSln4ZAZImvuvrXwqJAEUPXhLgqP7OF VW5Dampg4rnEh3vHssPq9lyfQOZ1MwW5HSGyX/UU3BgCRytPJRl4QgGICie6yzI1zPSc c8VmDg2fRRJaGyW/SfT4NT9OZg5mcJAN3hrNlxkKgZdI3jfW11Wb64eyiVhdeNDe+cUL mfon01XDyEEjRcKGUpcb3V/v6tv6j2GmELy/n3AaPWyDYztqT/5DJeHlSugBj6Qy3N1I z+0A== X-Gm-Message-State: AOJu0YzRZ5gDQaTCutilaV+8fItog7ngxrb7p3pNwn9rDgq8oH86+jxz Wo1Phf0GBTIGZC4IF3e2xB8PxrxZBa8xNjNWQDmYmGGPREZbVmfSrcpbmzJm36fi X-Gm-Gg: Acq92OGsvBWCunRlKA2MgZ1rUnZ9qVqC8Y3atEVzQSNRs0GcntNDBpRyyb23BEGCg16 3u/cZKF/vuEQ2L/1F30xph9EpodsrNQmJQIhacup/OvhoHfAKpg7wleVoI99UYAg1egZBUnDaH3 rH4Hm5xm8czxFRJ27C6fpahMWoWzYMiAlhrcbe4wBLb3G1h7hEL32MboHwzJgmUyn/BnyghABLp YURJ8mnD/8Y71mYK4Ga8l+n41H32hfjNO568BkG20i3xs6z/ev0B9EOsaIHy9A7ibhQwWVJBcDk khJA+qTIgFgFOfhdpi+egUq5bAAONhoOyO8fOcafdZ/E9FyHH/MlK1OUThZ0ctKDo5wcpoUyGxk afU47QbYUm37SrdnhNCx5Dov/2dmj49WY356gv31w3plazYBm0YmC11/yWYa6PwMFPFrV1V+wWK 5cvOOsXje1e0QA6Cin4P9c/zpdZXOaAkYfpmnEshhxJlOH/eZxMLXx0s3lCrpotgyCpSXHYVZS1 NzhSZTO2sPpMLXKhe7R7Q== X-Received: by 2002:a05:600c:674a:b0:490:5057:f5f7 with SMTP id 5b1f17b1804b1-49050580a91mr324361225e9.11.1779890851509; Wed, 27 May 2026 07:07: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-4907e6c7433sm19579085e9.8.2026.05.27.07.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 07:07: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 v8 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Wed, 27 May 2026 15:07:18 +0100 Message-ID: <61996570b8f75c902c19c94fb0edfe146adb0ae1.1779890764.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