From nobody Mon Jun 8 16:28:11 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.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 C20D12F8E87 for ; Thu, 28 May 2026 05:55:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947706; cv=none; b=CYo3bnTZtgs0vBoU8XM0bzDGWOfhHky09WfB111ODmNJ7BgGyGWVDaOwk7KTMW+ZL3ZjSh1HOC97+SSqubufuJGX5fyFKC1m5WPTCieY8o7nDU+HF4RoCHvLwpY9j0Xd4vVqvCh1K5jW6JiUZ8mux+Rvp16XXIUJvlXp4Rzx8rA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947706; c=relaxed/simple; bh=PJ89tchvDdk572/bznw24XqiiC6pPJVpO6DU6QBUReg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=debgb53iFLsMZEeKescKl/iPRsAFuacNLlpDTLdwXMUXGub5g/s9uhJlTehE6oEt0vLafdTqubLTZq9tggVPA5flB/mbY4HUfc/wo0siQ7kuE88SxIi+fs/0vE8W+QAAfRZh8VhB4510pj0g6cIjf8IVNOg2lW1seSFNqJS6Nl8= 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=qYOGlY8J; arc=none smtp.client-ip=209.85.221.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="qYOGlY8J" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-45edc09f51bso887712f8f.0 for ; Wed, 27 May 2026 22:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779947703; x=1780552503; 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=qYOGlY8J7xyU8rpx2C8wG7Z8I4pDcU/9yQ9NcAhx2Ef1JOFChRmHeO0WJKYc9O84ct VMGqo2T58RrPL997s35SAi6Dv7zV7z7Ka0CJVVIzJzjyzPzyyBGoUezUe5fIU5GQfbEP tLxtTkYM+ZSv84JeSamQTHCTCB7lrO7gaAvz5bweUXyQ+D9P6HMdea/8xBDPslxMCSjI URo5YsVEZvq60bhkPovWC5JMq7koQh+ylcJ23fprlzjna3nMsRVmLXPzrvvveeytZKnw dQG0+UH2CTuisGiql0WfrnTo9YLczDxTna/Ba7N+1sUJzUva02mi8a4dB4fuWCwSfyOx s0fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779947703; x=1780552503; 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=szyV0pe+q3GRkwqCZgTKdFKBiGnHW2v4eydSJxJ6+7VLp5S1XG/rBXWY4ZRe4houy2 jLEnGnxvJg/yYgCUI1Js/IlaVkK2Nq1hUek1ah4iscRusT/toW8qMRrU2FJEFqQVL6ud m9MHv+WG3hqBL+EQzBATZkLl8+672mBqhjconPwDseCQquPl+e+5jsPGGJ8vdXa+FETd Q9o+vxJ0iZ5sZyL1wkJYtopKdb5De8dIDZatjSOhHWuj4KZ9F2nTWCAXXtinp312+KcN B14YJoVBo526q6Ln7MmIxF9MsOrkI6MQeo6nTBiDcVhOH+fMfyHwi1B2oPH/6rdQuxqO U7ng== X-Gm-Message-State: AOJu0YxaEKOYqgIh87EGN/hJoyHeFtKaEmg8ahNDfdKdcKREmy1BsKfc DCgcu2Nqg2EmAQf8cEC2/YatSr34qXzN3ueFLwBc0y3Qz64lAWdj7L1vw5j7k0t9 X-Gm-Gg: Acq92OGzJqfw8q5/5RjGyuXIrnLFGkIebnT44RgLgMqIAReYtTgubKWMjLOLSK7UaZf sRzaCqW2h4ucee1u2FW+poNSYSrQioV3IiRLxx26GhOHk+EEseAx7dPPfbG6EuKlc29Q3QyOh+z tz6eSaNpxNgVzaKgQd5Bq+socaMLR3+BlUcyVviFBKZoZamwRiEsNMzZ024gJ0RNUh2+7uEGckJ tZHSeZDrDWzpVH2xVRlOebvD2cdYIAOi2Aipj9JjMY9KOVZH5tXeBO1hCY9StPSoop3DONHRaGH v0J7+XEcZrrYxjz2+4qmSLGvauQdL7eoI6ALT4sJTi+1QJg9N6qbG1RgsgZpYIIb4/0FDKUxzmX nRgmPJS96pDG7myJAYiLpMaz2rrXEs+0A28vvd8FJIXFzupkg0LC4xnaCVS2/ymT7PKE8pCAN77 jTDt9vGaegr67QgexOMvxjeEuH2+QxrJT1NBgwIUT6VR0yQDfZXv8X3nL/uEcL0IkSxwxCXBaBG 8NsnhBK0z4OQ7/uSX1+BQ== X-Received: by 2002:a05:600c:4583:b0:489:1b10:d896 with SMTP id 5b1f17b1804b1-49042252732mr429700545e9.0.1779947703105; Wed, 27 May 2026 22:55:03 -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-45edb5a2c87sm11002245f8f.17.2026.05.27.22.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 22:55:02 -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 v9 1/4] mptcp: sockopt: factor inet_flags propagation into a mask Date: Thu, 28 May 2026 06:54:55 +0100 Message-ID: <20260528055459.55133-2-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260528055459.55133-1-devnexen@gmail.com> References: <20260528055459.55133-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 Mon Jun 8 16:28:11 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.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 B9DB130C353 for ; Thu, 28 May 2026 05:55:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947707; cv=none; b=gS0OlSFWVy2CWsagUrUNY3KZLP3eS65OK8tBeDNlfWZTH8ayhNxOEWRAi31T3mUqppj/aIid4dXLUZI/ZyV9s0wt+u1Lq1KBXgGm6iMA9MN6LPLWHAYNkpYDOhaySUDqDVh6bCuX/RYKxAPUfC3mrPsw67dDspjxIIoO3AaWRh8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947707; c=relaxed/simple; bh=A9tYxw+Zn1LA/ziarPzR6b4b8QgIJ1MkR3+IOGmXh6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EiFbjPsMs7feiAqERpJG0k9Uv5MJacT/lpxgtJJXjw/pMwG3iKdTyic5Ip21m2WxN4aORT6DyV04G4K/8Bur0/9Jp/X4dy/Dhl0fQVNea2tls/SXHRpDLcKz5aG+V2o+fJdbPmVF5AvhwYfDIajzr6Ry2HO/V2w5aLYzNgJgJNg= 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=eRxr3dJS; arc=none smtp.client-ip=209.85.221.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="eRxr3dJS" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-4585a116a4aso10362595f8f.3 for ; Wed, 27 May 2026 22:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779947704; x=1780552504; 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=dJ77+0lG1ji9sCSYntZP/KM8dw4RDg8LxDEFGOALtrY=; b=eRxr3dJS7ObsBEiA4QzOkSu1suBt4BnhJu2wsw1Rh5sDPpey5dzDVIXpdNmmKeh2Xd BoP3++lwrxcJHfYLl3EMzW9xb6mLlS5CLNgukabHD5udAcyaTMRw8XSG/8ZZEAHGavPI BSyLqdwSnrfRagm2k3N/bmECVt1X06+gTH1JVwSlDSJrYKyevnosBK6TW5PgagEVKbOz hoM5O1nDQ3lcDEyNdP1WwiIlkkXS5LHaFTMQT4aarxx5pV6Z1QaqZuZWUYXMVOzy8r/l hYNwoEnZXFH13MWW+RTq+v8cCTwJxQPgG48bdipe68c3MlKVoZD0zi8alSYkjnpSONI4 x8Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779947704; x=1780552504; 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=dJ77+0lG1ji9sCSYntZP/KM8dw4RDg8LxDEFGOALtrY=; b=DI9RjvcjvRWIdGhkw+gPGH87w9/5MPX3x2dg3cyVFjqhkioYdXBliD53mqi28cZPbv Q5Jx/b2sS8I0v5Wdhx3Wf/ObMPEJQ9qhbvebxHemNM+eBwzQLfCL4rbDnJjX4unrqKSL yJlpxiOuergsO2FIuXUh1DXHUGHkWRwsGIx7x9N1bfSQQKlgThuG98+kjqmJVl2flMLM bo4rZ5ho0q/qsJGHNDZaoiTAgzxUD6FlJZg3uFlolxn8j2eCBjKdLMWkzzBmPb8LIKyz YJdJmFDX4SDyFMD66+gIccJX3BmnN2MO2+6Gdu5osAaFH2OhkNTU6vUi1rzx03jd6aHp tDRQ== X-Gm-Message-State: AOJu0YycLNAS1oYanBv/WcUbPFWc8Qru56CwN/RC6zNeLUwccFVM1Uu3 cRtiXnrQcTk4NKIgn+rc/nhhfputmD9gFQbV5ywPlKYbJsCAUIttFdvlmh30Sf6l X-Gm-Gg: Acq92OFdHHzMBrfwhIhQUTWqiCDgSPcZQ9T+jJXxCwOknCkCdAly21NJfSqjhl5azrP 4zSNKUZy+TELkXa3lcFnKc6K1t18MhLM6L4fg9/IQExcTxHqRN745GB/1g5IGfQcUSFx1vW8Tk9 rMHEzj+UdQdND4ZZA9Pe4vqK1Zee0NJ0Q0hDjVwdcSoVsO8PIJKCSi8hi8hZLslcm6DKYVMY5/8 Bdnbmq9Cmrwykm+QKXSS5RazremltUGAC1Gdkrbgubz8+9Okzkq7ZRjxlQt2KmEnLpJ2iyPHAev 9AFLlA9wXKGaBUhQeS4GAGKd9jZnKNF/W81aenaZoTH+3bmTycO0+q97AtdHNs5IhPHIUtCV9LW EMndTL8WxDUQsiLGbsm0kFEWEbyC2mgg8m7OiDW9RlbHjwRBO0Hrvmwizij2YaUVONir+e20PpW 5+BBY990i6T/iqHT8wFBMR0wD0mVvtpfugYhGsvhsd2HgSrDS5rr/EQoF8QNiqtOp2bgO53fqmF eTb2y2NVKgc/BKmq+YM8pHMc9eC7RMD X-Received: by 2002:a5d:5988:0:b0:45d:77f4:1ac2 with SMTP id ffacd0b85a97d-45eb3330a14mr42467455f8f.0.1779947703987; Wed, 27 May 2026 22:55:03 -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-45edb5a2c87sm11002245f8f.17.2026.05.27.22.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 22:55:03 -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 v9 2/4] mptcp: propagate RECVERR sockopts to subflows Date: Thu, 28 May 2026 06:54:56 +0100 Message-ID: <20260528055459.55133-3-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260528055459.55133-1-devnexen@gmail.com> References: <20260528055459.55133-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 | 131 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 109 insertions(+), 22 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b9cac04a749a..cc510501ccd9 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; @@ -1601,6 +1680,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 Mon Jun 8 16:28:11 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.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 9D0882F8E87 for ; Thu, 28 May 2026 05:55:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947708; cv=none; b=HWTyvY+C9lUWIBsnr5GnITouIJ7Ez/e0qpsY3gVchnAxeB992/UWnVLrMeSwr3zLGELv3EgbKvd4q8h5rQhbijq4vzBMfvz+Pm9wOsw9Xxs41/lNKjy7RVVQJ/fbrXPE3c2ECcU8MY4iVomBpps7RKD2YgzB0vUSpftNhGhD5WQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947708; c=relaxed/simple; bh=NFCuNKYpF8KXxwCucfIl4D1adlRLAnDT6OheGknS9mk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g8I/HYShoLtF7TMwLdFb3X/lzY96Z2cq30VAMNPO0fbYy2aEih1Rih+O6G5dBmKubF40HXq6aw5Q62VNUhSvZgaW5rzwHB+KFiEJE/N8W3QM64fgijhebvmRtoj39CH4wNg4yd8B+9r2AHt0y+4MslKEiFUOEnpN/9ODH0NfFYE= 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=mbGB9ADY; arc=none smtp.client-ip=209.85.221.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="mbGB9ADY" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-43d77f6092eso7046110f8f.2 for ; Wed, 27 May 2026 22:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779947705; x=1780552505; 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=hYe262hIR9qgeIBQm5PBf+dVUVdbVcK95tRHVHsT30U=; b=mbGB9ADYT5KbAm2EcJTAD4iCUYd9ZWqtNosx2YX1TugRedek7CdJZjbj1BiWg9R21j ogBIsz/3+Md6W7uf7PJFGQLhkoclY2R+wX+x4SXxv40UKwbehptykOf8fWyENDq/+GUH f/1NfNmlSfoUU5lulbBj5Z+wTMLVjhiGZxRneWwuX+tbtuGf2t/da56jLE57ORqXVEBQ l2fyOzH/4R1jc6RxyxEOSPBGqojD8aP/MMcU5V9kouj+VtOnJMAO3FXg6/ZwFYXQx+qS QoYS16Q/sLTlS4Wyk6Av//gaixz+y9I6KywyiQByc/R3Z0+gfYR3PyPdvTYeUOuCGK0C 5jEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779947705; x=1780552505; 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=hYe262hIR9qgeIBQm5PBf+dVUVdbVcK95tRHVHsT30U=; b=Vj4R3xMEyz4O4NKCYde2400sXcYH6ppFNwvvBB1ia1XGpvB9rPz7Tc9phKdropvvW6 z77f32w1KUJ38Yo4TM87amxswHeuta+OqA2jHsdq3ru3SHyZ78F9pUHjvAJyHcF6qJNL FR6w5M0648HKpFlPB2pbVoiwKvdNZCTVkEYzqSagOnuyYONlT1aOA7y0u168+DR0UQZQ DVJA9T7mOzv6PXQUAwHC6Qt/wAnREXCpkeFmEMPvIRQn3ZbQihjL2T9KgjZzY6trPdv6 FMEQ0W9yqvrK3KQWz3LLqogoCd99LtCTaXGa2l7emgJt405x4dCW0CNgtt4pPFYY/KGD njSQ== X-Gm-Message-State: AOJu0Yz5npu2SSa05+EdEaBCK8eDSNf48okMAkOK3xDbLVVH8Q5l7jce fGA6jw2X5CQVKixUTTDXzKWUaFDzuH78lTH35D4LemcHIAbE+VfXCWdFzcJy5R96 X-Gm-Gg: Acq92OE5RbTtV/fECz5et8Z12zu6NToL+/mzxOn1ccXUdY8LoSxjYzeOS2O0E9Ry3tp 3mYHxkGasLC04QBtGDEubz+8c+gzKs27g6ozOuARyI/D6q8wuwso/6fLV1N0rckOpY9W5L5ovmc cjB8i8lA2hidR11gNYjhNair3LFGhOFnMNLNG2Y2mcbfxDjy21Oh78ZN6caU4wjBI/u0VS6OzaT iXvgWtRzXLBSsVG3WC1Ahr9klZ6B9gYDkj9YH8Wfeh0Rtncf3pjrc9NYLhxVRrAnGc9kWpjnpos ik+aRiFqTwATueBCvEw+rmsrnH1zG/8W7zA0Pq1fBmjSCIyHO2APiPJWcsBCFPta7XSZV1Sz9KI HKbehh/ICQGJAon3KAKQGnZg5lMWs70zU5uPhdqKFFGzB/cs0IuqgwPeHK8Sz0Sv9YnFsHMoCLz e/KUn2xo6RbfL7BCdIk33B62i8T28OglzXA4BYbw4aGmt55iscQOeIO/rGnbPZQ8R5Ho0/Bg2K6 YAczKVmR79Zig8b4Rm9Jg== X-Received: by 2002:a5d:5f54:0:b0:45c:3f0b:be08 with SMTP id ffacd0b85a97d-45eb38a686bmr46195043f8f.23.1779947704902; Wed, 27 May 2026 22:55:04 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb5a2c87sm11002245f8f.17.2026.05.27.22.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 22:55:04 -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 v9 3/4] mptcp: support MSG_ERRQUEUE on the parent socket Date: Thu, 28 May 2026 06:54:57 +0100 Message-ID: <20260528055459.55133-4-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260528055459.55133-1-devnexen@gmail.com> References: <20260528055459.55133-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. 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 | 55 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1d67728d4233..972b6751d741 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,53 @@ 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) { + 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 +886,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 +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 16:28:11 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 82A48314B72 for ; Thu, 28 May 2026 05:55:07 +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=1779947709; cv=none; b=MsXAlYiTKWYpJWFgL5VFo7b/Ucsy6pLWQkZf4vllV76ln78eTIbN5h5xeljUa7Z0u0B0bGg1MFsrIp5dpLRPwIdsznWNvYzG57SqnRZXi7lbCxzuRvMsB0HrCZUKFYoeZz05Nof1+Qj+xZz6pKbmQ68iqEd8APH+4+1P8xMFb60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779947709; c=relaxed/simple; bh=QcNVzrHJDmzDhVBtHzMTu8HUGMD/QTYlMSpRK5EIoOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=erEiC61C7ZBfL7NUer4supBZ2YF61newT6f86ZWKTeVODkcAwPR0gLCqw3Gx7sFJqDCFBu42UmkiUhPBbusER5xRfllhli/YhI2vXY5/cjgAiXmjruTluUjDMQnj5XqSwwDmE5qkghZxFSqQQNdfTPObDxaa+rqCWpytkqhg5+o= 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=O2xKHY9h; 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="O2xKHY9h" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-490388fd0dbso67327965e9.0 for ; Wed, 27 May 2026 22:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779947706; x=1780552506; 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=O2xKHY9hgBpVOtLRpLOn4pcfMYRCYsRR4d1OvuGESCzZ/2tz6firUrwO9kBZc1n4CP Se5B+sw0iZrZAE1QjedK0b3e7uapBiKUxFw+ONxkFgVkum7dgLhac1/VQsrSZ1j52P16 oCK5DI8r+YUXcA6akIVidau1e4wfX6Mr+3bk93c9urFuGZ00XIFT31BHDG5flI4tok8y kBowPjkXjup33BurV0ygtocbO5eBw1Qv9GmqLlid75d9xarBpJshvXoit1AzyobpMWiP jFYUAsBuLcCpCsO8jg5d0s/H7DW9rF2Oc9+saufNqnZvNjBagPdpHYuJzYtP1lYrHgt2 I46A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779947706; x=1780552506; 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=G1exN2o9PsxnAmGV+bEbUs2JrIaQletxsa46MR/vgteSPYEr9wstuEitzVGcLceSUb 3Ci3p1TAZwfk81fEx4fvgUQPC9Q6mRhKmBcUCqZ1A1mv8hSahdNyBaPxUvAFR/3Sr6WA 5/zIeKf3P+b35wVBz64gD0b1SuKrhIcfLaWMT+KNfNb3twz2oAB8Kv094tyfHIYjqJOB I6isJIb0B26D7RkEbnaU/ON2E+van+qpcO3EwWq81PdP7Rwf5DMTLissD48vbJxrk4Gm mMW2rq2SHSteQe9ELU//e1btCtVvjZlxDqhNLqbTiJ+r5M5kjGDz37e4iOnGH2QvE1zi iUzg== X-Gm-Message-State: AOJu0Yx4zwySjI05LesQmbbUpQuq1gl8/mLzqTgV3fIUIqlyRhbd/axI cZuGyWw6dxjbFEx7TA5ycoyBYT1rxcXvMW69mUiKNeAyDBjEiqWDeo1cErleTYOE X-Gm-Gg: Acq92OEbGnDPeh5pNQpwqxhXWtKg0AVJLYSw06i5RtCoCLey7VQkkkbeJJPNaKz0INJ Xd88h5gOpgJ87C5MabEm+d9o8vNBPEKtVFAWbkJW2FBp9Li2WhMV2M93jnChaLkwH09nRKmXdDM o4dopbxqSsZrn3miyVxU50BlH0lhJn7mmQx9e5BpczzxK1X0gO4cVBVym6c/rcM32of8+/oKoiO +KSWrR3gLAnk/XXTiMio5GceTeO2iP8znuYhM6lWAm9Stq1I0swxiVhEzBdCHu7RwBQZPuphmEP Nzvsn4NrHAWeR9ztlogPLy2oyU9GGPNWGiyRDWi/RdiUpSGjT0TNlpK4ZY3gx7+NmqaoCAj41Jc eln8Ff6Pfp553xeK2+OLo2iioWlVV20GUa1dNHaMwrGHW+HuodY7ddcl648KEDJpNcGYOnMekyC QqWYuFiXjddQ2rAyc22qZIFYbK5XeD5EIh2ijobph6SozzXrb8Pb612bc+LoPlw1zQ29393ldHe 7+PKymb1Wq3zlF2sFs77w== X-Received: by 2002:a05:600c:3541:b0:490:6e12:542c with SMTP id 5b1f17b1804b1-4906e125469mr213722635e9.23.1779947705820; Wed, 27 May 2026 22:55:05 -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-45edb5a2c87sm11002245f8f.17.2026.05.27.22.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 22:55:05 -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 v9 4/4] selftests: mptcp: cover IP_RECVERR sockopt propagation Date: Thu, 28 May 2026 06:54:58 +0100 Message-ID: <20260528055459.55133-5-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260528055459.55133-1-devnexen@gmail.com> References: <20260528055459.55133-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