Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1280285
| From | Jason Baron <jbaron@akamai.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label |
| Date | 2015-11-30 22:10 +0100 |
| Message-ID | <qADRT-nK-9@gated-at.bofh.it> (permalink) |
| References | <qytMZ-5hB-3@gated-at.bofh.it> <qytN2-5hB-49@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Hi,
On 11/24/2015 04:52 PM, Johannes Weiner wrote:
> The unified hierarchy memory controller is going to use this jump
> label as well to control the networking callbacks. Move it to the
> memory controller code and give it a more generic name.
>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
> Acked-by: Michal Hocko <mhocko@suse.com>
> Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>
> ---
> include/linux/memcontrol.h | 4 ++++
> include/net/sock.h | 7 -------
> mm/memcontrol.c | 3 +++
> net/core/sock.c | 5 -----
> net/ipv4/tcp_memcontrol.c | 4 ++--
> 5 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> index d99fefe..dad56ef 100644
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -681,6 +681,8 @@ static inline void mem_cgroup_wb_stats(struct bdi_writeback *wb,
>
> #if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
> struct sock;
> +extern struct static_key memcg_sockets_enabled_key;
> +#define mem_cgroup_sockets_enabled static_key_false(&memcg_sockets_enabled_key)
We're trying to move to the updated API, so this should be:
static_branch_unlikely(&memcg_sockets_enabled_key)
see: include/linux/jump_label.h for details.
> void sock_update_memcg(struct sock *sk);
> void sock_release_memcg(struct sock *sk);
> bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages);
> @@ -689,6 +691,8 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)
> {
> return memcg->tcp_mem.memory_pressure;
> }
> +#else
> +#define mem_cgroup_sockets_enabled 0
> #endif /* CONFIG_INET && CONFIG_MEMCG_KMEM */
>
> #ifdef CONFIG_MEMCG_KMEM
> diff --git a/include/net/sock.h b/include/net/sock.h
> index 1a94b85..fcc9442 100644
> --- a/include/net/sock.h
> +++ b/include/net/sock.h
> @@ -1065,13 +1065,6 @@ static inline void sk_refcnt_debug_release(const struct sock *sk)
> #define sk_refcnt_debug_release(sk) do { } while (0)
> #endif /* SOCK_REFCNT_DEBUG */
>
> -#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_NET)
> -extern struct static_key memcg_socket_limit_enabled;
> -#define mem_cgroup_sockets_enabled static_key_false(&memcg_socket_limit_enabled)
> -#else
> -#define mem_cgroup_sockets_enabled 0
> -#endif
> -
> static inline bool sk_stream_memory_free(const struct sock *sk)
> {
> if (sk->sk_wmem_queued >= sk->sk_sndbuf)
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 68d67fc..0602bee 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -291,6 +291,9 @@ static inline struct mem_cgroup *mem_cgroup_from_id(unsigned short id)
> /* Writing them here to avoid exposing memcg's inner layout */
> #if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
>
> +struct static_key memcg_sockets_enabled_key;
And this would be:
static DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
> void sock_update_memcg(struct sock *sk)
> {
> struct mem_cgroup *memcg;
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 6486b0d..c5435b5 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -201,11 +201,6 @@ EXPORT_SYMBOL(sk_net_capable);
> static struct lock_class_key af_family_keys[AF_MAX];
> static struct lock_class_key af_family_slock_keys[AF_MAX];
>
> -#if defined(CONFIG_MEMCG_KMEM)
> -struct static_key memcg_socket_limit_enabled;
> -EXPORT_SYMBOL(memcg_socket_limit_enabled);
> -#endif
> -
> /*
> * Make lock validator output more readable. (we pre-construct these
> * strings build-time, so that runtime initialization of socket
> diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
> index e507825..9a22e2d 100644
> --- a/net/ipv4/tcp_memcontrol.c
> +++ b/net/ipv4/tcp_memcontrol.c
> @@ -34,7 +34,7 @@ void tcp_destroy_cgroup(struct mem_cgroup *memcg)
> return;
>
> if (memcg->tcp_mem.active)
> - static_key_slow_dec(&memcg_socket_limit_enabled);
> + static_key_slow_dec(&memcg_sockets_enabled_key);
>
static_branch_dec(&memcg_sockets_enabled_key);
}
>
> static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
> @@ -65,7 +65,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
> * because when this value change, the code to process it is not
> * patched in yet.
> */
> - static_key_slow_inc(&memcg_socket_limit_enabled);
> + static_key_slow_inc(&memcg_sockets_enabled_key);
> memcg->tcp_mem.active = true;
> }
>
>
static_branch_inc(&memcg_sockets_enabled_key);
Thanks,
-Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/13] mm: memcontrol: account socket memory in unified hierarchy v4 Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 12/13] mm: memcontrol: account socket memory in unified hierarchy memory controller Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 12/13] mm: memcontrol: account socket memory in unified hierarchy memory controller David Miller <davem@davemloft.net> - 2015-11-25 17:40 +0100
Re: [PATCH 12/13] mm: memcontrol: account socket memory in unified hierarchy memory controller Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-11-30 12:00 +0100
Re: [PATCH 12/13] mm: memcontrol: account socket memory in unified hierarchy memory controller Johannes Weiner <hannes@cmpxchg.org> - 2015-11-30 16:30 +0100
Re: [PATCH 12/13] mm: memcontrol: account socket memory in unified hierarchy memory controller Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-11-30 18:10 +0100
[PATCH 01/13] mm: memcontrol: export root_mem_cgroup Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 04/13] net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-label Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 02/13] net: tcp_memcontrol: properly detect ancestor socket pressure Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 06/13] net: tcp_memcontrol: simplify the per-memcg limit access Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 06/13] net: tcp_memcontrol: simplify the per-memcg limit access David Miller <davem@davemloft.net> - 2015-11-25 17:30 +0100
[PATCH 07/13] net: tcp_memcontrol: sanitize tcp memory accounting callbacks Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 07/13] net: tcp_memcontrol: sanitize tcp memory accounting callbacks David Miller <davem@davemloft.net> - 2015-11-25 17:30 +0100
[PATCH 03/13] net: tcp_memcontrol: remove bogus hierarchy pressure propagation Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 11/13] mm: memcontrol: move socket code for unified hierarchy accounting Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 11/13] mm: memcontrol: move socket code for unified hierarchy accounting David Miller <davem@davemloft.net> - 2015-11-25 17:40 +0100
[PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label David Miller <davem@davemloft.net> - 2015-11-25 17:30 +0100
Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label Jason Baron <jbaron@akamai.com> - 2015-11-30 22:10 +0100
Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label Johannes Weiner <hannes@cmpxchg.org> - 2015-11-30 23:00 +0100
Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label Jason Baron <jbaron@akamai.com> - 2015-11-30 23:30 +0100
Re: [PATCH 09/13] mm: memcontrol: generalize the socket accounting jump label Johannes Weiner <hannes@cmpxchg.org> - 2015-11-30 23:50 +0100
[PATCH 08/13] net: tcp_memcontrol: simplify linkage between socket and page counter Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
Re: [PATCH 08/13] net: tcp_memcontrol: simplify linkage between socket and page counter David Miller <davem@davemloft.net> - 2015-11-25 17:30 +0100
[PATCH 05/13] net: tcp_memcontrol: remove dead per-memcg count of allocated sockets Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:00 +0100
[PATCH 13/13] mm: memcontrol: hook up vmpressure to socket pressure Johannes Weiner <hannes@cmpxchg.org> - 2015-11-24 23:10 +0100
Re: [PATCH 13/13] mm: memcontrol: hook up vmpressure to socket pressure David Miller <davem@davemloft.net> - 2015-11-25 17:40 +0100
Re: [PATCH 13/13] mm: memcontrol: hook up vmpressure to socket pressure Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-11-30 12:40 +0100
Re: [PATCH 13/13] mm: memcontrol: hook up vmpressure to socket pressure Johannes Weiner <hannes@cmpxchg.org> - 2015-11-30 17:00 +0100
Re: [PATCH 13/13] mm: memcontrol: hook up vmpressure to socket pressure Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-11-30 17:20 +0100
csiph-web