From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 615ED3264FD for ; Wed, 16 Sep 2026 15:56:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789574203; cv=none; b=uuvfltBN03RmEMynbGIBsh7Zq5Aqdsy2vYHgoILQY/CL+gaa6ke7k8laBj6sFOWgOE0m2vClNys7vnjgvyppTHl02cbKKaIY14+z2BnFE9mcvX8fU2mDAFdYjum0qUlChLJHkULLQO3UrENAHOTqXOH73lVZZyarAMHBDAxogvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789574203; c=relaxed/simple; bh=oOl6irGhHk+LAgSjgBrNEVvD/figf08RkP2kHPvePN0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jtbaJlpaLcdQS0DrKQlfdBcHo2WfilEpzM3oO/ajt+n0an7rMjDMoXGyUzpNeIHRnLSgoNOi0GIDjVz70P/+uPb+kiZCny6cLqBOK/9BBVztl2ggnO+6fb1lUOVduE8ekLB5Qets5eH8+tlYkXtiBK2euiY3dc2aPaJV5FffdOM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H3apmymE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H3apmymE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41A8C1F000FF; Wed, 16 Sep 2026 15:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789574173; bh=TbYaCYHO3wwHBIXB/jv3wG0goyQJ08yEeJyWBHwXAfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H3apmymEyABizeNnQ7oZ5bsqpSWySSEKt+u/ChekwGAbS302aboH4oLSSNzrKxEQH gLh5JNkSYJCIoSmLRgN2AiX9rX8pE/VZQwOM0aKDNNMAAWmIfCpuYTvlBx2UBbcGtD xOd6jYe+u2ah6yX33n2MZn0pyosbNAupuLlUackNV7PH3tdkNk5bdJOc7Tca9QHSfh jYilBz5rf+Wy4CmkSbY8PIUdvCTaPKiZ1tYP3kdco1fxiiaNLsyrz3D+iUagL8SRrY FOX1gaqh7jR2EnphS75xwYy7AZwojpVbMzsvOHtOgy6WFgvwrUgnXGcsT9rz+PLuxm OKLanGoGrkV4g== From: Sasha Levin To: stable@vger.kernel.org Cc: Zihan Xi , Vega , Ido Schimmel , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] ipmr: account multicast table and route memory Date: Wed, 16 Sep 2026 11:56:11 -0400 Message-ID: <20260916155611.10207-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026091605-vineyard-astronaut-9480@gregkh> References: <2026091605-vineyard-astronaut-9480@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zihan Xi [ Upstream commit b7ee18725f2292ab554aa96a101ae42d45f008bd ] A netadmin in a user+net namespace can create many IPv4 and IPv6 multicast routing tables with MRT_TABLE and MRT6_TABLE. Each unseen id allocates an mr_table via the shared mr_table_alloc(), links it into the per-net list, and leaves it until netns teardown. Those objects were not charged to memcg, so the host unreclaimable slab grows with the table count. Account mr_table allocations with GFP_KERNEL_ACCOUNT and mark the IPv4/IPv6 MFC caches SLAB_ACCOUNT. This matches the established handling of IP addresses, routes and alternate interface names. Unresolved MFC entries are still allocated from softIRQ with GFP_ATOMIC and are not charged. They expire after 10 seconds and are bounded by the socket receive queue; see commit 0079ad8e8dc3 ("ipmr: remove hard code cache_resolve_queue_len limit"). Fixes: f0ad0860d01e ("ipv4: ipmr: support multiple tables") Fixes: d1db275dd3f6 ("ipv6: ip6mr: support multiple tables") Cc: stable@vger.kernel.org Reported-by: Vega Signed-off-by: Zihan Xi Reviewed-by: Ido Schimmel Link: https://patch.msgid.link/050b58f7fc6b45da0fb12768ebb62d18fa46133d.1788784801.git.zihanx@nebusec.ai Signed-off-by: Jakub Kicinski [ adapted upstream allocation helpers to existing kzalloc() and kmem_cache_create() calls. ] Signed-off-by: Sasha Levin --- net/ipv4/ipmr.c | 3 ++- net/ipv4/ipmr_base.c | 2 +- net/ipv6/ip6mr.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index f64651c0dea6c..4ae99e9f6a065 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -3145,7 +3145,8 @@ int __init ip_mr_init(void) mrt_cachep = kmem_cache_create("ip_mrt_cache", sizeof(struct mfc_cache), - 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, + 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC | + SLAB_ACCOUNT, NULL); err = register_pernet_subsys(&ipmr_net_ops); diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c index de98ce66d38f3..ae5a685daeeac 100644 --- a/net/ipv4/ipmr_base.c +++ b/net/ipv4/ipmr_base.c @@ -38,7 +38,7 @@ mr_table_alloc(struct net *net, u32 id, struct mr_table *mrt; int err; - mrt = kzalloc(sizeof(*mrt), GFP_KERNEL); + mrt = kzalloc(sizeof(*mrt), GFP_KERNEL_ACCOUNT); if (!mrt) return ERR_PTR(-ENOMEM); mrt->id = id; diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 00774cfa011af..e56f684e16d57 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1389,7 +1389,7 @@ int __init ip6_mr_init(void) mrt_cachep = kmem_cache_create("ip6_mrt_cache", sizeof(struct mfc6_cache), - 0, SLAB_HWCACHE_ALIGN, + 0, SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT, NULL); if (!mrt_cachep) return -ENOMEM; -- 2.53.0