From: Yang Shi <shy828301@gmail.com>
To: Vlastimil Babka <vbabka@suse.cz>
Cc: Roman Gushchin <guro@fb.com>, Kirill Tkhai <ktkhai@virtuozzo.com>,
Shakeel Butt <shakeelb@google.com>,
Dave Chinner <david@fromorbit.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linux MM <linux-mm@kvack.org>,
Linux FS-devel Mailing List <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [v5 PATCH 06/11] mm: vmscan: use a new flag to indicate shrinker is registered
Date: Thu, 28 Jan 2021 15:47:57 -0800 [thread overview]
Message-ID: <CAHbLzkr1ab9c6hMQgtF7Ys--9LsdDGAi0SqotHwpTzvv0wJ2TA@mail.gmail.com> (raw)
In-Reply-To: <df26e4ae-ec84-227e-08e1-5849f7fb7be3@suse.cz>
On Thu, Jan 28, 2021 at 9:56 AM Vlastimil Babka <vbabka@suse.cz> wrote:
>
> On 1/28/21 12:33 AM, Yang Shi wrote:
> > Currently registered shrinker is indicated by non-NULL shrinker->nr_deferred.
> > This approach is fine with nr_deferred at the shrinker level, but the following
> > patches will move MEMCG_AWARE shrinkers' nr_deferred to memcg level, so their
> > shrinker->nr_deferred would always be NULL. This would prevent the shrinkers
> > from unregistering correctly.
> >
> > Remove SHRINKER_REGISTERING since we could check if shrinker is registered
> > successfully by the new flag.
> >
> > Signed-off-by: Yang Shi <shy828301@gmail.com>
> > ---
> > include/linux/shrinker.h | 7 ++++---
> > mm/vmscan.c | 27 +++++++++------------------
> > 2 files changed, 13 insertions(+), 21 deletions(-)
> >
> > diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
> > index 0f80123650e2..1eac79ce57d4 100644
> > --- a/include/linux/shrinker.h
> > +++ b/include/linux/shrinker.h
> > @@ -79,13 +79,14 @@ struct shrinker {
> > #define DEFAULT_SEEKS 2 /* A good number if you don't know better. */
> >
> > /* Flags */
> > -#define SHRINKER_NUMA_AWARE (1 << 0)
> > -#define SHRINKER_MEMCG_AWARE (1 << 1)
> > +#define SHRINKER_REGISTERED (1 << 0)
> > +#define SHRINKER_NUMA_AWARE (1 << 1)
> > +#define SHRINKER_MEMCG_AWARE (1 << 2)
> > /*
> > * It just makes sense when the shrinker is also MEMCG_AWARE for now,
> > * non-MEMCG_AWARE shrinker should not have this flag set.
> > */
> > -#define SHRINKER_NONSLAB (1 << 2)
> > +#define SHRINKER_NONSLAB (1 << 3)
> >
> > extern int prealloc_shrinker(struct shrinker *shrinker);
> > extern void register_shrinker_prepared(struct shrinker *shrinker);
> > diff --git a/mm/vmscan.c b/mm/vmscan.c
> > index 92e917033797..256896d157d4 100644
> > --- a/mm/vmscan.c
> > +++ b/mm/vmscan.c
> > @@ -308,19 +308,6 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id)
> > }
> > }
> >
> > -/*
> > - * We allow subsystems to populate their shrinker-related
> > - * LRU lists before register_shrinker_prepared() is called
> > - * for the shrinker, since we don't want to impose
> > - * restrictions on their internal registration order.
> > - * In this case shrink_slab_memcg() may find corresponding
> > - * bit is set in the shrinkers map.
> > - *
> > - * This value is used by the function to detect registering
> > - * shrinkers and to skip do_shrink_slab() calls for them.
> > - */
> > -#define SHRINKER_REGISTERING ((struct shrinker *)~0UL)
> > -
> > static DEFINE_IDR(shrinker_idr);
> >
> > static int prealloc_memcg_shrinker(struct shrinker *shrinker)
> > @@ -329,7 +316,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shrinker)
> >
> > down_write(&shrinker_rwsem);
> > /* This may call shrinker, so it must use down_read_trylock() */
> > - id = idr_alloc(&shrinker_idr, SHRINKER_REGISTERING, 0, 0, GFP_KERNEL);
> > + id = idr_alloc(&shrinker_idr, NULL, 0, 0, GFP_KERNEL);
>
> Is it still needed to register a NULL and then replace it with real pointer,
> given the SHRINKER_REGISTERED flag?
Good question. Should not need this alloc-replace sequence anymore.
The shrinker_slab_memcg() should see SHRINKER_REGISTERED set when the
shrinker is really registered since the registration is protected by
write shrinker_rwsem.
Will fix this in v6.
>
> > if (id < 0)
> > goto unlock;
> >
> > @@ -496,6 +483,7 @@ void register_shrinker_prepared(struct shrinker *shrinker)
> > if (shrinker->flags & SHRINKER_MEMCG_AWARE)
> > idr_replace(&shrinker_idr, shrinker, shrinker->id);
> > #endif
> > + shrinker->flags |= SHRINKER_REGISTERED;
> > up_write(&shrinker_rwsem);
> > }
> >
> > @@ -515,13 +503,16 @@ EXPORT_SYMBOL(register_shrinker);
> > */
> > void unregister_shrinker(struct shrinker *shrinker)
> > {
> > - if (!shrinker->nr_deferred)
> > + if (!(shrinker->flags & SHRINKER_REGISTERED))
> > return;
> > - if (shrinker->flags & SHRINKER_MEMCG_AWARE)
> > - unregister_memcg_shrinker(shrinker);
> > +
> > down_write(&shrinker_rwsem);
> > list_del(&shrinker->list);
> > + shrinker->flags &= ~SHRINKER_REGISTERED;
> > up_write(&shrinker_rwsem);
> > +
> > + if (shrinker->flags & SHRINKER_MEMCG_AWARE)
> > + unregister_memcg_shrinker(shrinker);
> > kfree(shrinker->nr_deferred);
> > shrinker->nr_deferred = NULL;
> > }
> > @@ -687,7 +678,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
> > struct shrinker *shrinker;
> >
> > shrinker = idr_find(&shrinker_idr, i);
> > - if (unlikely(!shrinker || shrinker == SHRINKER_REGISTERING)) {
> > + if (unlikely(!shrinker || !(shrinker->flags & SHRINKER_REGISTERED))) {
> > if (!shrinker)
> > clear_bit(i, info->map);
> > continue;
> >
>
next prev parent reply other threads:[~2021-01-28 23:48 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 23:33 [v5 PATCH 0/11] Make shrinker's nr_deferred memcg aware Yang Shi
2021-01-27 23:33 ` [v5 PATCH 01/11] mm: vmscan: use nid from shrink_control for tracepoint Yang Shi
2021-01-28 16:02 ` Vlastimil Babka
2021-01-27 23:33 ` [v5 PATCH 02/11] mm: vmscan: consolidate shrinker_maps handling code Yang Shi
2021-01-28 16:10 ` Vlastimil Babka
2021-01-28 21:16 ` Yang Shi
2021-01-29 14:33 ` Kirill Tkhai
2021-01-29 17:11 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 03/11] mm: vmscan: use shrinker_rwsem to protect shrinker_maps allocation Yang Shi
2021-01-28 16:19 ` Vlastimil Babka
2021-01-27 23:33 ` [v5 PATCH 04/11] mm: vmscan: remove memcg_shrinker_map_size Yang Shi
2021-01-28 16:53 ` Vlastimil Babka
2021-01-28 21:22 ` Yang Shi
2021-01-29 11:22 ` Vlastimil Babka
2021-01-29 17:05 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 05/11] mm: memcontrol: rename shrinker_map to shrinker_info Yang Shi
2021-01-28 17:38 ` Vlastimil Babka
2021-01-28 22:05 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 06/11] mm: vmscan: use a new flag to indicate shrinker is registered Yang Shi
2021-01-28 17:56 ` Vlastimil Babka
2021-01-28 23:47 ` Yang Shi [this message]
2021-01-27 23:33 ` [v5 PATCH 07/11] mm: vmscan: add per memcg shrinker nr_deferred Yang Shi
2021-01-29 13:00 ` Vlastimil Babka
2021-01-29 14:46 ` Kirill Tkhai
2021-01-29 17:20 ` Yang Shi
2021-01-29 18:04 ` Yang Shi
2021-02-01 15:17 ` Vlastimil Babka
2021-02-01 17:09 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 08/11] mm: vmscan: use per memcg nr_deferred of shrinker Yang Shi
2021-01-29 14:55 ` Kirill Tkhai
2021-01-29 14:59 ` Kirill Tkhai
2021-01-29 17:22 ` Yang Shi
2021-01-29 15:13 ` Vlastimil Babka
2021-01-29 17:33 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 09/11] mm: vmscan: don't need allocate shrinker->nr_deferred for memcg aware shrinkers Yang Shi
2021-01-29 15:40 ` Vlastimil Babka
2021-01-29 17:34 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 10/11] mm: memcontrol: reparent nr_deferred when memcg offline Yang Shi
2021-01-29 15:52 ` Vlastimil Babka
2021-01-29 17:38 ` Yang Shi
2021-01-27 23:33 ` [v5 PATCH 11/11] mm: vmscan: shrink deferred objects proportional to priority Yang Shi
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=CAHbLzkr1ab9c6hMQgtF7Ys--9LsdDGAi0SqotHwpTzvv0wJ2TA@mail.gmail.com \
--to=shy828301@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=david@fromorbit.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=ktkhai@virtuozzo.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=shakeelb@google.com \
--cc=vbabka@suse.cz \
/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).