* [PATCH v2] net, mm: account sock objects to kmemcg
@ 2018-06-27 22:16 Shakeel Butt
2018-06-28 14:52 ` Kirill Tkhai
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Shakeel Butt @ 2018-06-27 22:16 UTC (permalink / raw)
To: Andrew Morton
Cc: Johannes Weiner, Vladimir Davydov, Greg Thelen, Roman Gushchin,
David S . Miller, Eric Dumazet, Kirill Tkhai, linux-kernel,
netdev, linux-mm, Shakeel Butt
Currently the kernel accounts the memory for network traffic through
mem_cgroup_[un]charge_skmem() interface. However the memory accounted
only includes the truesize of sk_buff which does not include the size of
sock objects. In our production environment, with opt-out kmem
accounting, the sock kmem caches (TCP[v6], UDP[v6], RAW[v6], UNIX) are
among the top most charged kmem caches and consume a significant amount
of memory which can not be left as system overhead. So, this patch
converts the kmem caches of all sock objects to SLAB_ACCOUNT.
Signed-off-by: Shakeel Butt <shakeelb@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
---
Changelog since v1:
- Instead of specific sock kmem_caches, convert all sock kmem_caches to
use SLAB_ACCOUNT.
net/core/sock.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index bcc41829a16d..9e8f65585b81 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3243,7 +3243,8 @@ static int req_prot_init(const struct proto *prot)
rsk_prot->slab = kmem_cache_create(rsk_prot->slab_name,
rsk_prot->obj_size, 0,
- prot->slab_flags, NULL);
+ SLAB_ACCOUNT | prot->slab_flags,
+ NULL);
if (!rsk_prot->slab) {
pr_crit("%s: Can't create request sock SLAB cache!\n",
@@ -3258,7 +3259,8 @@ int proto_register(struct proto *prot, int alloc_slab)
if (alloc_slab) {
prot->slab = kmem_cache_create_usercopy(prot->name,
prot->obj_size, 0,
- SLAB_HWCACHE_ALIGN | prot->slab_flags,
+ SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT |
+ prot->slab_flags,
prot->useroffset, prot->usersize,
NULL);
@@ -3281,6 +3283,7 @@ int proto_register(struct proto *prot, int alloc_slab)
kmem_cache_create(prot->twsk_prot->twsk_slab_name,
prot->twsk_prot->twsk_obj_size,
0,
+ SLAB_ACCOUNT |
prot->slab_flags,
NULL);
if (prot->twsk_prot->twsk_slab == NULL)
--
2.18.0.rc2.346.g013aa6912e-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] net, mm: account sock objects to kmemcg
2018-06-27 22:16 [PATCH v2] net, mm: account sock objects to kmemcg Shakeel Butt
@ 2018-06-28 14:52 ` Kirill Tkhai
2018-06-28 15:03 ` Eric Dumazet
2018-06-29 12:57 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Kirill Tkhai @ 2018-06-28 14:52 UTC (permalink / raw)
To: Shakeel Butt, Andrew Morton
Cc: Johannes Weiner, Vladimir Davydov, Greg Thelen, Roman Gushchin,
David S . Miller, Eric Dumazet, linux-kernel, netdev, linux-mm
On 28.06.2018 01:16, Shakeel Butt wrote:
> Currently the kernel accounts the memory for network traffic through
> mem_cgroup_[un]charge_skmem() interface. However the memory accounted
> only includes the truesize of sk_buff which does not include the size of
> sock objects. In our production environment, with opt-out kmem
> accounting, the sock kmem caches (TCP[v6], UDP[v6], RAW[v6], UNIX) are
> among the top most charged kmem caches and consume a significant amount
> of memory which can not be left as system overhead. So, this patch
> converts the kmem caches of all sock objects to SLAB_ACCOUNT.
>
> Signed-off-by: Shakeel Butt <shakeelb@google.com>
> Suggested-by: Eric Dumazet <edumazet@google.com>
Looks good for me.
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
> ---
> Changelog since v1:
> - Instead of specific sock kmem_caches, convert all sock kmem_caches to
> use SLAB_ACCOUNT.
>
> net/core/sock.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/sock.c b/net/core/sock.c
> index bcc41829a16d..9e8f65585b81 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -3243,7 +3243,8 @@ static int req_prot_init(const struct proto *prot)
>
> rsk_prot->slab = kmem_cache_create(rsk_prot->slab_name,
> rsk_prot->obj_size, 0,
> - prot->slab_flags, NULL);
> + SLAB_ACCOUNT | prot->slab_flags,
> + NULL);
>
> if (!rsk_prot->slab) {
> pr_crit("%s: Can't create request sock SLAB cache!\n",
> @@ -3258,7 +3259,8 @@ int proto_register(struct proto *prot, int alloc_slab)
> if (alloc_slab) {
> prot->slab = kmem_cache_create_usercopy(prot->name,
> prot->obj_size, 0,
> - SLAB_HWCACHE_ALIGN | prot->slab_flags,
> + SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT |
> + prot->slab_flags,
> prot->useroffset, prot->usersize,
> NULL);
>
> @@ -3281,6 +3283,7 @@ int proto_register(struct proto *prot, int alloc_slab)
> kmem_cache_create(prot->twsk_prot->twsk_slab_name,
> prot->twsk_prot->twsk_obj_size,
> 0,
> + SLAB_ACCOUNT |
> prot->slab_flags,
> NULL);
> if (prot->twsk_prot->twsk_slab == NULL)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] net, mm: account sock objects to kmemcg
2018-06-27 22:16 [PATCH v2] net, mm: account sock objects to kmemcg Shakeel Butt
2018-06-28 14:52 ` Kirill Tkhai
@ 2018-06-28 15:03 ` Eric Dumazet
2018-06-29 12:57 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2018-06-28 15:03 UTC (permalink / raw)
To: Shakeel Butt, Andrew Morton
Cc: Johannes Weiner, Vladimir Davydov, Greg Thelen, Roman Gushchin,
David S . Miller, Eric Dumazet, Kirill Tkhai, linux-kernel,
netdev, linux-mm
On 06/27/2018 03:16 PM, Shakeel Butt wrote:
> Currently the kernel accounts the memory for network traffic through
> mem_cgroup_[un]charge_skmem() interface. However the memory accounted
> only includes the truesize of sk_buff which does not include the size of
> sock objects. In our production environment, with opt-out kmem
> accounting, the sock kmem caches (TCP[v6], UDP[v6], RAW[v6], UNIX) are
> among the top most charged kmem caches and consume a significant amount
> of memory which can not be left as system overhead. So, this patch
> converts the kmem caches of all sock objects to SLAB_ACCOUNT.
>
> Signed-off-by: Shakeel Butt <shakeelb@google.com>
> Suggested-by: Eric Dumazet <edumazet@google.com>
> ---
Reviewed-by: Eric Dumazet <edumazet@google.com>
Thanks !
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] net, mm: account sock objects to kmemcg
2018-06-27 22:16 [PATCH v2] net, mm: account sock objects to kmemcg Shakeel Butt
2018-06-28 14:52 ` Kirill Tkhai
2018-06-28 15:03 ` Eric Dumazet
@ 2018-06-29 12:57 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-06-29 12:57 UTC (permalink / raw)
To: shakeelb
Cc: akpm, hannes, vdavydov.dev, gthelen, guro, edumazet, ktkhai,
linux-kernel, netdev, linux-mm
From: Shakeel Butt <shakeelb@google.com>
Date: Wed, 27 Jun 2018 15:16:42 -0700
> Currently the kernel accounts the memory for network traffic through
> mem_cgroup_[un]charge_skmem() interface. However the memory accounted
> only includes the truesize of sk_buff which does not include the size of
> sock objects. In our production environment, with opt-out kmem
> accounting, the sock kmem caches (TCP[v6], UDP[v6], RAW[v6], UNIX) are
> among the top most charged kmem caches and consume a significant amount
> of memory which can not be left as system overhead. So, this patch
> converts the kmem caches of all sock objects to SLAB_ACCOUNT.
>
> Signed-off-by: Shakeel Butt <shakeelb@google.com>
> Suggested-by: Eric Dumazet <edumazet@google.com>
> ---
> Changelog since v1:
> - Instead of specific sock kmem_caches, convert all sock kmem_caches to
> use SLAB_ACCOUNT.
Applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-29 12:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-27 22:16 [PATCH v2] net, mm: account sock objects to kmemcg Shakeel Butt
2018-06-28 14:52 ` Kirill Tkhai
2018-06-28 15:03 ` Eric Dumazet
2018-06-29 12:57 ` David Miller
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).