From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: akpm@linux-foundation.org, shakeelb@google.com,
viro@zeniv.linux.org.uk, hannes@cmpxchg.org, mhocko@kernel.org,
tglx@linutronix.de, pombredanne@nexb.com,
stummala@codeaurora.org, gregkh@linuxfoundation.org,
sfr@canb.auug.org.au, guro@fb.com, mka@chromium.org,
penguin-kernel@I-love.SAKURA.ne.jp, chris@chris-wilson.co.uk,
longman@redhat.com, minchan@kernel.org, ying.huang@intel.com,
mgorman@techsingularity.net, jbacik@fb.com, linux@roeck-us.net,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
willy@infradead.org, lirongqing@baidu.com,
aryabinin@virtuozzo.com
Subject: Re: [PATCH v6 14/17] mm: Iterate only over charged shrinkers during memcg shrink_slab()
Date: Sun, 20 May 2018 11:00:03 +0300 [thread overview]
Message-ID: <20180520080003.gfygtb6rloqpjaol@esperanza> (raw)
In-Reply-To: <152663304128.5308.12840831728812876902.stgit@localhost.localdomain>
On Fri, May 18, 2018 at 11:44:01AM +0300, Kirill Tkhai wrote:
> Using the preparations made in previous patches, in case of memcg
> shrink, we may avoid shrinkers, which are not set in memcg's shrinkers
> bitmap. To do that, we separate iterations over memcg-aware and
> !memcg-aware shrinkers, and memcg-aware shrinkers are chosen
> via for_each_set_bit() from the bitmap. In case of big nodes,
> having many isolated environments, this gives significant
> performance growth. See next patches for the details.
>
> Note, that the patch does not respect to empty memcg shrinkers,
> since we never clear the bitmap bits after we set it once.
> Their shrinkers will be called again, with no shrinked objects
> as result. This functionality is provided by next patches.
>
> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
> ---
> mm/vmscan.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 78 insertions(+), 9 deletions(-)
>
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index f09ea20d7270..2fbf3b476601 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -373,6 +373,20 @@ int prealloc_shrinker(struct shrinker *shrinker)
> goto free_deferred;
> }
>
> + /*
> + * There is a window between prealloc_shrinker()
> + * and register_shrinker_prepared(). We don't want
> + * to clear bit of a shrinker in such the state
> + * in shrink_slab_memcg(), since this will impose
> + * restrictions on a code registering a shrinker
> + * (they would have to guarantee, their LRU lists
> + * are empty till shrinker is completely registered).
> + * So, we differ the situation, when 1)a shrinker
> + * is semi-registered (id is assigned, but it has
> + * not yet linked to shrinker_list) and 2)shrinker
> + * is not registered (id is not assigned).
> + */
> + INIT_LIST_HEAD(&shrinker->list);
> return 0;
>
> free_deferred:
> @@ -544,6 +558,67 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
> return freed;
> }
>
> +#ifdef CONFIG_MEMCG_KMEM
> +static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
> + struct mem_cgroup *memcg, int priority)
> +{
> + struct memcg_shrinker_map *map;
> + unsigned long freed = 0;
> + int ret, i;
> +
> + if (!memcg_kmem_enabled() || !mem_cgroup_online(memcg))
> + return 0;
> +
> + if (!down_read_trylock(&shrinker_rwsem))
> + return 0;
> +
> + /*
> + * 1) Caller passes only alive memcg, so map can't be NULL.
> + * 2) shrinker_rwsem protects from maps expanding.
> + */
> + map = rcu_dereference_protected(memcg->nodeinfo[nid]->shrinker_map,
> + true);
> + BUG_ON(!map);
> +
> + for_each_set_bit(i, map->map, memcg_shrinker_nr_max) {
> + struct shrink_control sc = {
> + .gfp_mask = gfp_mask,
> + .nid = nid,
> + .memcg = memcg,
> + };
> + struct shrinker *shrinker;
> +
> + shrinker = idr_find(&shrinker_idr, i);
> + if (unlikely(!shrinker)) {
Nit: I don't think 'unlikely' is required here as this is definitely not
a hot path.
> + clear_bit(i, map->map);
> + continue;
> + }
> + BUG_ON(!(shrinker->flags & SHRINKER_MEMCG_AWARE));
> +
> + /* See comment in prealloc_shrinker() */
> + if (unlikely(list_empty(&shrinker->list)))
Ditto.
> + continue;
> +
> + ret = do_shrink_slab(&sc, shrinker, priority);
> + freed += ret;
> +
> + if (rwsem_is_contended(&shrinker_rwsem)) {
> + freed = freed ? : 1;
> + break;
> + }
> + }
> +
> + up_read(&shrinker_rwsem);
> + return freed;
> +}
> +#else /* CONFIG_MEMCG_KMEM */
> +static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
> + struct mem_cgroup *memcg, int priority)
> +{
> + return 0;
> +}
> +#endif /* CONFIG_MEMCG_KMEM */
> +
> /**
> * shrink_slab - shrink slab caches
> * @gfp_mask: allocation context
> @@ -573,8 +648,8 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
> struct shrinker *shrinker;
> unsigned long freed = 0;
>
> - if (memcg && (!memcg_kmem_enabled() || !mem_cgroup_online(memcg)))
> - return 0;
> + if (memcg && !mem_cgroup_is_root(memcg))
> + return shrink_slab_memcg(gfp_mask, nid, memcg, priority);
>
> if (!down_read_trylock(&shrinker_rwsem))
> goto out;
> @@ -586,13 +661,7 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
> .memcg = memcg,
> };
>
> - /*
> - * If kernel memory accounting is disabled, we ignore
> - * SHRINKER_MEMCG_AWARE flag and call all shrinkers
> - * passing NULL for memcg.
> - */
> - if (memcg_kmem_enabled() &&
> - !!memcg != !!(shrinker->flags & SHRINKER_MEMCG_AWARE))
> + if (!!memcg != !!(shrinker->flags & SHRINKER_MEMCG_AWARE))
> continue;
>
> if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
>
next prev parent reply other threads:[~2018-05-20 8:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 8:41 [PATCH v6 00/17] Improve shrink_slab() scalability (old complexity was O(n^2), new is O(n)) Kirill Tkhai
2018-05-18 8:41 ` [PATCH v6 01/17] list_lru: Combine code under the same define Kirill Tkhai
2018-05-18 8:41 ` [PATCH v6 02/17] mm: Introduce CONFIG_MEMCG_KMEM as combination of CONFIG_MEMCG && !CONFIG_SLOB Kirill Tkhai
2018-05-18 8:42 ` [PATCH v6 03/17] mm: Assign id to every memcg-aware shrinker Kirill Tkhai
2018-05-20 7:08 ` Vladimir Davydov
2018-05-18 8:42 ` [PATCH v6 04/17] memcg: Move up for_each_mem_cgroup{, _tree} defines Kirill Tkhai
2018-05-18 8:42 ` [PATCH v6 05/17] mm: Assign memcg-aware shrinkers bitmap to memcg Kirill Tkhai
2018-05-20 7:27 ` Vladimir Davydov
2018-05-21 10:16 ` Kirill Tkhai
2018-05-21 18:40 ` Vladimir Davydov
2018-05-18 8:42 ` [PATCH v6 06/17] mm: Refactoring in workingset_init() Kirill Tkhai
2018-05-18 8:42 ` [PATCH v6 07/17] fs: Refactoring in alloc_super() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 08/17] fs: Propagate shrinker::id to list_lru Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 09/17] list_lru: Add memcg argument to list_lru_from_kmem() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 10/17] list_lru: Pass dst_memcg argument to memcg_drain_list_lru_node() Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 11/17] list_lru: Pass lru " Kirill Tkhai
2018-05-18 8:43 ` [PATCH v6 12/17] mm: Set bit in memcg shrinker bitmap on first list_lru item apearance Kirill Tkhai
2018-05-20 7:55 ` Vladimir Davydov
2018-05-21 9:31 ` Kirill Tkhai
2018-05-21 18:16 ` Vladimir Davydov
2018-05-18 8:43 ` [PATCH v6 13/17] mm: Export mem_cgroup_is_root() Kirill Tkhai
2018-05-20 7:57 ` Vladimir Davydov
2018-05-18 8:44 ` [PATCH v6 14/17] mm: Iterate only over charged shrinkers during memcg shrink_slab() Kirill Tkhai
2018-05-20 8:00 ` Vladimir Davydov [this message]
2018-05-21 9:17 ` Kirill Tkhai
2018-05-21 17:56 ` Vladimir Davydov
2018-05-18 8:44 ` [PATCH v6 15/17] mm: Generalize shrink_slab() calls in shrink_node() Kirill Tkhai
2018-05-20 8:08 ` Vladimir Davydov
2018-05-21 9:19 ` Kirill Tkhai
2018-05-18 8:44 ` [PATCH v6 16/17] mm: Add SHRINK_EMPTY shrinker methods return value Kirill Tkhai
2018-05-18 8:44 ` [PATCH v6 17/17] mm: Clear shrinker bit if there are no objects related to memcg Kirill Tkhai
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=20180520080003.gfygtb6rloqpjaol@esperanza \
--to=vdavydov.dev@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=chris@chris-wilson.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=jbacik@fb.com \
--cc=ktkhai@virtuozzo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@roeck-us.net \
--cc=lirongqing@baidu.com \
--cc=longman@redhat.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=minchan@kernel.org \
--cc=mka@chromium.org \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=pombredanne@nexb.com \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.com \
--cc=stummala@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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).