netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>
Cc: Wei Wang <weiwan@google.com>, Simon Horman <horms@kernel.org>,
	 Cai Xinchen <caixinchen1@huawei.com>,
	netdev@vger.kernel.org, edumazet@kernel.org,
	 Eric Dumazet <edumazet@google.com>
Subject: [PATCH v2 net 0/2] net: fix SO_RESERVE_MEM socket type restriction and value bounds
Date: Fri, 25 Sep 2026 13:52:42 +0000	[thread overview]
Message-ID: <20260925135244.3715196-1-edumazet@google.com> (raw)

This series fixes two issues with SO_RESERVE_MEM and adds a kselftest suite:

- Patch 1 restricts sock_reserve_memory() to TCP sockets (sk_is_tcp(sk))
  instead of sk_has_account(sk), and caps the requested reservation to
  SZ_1G in sk_setsockopt(SO_RESERVE_MEM).

  Currently, sk_has_account(sk) allows SO_RESERVE_MEM on UDP sockets,
  where sk->sk_forward_alloc is protected by sk->sk_receive_queue.lock
  rather than the socket lock, and udp_rmem_release() does not account
  for sk_unused_reserved_mem(sk). Concurrent UDP packet processing and
  setsockopt(SO_RESERVE_MEM) corrupt sk_forward_alloc and memcg
  accounting. In addition, values near INT_MAX overflow 32-bit signed
  int in sk_mem_pages(delta) and (pages << PAGE_SHIFT).

- Patch 2 adds a kselftest (tools/testing/selftests/net/so_reserve_mem.c)
  covering non-TCP rejection (UDP, AF_UNIX, SOCK_RAW, MPTCP), bounds
  validation, reserve grow/shrink/rounding and SK_MEMINFO_FWD_ALLOC
  reporting, cgroup v2 memory.max enforcement, accept() child zero-reserve
  inheritance, and reserve retention across TCP traffic.

v2:
 - Patch 1: use page-aligned SZ_1G instead of INT_MAX >> 1 so values
   returned by getsockopt(SO_RESERVE_MEM) always round-trip through
   setsockopt(SO_RESERVE_MEM) (Sashiko).
 - Patch 2: enable CONFIG_CGROUPS=y and CONFIG_MEMCG=y in
   tools/testing/selftests/net/config, skip when memcg socket accounting
   is unavailable, restore cgroup.subtree_control on teardown, accept
   ENOPROTOOPT when MPTCP is disabled via sysctl, move the test process
   out of cg_child before lowering memory.max, wait for
   SK_MEMINFO_WMEM_QUEUED to drain before checking cfd forward alloc,
   and drop the arch-specific SO_RESERVE_MEM fallback define (Sashiko).
 - Link to v1: https://lore.kernel.org/netdev/20260924123602.1979090-1-edumazet@google.com/

Eric Dumazet (2):
  net: restrict SO_RESERVE_MEM to TCP sockets and cap max value
  selftests/net: add SO_RESERVE_MEM test

 net/core/sock.c                              |   4 +-
 tools/testing/selftests/net/.gitignore       |   1 +
 tools/testing/selftests/net/Makefile         |   1 +
 tools/testing/selftests/net/config           |   2 +
 tools/testing/selftests/net/so_reserve_mem.c | 404 +++++++++++++++++++
 5 files changed, 410 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/net/so_reserve_mem.c

-- 
2.56.0.rc1.315.gc6ed9934b7-goog


             reply	other threads:[~2026-09-25 13:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-25 13:52 Eric Dumazet [this message]
2026-09-25 13:52 ` [PATCH v2 net 1/2] net: restrict SO_RESERVE_MEM to TCP sockets and cap max value Eric Dumazet
2026-09-28 17:23   ` Wei Wang
2026-09-25 13:52 ` [PATCH v2 net 2/2] selftests/net: add SO_RESERVE_MEM test Eric Dumazet
2026-09-28 17:22   ` Wei Wang
2026-09-28 18:27     ` Eric Dumazet
2026-09-28 19:54   ` netdev-bot+sashiko
2026-09-28 20:03     ` Eric Dumazet
2026-09-28 20:18       ` Wei Wang
2026-09-29  2:40 ` [PATCH v2 net 0/2] net: fix SO_RESERVE_MEM socket type restriction and value bounds patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260925135244.3715196-1-edumazet@google.com \
    --to=edumazet@google.com \
    --cc=caixinchen1@huawei.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=weiwan@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).