From: Kuniyuki Iwashima <kuniyu@google.com>
To: "David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Neal Cardwell" <ncardwell@google.com>,
"Paolo Abeni" <pabeni@redhat.com>,
"Willem de Bruijn" <willemb@google.com>,
"Matthieu Baerts" <matttbe@kernel.org>,
"Mat Martineau" <martineau@kernel.org>,
"Johannes Weiner" <hannes@cmpxchg.org>,
"Michal Hocko" <mhocko@kernel.org>,
"Roman Gushchin" <roman.gushchin@linux.dev>,
"Shakeel Butt" <shakeel.butt@linux.dev>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Michal Koutný" <mkoutny@suse.com>, "Tejun Heo" <tj@kernel.org>
Cc: Simon Horman <horms@kernel.org>,
Geliang Tang <geliang@kernel.org>,
Muchun Song <muchun.song@linux.dev>,
Mina Almasry <almasrymina@google.com>,
Kuniyuki Iwashima <kuniyu@google.com>,
Kuniyuki Iwashima <kuni1840@gmail.com>,
netdev@vger.kernel.org, mptcp@lists.linux.dev,
cgroups@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v4 net-next 00/10] net-memcg: Gather memcg code under CONFIG_MEMCG.
Date: Thu, 14 Aug 2025 20:08:32 +0000 [thread overview]
Message-ID: <20250814200912.1040628-1-kuniyu@google.com> (raw)
This series converts most sk->sk_memcg access to helper functions
under CONFIG_MEMCG and finally defines sk_memcg under CONFIG_MEMCG.
This is v4 of the series linked below but without core changes
that decoupled memcg and global socket memory accounting.
I will defer the changes to a follow-up series that will use BPF
to store a flag in sk->sk_memcg.
Overview of the series:
patch 1 is a bug fix for MPTCP
patch 2 ~ 9 move sk->sk_memcg accesses to a single place
patch 10 moves sk_memcg under CONFIG_MEMCG
Changes:
v4:
* Patch 1
* Use set_active_memcg()
v3: https://lore.kernel.org/netdev/20250812175848.512446-1-kuniyu@google.com/
* Patch 12
* Fix build failrue for kTLS (include <net/proto_memory.h>)
v2: https://lore.kernel.org/netdev/20250811173116.2829786-1-kuniyu@google.com/
* Remove per-memcg knob
* Patch 11
* Set flag on sk_memcg based on memory.max
* Patch 12
* Add sk_should_enter_memory_pressure() and cover
tcp_enter_memory_pressure() calls
* Update examples in changelog
v1: https://lore.kernel.org/netdev/20250721203624.3807041-1-kuniyu@google.com/
Kuniyuki Iwashima (10):
mptcp: Fix up subflow's memcg when CONFIG_SOCK_CGROUP_DATA=n.
mptcp: Use tcp_under_memory_pressure() in mptcp_epollin_ready().
tcp: Simplify error path in inet_csk_accept().
net: Call trace_sock_exceed_buf_limit() for memcg failure with
SK_MEM_RECV.
net: Clean up __sk_mem_raise_allocated().
net-memcg: Introduce mem_cgroup_from_sk().
net-memcg: Introduce mem_cgroup_sk_enabled().
net-memcg: Pass struct sock to mem_cgroup_sk_(un)?charge().
net-memcg: Pass struct sock to mem_cgroup_sk_under_memory_pressure().
net: Define sk_memcg under CONFIG_MEMCG.
include/linux/memcontrol.h | 39 ++++++++++++++--------------
include/net/proto_memory.h | 4 +--
include/net/sock.h | 46 +++++++++++++++++++++++++++++++++
include/net/tcp.h | 4 +--
mm/memcontrol.c | 29 ++++++++++++++-------
net/core/sock.c | 38 ++++++++++++++-------------
net/ipv4/inet_connection_sock.c | 19 +++++++-------
net/ipv4/tcp_output.c | 5 ++--
net/mptcp/protocol.h | 4 +--
net/mptcp/subflow.c | 11 +++-----
10 files changed, 124 insertions(+), 75 deletions(-)
--
2.51.0.rc1.163.g2494970778-goog
next reply other threads:[~2025-08-14 20:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-14 20:08 Kuniyuki Iwashima [this message]
2025-08-14 20:08 ` [PATCH v4 net-next 01/10] mptcp: Fix up subflow's memcg when CONFIG_SOCK_CGROUP_DATA=n Kuniyuki Iwashima
2025-08-14 21:44 ` Shakeel Butt
2025-08-14 23:27 ` Kuniyuki Iwashima
2025-08-14 23:46 ` Shakeel Butt
2025-08-15 0:05 ` Kuniyuki Iwashima
2025-08-15 1:05 ` Shakeel Butt
2025-08-15 2:31 ` Kuniyuki Iwashima
2025-08-15 17:24 ` Kuniyuki Iwashima
2025-08-15 17:30 ` Matthieu Baerts
2025-08-15 17:39 ` Michal Koutný
2025-08-14 20:08 ` [PATCH v4 net-next 02/10] mptcp: Use tcp_under_memory_pressure() in mptcp_epollin_ready() Kuniyuki Iwashima
2025-08-14 20:08 ` [PATCH v4 net-next 03/10] tcp: Simplify error path in inet_csk_accept() Kuniyuki Iwashima
2025-08-14 20:08 ` [PATCH v4 net-next 04/10] net: Call trace_sock_exceed_buf_limit() for memcg failure with SK_MEM_RECV Kuniyuki Iwashima
2025-08-14 20:08 ` [PATCH v4 net-next 05/10] net: Clean up __sk_mem_raise_allocated() Kuniyuki Iwashima
2025-08-14 20:08 ` [PATCH v4 net-next 06/10] net-memcg: Introduce mem_cgroup_from_sk() Kuniyuki Iwashima
2025-08-14 21:51 ` Shakeel Butt
2025-08-14 20:08 ` [PATCH v4 net-next 07/10] net-memcg: Introduce mem_cgroup_sk_enabled() Kuniyuki Iwashima
2025-08-14 21:51 ` Shakeel Butt
2025-08-14 20:08 ` [PATCH v4 net-next 08/10] net-memcg: Pass struct sock to mem_cgroup_sk_(un)?charge() Kuniyuki Iwashima
2025-08-14 21:54 ` Shakeel Butt
2025-08-14 20:08 ` [PATCH v4 net-next 09/10] net-memcg: Pass struct sock to mem_cgroup_sk_under_memory_pressure() Kuniyuki Iwashima
2025-08-14 22:00 ` Shakeel Butt
2025-08-14 22:10 ` Shakeel Butt
2025-08-14 23:22 ` Kuniyuki Iwashima
2025-08-14 20:08 ` [PATCH v4 net-next 10/10] net: Define sk_memcg under CONFIG_MEMCG Kuniyuki Iwashima
2025-08-14 20:21 ` Roman Gushchin
2025-08-14 22:10 ` Shakeel Butt
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=20250814200912.1040628-1-kuniyu@google.com \
--to=kuniyu@google.com \
--cc=akpm@linux-foundation.org \
--cc=almasrymina@google.com \
--cc=cgroups@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=linux-mm@kvack.org \
--cc=martineau@kernel.org \
--cc=matttbe@kernel.org \
--cc=mhocko@kernel.org \
--cc=mkoutny@suse.com \
--cc=mptcp@lists.linux.dev \
--cc=muchun.song@linux.dev \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeel.butt@linux.dev \
--cc=tj@kernel.org \
--cc=willemb@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).