From nobody Tue May 5 11:26:39 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60B1E1A6825 for ; Sat, 2 May 2026 21:20:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756817; cv=none; b=P3+pVXglygaYvk9AwEhtl8IOpOLoHg8MtOkbFRpR9DrstLPNA7NfLsu9JffVa93v6qXYHcV+WFmy1XL///ZA14e8ZTPMmmZv2EvbRFAO0X9gT9pYq0zq0bBiMy38UPdvCJ05DLtaNvq9NQxAJJ5QaWR5Y43wru83YkHDOl9Sx+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756817; c=relaxed/simple; bh=xEXE2bc5iPaZN+2whmBVNlS14eYoNhOCNrWhZYi5alc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kXwNnbxsLqRxvSmP5TMnlvr5XX72h3I24m54orfJ907/NxV9ugtYccGdv6LbSBt0oeizq59JWDYRwSu0SrPRbUtNNhBEAD37yEEjNAhAQT2psJTpHrabPzO4ukf7Xb2ScPmsG25X/6yvaKA7AmX0Q9K4VysmPZ6xKd4IFd0SGzo= 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=aEQdeAFT; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aEQdeAFT" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-445795cf6f1so1708795f8f.1 for ; Sat, 02 May 2026 14:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777756814; x=1778361614; 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=kGCCWJrtrsRJ2Jme2YYckkzIP7ChzSwrrPArTaO+ixA=; b=aEQdeAFTeadkq+mytXTWVOZ2L8vjU8mFMnsnBoMkve+d0sxWgGvERciAU3oh5155os dwstuFLdZBrQDUKrWzqLe7u0rYKZMhNJaPizufcFwljW2HOg6dbwKpOb8hYWYbC9Lm5D mmIgZPID/47GN7l3xKVSwiGsk1ueDojowTAPNimN5Bsb8EofpAojw04BF2OhMje2qf4C 6ByJPAPLBUXkesPMeC6pHKmxNiQxAGdbNdN262P/UlRtZiCD2vN/f6cjkAXHcoPHIVEr s6PoYt2bxIKFshXb/jVeCrUBIwu1lXT+bZDbj9R/P83hYWGikxvqRU13ITEEoFFlQs7d j74Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777756814; x=1778361614; 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=kGCCWJrtrsRJ2Jme2YYckkzIP7ChzSwrrPArTaO+ixA=; b=iUD7qMKTuHFHmqQ/y0butnp3iU/9hhznHJrO9wvAarYnPhNOfSdPNBN2r+E/dCt9Dn gdl/xp4T82b8Ru96DFcA5Nn7fI5zSmCqQeZz8vOx9Cz3zX5AOFefk4vj2blRpyB4+7n1 WMxDU5K2W/33maH3YJsjPbX28U61WdwkpQnO0xUTVD0DFtlPKzFjN4zvCTZS1zCCOD+6 l81mXnW19zBRNnOEhD4adj3dUQTrOgzdv9yB9G3xUCI1AeoAGm8tilN8QPua6VuxbNWD IdYGxv+zZuU0ct64U4649E2lIcMa/z/aEzpkpfHg38sFIGElqHrJIGBF+tTBu8bHREiz Cpig== X-Gm-Message-State: AOJu0Yy7KOQFl5Z0daKQKYZrZYVQKc9ACkVqIbjYLfkPevCuUEgLxPo9 Nu0BiJcYkK57ihMfL9V5h1So1SkPwkAnWNKJlgwWAogjtTfW70rUSrgnDx1M5D4e X-Gm-Gg: AeBDievu2flZbrTx5T0yPf1P6JSeYmmCbjHSUAuDw9g/rU4JO0oBuYQmzZHTUX0e75e /wKFma7hayuc8/xJN7PgYD1FPS/Ts5L2gveCGfmnMP8PgjLnb2Q8+5SDoVDPAhhOfG9xMigPQ/o BNY9mPFihOZm9tkOwrSOfccfgN4RYvZBk7RtSfXqjvCQOUc7XaX94S+CoHl6GA8i2FpkkQ1Q+ZB ehU7+QFR/pPkx83+H3sx+JrvtTzAqUpOHGl//uhqEJXECeJ0jhflbMJoqpOyQ0MHjiqtb96eYDS ESLsvK8iZ34SfSjomMRUvjLeo27bfcVxRJJ9c09Rmwje2EaSxUoz4+GsuzuZsLrOAHFzcPCplKK 1gZ++CuqtBqBY3klUZMwqegyTalaYd3qNwsUsRi3SlqvW9pjnPJixZJMFADgbFOKaC137B/CYcR EXx6jkXcIWM+nCzbsle4+cZzYyZY/lUMlM/6RYmcK9NNmRgeF6WCxAalYHtPLwY2G+BDfFdnId5 M7VM5od+hkc2U5fpyEawg== X-Received: by 2002:a05:6000:2011:b0:43f:dc54:9493 with SMTP id ffacd0b85a97d-44bb5495b60mr5970054f8f.21.1777756814351; Sat, 02 May 2026 14:20:14 -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 ffacd0b85a97d-44a981defb3sm19490140f8f.20.2026.05.02.14.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 14:20:14 -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 v5 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Sat, 2 May 2026 22:19:57 +0100 Message-ID: <2d142af0982408ad8c5749dce276503efe2c37c6.1777756707.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 0efe40be2fde..b828cdd9657c 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) { @@ -1536,6 +1540,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); @@ -1582,9 +1589,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 Tue May 5 11:26:39 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.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 966CE2DEA98 for ; Sat, 2 May 2026 21:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756819; cv=none; b=a7BRpl7dmtBbaFghn13/k2vG9bHnryYIYMOfiIELDBd4p/YJwkB5FsekfauTZRJ/3+fdZUHi52bQxd7m+g6IWv8w5ZWsf2MWDoWlb3LMgBQN6yb/cCl0VBQv8oAeK+xMju0T6ufpeMAnby/zfNXrX2p8Nj6Ij/RdYkQQbQnKklc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756819; c=relaxed/simple; bh=dRw03HDHPifZK+1/GQrOdbW8fYCNqkTv127CMHBg9UM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0UAH68SodHI8ssc+4aGkx7XhvGfQ81hzgHGYflQVYJTd5+Xpt8ajyW8pOaVh+vIQs/Xl9GrDYL2IeDyPR56ci6VoGko0N3EDIg+9PgWI7xMKu6Wqq2QBsmoa5AQ6hQMU9GH3oOoohAo/RQwBs/1u7saXPawdh9Sj20bIwaLynI= 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=Dn+q+hjp; arc=none smtp.client-ip=209.85.221.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="Dn+q+hjp" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-43d75312379so2201179f8f.1 for ; Sat, 02 May 2026 14:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777756816; x=1778361616; 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=Tn5z5rghKByXHpHoCWMCWDKnfvZ/R9vY3BgrEcYyArE=; b=Dn+q+hjpfLHstxvF9bxGT/xupYcjX//VXKdtA3hz+tYuF7ydcYZLPvBnDxv48XcPMF DxWIul5C2GJSpAh8RRXNI0PgqdbQAp19odANK5XaqzkavWoRGMMhovs3lXvbL3ZwLdXw PmnDKXdCTc0SvOO8Xg29zNNpkLLvTznvCkauDmPqLFAnA5tdQ9qCP6WkleUojE5f6L+d WHzN7PBNxV8Dnnc4am9eZZ77dgEG13bkk1DlFqcN6PsSuhnzqLPg+RClMlEovAR1uZR6 LqsISDd3B3D3JMiqNS4Te/m+NGLbVHKY8udxxtJmyBI3VNBABX4ByL4puiWBfAIUVBz7 xESA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777756816; x=1778361616; 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=Tn5z5rghKByXHpHoCWMCWDKnfvZ/R9vY3BgrEcYyArE=; b=RriOSKL7WijAZqCwad9Z+lZes3os1rEU0IaME8QqecIdWaW6+FLPQPJBAIp65aUrAx cW/KF8ZhvPoBgZ9rSYyDlD+hK8i2gHoh6GbwOWVV/tNDgDM5fs/BFZm/qs8tSj1J2O5A Dp03NSFXZkP6APGL8/m4H/MxT58I8P/k+792oBg5ZkyyQKtNYVQ3Rwi8/3LUgDrsizFi v3Y4Yq6x350FwdSdIVmHOVir8pDYn1QQFl3/tJHCtn+cWlChgHBff4Yg9zq26YYVh+yO sJkYYhtc+26kB3UWQVW3C5Hf6xcNMHnwYIkAUQl2PoTDupbPwawPNN9xddf3YBFIw3ff aVPw== X-Gm-Message-State: AOJu0YznRmiCyJ1W62t16gGPW/2htfA1j878BG8Sb9BUdgC1kA2Sucxs 3JFEz+h6jg7nHeqJAHG5xxRyWVVV30ylgnpt+SWG3DrD+MD93cpQo77o0fIfTyz7 X-Gm-Gg: AeBDies9rKTnmajSY4bHY2x8rmGuLTokswjywb44yjCQ7/kFISga+4pkCprjQl+Hw2H QSewlvVcDhurVnE9Lqzo2KNmG05LWpTlycTE9Vx+9NTTrbkVk1R+26p3CtcDJsItzcFkDD7jpnP paH0VmA6b+W+g/+N1g9TQYyaOxXmOW+iJQ1GCjDAFjkl7RFkgQMuifXzrEr9WezDvxyNbX9/Kmp 7q99f+TPZ6Q//gY247b3PG82hG6s/ImrxfXtAZct3/KMTyIpTqajgonf9Ny+RetM2OzaOegHOmk U93n13PKocyYPGvd/Tizc0uaOnxkv5A5nfsHtID233+faajeercxQnD86VyI2ivd6GMONd84Qpi PHUD12nWY1XEBzklCaYERnrqZh9TdZ4ZuCPlQgXxb9AYf1UoFItcqtHCyjCr8dXii1JEqfmV3iH f6Q1jeEHwjGEuQMtA/AjOegAWA1Y+BkFyAJ77iyX7wghzo9csngbm9CGASdE6ERelx/0Z0s/c7y /6oVyonsNfDHF9dCvz210sU8vdwmaf/ X-Received: by 2002:a05:6000:2b07:b0:444:1fd4:a4ff with SMTP id ffacd0b85a97d-4494e5f0615mr12049714f8f.9.1777756815481; Sat, 02 May 2026 14:20:15 -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 ffacd0b85a97d-44a981defb3sm19490140f8f.20.2026.05.02.14.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 14:20:14 -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 v5 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Sat, 2 May 2026 22:19:58 +0100 Message-ID: <072e47482484e10bc8894fda10e9c1e27ba5a27a.1777756707.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 | 95 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 77 insertions(+), 18 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b828cdd9657c..56265b076f6e 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,57 @@ 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; + } + 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; + + if (optlen < sizeof(int)) + return -EINVAL; + if (copy_from_sockptr(&val, optval, sizeof(val))) + return -EFAULT; + + if (level =3D=3D SOL_IP) + ret =3D ip_setsockopt(sk, level, optname, KERNEL_SOCKPTR(&val), sizeof(v= al)); + +#if IS_ENABLED(CONFIG_IPV6) + else if (level =3D=3D SOL_IPV6) + ret =3D ipv6_setsockopt(sk, level, optname, KERNEL_SOCKPTR(&val), sizeof= (val)); +#endif + else + return -EOPNOTSUPP; + if (ret) + return ret; + + lock_sock(sk); + sockopt_seq_inc(msk); + 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 +487,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 +836,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,23 +866,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; - } - return ret; -} - static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -1463,6 +1510,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; @@ -1483,6 +1536,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 Tue May 5 11:26:39 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 28BDF1A6825 for ; Sat, 2 May 2026 21:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756820; cv=none; b=C6rIHN4ZfqOSaHyKkI+m/OYkmmY1HGRwPXrAldj6j8V5lvl9MLBTroz9w/gx+xItAYROzRjp2ibA472SVjvgDepj5e/ZedLiYqNq0HhYKr8ZhO6JAM6SIajXZyB82ErQn+K+hDCcbuwcpbPoR8eMIuxJ8oPds3ZZ2YNRmejMHMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756820; c=relaxed/simple; bh=VMBMfvrQfme4v1F3IF2CnljZz9JLs9rmam8hQwxkoUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GcHhWyZuh0CX109ZNNAGGIXU6/Lndx/LvL23n3wdrWuPWNCnNP/uc0hfpVpz2PtGkpFv1q9C+rTbrD+DG269zvdpPhF+SweSe0ktHPLj4ZqjIC+cXhvpP5eqjb+IONGwGcfenJYoecv7t60eY9JST5XCYPJ4J6p4CD8d/87KC9c= 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=W0WZOicj; arc=none smtp.client-ip=209.85.221.54 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="W0WZOicj" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-441209fb77eso1631825f8f.1 for ; Sat, 02 May 2026 14:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777756817; x=1778361617; 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=mZs56aPqR5NiVcGf7GGB49cZUg0adWLDOUMtOX8cPak=; b=W0WZOicjqjkz2g0q1m4IuSNR6lTDarLmYi+m0ftiyf3chH8qBqQdVZUGFRZZZ1J0D5 KSVY9L6zqD6dfa5xfXbmnbwtANhROQNl3GaMM5xqV3c6TSMLNJQtFNTXHKsHcuSzHSq2 /GmMliQ5GoIx2qGPO3VZQiE+xSvp4hHMrZcAxGCSQbxHt+E0qFxUrVziDIfc8uE3hbjA HLbekTdpMH1UHObPS44KaWCaMB8KxyczvCvPxzJUt2grl797XTJukoPlnM0eNYNESqab uwwgS3SvcD0nQW0FP8DgwJEMUuT5hX9gg+OvotOtBotkZU3iLbwSNd8mV595x/0CFsgk rZQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777756817; x=1778361617; 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=mZs56aPqR5NiVcGf7GGB49cZUg0adWLDOUMtOX8cPak=; b=FksmAxq34oN5eTVSKLY7IpjZSf7Qa5psR2qMmDwQ7NA6fz/gdAM+1QwWykg3KA/wrO wq/korKtMNx/LDwv9q+s11tptEN5Fr0IGEjDOncSyHLGtWcHjgVQ0fyiIAe6A+jhJTJ3 zMNBq2zfJG47Rm1cV7j8QE+YCW3aDAOZDieMFCL+RnTxN4geh5NeZ/xFaCYi1QVOwJ2z obZwqLYExeoZkbh4AaxV9Bt/tN6+/dgDh4FOY+0Gd3gUqTP9D6A4hE4h96xdx2HecTYN G4X7cFwkUiRs/Jhe+moiHvBsBcnydWnS+Zy7BzAeOkjwRjfOpBkFb2Hc3Y7p46olWKr4 XRaQ== X-Gm-Message-State: AOJu0YxgBV+LVObvsfzCxlpvx6qjO1s+O8DZa+bwt61gUEn3xZ5mjm2j 16Gu+t7BLFcyd9Y8bEtdp09CgCGb594V1Gh8JzV0pX/UOkp86OL+DinzVurjm6NJ X-Gm-Gg: AeBDies4/tRxWiBEdLmE6pd36AFR6yWx+jUnH3cvOVsB7CcRwlKofx01nIewZjQGpK+ 5wVIu6rmsU988IjncnW4tN4Q+G8wpaz5x6kP351LO2qJCn+Gn1JeFxJ1yuqfImnI+kEv/H+e8zt p1/vQl/POZAvzB8FbvgpEyQECjgwlkx9/7/rijYobZI5nWSnwrIlaHkCI1P/BdVsnNRo6jlwkF4 /ZeYjuNJ02xKG1wQ4ETTU7hS2Lq+sz3h9jzdWoaM/ILNsJKTMYfpnLGDhlaibrVFh8Jc2i1ABz+ LPWVzj3Tg9s52wEfLtbWLkbbhZoLpkXU+y+yJ+IaA08Q5qNKikjjJnewCq2RK3fjejsnXFBec0r ytVS6K6GltXvZbrkz6uriVYrNGxbBO1Ow6lpWWKuqK/XwVIGBIyVj3brRE+epGM3iSBbYGF3brU yEj37tDOYuZ/hyHnHDP81t3qGGxgWQbhwBpLDW2UL4c1MHlkKuDEBsQAoLbSt6t98qvlO6zjIKJ 2B0PxoKXg9hHsmhwgEcIg== X-Received: by 2002:a05:6000:1614:b0:446:708e:1e8d with SMTP id ffacd0b85a97d-44951bd849emr13336594f8f.30.1777756817229; Sat, 02 May 2026 14:20:17 -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 ffacd0b85a97d-44a981defb3sm19490140f8f.20.2026.05.02.14.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 14:20:16 -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 v5 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Sat, 2 May 2026 22:19:59 +0100 Message-ID: <690b4b87e71514a4fc0a0400db62edc63b4bf5eb.1777756707.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 | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0db50e3715c3..ed7b086f109a 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,23 @@ 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; + + lock_sock(sk); + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (!skb_queue_empty(&ssk->sk_error_queue)) + __mptcp_subflow_splice_errqueue(sk, ssk); + } + release_sock(sk); + + return inet_recv_error(sk, msg, len); +} + static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags) { @@ -2295,9 +2349,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 +4393,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 Tue May 5 11:26:39 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 02140277C88 for ; Sat, 2 May 2026 21:20:19 +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=1777756821; cv=none; b=cX5I+lFAb+AnXn17DCIl1roIt0RueuEFwtf+t6YfrEeckgV1Vg++v1et98StKDZny14Rb1cFmLqxk8XJh2TKs7W69eloUqityx4x/GBmK5CqD5iFUDs5TxYrNmYJj5mfNrn7J83nqZUbYYJqvi2BvIk9H3Tka5hg7vYkDjPhbFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777756821; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TfJn8JmnwdpoZrblgQ4vu3CX8X16NMXkrX44Jw76J8M3aKA2XOOw23ELuqXTEWFVC4DSHnXVFA0/vLwl8HlXYKzCc3snEX8no3eIiRVr0Z+JVN+x5l2LH8S/eg4Fgpi+mc0PiR/eynC9imKy24X76S1uomNn57w3lii4825QBtI= 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=Z9y1w7yP; 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="Z9y1w7yP" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso35651315e9.1 for ; Sat, 02 May 2026 14:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777756818; x=1778361618; 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=Z9y1w7yPMCPOzF3kVs4FEQq/J4OGNy/EL5nEuPUAMqQEs7/XUVmsaM9TSg5j0mw7KB pd1nJxyrbwbCHwlSxV7tXH8qCbVClg+55ITUyL40OhaOPsGS0vTHXE8a1SiwubCwbpgS p24wTNa0qL+lyHBroHtCrQ3GgOxR7/2flH2BiceiqBDRKLnXEMs1DQw+TS05MoBS1RjD 9Iwtcl8DFHJVrRMvkXQweL2AKpYuc5wuv6AZP3CZI5bP/+gVFBYcrBsiWHch/uyvzLlE pOq0WE47h41IECJrqOhuqRAhaPJJm3/hO/gCIvBmACnHXKwza3O+JO+l4slm5or8CBz1 t/vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777756818; x=1778361618; 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=cECd8hHm0sUBrOB010+K5TrFgcAHnuo5DMXgt3NoWESCbD1Mnyy3HoMBbsN2O8eoyn GZ+FoEk5yj7zViPcqIEHgSt+LxRRdgutLncP2rZ0q+A+/mXtEWU2RP/gdfqaEupTyDCY 2Jk9g0JdEUGPaWzrWa1g6eByEQioG9ZKxAREh/uEoyzDNZIYhIkc+6jXv9atUorGqUv+ KOYS3Jp6go/ik7l+hT0DQIUnxsB8m9pVrl8t+vWUS6j9UakbQSZuj0rH+Zb9MuyawPtF dQaF+yoxw0hzQ3XBzEcQH6+PFeVvRYkaLlVbhrBemEEEEgpqSrvklAIYIpAuzxUr48sb oJZg== X-Gm-Message-State: AOJu0Yw3+IWYwt0kMIdIsKGFYD++yw6SVcWPg5ka3MyzhoZdC50BK5Nk IcEuUsDeAKo5dzlMHaS2MEKJEuc4coyN0DNgvSMk2nVcJnM2DNdUdmylmrZyUPvP X-Gm-Gg: AeBDietQTfnElYfoY2O8wHT63FUvOTdCUmQZs+drlnA+EjrL344HGcL7m+eOlXEmSqL 3FmO/MT3pNvMpnFRFB2pNl7bighbulUmQkya59gWUgM5p5TOHf66e6UkJp0HEjCVHsTRuAMY8T5 RxlCg7xbWfVt1X2qerWqQ69u1eLaGCpY3ayWRfPRcNpm4xD5DXSbGmhpVAvRBP3xVRI6021JL9F VTotgJjtEDf64y+IQQxVZPcNxxA2eAgZP/kopR1tXDW7Z+sNlxmA/8QVmm6L3l0yhr347qr8L7e yqE2bdUZ0rvVb2yPbsTorUfvc7NdHlbsoyopn3JmesIf83gmGuYPjfL7PtZfEdToNrV29UPrqlU fZ6LJecQc4omF0iCqAXG9XcNvDaBfvbp1CVyIJXFYTSWPIKsKtu02sOIGWihgwlG4I5te6DFmHc 9ReBgBOyCjO05JYTCLSC9Q7sjsHdGsPLDL4M5ndIdJfGZZLx8iHyKsSOAaoVwSjwLD3W3t84TQI i5gbBJBVOUT3KBwPI+tXg== X-Received: by 2002:a05:600c:c1d7:10b0:489:1c0d:c9cb with SMTP id 5b1f17b1804b1-48a85e1fa62mr133732595e9.5.1777756818184; Sat, 02 May 2026 14:20:18 -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 ffacd0b85a97d-44a981defb3sm19490140f8f.20.2026.05.02.14.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 14:20:17 -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 v5 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Sat, 2 May 2026 22:20:00 +0100 Message-ID: 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